From dfd2cc4b6047e76dc8b4302893a5042f711c213c Mon Sep 17 00:00:00 2001 From: Jordie0608 Date: Tue, 13 May 2014 01:44:29 +1000 Subject: [PATCH] Changed suicide messages to visible_messages and fixed relative pathing --- code/defines/obj/weapon.dm | 4 +-- .../game/objects/items/stacks/sheets/glass.dm | 6 ++--- code/game/objects/items/toys.dm | 26 +++++++++---------- code/game/objects/items/weapons/explosives.dm | 2 +- code/game/objects/items/weapons/kitchen.dm | 24 ++++++++--------- .../objects/items/weapons/melee/energy.dm | 6 ++--- code/game/objects/items/weapons/melee/misc.dm | 2 +- .../game/objects/items/weapons/power_cells.dm | 4 +-- code/game/objects/items/weapons/stunbaton.dm | 4 +-- code/game/objects/items/weapons/tools.dm | 6 ++--- code/game/objects/items/weapons/weaponry.dm | 20 +++++++------- code/modules/hydroponics/growninedible.dm | 8 +++--- code/modules/hydroponics/hydroitemdefines.dm | 20 +++++++------- code/modules/power/cable.dm | 12 ++++----- code/modules/surgery/tools.dm | 18 ++++++------- 15 files changed, 81 insertions(+), 81 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 21f89fb2e7b..230194070b9 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -175,8 +175,8 @@ desc = "A trap used to catch bears and other legged creatures." var/armed = 0 - suicide_act(mob/user) - viewers(user) << "[user] is putting the [src.name] on \his head! It looks like \he's trying to commit suicide." + /obj/item/weapon/legcuffs/beartrap/suicide_act(mob/user) + user.visible_message("[user] is putting the [src.name] on \his head! It looks like \he's trying to commit suicide.") return (BRUTELOSS) /obj/item/weapon/legcuffs/beartrap/attack_self(mob/user as mob) diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 7b09833e591..aa1a50edca7 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -250,9 +250,9 @@ attack_verb = list("stabbed", "slashed", "sliced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' - suicide_act(mob/user) - viewers(user) << pick("[user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.", \ - "[user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.") + /obj/item/weapon/shard/suicide_act(mob/user) + user.visible_message(pick("[user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.", \ + "[user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.")) return (BRUTELOSS) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 71e978a4529..7537f0cb915 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -121,14 +121,14 @@ attack_verb = list("struck", "pistol whipped", "hit", "bashed") var/bullets = 7.0 - examine() + /obj/item/toy/gun/examine() set src in usr src.desc = text("There are [] cap\s left. Looks almost like the real thing! Ages 8 and up.", src.bullets) ..() return - attackby(obj/item/toy/ammo/gun/A as obj, mob/user as mob) + /obj/item/toy/gun/attackby(obj/item/toy/ammo/gun/A as obj, mob/user as mob) if (istype(A, /obj/item/toy/ammo/gun)) if (src.bullets >= 7) @@ -149,7 +149,7 @@ return 1 return - afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) + /obj/item/toy/gun/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) if (flag) return if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") @@ -193,13 +193,13 @@ attack_verb = list("attacked", "struck", "hit") var/bullets = 5 - examine() + /obj/item/toy/crossbow/examine() set src in view(2) ..() if (bullets) usr << "\blue It is loaded with [bullets] foam darts!" - attackby(obj/item/I as obj, mob/user as mob) + /obj/item/toy/crossbow/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/toy/ammo/crossbow)) if(bullets <= 4) user.drop_item() @@ -210,7 +210,7 @@ usr << "\red It's already fully loaded." - afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) + /obj/item/toy/crossbow/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) if(!isturf(target.loc) || target == user) return if(flag) return @@ -258,7 +258,7 @@ O.show_message(text("\red [] realized they were out of ammo and starting scrounging for some!", user), 1) - attack(mob/M as mob, mob/user as mob) + /obj/item/toy/crossbow/attack(mob/M as mob, mob/user as mob) src.add_fingerprint(user) // ******* Check @@ -310,7 +310,7 @@ attack_verb = list("attacked", "struck", "hit") var/hacked = 0 - attack_self(mob/user as mob) + /obj/item/toy/sword/attack_self(mob/user as mob) active = !( active ) if (active) user << "\blue You extend the plastic blade with a quick flick of your wrist." @@ -418,10 +418,10 @@ var/uses = 30 //0 for unlimited uses var/instant = 0 var/colourName = "red" //for updateIcon purposes - suicide_act(mob/user) - viewers(user) << "[user] is jamming the [src.name] up \his nose and into \his brain. It looks like \he's trying to commit suicide." + /obj/item/toy/crayon/suicide_act(mob/user) + user.visible_message("[user] is jamming the [src.name] up \his nose and into \his brain. It looks like \he's trying to commit suicide.") return (BRUTELOSS|OXYLOSS) - New() + /obj/item/toy/crayon/New() ..() name = "[colourName] crayon" //Makes crayons identifiable in things like grinders /* @@ -434,13 +434,13 @@ icon_state = "snappop" w_class = 1 - throw_impact(atom/hit_atom) + /obj/item/toy/snappop/throw_impact(atom/hit_atom) ..() var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() new /obj/effect/decal/cleanable/ash(src.loc) - src.visible_message("\red The [src.name] explodes!","\red You hear a snap!") + src.visible_message(" The [src.name] explodes!"," You hear a snap!") playsound(src, 'sound/effects/snap.ogg', 50, 1) qdel(src) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 9ff6e7bfd03..c5c2f83e071 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -23,7 +23,7 @@ /obj/item/weapon/plastique/suicide_act(var/mob/user) . = (BRUTELOSS) - viewers(user) << "[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!" + user.visible_message("[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!") var/message_say = "FOR NO RAISIN!" if(user.mind) if(user.mind.special_role) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 2db80a1c890..f7bd2811a24 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -82,10 +82,10 @@ force = 10.0 throwforce = 10.0 - suicide_act(mob/user) - viewers(user) << pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ + /obj/item/weapon/kitchen/utensil/knife/suicide_act(mob/user) + user.visible_message(pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ "[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ - "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") + "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.")) return (BRUTELOSS) /obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) @@ -114,10 +114,10 @@ origin_tech = "materials=1" attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - suicide_act(mob/user) - viewers(user) << pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ + /obj/item/weapon/kitchenknife/suicide_act(mob/user) + user.visible_message(pick("[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ "[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ - "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") + "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.")) return (BRUTELOSS) /obj/item/weapon/kitchenknife/ritual @@ -238,13 +238,13 @@ return //it always returns, but I feel like adding an extra return just for safety's sakes. EDIT; Oh well I won't :3 add_logs(user, M, "attacked", object="[src.name]") - + if(istype(M, /mob/living/carbon/human)) - + var/mob/living/carbon/human/H = M ///////////////////////////////////// /Let's have this ready for later. if(prob(50)) - playsound(M, 'sound/items/trayhit1.ogg', 50, 1) + playsound(M, 'sound/items/trayhit1.ogg', 50, 1) else playsound(M, 'sound/items/trayhit2.ogg', 50, 1) @@ -277,8 +277,8 @@ H.head.add_blood(H) if (H.glasses && prob(33)) H.glasses.add_blood(H) - - + + M.visible_message("[user] slams [M] in the face with the tray!", \ "[user] slams [M] in the face with the tray, against your mask!") @@ -304,7 +304,7 @@ M.Weaken(2) return return - + else ..() diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 6683467952a..27cae71883b 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -2,8 +2,8 @@ var/active = 0 /obj/item/weapon/melee/energy/suicide_act(mob/user) - viewers(user) << pick("[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \ - "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.") + user.visible_message(pick("[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \ + "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.")) return (BRUTELOSS|FIRELOSS) /obj/item/weapon/melee/energy/rejects_blood() @@ -24,7 +24,7 @@ attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") /obj/item/weapon/melee/energy/axe/suicide_act(mob/user) - viewers(user) << "[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide." + user.visible_message("[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.") return (BRUTELOSS|FIRELOSS) /obj/item/weapon/melee/energy/axe/attack_self(mob/user) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index c9ee6618903..5faf9b065c3 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -13,7 +13,7 @@ hitsound = 'sound/weapons/slash.ogg' //pls replace /obj/item/weapon/melee/chainofcommand/suicide_act(mob/user) - viewers(user) << "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." + user.visible_message("[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.") return (OXYLOSS) diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 1d2e273aaee..821d19f6b67 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -19,8 +19,8 @@ var/construction_cost = list("metal"=750,"glass"=75) var/construction_time=100 - suicide_act(mob/user) - viewers(user) << "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide." + /obj/item/weapon/stock_parts/cell/suicide_act(mob/user) + user.visible_message("[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.") return (FIRELOSS) /obj/item/weapon/stock_parts/cell/crap diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 45cff3703d0..79d5cff3d1b 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -14,8 +14,8 @@ var/obj/item/weapon/stock_parts/cell/high/bcell = null var/hitcost = 1000 - suicide_act(mob/user) - viewers(user) << "[user] is putting the live [name] in \his mouth! It looks like \he's trying to commit suicide." + /obj/item/weapon/melee/baton/suicide_act(mob/user) + user.visible_message("[user] is putting the live [name] in \his mouth! It looks like \he's trying to commit suicide.") return (FIRELOSS) /obj/item/weapon/melee/baton/New() diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 07c08f3f4f2..52de1d4eae4 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -49,9 +49,9 @@ attack_verb = list("stabbed") hitsound = 'sound/weapons/bladeslice.ogg' - suicide_act(mob/user) - viewers(user) << pick("[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \ - "[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.") + /obj/item/weapon/screwdriver/suicide_act(mob/user) + user.visible_message(pick("[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \ + "[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.")) return(BRUTELOSS) /obj/item/weapon/screwdriver/New() diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index da07f221a55..a50dc71f0c5 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -11,7 +11,7 @@ attack_verb = list("banned") /obj/item/weapon/banhammer/suicide_act(mob/user) - viewers(user) << "[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life." + user.visible_message("[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life.") return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS) /obj/item/weapon/banhammer/attack(mob/M, mob/user) @@ -32,8 +32,8 @@ throwforce = 10 w_class = 1 - suicide_act(mob/user) - viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." + /obj/item/weapon/nullrod/suicide_act(mob/user) + user.visible_message("[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.") return (BRUTELOSS|FIRELOSS) /obj/item/weapon/sord @@ -48,8 +48,8 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - suicide_act(mob/user) - viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." + /obj/item/weapon/sord/suicide_act(mob/user) + user.visible_message("[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.") return(BRUTELOSS) /obj/item/weapon/claymore @@ -65,11 +65,11 @@ w_class = 3 attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - IsShield() + /obj/item/weapon/claymore/IsShield() return 1 - suicide_act(mob/user) - viewers(user) << "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide." + /obj/item/weapon/claymore/suicide_act(mob/user) + user.visible_message("[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.") return(BRUTELOSS) /obj/item/weapon/katana @@ -85,8 +85,8 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - suicide_act(mob/user) - viewers(user) << "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku." + /obj/item/weapon/katana/suicide_act(mob/user) + user.visible_message("[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") return(BRUTELOSS) /obj/item/weapon/katana/IsShield() diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 5332fa4f892..ef4bff6b79c 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -52,7 +52,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris, /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat) - + New(var/loc, var/potency = 10) ..() @@ -98,7 +98,7 @@ throw_range = 3 plant_type = 0 seed = "/obj/item/seeds/sunflowerseed" - + New(var/loc, var/potency = 10) ..() @@ -169,8 +169,8 @@ reagents.add_reagent("pacid", round(potency, 1)) force = round((5+potency/2.5), 1) - suicide_act(mob/user) - viewers(user) << "[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide." + /obj/item/weapon/grown/deathnettle/suicide_act(mob/user) + user.visible_message("[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.") return (BRUTELOSS|TOXLOSS) /obj/item/weapon/grown/bananapeel diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 8334d7f015a..225b0e580eb 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -7,7 +7,7 @@ item_state = "analyzer" origin_tech = "magnets=1;biotech=1" - attack_self(mob/user as mob) + /obj/item/device/analyzer/plant_analyzer/attack_self(mob/user as mob) return 0 // ************************************* @@ -28,12 +28,12 @@ throw_speed = 3 throw_range = 10 - New() + /obj/item/weapon/reagent_containers/spray/weedspray/New() ..() reagents.add_reagent("weedkiller", 100) - suicide_act(mob/user) - viewers(user) << "[user] is huffing the [src.name]! It looks like \he's trying to commit suicide." + /obj/item/weapon/reagent_containers/spray/weedspray/suicide_act(mob/user) + user.visible_message("[user] is huffing the [src.name]! It looks like \he's trying to commit suicide.") return (TOXLOSS) /obj/item/weapon/reagent_containers/spray/pestspray // -- Skie @@ -50,11 +50,11 @@ throw_speed = 3 throw_range = 10 - New() + /obj/item/weapon/reagent_containers/spray/pestspray/New() ..() reagents.add_reagent("pestkiller", 100) - suicide_act(mob/user) + /obj/item/weapon/reagent_containers/spray/pestspray/suicide_act(mob/user) viewers(user) << "[user] is huffing the [src.name]! It looks like \he's trying to commit suicide." return (TOXLOSS) @@ -84,7 +84,7 @@ icon_state = "bottle16" w_class = 1.0 - New() + /obj/item/weapon/reagent_containers/glass/bottle/nutrient/New() ..() src.pixel_x = rand(-5.0, 5) src.pixel_y = rand(-5.0, 5) @@ -94,7 +94,7 @@ name = "bottle of E-Z-Nutrient" icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" - New() + /obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez/New() ..() reagents.add_reagent("eznutriment", 30) @@ -102,7 +102,7 @@ name = "bottle of Left 4 Zed" icon = 'icons/obj/chemical.dmi' icon_state = "bottle18" - New() + /obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z/New() ..() reagents.add_reagent("left4zednutriment", 30) @@ -110,6 +110,6 @@ name = "bottle of Robust Harvest" icon = 'icons/obj/chemical.dmi' icon_state = "bottle15" - New() + /obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh/New() ..() reagents.add_reagent("robustharvestnutriment", 30) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index ba011c6777c..a349a9be420 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -207,12 +207,12 @@ slot_flags = SLOT_BELT attack_verb = list("whipped", "lashed", "disciplined", "flogged") - suicide_act(mob/user) - if(locate(/obj/structure/stool) in user.loc) - viewers(user) << "[user] is making a noose with the [src.name]! It looks like \he's trying to commit suicide." - else - viewers(user) << "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." - return(OXYLOSS) +/obj/item/stack/cable_coil/suicide_act(mob/user) + if(locate(/obj/structure/stool) in user.loc) + user.visible_message("[user] is making a noose with the [src.name]! It looks like \he's trying to commit suicide.") + else + user.visible_message("[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.") + return(OXYLOSS) /obj/item/stack/cable_coil/attack(mob/living/carbon/human/H, mob/user) if(!istype(H)) diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index ebcc675cf43..d8db9381aaa 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -50,10 +50,10 @@ origin_tech = "materials=1;biotech=1" attack_verb = list("drilled") - suicide_act(mob/user) - viewers(user) << pick("[user] is pressing [src] to \his temple and activating it! It looks like \he's trying to commit suicide.", \ - "[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide.") - return (BRUTELOSS) +/obj/item/weapon/scalpel/suicide_act(mob/user) + user.visible_message(pick("[user] is pressing [src] to \his temple and activating it! It looks like \he's trying to commit suicide.", \ + "[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide.")) + return (BRUTELOSS) /obj/item/weapon/scalpel @@ -73,11 +73,11 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' - suicide_act(mob/user) - viewers(user) << pick("[user] is slitting \his wrists with [src]! It looks like \he's trying to commit suicide.", \ - "[user] is slitting \his throat with [src]! It looks like \he's trying to commit suicide.", \ - "[user] is slitting \his stomach open with [src]! It looks like \he's trying to commit seppuku.") - return (BRUTELOSS) +/obj/item/weapon/scalpel/suicide_act(mob/user) + user.visible_message(pick("[user] is slitting \his wrists with [src]! It looks like \he's trying to commit suicide.", \ + "[user] is slitting \his throat with [src]! It looks like \he's trying to commit suicide.", \ + "[user] is slitting \his stomach open with [src]! It looks like \he's trying to commit seppuku.")) + return (BRUTELOSS) /obj/item/weapon/circular_saw