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
index 5723dafe63bf826dc4037bfeeaa9a4aece3a700f,d2cb8313e3f022402353736f94ac839da415114b..4d701d04790060f40e9d8bbd67b956d6af8d807d
--- 1/qcsrc/common/monsters/monster/spider.qc
--- 2/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@@ -161,8 -159,8 +159,9 @@@ void M_Spider_Attack_Web(entity this
        proj.event_damage = func_null;
        proj.flags = FL_PROJECTILE;
        IL_PUSH(g_projectiles, proj);
+       IL_PUSH(g_bot_dodge, proj);
        proj.damagedbycontents = true;
 +      IL_PUSH(g_damagedbycontents, proj);
  
        proj.bouncefactor = 0.3;
        proj.bouncestop = 0.05;

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

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

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

diff --cc qcsrc/common/turrets/turret/walker.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/electro.qc
index d281670971209448e8a4e6639f03d1b9dc454c88,7e05241a490873f200bbd1ecbeb5cbd8ec43e0ab..319f0d1d701ca936491e65d271e248ebedaf8202
--- 1/qcsrc/common/weapons/weapon/electro.qc
--- 2/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@@ -449,9 -451,8 +452,10 @@@ void W_Electro_Attack_Orb(Weapon thiswe
        proj.event_damage = W_Electro_Orb_Damage;
        proj.flags = FL_PROJECTILE;
        IL_PUSH(g_projectiles, proj);
+       IL_PUSH(g_bot_dodge, proj);
        proj.damagedbycontents = (WEP_CVAR_SEC(electro, damagedbycontents));
 +      if(proj.damagedbycontents)
 +              IL_PUSH(g_damagedbycontents, proj);
  
        proj.bouncefactor = WEP_CVAR_SEC(electro, bouncefactor);
        proj.bouncestop = WEP_CVAR_SEC(electro, bouncestop);

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/minelayer.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
index 9a53c1305966368ffed9c2cacb9251fc5c1ceac1,b034968901e741e40d348952fdf7ef40ab16f9d9..49e7236d2f3d71cc923b7dfb3df772c2501fdd51
--- 1/qcsrc/server/defs.qh
--- 2/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -426,12 -426,8 +426,11 @@@ const int MIF_GUIDED_CONFUSABLE = MIF_G
  
  .string cvar_cl_physics;
  
- .bool init_for_player_needed;
  .void(entity this, entity player) init_for_player;
  
 +IntrusiveList g_damagedbycontents;
 +STATIC_INIT(g_damagedbycontents) { g_damagedbycontents = IL_NEW(); }
 +
  IntrusiveList g_monsters;
  STATIC_INIT(g_monsters) { g_monsters = IL_NEW(); }
  

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

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

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

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