Merge branch 'Lyberta/Survival' into Lyberta/master

diff --cc .gitlab-ci.yml
index 9cb41d2d736f6f0eedaf7b348876990eedc37dcf,e6ecbcbcb368d095e679623ac0320a490e3a0072..188c8f76325ddfe262ee255d54821bc57ffea392
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -29,7 -29,7 +29,8 @@@ test_sv_game
      - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
      - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
      - make
 +    - EXPECT=65ca7b997c01a5ad468a7a5dccd32044
+     - EXPECT=d1a65371174a5210320fa85b3f059d0f
      - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
        | tee /dev/stderr
        | grep '^:'

diff --cc defaultClient.cfg
Simple merge

diff --cc qcsrc/client/view.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
Simple merge

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

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