Merge pull request #10614 from Putnam3145/suicide_option

Made suicide a config flag
This commit is contained in:
Ghom
2020-01-20 03:24:00 +01:00
committed by GitHub
4 changed files with 9 additions and 1 deletions
+1 -1
View File
@@ -178,7 +178,7 @@
if(!C.credits)
C.RollCredits()
C.playtitlemusic(40)
CONFIG_SET(flag/suicide_allowed,TRUE) // EORG suicides allowed
var/popcount = gather_roundend_feedback()
display_report(popcount)
@@ -408,3 +408,5 @@
/datum/config_entry/number/dropped_modes
config_entry_value = 3
/datum/config_entry/flag/suicide_allowed
+3
View File
@@ -207,6 +207,9 @@
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()
if(!CONFIG_GET(flag/suicide_allowed))
to_chat(src, "Suicide is not enabled in the config.")
return FALSE
switch(stat)
if(CONSCIOUS)
return TRUE
+3
View File
@@ -597,3 +597,6 @@ MODETIER_VOTING
## Number of modes dropped by the modetier vote during mode selection, after vote.
DROPPED_MODES 3
## Whether the suicide verb is allowed.
# SUICIDE_ALLOWED