diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 02ac1dc39a7..550d043a2df 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -1220,7 +1220,7 @@ force = round((5+potency/2.5), 1) suicide_act(mob/user) - viewers(user) << "\red [user] is eating some of the [src]! It looks like \he's trying to commit suicide." + viewers(user) << "\red [user] is eating some of the [src.name]! It looks like \he's trying to commit suicide." return (BRUTELOSS|TOXLOSS) // ************************************* @@ -1291,7 +1291,7 @@ var/WeedKillStr = 2 suicide_act(mob/user) - viewers(user) << "\red [user] is huffing the [src]! It looks like \he's trying to commit suicide." + viewers(user) << "\red [user] is huffing the [src.name]! It looks like \he's trying to commit suicide." return (TOXLOSS) /obj/item/weapon/pestspray // -- Skie @@ -1310,7 +1310,7 @@ var/PestKillStr = 2 suicide_act(mob/user) - viewers(user) << "\red [user] is huffing the [src]! It looks like \he's trying to commit suicide." + viewers(user) << "\red [user] is huffing the [src.name]! It looks like \he's trying to commit suicide." return (TOXLOSS) /obj/item/weapon/minihoe // -- Numbers diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 7791bed359e..26e1697777f 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -224,7 +224,7 @@ var/armed = 0 suicide_act(mob/user) - viewers(user) << "\red [user] is putting the [src] on \his head! It looks like \he's trying to commit suicide." + viewers(user) << "\red [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) @@ -412,7 +412,7 @@ attack_verb = list("whipped", "lashed", "disciplined", "tickled") suicide_act(mob/user) - viewers(user) << "\red [user] is strangling \himself with the [src]! It looks like \he's trying to commit suicide." + viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." return (OXYLOSS) /obj/item/weapon/module diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 38058a0a560..e3c2ac18c57 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -63,11 +63,11 @@ //user: The mob that is suiciding //damagetype: The type of damage the item will inflict on the user -//bruteloss = 1 -//fireloss = 2 -//toxloss = 4 -//oxyloss = 8 -//This proc will return an array. The first element of the list should always be the suicide message that players will see, next is the damagetype +//BRUTELOSS = 1 +//FIRELOSS = 2 +//TOXLOSS = 4 +//OXYLOSS = 8 +//Output a creative message and then return the damagetype done /obj/item/proc/suicide_act(mob/user) return diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 60d6b1bf221..7deaf762d77 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -369,7 +369,7 @@ var/colourName = "red" //for updateIcon purposes suicide_act(mob/user) - viewers(user) << "\red [user] is jaming the [src] up \his nose and into \his brain. It looks like \he's trying to commit suicide." + viewers(user) << "\red [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) /* diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 1233fa75174..d2c9f9ffc5b 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -82,9 +82,9 @@ throwforce = 10.0 suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.") + viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\red [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,9 +114,9 @@ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.") + viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\red [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 diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index a5f74e0344f..0d46aa3a342 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 suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.", \ - "\red [user] is falling on the [src]! It looks like \he's trying to commit suicide.") + viewers(user) << pick("\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.", \ + "\red [user] is falling on the [src.name]! It looks like \he's trying to commit suicide.") return (BRUTELOSS|FIRELOSS) /obj/item/weapon/melee/energy/axe @@ -20,7 +20,7 @@ attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") suicide_act(mob/user) - viewers(user) << "\red [user] swings the [src] towards /his head! It looks like \he's trying to commit suicide." + viewers(user) << "\red [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/sword diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 30ed99b4b77..3b3e611575e 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -12,5 +12,5 @@ attack_verb = list("flogged", "whipped", "lashed", "disciplined") suicide_act(mob/user) - viewers(user) << "\red [user] is strangling \himself with the [src]! It looks like \he's trying to commit suicide." + viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." return (OXYLOSS) \ No newline at end of file diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index 8348407e896..472e28852f3 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -21,7 +21,7 @@ var/construction_time=100 suicide_act(mob/user) - viewers(user) << "\red [user] is licking the electrodes of the [src]! It looks like \he's trying to commit suicide." + viewers(user) << "\red [user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide." return (FIRELOSS) /obj/item/weapon/cell/crap diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 5ac17a4478b..6f262d16d2a 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -13,7 +13,7 @@ origin_tech = "combat=2" suicide_act(mob/user) - viewers(user) << "\red [user] is putting the live [src] in \his mouth! It looks like \he's trying to commit suicide." + viewers(user) << "\red [user] is putting the live [src.name] in \his mouth! It looks like \he's trying to commit suicide." return (FIRELOSS) /obj/item/weapon/melee/baton/update_icon() diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 255ff8999ad..8e6701f2440 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -370,8 +370,8 @@ attack_verb = list("drilled") suicide_act(mob/user) - viewers(user) << pick("/red [user] is pressing the [src] to \his temple and activating it! It looks like \he's trying to commit suicide.", \ - "/red [user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide.") + viewers(user) << pick("/red [user] is pressing the [src.name] to \his temple and activating it! It looks like \he's trying to commit suicide.", \ + "/red [user] is pressing [src.name] to \his chest and activating it! It looks like \he's trying to commit suicide.") return (BRUTELOSS) /* * Scalpel @@ -393,9 +393,9 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.") + viewers(user) << pick("\red [user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") return (BRUTELOSS) /obj/item/weapon/scalpel/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 520bc803718..6b91a224e27 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -49,8 +49,8 @@ attack_verb = list("stabbed") suicide_act(mob/user) - viewers(user) << pick("\red [user] is stabbing the [src] into \his temple! It looks like \he's trying to commit suicide.", \ - "\red [user] is stabbing the [src] into \his heart! It looks like \he's trying to commit suicide.") + viewers(user) << pick("\red [user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \ + "\red [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 229b7393856..8c6ee9461ef 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -12,7 +12,7 @@ attack_verb = list("banned") suicide_act(mob/user) - viewers(user) << "\red [user] is hitting \himself with the [src]! It looks like \he's trying to ban \himself from life." + viewers(user) << "\red [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/nullrod @@ -29,7 +29,7 @@ w_class = 1 suicide_act(mob/user) - viewers(user) << "\red [user] is impaling \himself with the [src]! It looks like \he's trying to commit suicide." + viewers(user) << "\red [user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." return (BRUTELOSS|FIRELOSS) /obj/item/weapon/sord @@ -45,7 +45,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << "\red [user] is impaling \himself with the [src]! It looks like \he's trying to commit suicide." + viewers(user) << "\red [user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." return(BRUTELOSS) /obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) @@ -68,7 +68,7 @@ return 1 suicide_act(mob/user) - viewers(user) << "\red [user] is falling on the [src]! It looks like \he's trying to commit suicide." + viewers(user) << "\red [user] is falling on the [src.name]! It looks like \he's trying to commit suicide." return(BRUTELOSS) /obj/item/weapon/claymore/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) @@ -88,7 +88,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << "\red [user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku." + viewers(user) << "\red [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/power/cable.dm b/code/modules/power/cable.dm index f44939e5ea7..7d8b42e1d0b 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -173,7 +173,7 @@ attack_verb = list("whipped", "lashed", "disciplined", "flogged") suicide_act(mob/user) - viewers(user) << "\red [user] is strangling \himself with the [src]! It looks like \he's trying to commit suicide." + viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." return(OXYLOSS)