Merge branch 'master' into Mario/overkill

Conflicts:
	qcsrc/common/notifications.qh
	qcsrc/server/mutators/mutator_instagib.qc

diff --cc qcsrc/client/View.qc
Simple merge

diff --cc qcsrc/client/weapons/projectile.qc
Simple merge

diff --cc qcsrc/common/notifications.qh
Simple merge

diff --cc qcsrc/server/defs.qh
Simple merge

diff --cc qcsrc/server/mutators/mutator_instagib.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator_nades.qc
index 70c4578bd02baea2c19b7185add6ddaade69913b,70c4578bd02baea2c19b7185add6ddaade69913b..3341d30a7ffeb244d4aec34ba7d3e29bad940faf
--- 1/qcsrc/server/mutators/mutator_nades.qc
--- 2/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@@ -573,7 -573,7 +573,7 @@@ void nade_damage(entity inflictor, enti
        if(self.nade_type == NADE_TYPE_TRANSLOCATE || self.nade_type == NADE_TYPE_SPAWN)
                return;
  
--      if(DEATH_ISWEAPON(deathtype, WEP_BLASTER))
++      if(DEATH_ISWEAPON(deathtype, WEP_BLASTER) || (DEATH_ISWEAPON(deathtype, WEP_VAPORIZER) && (deathtype & HITTYPE_SECONDARY)))
                return;
  
        if(DEATH_ISWEAPON(deathtype, WEP_VORTEX) || DEATH_ISWEAPON(deathtype, WEP_VAPORIZER))
@@@ -582,7 -582,7 +582,7 @@@
                damage = self.max_health * 0.55;
        }
  
--      if(DEATH_ISWEAPON(deathtype, WEP_MACHINEGUN))
++      if(DEATH_ISWEAPON(deathtype, WEP_MACHINEGUN) || DEATH_ISWEAPON(deathtype, WEP_HMG))
                damage = self.max_health * 0.1;
  
        if((DEATH_ISWEAPON(deathtype, WEP_SHOCKWAVE) || DEATH_ISWEAPON(deathtype, WEP_SHOTGUN)) && (deathtype & HITTYPE_SECONDARY)) // WEAPONTODO
@@@ -590,8 -590,8 +590,6 @@@
                damage = self.max_health * 0.1;
                force *= 10;
        }
--      else
--              damage = self.max_health * 1.1;
  
        self.velocity += force;