From a0b2e72b4c56dec8a611c0385ddbe073e4abb6db Mon Sep 17 00:00:00 2001 From: dannno Date: Sun, 1 Feb 2015 11:04:40 -0500 Subject: [PATCH] gun suicide messages --- code/modules/projectiles/guns/energy.dm | 7 ++++++- code/modules/projectiles/guns/magic.dm | 7 ++++++- code/modules/projectiles/guns/projectile.dm | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 4474aa5a6cc..c8e44a242b8 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -89,4 +89,9 @@ return /obj/item/weapon/gun/energy/ui_action_click() - toggle_gunlight() \ No newline at end of file + toggle_gunlight() + +/obj/item/weapon/gun/energy/suicide_act(mob/user) + user.visible_message("[user] is aiming the [src.name] at themself! It looks like \he's trying to commit suicide.") + playsound(loc, fire_sound, 50, 1, -1) + return (FIRELOSS) \ No newline at end of file diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 0fdbc0456bb..2c8147992ea 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -70,4 +70,9 @@ /obj/item/weapon/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj) user << "The [name] whizzles quietly." - return \ No newline at end of file + return + +/obj/item/weapon/gun/magic/suicide_act(mob/user) + user.visible_message("[user] is casting a spell on themself with the [src.name]! It looks like \he's trying to commit suicide.") + playsound(loc, fire_sound, 50, 1, -1) + return (FIRELOSS) \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index db55594fa4d..ab3546cc75e 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -132,6 +132,11 @@ boolets += magazine.ammo_count() return boolets +/obj/item/weapon/gun/projectile/suicide_act(mob/user) + user.visible_message("[user] is aiming the [src.name] at themself! It looks like \he's trying to commit suicide.") + playsound(loc, fire_sound, 50, 1, -1) + return (BRUTELOSS) + /obj/item/weapon/suppressor name = "suppressor" desc = "A universal syndicate small-arms suppressor for maximum espionage."