From 56b4f0c85f39d43df491890c30df8f31d9621eeb Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 7 Mar 2013 05:54:46 +0400 Subject: [PATCH] Fixed couple of issues with suicide - no sound and inability to suicide again if tried to do it without ammo. --- code/modules/projectiles/gun.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index c1316b3c1fa..2a0fbfe9201 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -169,6 +169,10 @@ return if (load_into_chamber()) user.visible_message("[user] pulls the trigger. Ow.") + if(silenced) + playsound(user, fire_sound, 10, 1) + else + playsound(user, fire_sound, 50, 1) in_chamber.on_hit(M) if (!in_chamber.nodamage) 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]") @@ -180,6 +184,7 @@ else user.visible_message("*click click*", "\red *click*") playsound(user, 'sound/weapons/empty.ogg', 100, 1) + mouthshoot = 0 return if (load_into_chamber())