Merge branch 'master' into Mario/monsters

# Conflicts:
#	qcsrc/server/defs.qh

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

diff --cc qcsrc/common/triggers/func/breakable.qc
Simple merge

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

diff --cc qcsrc/server/defs.qh
index 9fc2c60591d35b2f63167fa454146570a6b55d17,ca7430de31eaaa17cfecdec04e6eef1c9ae2907e..7c0c572686a5d46fdbda5f24f0ed4c397438b3f7
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -468,5 -468,14 +468,17 @@@ STATIC_INIT(g_bot_dodge) { g_bot_dodge 
  IntrusiveList g_damagedbycontents;
  STATIC_INIT(g_damagedbycontents) { g_damagedbycontents = IL_NEW(); }
  
 +IntrusiveList g_monster_targets;
 +STATIC_INIT(g_monster_targets) { g_monster_targets = IL_NEW(); }
++
+ IntrusiveList g_railgunhit;
+ STATIC_INIT(g_railgunhit) { g_railgunhit = IL_NEW(); }
+ 
+ IntrusiveList g_ladders;
+ STATIC_INIT(g_ladders) { g_ladders = IL_NEW(); }
+ 
+ IntrusiveList g_locations;
+ STATIC_INIT(g_locations) { g_locations = IL_NEW(); }
+ 
+ IntrusiveList g_saved_team;
+ STATIC_INIT(g_saved_team) { g_saved_team = IL_NEW(); }