Merge pull request #6243 from Citadel-Station-13/upstream-merge-36907

[MIRROR] Unit tests don't start until after 10s of round time
2018-04-03 08:15:33 +00:00
parent 1013f3d92e c5d38d983f
commit a196e2c58e
1 changed files with 4 additions and 2 deletions
@@ -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)