diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm
index 6a9bd55d688..c08699c48ee 100644
--- a/code/controllers/subsystem/SSticker.dm
+++ b/code/controllers/subsystem/SSticker.dm
@@ -81,9 +81,9 @@ SUBSYSTEM_DEF(ticker)
 	switch(current_state)
 		if(GAME_STATE_STARTUP)
 			// This is ran as soon as the MC starts firing, and should only run ONCE, unless startup fails
-			round_start_time = world.time + (GLOB.configuration.general.lobby_time SECONDS)
 			pregame_timeleft = GLOB.configuration.general.lobby_time SECONDS
-			to_chat(world, "<b><span class='darkmblue'>Welcome to the pre-game lobby!</span></b>")
+			round_start_time = world.time + pregame_timeleft
+			to_chat(world, "<B><span class='darkmblue'>Welcome to the pre-game lobby!</span></B>")
 			to_chat(world, "Please, setup your character and select ready. Game will start in [GLOB.configuration.general.lobby_time] seconds")
 			current_state = GAME_STATE_PREGAME
 			fire() // TG says this is a good idea
@@ -95,12 +95,9 @@ SUBSYSTEM_DEF(ticker)
 				return
 
 			// This is so we dont have sleeps in controllers, because that is a bad, bad thing
-			if(!delay_end)
-				pregame_timeleft = max(0, round_start_time - world.time) // Normal lobby countdown when roundstart was not delayed
-			else
-				pregame_timeleft = max(0, pregame_timeleft - wait) // If roundstart was delayed, we should resume the countdown where it left off
+			pregame_timeleft = max(0, round_start_time - world.time)
 
-			if(pregame_timeleft <= 600 && !tipped) // 60 seconds
+			if(pregame_timeleft <= 1 MINUTES && !tipped)
 				send_tip_of_the_round()
 				tipped = TRUE
 
diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm
index 7acb04f5472..01694f122ce 100644
--- a/code/game/gamemodes/nuclear/nuclear_challenge.dm
+++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm
@@ -1,9 +1,9 @@
 #define CHALLENGE_TELECRYSTALS 1400
-#define CHALLENGE_TIME_LIMIT 6000
+#define CHALLENGE_TIME_LIMIT 10 MINUTES
 #define CHALLENGE_SCALE_PLAYER 1 // How many player per scaling bonus
 #define CHALLENGE_SCALE_BONUS 10 // How many TC per scaling bonus
 #define CHALLENGE_MIN_PLAYERS 50
-#define CHALLENGE_SHUTTLE_DELAY 18000 //30 minutes, so the ops have at least 10 minutes before the shuttle is callable. Gives the nuke ops at least 15 minutes before shuttle arrive.
+#define CHALLENGE_SHUTTLE_DELAY 30 MINUTES // So the ops have at least 10 minutes before the shuttle is callable. Gives the nuke ops at least 15 minutes before shuttle arrive.
 
 /obj/item/nuclear_challenge
 	name = "Declaration of War (Challenge Mode)"
diff --git a/code/modules/admin/misc_admin_procs.dm b/code/modules/admin/misc_admin_procs.dm
index 40729ea7e0f..03aa0b49fb0 100644
--- a/code/modules/admin/misc_admin_procs.dm
+++ b/code/modules/admin/misc_admin_procs.dm
@@ -613,6 +613,7 @@ GLOBAL_VAR_INIT(nologevent, 0)
 		log_admin("[key_name(usr)] delayed the game.")
 	else
 		SSticker.ticker_going = TRUE
+		SSticker.round_start_time = world.time + SSticker.pregame_timeleft
 		to_chat(world, "<b>The game will start soon.</b>")
 		log_admin("[key_name(usr)] removed the delay.")
 
diff --git a/code/modules/shuttle/syndicate_shuttles.dm b/code/modules/shuttle/syndicate_shuttles.dm
index 76f3556883a..697819a586a 100644
--- a/code/modules/shuttle/syndicate_shuttles.dm
+++ b/code/modules/shuttle/syndicate_shuttles.dm
@@ -1,4 +1,4 @@
-#define SYNDICATE_CHALLENGE_TIMER 12000 //20 minutes
+#define SYNDICATE_CHALLENGE_TIMER 20 MINUTES
 
 /obj/machinery/computer/shuttle/syndicate
 	name = "syndicate shuttle terminal"