diff --git a/Source/Client/Defs.h b/Source/Client/Defs.h
index 8a47a4ee..fe7e00c4 100644
--- a/Source/Client/Defs.h
+++ b/Source/Client/Defs.h
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/Draw.c b/Source/Client/Draw.c
index d669fb99..d3a6960d 100644
--- a/Source/Client/Draw.c
+++ b/Source/Client/Draw.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/Entities.c b/Source/Client/Entities.c
index c414c34f..bc5dff61 100644
--- a/Source/Client/Entities.c
+++ b/Source/Client/Entities.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/Event.c b/Source/Client/Event.c
index 6477688c..b567b99e 100644
--- a/Source/Client/Event.c
+++ b/Source/Client/Event.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/HUD.c b/Source/Client/HUD.c
index cba74960..6e3c572d 100644
--- a/Source/Client/HUD.c
+++ b/Source/Client/HUD.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/HUDCrosshair.c b/Source/Client/HUDCrosshair.c
index 9dcea96c..01ec85fa 100644
--- a/Source/Client/HUDCrosshair.c
+++ b/Source/Client/HUDCrosshair.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/HUDOrbituaries.c b/Source/Client/HUDOrbituaries.c
index c7e0ffcf..79a7c0ce 100644
--- a/Source/Client/HUDOrbituaries.c
+++ b/Source/Client/HUDOrbituaries.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/HUDWeaponSelect.c b/Source/Client/HUDWeaponSelect.c
index d1bde831..6a05f4fd 100644
--- a/Source/Client/HUDWeaponSelect.c
+++ b/Source/Client/HUDWeaponSelect.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/Init.c b/Source/Client/Init.c
index 1733da84..49e55eb2 100644
--- a/Source/Client/Init.c
+++ b/Source/Client/Init.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/Nightvision.c b/Source/Client/Nightvision.c
index 2408ca1c..c18ed494 100644
--- a/Source/Client/Nightvision.c
+++ b/Source/Client/Nightvision.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/Sound.c b/Source/Client/Sound.c
index c6c113af..31a74a92 100644
--- a/Source/Client/Sound.c
+++ b/Source/Client/Sound.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/VGUI.c b/Source/Client/VGUI.c
index f7b8a597..ba001259 100644
--- a/Source/Client/VGUI.c
+++ b/Source/Client/VGUI.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/VGUI.h b/Source/Client/VGUI.h
index e19a6bfd..ec919b8b 100644
--- a/Source/Client/VGUI.h
+++ b/Source/Client/VGUI.h
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/VGUIBuyMenu.c b/Source/Client/VGUIBuyMenu.c
index dbdb6997..cda7fdb1 100644
--- a/Source/Client/VGUIBuyMenu.c
+++ b/Source/Client/VGUIBuyMenu.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/VGUIMOTD.c b/Source/Client/VGUIMOTD.c
index c6155c74..9e00cc29 100644
--- a/Source/Client/VGUIMOTD.c
+++ b/Source/Client/VGUIMOTD.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/VGUIObjects.c b/Source/Client/VGUIObjects.c
index 1b7ec45b..a1f94721 100644
--- a/Source/Client/VGUIObjects.c
+++ b/Source/Client/VGUIObjects.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-
 #include "VGUI.h"
 
 vector HUD_GetChatColor( float fTeam ) {
diff --git a/Source/Client/VGUIScoreboard.c b/Source/Client/VGUIScoreboard.c
index a6c910cf..594b6335 100644
--- a/Source/Client/VGUIScoreboard.c
+++ b/Source/Client/VGUIScoreboard.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/VGUISpectator.c b/Source/Client/VGUISpectator.c
index e488e9fc..c47cb960 100644
--- a/Source/Client/VGUISpectator.c
+++ b/Source/Client/VGUISpectator.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/VGUITeamSelect.c b/Source/Client/VGUITeamSelect.c
index 02d27860..eb59157d 100644
--- a/Source/Client/VGUITeamSelect.c
+++ b/Source/Client/VGUITeamSelect.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Client/View.c b/Source/Client/View.c
index 14752778..3ffbba4f 100644
--- a/Source/Client/View.c
+++ b/Source/Client/View.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/AmbientSound.c b/Source/Server/AmbientSound.c
index a14e0d78..aaf36841 100644
--- a/Source/Server/AmbientSound.c
+++ b/Source/Server/AmbientSound.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Ammo.c b/Source/Server/Ammo.c
index af7271aa..a2098ef3 100644
--- a/Source/Server/Ammo.c
+++ b/Source/Server/Ammo.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Animations.c b/Source/Server/Animations.c
index f33d73d8..5bd29163 100644
--- a/Source/Server/Animations.c
+++ b/Source/Server/Animations.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Client.c b/Source/Server/Client.c
index 8e154b2c..e57855dd 100644
--- a/Source/Server/Client.c
+++ b/Source/Server/Client.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Damage.c b/Source/Server/Damage.c
index 80b7f455..b880a385 100644
--- a/Source/Server/Damage.c
+++ b/Source/Server/Damage.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Defs.h b/Source/Server/Defs.h
index 3f96bb72..62ed189a 100644
--- a/Source/Server/Defs.h
+++ b/Source/Server/Defs.h
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/EntHostage.c b/Source/Server/EntHostage.c
index 1f6faabc..807067c9 100644
--- a/Source/Server/EntHostage.c
+++ b/Source/Server/EntHostage.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Entities.c b/Source/Server/Entities.c
index 9be1c08e..043c5d1a 100644
--- a/Source/Server/Entities.c
+++ b/Source/Server/Entities.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/EnvObjects.c b/Source/Server/EnvObjects.c
index 3827f47a..97c779b4 100644
--- a/Source/Server/EnvObjects.c
+++ b/Source/Server/EnvObjects.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -18,7 +18,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-
 /*
 =================
 cycler_sprite
diff --git a/Source/Server/Footsteps.c b/Source/Server/Footsteps.c
index 126889f4..02e175f6 100644
--- a/Source/Server/Footsteps.c
+++ b/Source/Server/Footsteps.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/FuncBombTarget.c b/Source/Server/FuncBombTarget.c
index 2f1c7c75..4b1864ff 100644
--- a/Source/Server/FuncBombTarget.c
+++ b/Source/Server/FuncBombTarget.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-
 /*
 =================
 func_bomb_target_touch
diff --git a/Source/Server/FuncBreakable.c b/Source/Server/FuncBreakable.c
index 9c0a53b8..2fbbad2c 100644
--- a/Source/Server/FuncBreakable.c
+++ b/Source/Server/FuncBreakable.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/FuncButton.c b/Source/Server/FuncButton.c
index 30f2cfeb..e6a620a9 100644
--- a/Source/Server/FuncButton.c
+++ b/Source/Server/FuncButton.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/FuncBuyZone.c b/Source/Server/FuncBuyZone.c
index 357a217e..750eca40 100644
--- a/Source/Server/FuncBuyZone.c
+++ b/Source/Server/FuncBuyZone.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/FuncDoor.c b/Source/Server/FuncDoor.c
index faebe5e9..d7fdc399 100644
--- a/Source/Server/FuncDoor.c
+++ b/Source/Server/FuncDoor.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/FuncDoorRotating.c b/Source/Server/FuncDoorRotating.c
index 3162675e..300d1dfd 100644
--- a/Source/Server/FuncDoorRotating.c
+++ b/Source/Server/FuncDoorRotating.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/FuncEscapeZone.c b/Source/Server/FuncEscapeZone.c
index 0e4966e2..cc502c10 100644
--- a/Source/Server/FuncEscapeZone.c
+++ b/Source/Server/FuncEscapeZone.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/FuncHostageRescue.c b/Source/Server/FuncHostageRescue.c
index d79735d8..d90cb188 100644
--- a/Source/Server/FuncHostageRescue.c
+++ b/Source/Server/FuncHostageRescue.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/FuncLadder.c b/Source/Server/FuncLadder.c
index ed9785d8..0dffae27 100644
--- a/Source/Server/FuncLadder.c
+++ b/Source/Server/FuncLadder.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/FuncVIPSafetyZone.c b/Source/Server/FuncVIPSafetyZone.c
index 814b2b63..e493ab3c 100644
--- a/Source/Server/FuncVIPSafetyZone.c
+++ b/Source/Server/FuncVIPSafetyZone.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Input.c b/Source/Server/Input.c
index 7e1e69b4..d891596a 100644
--- a/Source/Server/Input.c
+++ b/Source/Server/Input.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Light.c b/Source/Server/Light.c
index 5728dd47..1f3a549e 100644
--- a/Source/Server/Light.c
+++ b/Source/Server/Light.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Money.c b/Source/Server/Money.c
index 9ad7677e..279e404e 100644
--- a/Source/Server/Money.c
+++ b/Source/Server/Money.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Player.c b/Source/Server/Player.c
index f8a9b3c6..67973e97 100644
--- a/Source/Server/Player.c
+++ b/Source/Server/Player.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Rules.c b/Source/Server/Rules.c
index e1c34608..126c10e7 100644
--- a/Source/Server/Rules.c
+++ b/Source/Server/Rules.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Spawn.c b/Source/Server/Spawn.c
index 698a49ad..27d203a0 100644
--- a/Source/Server/Spawn.c
+++ b/Source/Server/Spawn.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/Timer.c b/Source/Server/Timer.c
index 961e6681..1d0ca374 100644
--- a/Source/Server/Timer.c
+++ b/Source/Server/Timer.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Server/TraceAttack.c b/Source/Server/TraceAttack.c
index 57fa89a9..c30cb450 100644
--- a/Source/Server/TraceAttack.c
+++ b/Source/Server/TraceAttack.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -18,50 +18,63 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
+int iTotalPenetrations;
+
+void TraceAttack_FireSingle( vector vPos, vector vAngle ) {
+	static void TraceAttack_Penetrate( vector vPos, vector vAngle  ) {
+		if ( iTotalPenetrations > 0 ) {
+			return;
+		}
+		
+		TraceAttack_FireSingle( vPos, vAngle );
+		iTotalPenetrations++;
+	}
+	traceline( vPos, vPos + ( vAngle * 2048 ), MOVE_HITMODEL, self);
+		
+	if (trace_fraction != 1.0) {
+		if ( trace_ent.takedamage == DAMAGE_YES ) {
+			Damage_Apply( trace_ent, self, wptTable[ self.weapon ].iDamage, trace_endpos );
+		}
+		
+		if ( trace_ent.iBleeds == TRUE ) {
+			Effect_Impact( IMPACT_FLESH, trace_endpos, trace_plane_normal );
+		} else {
+			string sTexture = getsurfacetexture( trace_ent, getsurfacenearpoint( trace_ent, trace_endpos ) );
+	
+			switch( (float)hash_get( hashMaterials, sTexture ) ) { 
+				case 'G':
+				case 'V':
+					TraceAttack_Penetrate( trace_endpos + ( v_forward * 2 ), vAngle );
+				case 'M':
+				case 'P':
+					Effect_Impact( IMPACT_METAL, trace_endpos, trace_plane_normal );
+					break;
+				case 'D':
+				case 'W':
+					Effect_Impact( IMPACT_WOOD, trace_endpos, trace_plane_normal );
+					TraceAttack_Penetrate( trace_endpos + ( v_forward * 2 ), vAngle );
+					break;
+				case 'Y':
+					Effect_Impact( IMPACT_GLASS, trace_endpos, trace_plane_normal );
+					break;
+				case 'N':
+					TraceAttack_Penetrate( trace_endpos + ( v_forward * 2 ), vAngle );
+				case 'T':
+				default:
+					Effect_Impact( IMPACT_DEFAULT, trace_endpos, trace_plane_normal );
+					break;
+			 }
+		}
+	}
+}
 void TraceAttack_FireBullets( int iShots, vector vPos ) {
 	vector vDir;
-
 	makevectors(self.v_angle);
 	
 	while ( iShots > 0) {
+		iTotalPenetrations = 0;
 		vDir = aim( self, 100000 ) + Math_CRandom()*self.fAccuracy*v_right + Math_CRandom()*self.fAccuracy*v_up;
-		
-		traceline( vPos, vPos + ( vDir * 2048 ), MOVE_HITMODEL, self);
-		if (trace_fraction != 1.0) {
-			if ( trace_ent.takedamage == DAMAGE_YES ) {
-				Damage_Apply( trace_ent, self, wptTable[ self.weapon ].iDamage, trace_endpos );
-			}
-			
-			if ( trace_ent.iBleeds == TRUE ) {
-				Effect_Impact( IMPACT_FLESH, trace_endpos, trace_plane_normal );
-			} else {
-				string sTexture = getsurfacetexture( trace_ent, getsurfacenearpoint( trace_ent, trace_endpos ) );
-		
-				switch( (float)hash_get( hashMaterials, sTexture ) ) { 
-					case 'G':
-					case 'V':
-						TraceAttack_FireBullets( iShots, trace_endpos + ( v_forward * 2 ) );
-					case 'M':
-					case 'P':
-						Effect_Impact( IMPACT_METAL, trace_endpos, trace_plane_normal );
-						break;
-					case 'D':
-					case 'W':
-						Effect_Impact( IMPACT_WOOD, trace_endpos, trace_plane_normal );
-						TraceAttack_FireBullets( iShots, trace_endpos + ( v_forward * 2 ) );
-						break;
-					case 'Y':
-						Effect_Impact( IMPACT_GLASS, trace_endpos, trace_plane_normal );
-						break;
-					case 'N':
-						TraceAttack_FireBullets( iShots, trace_endpos + ( v_forward * 2 ) );
-					case 'T':
-					default:
-						Effect_Impact( IMPACT_DEFAULT, trace_endpos, trace_plane_normal );
-						break;
-				 }
-			}
-		}
+		TraceAttack_FireSingle( vPos, vDir );
 		iShots--;
 	}
 	
diff --git a/Source/Server/Triggers.c b/Source/Server/Triggers.c
index f3ee934f..bba46063 100644
--- a/Source/Server/Triggers.c
+++ b/Source/Server/Triggers.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/BaseMelee.c b/Source/Shared/BaseMelee.c
index 91e47520..dcd23251 100644
--- a/Source/Shared/BaseMelee.c
+++ b/Source/Shared/BaseMelee.c
@@ -1,5 +1,6 @@
 /*
-Copyright (C) 2015, 2016, 2017 Marco "eukara" Hladik
+OpenCS Project
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/Effects.c b/Source/Shared/Effects.c
index e1fad85c..3c3450bf 100644
--- a/Source/Shared/Effects.c
+++ b/Source/Shared/Effects.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-
 #ifdef CSQC
 .float framerate;
 .float maxframe;
diff --git a/Source/Shared/Equipment.c b/Source/Shared/Equipment.c
index ed3faafd..c88608d3 100644
--- a/Source/Shared/Equipment.c
+++ b/Source/Shared/Equipment.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/Radio.c b/Source/Shared/Radio.c
index 4d8a1bbf..44f0dfe1 100644
--- a/Source/Shared/Radio.c
+++ b/Source/Shared/Radio.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponAK47.c b/Source/Shared/WeaponAK47.c
index 821e8157..39d30261 100644
--- a/Source/Shared/WeaponAK47.c
+++ b/Source/Shared/WeaponAK47.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponAUG.c b/Source/Shared/WeaponAUG.c
index 35275b74..916be914 100644
--- a/Source/Shared/WeaponAUG.c
+++ b/Source/Shared/WeaponAUG.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponAWP.c b/Source/Shared/WeaponAWP.c
index f4aeb45c..10863b85 100644
--- a/Source/Shared/WeaponAWP.c
+++ b/Source/Shared/WeaponAWP.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponBase.c b/Source/Shared/WeaponBase.c
index b1dc8bb7..17d476fe 100644
--- a/Source/Shared/WeaponBase.c
+++ b/Source/Shared/WeaponBase.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponC4Bomb.c b/Source/Shared/WeaponC4Bomb.c
index 8a214ba7..bea08357 100644
--- a/Source/Shared/WeaponC4Bomb.c
+++ b/Source/Shared/WeaponC4Bomb.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponDeagle.c b/Source/Shared/WeaponDeagle.c
index 9ee59b57..78375053 100644
--- a/Source/Shared/WeaponDeagle.c
+++ b/Source/Shared/WeaponDeagle.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponElites.c b/Source/Shared/WeaponElites.c
index 684dda50..53d3f2b3 100644
--- a/Source/Shared/WeaponElites.c
+++ b/Source/Shared/WeaponElites.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponFiveSeven.c b/Source/Shared/WeaponFiveSeven.c
index ba480397..5bf02ceb 100644
--- a/Source/Shared/WeaponFiveSeven.c
+++ b/Source/Shared/WeaponFiveSeven.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponG3SG1.c b/Source/Shared/WeaponG3SG1.c
index 850bebbd..e6c939ae 100644
--- a/Source/Shared/WeaponG3SG1.c
+++ b/Source/Shared/WeaponG3SG1.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponGlock18.c b/Source/Shared/WeaponGlock18.c
index a4eb7f60..7e78274c 100644
--- a/Source/Shared/WeaponGlock18.c
+++ b/Source/Shared/WeaponGlock18.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponKnife.c b/Source/Shared/WeaponKnife.c
index 759a03ba..e488b61a 100644
--- a/Source/Shared/WeaponKnife.c
+++ b/Source/Shared/WeaponKnife.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponM3.c b/Source/Shared/WeaponM3.c
index 83ddf191..75084a7a 100644
--- a/Source/Shared/WeaponM3.c
+++ b/Source/Shared/WeaponM3.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponM4A1.c b/Source/Shared/WeaponM4A1.c
index da2a0447..2a9d9ccd 100644
--- a/Source/Shared/WeaponM4A1.c
+++ b/Source/Shared/WeaponM4A1.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponMP5.c b/Source/Shared/WeaponMP5.c
index c7c156a0..f9083c75 100644
--- a/Source/Shared/WeaponMP5.c
+++ b/Source/Shared/WeaponMP5.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponMac10.c b/Source/Shared/WeaponMac10.c
index 70e459b1..2d8ee340 100644
--- a/Source/Shared/WeaponMac10.c
+++ b/Source/Shared/WeaponMac10.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponP228.c b/Source/Shared/WeaponP228.c
index 175c0f7d..e65d2fa7 100644
--- a/Source/Shared/WeaponP228.c
+++ b/Source/Shared/WeaponP228.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-
 .int iMag_P228;
 
 // Weapon Info
diff --git a/Source/Shared/WeaponP90.c b/Source/Shared/WeaponP90.c
index c7a7267e..09a40bbe 100644
--- a/Source/Shared/WeaponP90.c
+++ b/Source/Shared/WeaponP90.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponPara.c b/Source/Shared/WeaponPara.c
index 2deb3ff3..8de47c0f 100644
--- a/Source/Shared/WeaponPara.c
+++ b/Source/Shared/WeaponPara.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponSG550.c b/Source/Shared/WeaponSG550.c
index a093522b..77e7998c 100644
--- a/Source/Shared/WeaponSG550.c
+++ b/Source/Shared/WeaponSG550.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponSG552.c b/Source/Shared/WeaponSG552.c
index d014370d..41beeacb 100644
--- a/Source/Shared/WeaponSG552.c
+++ b/Source/Shared/WeaponSG552.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponScout.c b/Source/Shared/WeaponScout.c
index 6fa47078..45829dfd 100644
--- a/Source/Shared/WeaponScout.c
+++ b/Source/Shared/WeaponScout.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponTMP.c b/Source/Shared/WeaponTMP.c
index 70339365..81445495 100644
--- a/Source/Shared/WeaponTMP.c
+++ b/Source/Shared/WeaponTMP.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponUMP45.c b/Source/Shared/WeaponUMP45.c
index c0713d17..e811b276 100644
--- a/Source/Shared/WeaponUMP45.c
+++ b/Source/Shared/WeaponUMP45.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponUSP45.c b/Source/Shared/WeaponUSP45.c
index 8fcef6ff..3dad8467 100644
--- a/Source/Shared/WeaponUSP45.c
+++ b/Source/Shared/WeaponUSP45.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/WeaponXM1014.c b/Source/Shared/WeaponXM1014.c
index 6731baa5..1e201951 100644
--- a/Source/Shared/WeaponXM1014.c
+++ b/Source/Shared/WeaponXM1014.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
diff --git a/Source/Shared/Weapons.c b/Source/Shared/Weapons.c
index 6048339e..f4f00406 100644
--- a/Source/Shared/Weapons.c
+++ b/Source/Shared/Weapons.c
@@ -1,6 +1,6 @@
 /*
 OpenCS Project
-Copyright (C) 2015 Marco "eukara" Hladik
+Copyright (C) 2016, 2017 Marco "eukara" Hladik
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License