Merge pull request #3866 from Citadel-Station-13/upstream-merge-32505

[MIRROR] Adds a config option to change world.sleep_offline

code/controllers/configuration/entries/config.dm

@@ -372,3 +372,10 @@ CONFIG_TWEAK(number/mc_tick_rate/ValidateAndSet(str_val))
 	. = ..()
 	if (.)
 		Master.UpdateTickRate()
+
+CONFIG_DEF(flag/resume_after_initializations)
+
+CONFIG_TWEAK(flag/ValidateAndSet(str_val))
+	. = ..()
+	if(. && Master.current_runlevel)
+		world.sleep_offline = !value

code/controllers/master.dm

@@ -189,10 +189,12 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	// Sort subsystems by display setting for easy access.
 	sortTim(subsystems, /proc/cmp_subsystem_display)
 	// Set world options.
-	world.sleep_offline = 1
+	world.sleep_offline = TRUE
 	world.fps = CONFIG_GET(number/fps)
 	var/initialized_tod = REALTIMEOFDAY
 	sleep(1)
+	if(CONFIG_GET(flag/resume_after_initializations))
+		world.sleep_offline = FALSE
 	initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10
 	// Loop.
 	Master.StartProcessing(0)

config/config.txt

@@ -358,8 +358,6 @@ MINUTE_TOPIC_LIMIT 100
 
 ## Allow admin hrefs that don't use the new token system, will eventually be removed
 DEBUG_ADMIN_HREFS
-<<<<<<< HEAD
-=======
 
 ###Master Controller High Pop Mode###
 
@@ -380,4 +378,6 @@ HIGH_POP_MC_MODE_AMOUNT 65
 
 ##Disengage high pop mode if player count drops below this
 DISABLE_HIGH_POP_MC_MODE_AMOUNT 60
->>>>>>> bc4d4e7... Merge pull request #31374 from MrStonedOne/highpopmode
+
+## Uncomment to prevent the world from sleeping while no players are connected after initializations
+#RESUME_AFTER_INITIALIZATIONS