Merged GunGame.

diff --cc maps/afterslime.mapinfo
index 745dacfad987408ad283db4a7adf45063ad1aad8,46da02fbfc3924a0232b6daacb92e76c5f522f10..89691e2f4ce247882ec37a6535fdf5dafda31401
--- 1/maps/afterslime.mapinfo
--- 2/maps/afterslime.mapinfo
+++ b/maps/afterslime.mapinfo
@@@ -11,4 -11,4 +11,5 @@@ gametype f
  gametype ka
  gametype kh
  gametype dom
+ gametype gg
 +gametype surv

diff --cc maps/atelier.mapinfo
index 4afb6ec0fdf8c121787ea18a683ccdcb54161ee5,2d1235b97a2c0c2a167e2823791672fc80e0736b..d9f7f90c6e78128024aada15788b86006e98ea48
--- 1/maps/atelier.mapinfo
--- 2/maps/atelier.mapinfo
+++ b/maps/atelier.mapinfo
@@@ -11,4 -11,4 +11,5 @@@ gametype f
  gametype ka
  gametype kh
  gametype dom
+ gametype gg
 +gametype surv

diff --cc maps/boil.mapinfo
index 839572734f7c68fbbbc8b10601ff31bbf86e997a,e4017481ab49099acbf68c743faa424c2387ad11..a550fe1ca7cf147e4379515eed8f7e955d60912f
--- 1/maps/boil.mapinfo
--- 2/maps/boil.mapinfo
+++ b/maps/boil.mapinfo
@@@ -10,4 -10,4 +10,5 @@@ gametype c
  gametype ft
  gametype kh
  gametype ka
+ gametype gg
 +gametype surv

diff --cc maps/darkzone.mapinfo
index 76ddf69af8f9f4d28a8bb784ec1d4957b79c387c,7d74caf929d0dff586eaf51d43c3d2986b503cfe..94f3896b359c041de2ff84e5eac7166eb5f71747
--- 1/maps/darkzone.mapinfo
--- 2/maps/darkzone.mapinfo
+++ b/maps/darkzone.mapinfo
@@@ -10,4 -10,4 +10,5 @@@ gametype td
  gametype ca
  gametype kh
  gametype ft
+ gametype gg
 +gametype surv

diff --cc maps/drain.mapinfo
index da7217eb8af9ff8cc9f4a2d224b4a9400b95ba34,3d9d6246a89a406c1e341129331c082a215f49fd..1d211d553f79799a6c529865bef4758a24e88851
--- 1/maps/drain.mapinfo
--- 2/maps/drain.mapinfo
+++ b/maps/drain.mapinfo
@@@ -10,4 -10,4 +10,5 @@@ gametype k
  gametype ft
  gametype ka
  gametype tdm
+ gametype gg
 +gametype surv

diff --cc maps/erbium.mapinfo
index 529c0cf209ac675f5d601a46044e5945415b5b66,0d287710f63b91d5bf3d4f8792095a9a4e13b396..b2d346113c915ff84a29db04816a69d195445503
--- 1/maps/erbium.mapinfo
--- 2/maps/erbium.mapinfo
+++ b/maps/erbium.mapinfo
@@@ -11,7 -11,7 +11,8 @@@ gametype f
  gametype ka
  gametype kh
  gametype dom
+ gametype gg
 +gametype surv
  
  clientsettemp_for_type all r_water 1
  clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --cc maps/finalrage.mapinfo
index a8d3e57832688c17bfcde784c4e61227a914872f,e48e6bc85ac323f89aab1021d5c1d1a09040955e..0761272aefec172c0147c4a0256368bd432036a3
--- 1/maps/finalrage.mapinfo
--- 2/maps/finalrage.mapinfo
+++ b/maps/finalrage.mapinfo
@@@ -11,7 -11,7 +11,8 @@@ gametype c
  gametype ft
  gametype kh
  gametype ka
+ gametype gg
 +gametype surv
  
  clientsettemp_for_type all r_water 1
  clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --cc maps/fuse.mapinfo
index 415637637d834190f68587b116b7773fa92ada98,865e29e4003c7fae0ed852cfcd49c8911599b0e4..6db48890fbd4965bb7409e92c535991373e488d8
--- 1/maps/fuse.mapinfo
--- 2/maps/fuse.mapinfo
+++ b/maps/fuse.mapinfo
@@@ -10,4 -10,4 +10,5 @@@ gametype k
  gametype ft
  gametype ca
  gametype tdm
+ gametype gg
 +gametype surv

diff --cc maps/glowplant.mapinfo
index dc727074bd442c363bef4caea029d231ce6f31d3,517c47d07cdf409bd86f8d3981ef821c76b078ce..ca3fe9b9b122ae05cae60c075ac1582a6c3401f1
--- 1/maps/glowplant.mapinfo
--- 2/maps/glowplant.mapinfo
+++ b/maps/glowplant.mapinfo
@@@ -11,7 -11,7 +11,8 @@@ gametype c
  gametype kh
  gametype ft
  gametype ka
+ gametype gg
 +gametype surv
  
  clientsettemp_for_type all r_water 1
  clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --cc maps/implosion.mapinfo
index d4e79c61193eb1260b2439239d988eb537a9c203,1ef9eb8d2658b13373cfcf01197adc977e0c7bbf..594ea10c421fa5be42991f76c9e34ca2001772fe
--- 1/maps/implosion.mapinfo
--- 2/maps/implosion.mapinfo
+++ b/maps/implosion.mapinfo
@@@ -12,4 -12,4 +12,5 @@@ gametype td
  gametype lms
  gametype dom
  gametype dm
+ gametype gg
 +gametype surv

diff --cc maps/oilrig.mapinfo
index 4f5c8097706a40efd4fe122043d1a76d75c7b05c,9498285cd2f374d7af0e39ca6d68b2c78e168baf..1a8aa99d28bf767a3b72af13c75faa4c51875762
--- 1/maps/oilrig.mapinfo
--- 2/maps/oilrig.mapinfo
+++ b/maps/oilrig.mapinfo
@@@ -10,6 -10,6 +10,7 @@@ gametype c
  gametype kh
  gametype ft
  gametype ka
+ gametype gg
 +gametype surv
  
  clientsettemp_for_type all r_shadow_realtime_world 0 // Disabled, because the performance drops significantly

diff --cc maps/runningman.mapinfo
index 212b44917469be890040dc5d216d35646be6c11b,613dbe746b529439721d3c392f484056a2540755..c2e07f2cdc6e4ab7c79464b48bc7de975a2c7edc
--- 1/maps/runningman.mapinfo
--- 2/maps/runningman.mapinfo
+++ b/maps/runningman.mapinfo
@@@ -6,7 -6,7 +6,8 @@@ has weapon
  gametype dm
  gametype lms
  gametype ka
+ gametype gg
 +gametype surv
  
  clientsettemp_for_type all r_water 1
  clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --cc maps/silentsiege.mapinfo
index 567563ce39b052817e02671aa29f630ad9d37f6e,f04c7c4645802366d645ffc6df6c4da102739583..7aa8a66ba063fb7f5dd0e417375d57e640b0c99b
--- 1/maps/silentsiege.mapinfo
--- 2/maps/silentsiege.mapinfo
+++ b/maps/silentsiege.mapinfo
@@@ -11,4 -11,4 +11,5 @@@ gametype f
  gametype ka
  gametype kh
  gametype dom
+ gametype gg
 +gametype surv

diff --cc maps/solarium.mapinfo
index 12877de70fabf17a2c9cebc65cd48a094934aced,48dc5f699e1c460632ae1bc7154393a3558c74ee..12c93bbcabb49e62cf1b5b63eea1811a626aac2b
--- 1/maps/solarium.mapinfo
--- 2/maps/solarium.mapinfo
+++ b/maps/solarium.mapinfo
@@@ -10,4 -10,4 +10,5 @@@ gametype c
  gametype ka
  gametype ft
  gametype kh
+ gametype gg
 +gametype surv

diff --cc maps/stormkeep.mapinfo
index 574f648ac60ff55473aa8dde9fa3e0003f59801c,348d3240e4cfcd10f505df8ed00aedb378f92069..dce97b2cbef301ca4213fedba70d7146187a2db6
--- 1/maps/stormkeep.mapinfo
--- 2/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@@ -12,7 -12,7 +12,8 @@@ gametype k
  gametype ca
  gametype ft
  gametype ka
+ gametype gg
 +gametype surv
  
  clientsettemp_for_type all r_water 1
  clientsettemp_for_type all r_water_resolutionmultiplier 1

diff --cc maps/warfare.mapinfo
index b8559a7d7b4ced9253ccb82de2b3c25ed6bb9c47,89df948d8da9bc8f9bb555cb713d3fe1cc9c8c5a..38067df23e65ce11d455ac8eb2fce222cdd255a2
--- 1/maps/warfare.mapinfo
--- 2/maps/warfare.mapinfo
+++ b/maps/warfare.mapinfo
@@@ -10,4 -10,4 +10,5 @@@ gametype c
  gametype ka
  gametype kh
  gametype ft
+ gametype gg
 +gametype surv

diff --cc maps/xoylent.mapinfo
index e45d30a24837bf96160c76819c8f59e5a10d0af9,99b3108ac8e0b4e45ccc397b032784a19c241dc7..b2c521bbadce7ee639fa8b2c26a5668a6cabb169
--- 1/maps/xoylent.mapinfo
--- 2/maps/xoylent.mapinfo
+++ b/maps/xoylent.mapinfo
@@@ -9,4 -9,4 +9,5 @@@ gametype td
  gametype ca
  gametype ft
  gametype ka
+ gametype gg
 +gametype surv