Merge branch 'master' into Mario/monsters

diff --combined qcsrc/server/mutators/mutator_minstagib.qc
index 6e7cb06047c46c9216283b02ecf1a6d0cb4676a5,f82817d12d1ecba1fcc73fbbc04dd7f53f8fa8cf..4b5e8113a809063b19dd8935f803bbd875cb97ac
--- 1/qcsrc/server/mutators/mutator_minstagib.qc
--- 2/qcsrc/server/mutators/mutator_minstagib.qc
+++ b/qcsrc/server/mutators/mutator_minstagib.qc
@@@ -109,22 -109,6 +109,22 @@@ MUTATOR_HOOKFUNCTION(minstagib_MatchEnd
        return FALSE;
  }
  
 +MUTATOR_HOOKFUNCTION(minstagib_MonsterLoot)
 +{
 +      other.monster_loot = spawnfunc_item_minst_cells;
 +
 +      return FALSE;
 +}
 +
 +MUTATOR_HOOKFUNCTION(minstagib_MonsterSpawn)
 +{
 +      // always refill ammo
 +      if(self.monsterid == MON_MAGE)
 +              self.skin = 1;
 +      
 +      return FALSE;
 +}
 +
  MUTATOR_HOOKFUNCTION(minstagib_BotShouldAttack)
  {
        if(checkentity.items & IT_STRENGTH)
@@@ -421,11 -405,15 +421,17 @@@ MUTATOR_HOOKFUNCTION(minstagib_BuildMut
        return FALSE;
  }
  
+ MUTATOR_HOOKFUNCTION(minstagib_SetModname)
+ {
+       modname = "MinstaGib";
+       return TRUE;
+ }
+ 
  MUTATOR_DEFINITION(mutator_minstagib)
  {
        MUTATOR_HOOK(MatchEnd, minstagib_MatchEnd, CBC_ORDER_ANY);
 +      MUTATOR_HOOK(MonsterDropItem, minstagib_MonsterLoot, CBC_ORDER_ANY);
 +      MUTATOR_HOOK(MonsterSpawn, minstagib_MonsterSpawn, CBC_ORDER_ANY);
        MUTATOR_HOOK(BotShouldAttack, minstagib_BotShouldAttack, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerPhysics, minstagib_PlayerPhysics, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerSpawn, minstagib_PlayerSpawn, CBC_ORDER_ANY);
@@@ -443,6 -431,7 +449,7 @@@
        MUTATOR_HOOK(OnEntityPreSpawn, minstagib_OnEntityPreSpawn, CBC_ORDER_ANY);
        MUTATOR_HOOK(BuildMutatorsString, minstagib_BuildMutatorsString, CBC_ORDER_ANY);
        MUTATOR_HOOK(BuildMutatorsPrettyString, minstagib_BuildMutatorsPrettyString, CBC_ORDER_ANY);
+       MUTATOR_HOOK(SetModname, minstagib_SetModname, CBC_ORDER_ANY);
  
        return FALSE;
  }