Merge branch 'master' into terencehill/overkill_stuff

diff --cc qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc
index f418395590ed0bae36e0953d64ae48cb709bc739,89fdfaf9ed842eee0e97e21cf0090b853abb0e1f..a8347499841b77d034adb39efac4853400343f29
--- 1/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc
--- 2/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc
+++ b/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc
@@@ -1,8 -1,8 +1,8 @@@
  #include "sv_melee_only.qh"
  
 -REGISTER_MUTATOR(melee_only, cvar("g_melee_only") && !cvar("g_instagib") && !g_nexball);
 +REGISTER_MUTATOR(melee_only, cvar("g_melee_only") && !cvar("g_instagib") && !cvar("g_overkill") && !g_nexball);
  
- MUTATOR_HOOKFUNCTION(melee_only, SetStartItems)
+ MUTATOR_HOOKFUNCTION(melee_only, SetStartItems, CBC_ORDER_LAST)
  {
        start_ammo_shells = warmup_start_ammo_shells = 0;
        start_weapons = warmup_start_weapons = WEPSET(SHOTGUN);