Merge pull request #3647 from SkyMarshal/patch-2

ZAS fix, Stops lasertag guns from killing you if you shoot it into your mouth.
This commit is contained in:
Chinsky
2013-09-04 07:20:15 -07:00
2 changed files with 4 additions and 5 deletions
+2 -2
View File
@@ -187,7 +187,7 @@
else
playsound(user, fire_sound, 50, 1)
in_chamber.on_hit(M)
if (!in_chamber.nodamage)
if (in_chamber.damage_type != HALLOSS)
user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]")
user.death()
else
@@ -212,4 +212,4 @@
Fire(M,user) ///Otherwise, shoot!
return
else
return ..() //Pistolwhippin'
return ..() //Pistolwhippin'