Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival

diff --cc .gitlab-ci.yml
index 43e3df8554298cf6b6cb19e00bf0e6a1735eb503,4754425bf971689d6df0aaf9cfdad7f13dcd7595..1d781d183d4385a01deb2e161b9a5effbd4a7613
--- 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=422d5d8a0490e961463fda69da1975bc
+     - EXPECT=fb771b180a47f7acf09eb12dddd391f8
      - HASH=$(${ENGINE} -noconfig -nohome +exec serverbench.cfg
        | tee /dev/stderr
        | grep '^:'

diff --cc qcsrc/common/t_items.qc
Simple merge

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

diff --cc qcsrc/server/mutators/events.qh
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_assault.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_invasion.qc
Simple merge