cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes Suicide properly impossible when the config to disable suicide is active (#22314)

Browse Source 
* Makes Suicide properly impossible when the config to disable suicide is active

* Yeah sure, I'm not the one that had done that code, just moved it.

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
GoldenAlpharex
2023-07-15 13:40:31 -07:00
committed by GitHub
co-authored by MrMelbert
parent aa204c2b30
commit d2f8331b78
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/verbs/suicide.dm
+6 -6
View File
@@ -12,12 +12,6 @@
if(!suicide_alert())
return
// SKYRAT EDIT ADDITION
if(CONFIG_GET(flag/disable_suicide))
to_chat(usr, span_warning("Suicide is disabled on this server."))
return
// SKYRAT EDIT END
set_suicide(TRUE)
send_applicable_messages()
final_checkout()
@@ -54,6 +48,12 @@
/// Checks if we are in a valid state to suicide (not already suiciding, capable of actually killing ourselves, area checks, etc.) Returns TRUE if we can suicide, FALSE if we can not.
/mob/living/proc/can_suicide()
// SKYRAT EDIT ADDITION
if(CONFIG_GET(flag/disable_suicide))
to_chat(src, span_warning("Suicide is disabled on this server."))
return FALSE
// SKYRAT EDIT END
if(HAS_TRAIT_FROM_ONLY(src, TRAIT_SUICIDED, REF(src)))
to_chat(src, span_warning("You are already commiting suicide!"))
return FALSE