Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival

diff --cc gamemodes-server.cfg
Simple merge

diff --cc qcsrc/client/hud/panel/modicons.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/_mod.inc
index 6056ba7cc278187d43b0b166cb9abda348803933,c4cd002c782221fe420d38415c25fed570909a4d..e37225e8e3361505e94b406ee1c9a0a031c98c41
--- 1/qcsrc/common/gamemodes/gamemode/_mod.inc
--- 2/qcsrc/common/gamemodes/gamemode/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/_mod.inc
@@@ -1,5 -1,17 +1,18 @@@
  // generated file; do not modify
  
+ #include <common/gamemodes/gamemode/assault/_mod.inc>
+ #include <common/gamemodes/gamemode/clanarena/_mod.inc>
+ #include <common/gamemodes/gamemode/ctf/_mod.inc>
+ #include <common/gamemodes/gamemode/cts/_mod.inc>
+ #include <common/gamemodes/gamemode/deathmatch/_mod.inc>
+ #include <common/gamemodes/gamemode/domination/_mod.inc>
+ #include <common/gamemodes/gamemode/freezetag/_mod.inc>
+ #include <common/gamemodes/gamemode/invasion/_mod.inc>
+ #include <common/gamemodes/gamemode/keepaway/_mod.inc>
+ #include <common/gamemodes/gamemode/keyhunt/_mod.inc>
+ #include <common/gamemodes/gamemode/lms/_mod.inc>
  #include <common/gamemodes/gamemode/nexball/_mod.inc>
  #include <common/gamemodes/gamemode/onslaught/_mod.inc>
+ #include <common/gamemodes/gamemode/race/_mod.inc>
 +#include <common/gamemodes/gamemode/survival/_mod.inc>
+ #include <common/gamemodes/gamemode/tdm/_mod.inc>

diff --cc qcsrc/common/gamemodes/gamemode/_mod.qh
index 333d341709b9d1129dab243c7e23559c15f1bf6b,d7c1aa66cc35f6f3f8143031123542abf134a33c..549b321ca1f8ac37711adc0ab24d8f695d915ae1
--- 1/qcsrc/common/gamemodes/gamemode/_mod.qh
--- 2/qcsrc/common/gamemodes/gamemode/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/_mod.qh
@@@ -1,5 -1,17 +1,18 @@@
  // generated file; do not modify
  
+ #include <common/gamemodes/gamemode/assault/_mod.qh>
+ #include <common/gamemodes/gamemode/clanarena/_mod.qh>
+ #include <common/gamemodes/gamemode/ctf/_mod.qh>
+ #include <common/gamemodes/gamemode/cts/_mod.qh>
+ #include <common/gamemodes/gamemode/deathmatch/_mod.qh>
+ #include <common/gamemodes/gamemode/domination/_mod.qh>
+ #include <common/gamemodes/gamemode/freezetag/_mod.qh>
+ #include <common/gamemodes/gamemode/invasion/_mod.qh>
+ #include <common/gamemodes/gamemode/keepaway/_mod.qh>
+ #include <common/gamemodes/gamemode/keyhunt/_mod.qh>
+ #include <common/gamemodes/gamemode/lms/_mod.qh>
  #include <common/gamemodes/gamemode/nexball/_mod.qh>
  #include <common/gamemodes/gamemode/onslaught/_mod.qh>
+ #include <common/gamemodes/gamemode/race/_mod.qh>
 +#include <common/gamemodes/gamemode/survival/_mod.qh>
+ #include <common/gamemodes/gamemode/tdm/_mod.qh>

diff --cc qcsrc/common/mapinfo.qh
Simple merge

diff --cc qcsrc/server/_mod.inc
Simple merge

diff --cc qcsrc/server/_mod.qh
Simple merge

diff --cc qcsrc/server/g_world.qc
Simple merge