Merge branch 'master' into Mario/wepent_experimental

diff --cc qcsrc/common/monsters/monster.qh
index 5572fe9102d05a1a07174cfc5255a143784e30ce,ab644988aa4d1192e60fde95bb97f28da642c0d3..8e086a085c62218ba68ee20cc7107f933f9da320
--- 1/qcsrc/common/monsters/monster.qh
--- 2/qcsrc/common/monsters/monster.qh
+++ b/qcsrc/common/monsters/monster.qh
@@@ -12,9 -12,10 +12,10 @@@ const int MON_FLAG_CRUSH = BIT(11); // 
  const int MON_FLAG_RIDE = BIT(12); // monster can be ridden in special modes
  const int MONSTER_SIZE_QUAKE = BIT(13);
  const int MONSTER_TYPE_PASSIVE = BIT(14); // doesn't target or chase enemies
+ const int MONSTER_TYPE_UNDEAD = BIT(15); // monster is by most definitions a zombie (doesn't fully die unless gibbed)
  
  // entity properties of monsterinfo:
 -.bool(int, entity actor, entity targ) monster_attackfunc;
 +.bool(int, entity actor, entity targ, .entity weaponentity) monster_attackfunc;
  
  // animations
  .vector anim_blockend;

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

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

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

diff --cc qcsrc/server/bot/default/havocbot/havocbot.qc
Simple merge

diff --cc qcsrc/server/bot/default/scripting.qc
Simple merge

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