diff --git a/code/controllers/configuration/entries/respawns.dm b/code/controllers/configuration/entries/respawns.dm index 69e48ed820..40c7d248a4 100644 --- a/code/controllers/configuration/entries/respawns.dm +++ b/code/controllers/configuration/entries/respawns.dm @@ -29,7 +29,7 @@ config_entry_value = FALSE /// Minutes from roundstart before someone can respawn -/datum/config_entry/flag/respawn_minimum_delay_roundstart +/datum/config_entry/number/respawn_minimum_delay_roundstart config_entry_value = 30.0 integer = FALSE diff --git a/code/modules/mob/dead/observer/respawn.dm b/code/modules/mob/dead/observer/respawn.dm index bca4d6ab0d..f966051ed3 100644 --- a/code/modules/mob/dead/observer/respawn.dm +++ b/code/modules/mob/dead/observer/respawn.dm @@ -122,12 +122,12 @@ to_chat(src, "You cannot respawn as you have enabled DNR.") return - var/roundstart_timeleft = world.time - (SSticker.round_start_time + (CONFIG_GET(number/respawn_minimum_delay_roundstart) * 600)) + var/roundstart_timeleft = (SSticker.round_start_time + (CONFIG_GET(number/respawn_minimum_delay_roundstart) * 600)) - world.time if(roundstart_timeleft > 0) to_chat(src, "It's been too short of a time since the round started! Please wait [CEILING(roundstart_timeleft / 600, 0.1)] more minutes.") return - var/list/modes = CONFIG_GET(keyed_list/respawn_chaos_gamemodes) + var/list/banned_modes = CONFIG_GET(keyed_list/respawn_chaos_gamemodes) if(SSticker.mode && banned_modes[lowertext(SSticker.mode.config_tag)]) to_chat(src, "The current mode tag, [SSticker.mode.config_tag], is not eligible for respawn.") return