Merge branch 'master' into Mario/intrusive_2

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

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

diff --cc qcsrc/common/monsters/sv_monsters.qc
index 69543a74569932bbe7d2295067a2742182991cf6,f680f118b3dd5acbe8a14093c03556173cf3cc21..72e79d58ac60e563be638bc961dca1b0e76e7376
--- 1/qcsrc/common/monsters/sv_monsters.qc
--- 2/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@@ -1300,12 -1296,9 +1296,12 @@@ bool Monster_Spawn(entity this, bool ch
        if(!autocvar_g_monsters) { Monster_Remove(this); return false; }
  
        if(!(this.spawnflags & MONSTERFLAG_RESPAWNED))
 +      {
                IL_PUSH(g_monsters, this);
 +              IL_PUSH(g_damagedbycontents, this);
 +      }
  
-       if(Monster_Appear_Check(this, mon_id)) { return true; } // return true so the monster isn't removed
+       if(check_appear && Monster_Appear_Check(this, mon_id)) { return true; } // return true so the monster isn't removed
  
        if(!this.monster_skill)
                this.monster_skill = cvar("g_monsters_skill");

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

diff --cc qcsrc/common/vehicles/sv_vehicles.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/arc.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/devastator.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/hagar.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/hook.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/mortar.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/seeker.qc
Simple merge

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

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

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

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