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

mafia update.

Browse Source
This commit is contained in:
LetterN
2021-09-11 11:38:15 +08:00
parent 237fdb9893
commit 791da1b9b4
7 changed files with 551 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/verbs/suicide.dm
+7 -3
View File
@@ -207,6 +207,10 @@
message_admins("[key_name(src)] (job: [src.job ? "[src.job]" : "None"]) [is_special_character(src) ? "(ANTAG!) " : ""][ghosting ? "ghosted" : "committed suicide"] at [AREACOORD(src)].")
/mob/living/proc/canSuicide()
var/area/A = get_area(src)
if(A.area_flags & BLOCK_SUICIDE)
to_chat(src, span_warning("You can't commit suicide here! You can ghost if you'd like."))
return FALSE
if(!CONFIG_GET(flag/suicide_allowed))
to_chat(src, "Suicide is not enabled in the config.")
return FALSE
@@ -214,11 +218,11 @@
if(CONSCIOUS)
return TRUE
if(SOFT_CRIT)
to_chat(src, "You can't commit suicide while in a critical condition!")
to_chat(src, span_warning("You can't commit suicide while in a critical condition!"))
if(UNCONSCIOUS)
to_chat(src, "You need to be conscious to commit suicide!")
to_chat(src, span_warning("You need to be conscious to commit suicide!"))
if(DEAD)
to_chat(src, "You're already dead!")
to_chat(src, span_warning("You're already dead!"))
return
/mob/living/carbon/canSuicide()