From: Mario <zacjardine@y7mail.com>
Date: Sat, 13 Dec 2014 11:12:43 +0000 (+1100)
Subject: Merge branch 'master' into Mario/overkill
X-Git-Tag: xonotic-v0.8.0~70^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=df110eb632e3d04119c2d0771e0d54c1a1ea27b8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/overkill

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

df110eb632e3d04119c2d0771e0d54c1a1ea27b8
diff --cc qcsrc/server/mutators/mutator_nades.qc
index 70c4578bd,70c4578bd..3341d30a7
--- a/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;