From 298035b33913c25a2c86fbf5fc93a382a82a1b08 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 20 Nov 2017 11:10:09 -0500
Subject: [PATCH 1/2] Merge pull request #32900 from
 AnturK/actuallyfixesthatthing

Fixes lobby timer on setup failure
---
 code/controllers/subsystem/ticker.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 3f419e92c8..18354893fb 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -194,6 +194,7 @@ SUBSYSTEM_DEF(ticker)
 				//setup failed
 				current_state = GAME_STATE_STARTUP
 				start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)
+				timeLeft = null
 				Master.SetRunLevel(RUNLEVEL_LOBBY)
 
 		if(GAME_STATE_PLAYING)