Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
#	qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
#	qcsrc/common/mutators/mutator/overkill/sv_overkill.qc

diff --cc qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
Simple merge

diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index caabb28233881c293a674b4ac021b66adff82b00,572261528ed7e100609a4ca69d90c2994fb71493..7201aaa0d8d4c6ecc96e68e21cc16efa5d2059d2
--- 1/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
--- 2/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@@ -285,7 -353,16 +285,7 @@@ MUTATOR_HOOKFUNCTION(ok, FilterItem
        return true;
  }
  
- MUTATOR_HOOKFUNCTION(ok, SetStartItems)
 -MUTATOR_HOOKFUNCTION(ok, SpectateCopy)
 -{
 -      entity spectatee = M_ARGV(0, entity);
 -      entity client = M_ARGV(1, entity);
 -
 -      client.ammo_charge[PS(client).m_weapon.m_id] = spectatee.ammo_charge[PS(spectatee).m_weapon.m_id];
 -      client.ok_use_ammocharge = spectatee.ok_use_ammocharge;
 -}
 -
+ MUTATOR_HOOKFUNCTION(ok, SetStartItems, CBC_ORDER_LAST)
  {
        WepSet ok_start_items = (WEPSET(MACHINEGUN) | WEPSET(VORTEX) | WEPSET(SHOTGUN));
  

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

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