Merge branch 'cmss13-devs:master' into claymore-est

cmss13-devs · Jul 31, 2024 · 7cb8527 · 7cb8527
2 parents e3bb352 + 444fabd
commit 7cb8527
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -21,7 +21,11 @@ SUBSYSTEM_DEF(ticker)
 	var/list/login_music = null //Music played in pregame lobby
 
 	var/delay_end = FALSE //If set true, the round will not restart on it's own
+#if defined(UNIT_TESTS) //must be FALSE for unit tests else they hang indefinitely
 	var/delay_start = FALSE
+#else
+	var/delay_start = TRUE
+#endif
 	var/admin_delay_notice = "" //A message to display to anyone who tries to restart the world after a delay
 
 	var/time_left //Pre-game timer

diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml
@@ -14,3 +14,6 @@
   - code_imp: Made the Tech Tree subsystem initialise faster.
   Zonespace27:
   - admin: Added freed mob bans to the jobban panel.
+2024-07-31:
+  Doubleumc:
+  - admin: round start delayed by default