shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Players may no longer commite suicide

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-05 18:08:56 -05:00
parent 39876074ca
commit 7288549dec
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/verbs/suicide.dm.rej
+10
View File
@@ -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)
code/modules/mob/living/carbon/human/examine.dm
+1 -1
View File
@@ -134,7 +134,7 @@
if(stat == DEAD || (status_flags & FAKEDEATH))
appears_dead = 1
if(suiciding)
msg += "<span class='warning'>[t_He] appear[p_s()] to have commited suicide... there is no hope of recovery.</span>\n"
msg += "<span class='warning'>[t_He] appear[p_s()] to have committed suicide... there is no hope of recovery.</span>\n"
if(hellbound)
msg += "<span class='warning'>[t_His] soul seems to have been ripped out of [t_his] body. Revival is impossible.</span>\n"
msg += "<span class='deadsay'>[t_He] [t_is] limp and unresponsive; there are no signs of life"