Merge pull request #33853 from tgstation/Cyberboss-patch-2

If the world is launched with the "no-init" param. Master.Initialize isn't called
2017-12-28 18:58:31 +13:00
parent 90582d2e1a
commit 0147b4a7e1
1 changed files with 3 additions and 0 deletions
@@ -37,6 +37,9 @@ GLOBAL_PROTECT(security_mode)
 	if(fexists(RESTART_COUNTER_PATH))
 		GLOB.restart_counter = text2num(trim(file2text(RESTART_COUNTER_PATH)))
 		fdel(RESTART_COUNTER_PATH)
+	
+	if("no-init" in params)
+		return

 	Master.Initialize(10, FALSE)