From 376eee917ad2b5f9aa8eee4dbcea72554c7db6c8 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 2 Apr 2018 15:56:03 -0400
Subject: [PATCH] Unit tests don't start until after 10s of round time (#36907)

---
 code/game/world.dm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/game/world.dm b/code/game/world.dm
index dde599db78..177d9ede22 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -55,11 +55,13 @@ GLOBAL_PROTECT(security_mode)
 	Master.sleep_offline_after_initializations = FALSE
 	SSticker.start_immediately = TRUE
 	CONFIG_SET(number/round_end_countdown, 0)
+	var/datum/callback/cb
 #ifdef UNIT_TESTS
-	SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/RunUnitTests))
+	cb = CALLBACK(GLOBAL_PROC, /proc/RunUnitTests)
 #else
-	SSticker.force_ending = TRUE
+	cb = VARSET_CALLBACK(SSticker, force_ending, TRUE)
 #endif
+	SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, cb, 10 SECONDS))
 
 /world/proc/SetupExternalRSC()
 #if (PRELOAD_RSC == 0)