Merge branch 'master' into LegendaryGuard/tandem_nade

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

diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
index 88431410caae654c6f3ec8502effa760847b9f2a,12997c0b51f4211f87793e0db6890556521a0bf3..75946ef0f32731f92d96569be1e084c6d92bcb97
--- 1/qcsrc/common/mutators/mutator/nades/nades.qc
--- 2/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@@ -1331,16 -972,16 +1331,16 @@@ void nade_boom(entity this
        if(this.takedamage)
        switch ( REGISTRY_GET(Nades, STAT(NADE_BONUS_TYPE, this)) )
        {
-               case NADE_TYPE_NAPALM:      nade_napalm_boom(this);       break;
-               case NADE_TYPE_ICE:         nade_ice_boom(this);          break;
-               case NADE_TYPE_TRANSLOCATE: nade_translocate_boom(this);  break;
-               case NADE_TYPE_SPAWN:       nade_spawn_boom(this);        break;
-               case NADE_TYPE_HEAL:        nade_heal_boom(this);         break;
-               case NADE_TYPE_TANDEM:      nade_tandem_boom(this);       break;
-               case NADE_TYPE_ENTRAP:      nade_entrap_boom(this);       break;
-               case NADE_TYPE_VEIL:        nade_veil_boom(this);         break;
-               case NADE_TYPE_AMMO:        nade_ammo_boom(this);         break;
-               case NADE_TYPE_DARK:        nade_darkness_boom(this);     break;
+               case NADE_TYPE_NAPALM:      nade_napalm_boom(this);      break;
+               case NADE_TYPE_ICE:         nade_ice_boom(this);         break;
+               case NADE_TYPE_TRANSLOCATE: nade_translocate_boom(this); break;
+               case NADE_TYPE_SPAWN:       nade_spawn_boom(this);       break;
+               case NADE_TYPE_HEAL:        nade_heal_boom(this);        break;
 -              case NADE_TYPE_MONSTER:     nade_monster_boom(this);     break;
++              case NADE_TYPE_TANDEM:      nade_tandem_boom(this);      break;
+               case NADE_TYPE_ENTRAP:      nade_entrap_boom(this);      break;
+               case NADE_TYPE_VEIL:        nade_veil_boom(this);        break;
+               case NADE_TYPE_AMMO:        nade_ammo_boom(this);        break;
+               case NADE_TYPE_DARKNESS:    nade_darkness_boom(this);    break;
        }
  
        IL_EACH(g_projectiles, it.classname == "grapplinghook" && it.aiment == this,