From 99bf9db04c82e368dc697124772bfd76a34fb492 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Tue, 3 Sep 2013 22:51:37 -0700 Subject: [PATCH] Fixes lastertag guns killing you if you stick it in your mouth. --- code/modules/projectiles/gun.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 35af50877c..de1e19ac26 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -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' \ No newline at end of file + return ..() //Pistolwhippin'