Merge pull request #4004 from Citadel-Station-13/upstream-merge-32812

[MIRROR] Fixes setup failure edge case
2017-11-19 04:26:49 +00:00
parent 7f7d282383 f2a39d438f
commit 2faceb1209
1 changed files with 1 additions and 0 deletions
@@ -193,6 +193,7 @@ SUBSYSTEM_DEF(ticker)
 			if(!setup())
 				//setup failed
 				current_state = GAME_STATE_STARTUP
+				start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)
 				Master.SetRunLevel(RUNLEVEL_LOBBY)

 		if(GAME_STATE_PLAYING)