[nexuiz-commits] r6906 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-06-07 16:04:56 -0400 (Sun, 07 Jun 2009)
New Revision: 6906

Modified:
   trunk/data/qcsrc/server/g_damage.qc
Log:
tuba: don't hurt team mates, they have ear plugs matching your team's tubas ;)


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2009-06-07 19:44:12 UTC (rev 6905)
+++ trunk/data/qcsrc/server/g_damage.qc	2009-06-07 20:04:56 UTC (rev 6906)
@@ -584,7 +584,7 @@
 					RemoveGrapplingHook(targ); // STOP THAT, you parasite!
 
 	// special rule: gravity bomb does not hit team mates (other than for disconnecting the hook)
-	if(DEATH_ISWEAPON(deathtype, WEP_HOOK))
+	if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || DEATH_ISWEAPON(deathtype, WEP_TUBA))
 	{
 		if(targ.classname == "player")
 			if not(IsDifferentTeam(targ, attacker))