Merge branch 'TimePath/issues/1490'

# Conflicts:
#	qcsrc/common/monsters/monster/mage.qc

diff --cc qcsrc/common/monsters/monster/mage.qc
index 13d9d33e42aefb3cc43bbe65ac5ef041abe47fe8,02f37c890ac44e68f9f8249f1fcf766f6ffac34d..2418bfc0c248479213799c0de61e7c15a9043d38
--- 1/qcsrc/common/monsters/monster/mage.qc
--- 2/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@@ -67,8 -67,8 +67,8 @@@ float friend_needshelp(entity e
        if(e.frozen)
                return false;
        if(!IS_PLAYER(e))
 -              return ((e.flags & FL_MONSTER) && e.health < e.max_health);
 +              return (IS_MONSTER(e) && e.health < e.max_health);
-       if(e.items & IT_INVINCIBLE)
+       if(e.items & ITEM_Shield.m_itemid)
                return false;
  
        switch(self.skin)

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

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

diff --cc qcsrc/server/mutators/mutator_nades.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator_overkill.qc
Simple merge