mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-22 12:47:16 +01:00
Configuration Controller (#7857)
This commit is contained in:
@@ -350,9 +350,9 @@
|
||||
// Special cases, can never respawn
|
||||
if(ticker?.mode?.deny_respawn)
|
||||
time = -1
|
||||
else if(!config.abandon_allowed)
|
||||
else if(!CONFIG_GET(flag/abandon_allowed)) // CHOMPEdit
|
||||
time = -1
|
||||
else if(!config.respawn)
|
||||
else if(!CONFIG_GET(flag/respawn)) // CHOMPEdit
|
||||
time = -1
|
||||
|
||||
// Special case for observing before game start
|
||||
@@ -361,7 +361,7 @@
|
||||
|
||||
// Wasn't given a time, use the config time
|
||||
else if(!time)
|
||||
time = config.respawn_time
|
||||
time = CONFIG_GET(number/respawn_time) // CHOMPEdit
|
||||
|
||||
var/keytouse = ckey
|
||||
// Try harder to find a key to use
|
||||
@@ -373,7 +373,7 @@
|
||||
GLOB.respawn_timers[keytouse] = world.time + time
|
||||
|
||||
/mob/observer/dead/set_respawn_timer()
|
||||
if(config.antag_hud_restricted && has_enabled_antagHUD)
|
||||
if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD) // CHOMPEdit
|
||||
..(-1)
|
||||
else
|
||||
return // Don't set it, no need
|
||||
@@ -733,6 +733,10 @@
|
||||
GLOB.stat_entry()
|
||||
else
|
||||
stat("Globals:", "ERROR")
|
||||
if(config)
|
||||
stat("[config]:", config.stat_entry())
|
||||
else
|
||||
stat("Config:", "ERROR")
|
||||
if(Master)
|
||||
Master.stat_entry()
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user