From 0aa5b11bea7bf6c2ca256eecfa36460e56b5c7dc Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Tue, 23 Feb 2021 19:33:27 -0500 Subject: [PATCH] Update world.dm --- code/game/world.dm | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/code/game/world.dm b/code/game/world.dm index 7c05a28ddd7..ac0e1034787 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -57,17 +57,8 @@ // Create robolimbs for chargen. populate_robolimb_list() -<<<<<<< HEAD - //Must be done now, otherwise ZAS zones and lighting overlays need to be recreated. - //createRandomZlevel() //VOREStation Removal: Deprecated - - master_controller = new /datum/controller/game_controller() - - Master.Initialize(10, FALSE, TRUE) -======= master_controller = new /datum/controller/game_controller() Master.Initialize(10, FALSE) ->>>>>>> 6cb0471... Merge pull request #7917 from MistakeNot4892/psched spawn(1) master_controller.setup() @@ -413,10 +404,6 @@ var/world_topic_spam_protect_time = world.timeofday to_world("Rebooting world immediately due to host request") else Master.Shutdown() //run SS shutdowns -<<<<<<< HEAD - //processScheduler.stop() //VOREStation Removal -======= ->>>>>>> 6cb0471... Merge pull request #7917 from MistakeNot4892/psched for(var/client/C in GLOB.clients) if(config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite C << link("byond://[config.server]")