From 7288549decf377cd6e0fe34454677666ec5e0c10 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 5 May 2017 18:08:56 -0500 Subject: [PATCH] Players may no longer commite suicide --- code/modules/client/verbs/suicide.dm.rej | 10 ++++++++++ code/modules/mob/living/carbon/human/examine.dm | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 code/modules/client/verbs/suicide.dm.rej diff --git a/code/modules/client/verbs/suicide.dm.rej b/code/modules/client/verbs/suicide.dm.rej new file mode 100644 index 0000000000..a2e5063fd6 --- /dev/null +++ b/code/modules/client/verbs/suicide.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm (rejected hunks) +@@ -12,7 +12,7 @@ + return + if(confirm == "Yes") + suiciding = 1 +- log_game("[key_name(src)] (job: [job ? "[job]" : "None"]) commited suicide at [get_area(src)].") ++ log_game("[key_name(src)] (job: [job ? "[job]" : "None"]) committed suicide at [get_area(src)].") + var/obj/item/held_item = get_active_held_item() + if(held_item) + var/damagetype = held_item.suicide_act(src) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 9081591395..a3bb2fefde 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -134,7 +134,7 @@ if(stat == DEAD || (status_flags & FAKEDEATH)) appears_dead = 1 if(suiciding) - msg += "[t_He] appear[p_s()] to have commited suicide... there is no hope of recovery.\n" + msg += "[t_He] appear[p_s()] to have committed suicide... there is no hope of recovery.\n" if(hellbound) msg += "[t_His] soul seems to have been ripped out of [t_his] body. Revival is impossible.\n" msg += "[t_He] [t_is] limp and unresponsive; there are no signs of life"