Merge pull request #1765 from Citadel-Station-13/upstream-merge-28753

[MIRROR] Fixes the server taking for fucking ever to initialize for local test
2017-06-25 01:02:47 -05:00
parent 9e9e8c323e 15362206dd
commit 67e1b0fda7
1 changed files with 3 additions and 0 deletions
@@ -1210,6 +1210,9 @@ proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
 #define DELTA_CALC max(((max(world.tick_usage, world.cpu) / 100) * max(Master.sleep_delta,1)), 1)

 /proc/stoplag()
+	if (!Master || !(Master.current_runlevel & RUNLEVELS_DEFAULT))
+		sleep(world.tick_lag)
+		return 1
 	. = 0
 	var/i = 1
 	do