Allow server to initialize before players connect. #1004

Merged
merged 1 commit into from May 8, 2012
View
3 code/game/algorithm.dm
@@ -27,7 +27,6 @@ Today, these people were mean:
LoadBans()
process_teleport_locs() //Sets up the wizard teleport locations
process_ghost_teleport_locs() //Sets up ghost teleport locations.
- sleep_offline = 1
if (config.kick_inactive)
spawn(30)
@@ -201,4 +200,4 @@ proc/countJob(rank)
var/mob/M = T.host
if(M.client && M.machine == subject)
subject.attack_hand(M)
-*/
+*/
View
4 code/game/cellautomata.dm
@@ -106,8 +106,6 @@
..()
- sleep(50)
-
plmaster = new /obj/effect/overlay( )
plmaster.icon = 'tile_effects.dmi'
plmaster.icon_state = "plasma"
@@ -196,4 +194,4 @@
/obj/effect/decal/point/point()
set src in oview()
set hidden = 1
- return
+ return
View
8 code/game/master_controller.dm
@@ -47,6 +47,12 @@ datum/controller/game_controller
world.tick_lag = config.Ticklag
+ // Sleep for about 5 seconds to allow background initialization procs to finish
+ sleep(50)
+
+ // Now that the game is world is fully initialized, pause server until a user connects.
+ world.sleep_offline = 1
+
setup_objects()
setupgenetics()
@@ -235,4 +241,4 @@ datum/controller/game_controller
else
for (var/mob/M in world)
if (M.client && M.client.holder)
- M << "<font color='red' size='2'><b> The Master Controller has fired. Automatic restart aborted.</b></font>"
+ M << "<font color='red' size='2'><b> The Master Controller has fired. Automatic restart aborted.</b></font>"