From 3dba9dbc4ed9f151eb62d2ab8668a64645c973b3 Mon Sep 17 00:00:00 2001 From: ZekeSulastin Date: Wed, 11 Mar 2020 01:35:09 -0400 Subject: [PATCH] Fixes pregame loop with no readied players (#6814) When the config option for pregame time was added in #6795, the pregame_timeleft setting was moved out of the do while !setup loop. If the game does not set up, it would keep decrementing the counter into the negatives since it was never reset. --- code/game/gamemodes/gameticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 191f268e08..92ec9cf0c5 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -46,9 +46,9 @@ var/global/datum/controller/gameticker/ticker send2mainirc("Server lobby is loaded and open at byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]") - pregame_timeleft = config.pregame_time do + pregame_timeleft = config.pregame_time to_chat(world, "Welcome to the pregame lobby!") to_chat(world, "Please set up your character and select ready. The round will start in [pregame_timeleft] seconds.") while(current_state == GAME_STATE_PREGAME)