Merge branch 'master' into upstream-merge-32188

code/controllers/subsystem/events.dm

@@ -57,8 +57,6 @@ SUBSYSTEM_DEF(events)
 /datum/controller/subsystem/events/proc/spawnEvent()
 	set waitfor = FALSE	//for the admin prompt
 	if(!CONFIG_GET(flag/allow_random_events))
-//		var/datum/round_event_control/E = locate(/datum/round_event_control/dust) in control
-//		if(E)	E.runEvent()
 		return
 
 	var/gamemode = SSticker.mode.config_tag

code/controllers/subsystem/shuttle.dm

@@ -505,14 +505,7 @@ SUBSYSTEM_DEF(shuttle)
 	// Then we want the point closest to -infinity,-infinity
 	var/x2 = min(x0, x1)
 	var/y2 = min(y0, y1)
-/*
-	var/lowx = topleft.x + SHUTTLE_TRANSIT_BORDER
-	var/lowy = topleft.y + SHUTTLE_TRANSIT_BORDER
 
-	var/turf/low_point = locate(lowx, lowy, topleft.z)
-	new /obj/effect/landmark/stationary(low_point)
-	to_chat(world, "Starting at the low point, we go [x2],[y2]")
-*/
 	// Then invert the numbers
 	var/transit_x = topleft.x + SHUTTLE_TRANSIT_BORDER + abs(x2)
 	var/transit_y = topleft.y + SHUTTLE_TRANSIT_BORDER + abs(y2)

code/controllers/subsystem/ticker.dm

@@ -193,6 +193,8 @@ SUBSYSTEM_DEF(ticker)
 			if(!setup())
 				//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)