Merge branch 'master' into Mario/monsters

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

diff --cc qcsrc/common/monsters/monster/mage.qc
Simple merge

diff --cc qcsrc/common/monsters/monster/mage.qh
Simple merge

diff --cc qcsrc/common/monsters/monster/spider.qh
Simple merge

diff --cc qcsrc/common/monsters/monster/wyvern.qh
Simple merge

diff --cc qcsrc/common/monsters/sv_monsters.qc
Simple merge

diff --cc qcsrc/common/notifications/all.inc
Simple merge

diff --cc qcsrc/common/turrets/sv_turrets.qc
Simple merge

diff --cc qcsrc/common/turrets/sv_turrets.qh
Simple merge

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

diff --cc qcsrc/server/g_world.qc
index 8d773bcbe2098533ab82ac290f578dd164801b82,a044c2a468a1ee00e229d91a0800ed2a8faed111..2bda678b80c81827becb20d99b4740e6cb0e0872
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -266,8 -266,10 +266,9 @@@ void cvar_changes_init(
                BADCVAR("g_domination");
                BADCVAR("g_domination_default_teams");
                BADCVAR("g_duel");
+               BADCVAR("g_duel_not_dm_maps");
                BADCVAR("g_freezetag");
                BADCVAR("g_freezetag_teams");
 -              BADCVAR("g_invasion_teams");
                BADCVAR("g_invasion_type");
                BADCVAR("g_jailbreak");
                BADCVAR("g_jailbreak_teams");

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