cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

finishes work on adapting the goon process scheduler for BS12.

Browse Source
This commit is contained in:
Graham Lloyd
2015-03-04 05:14:36 -05:00
parent 8364c3de2d
commit 160183ebd5
8 changed files with 96 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/controllers/master_controller.dm
View File

@@ -5,7 +5,6 @@
var/global/datum/controller/game_controller/master_controller //Set in world.New()
var/global/controller_iteration = 0
var/global/last_tick_timeofday = world.timeofday
var/global/last_tick_duration = 0
var/global/air_processing_killed = 0
@@ -53,8 +52,8 @@ datum/controller/game_controller/New()
if(!syndicate_code_phrase) syndicate_code_phrase = generate_code_phrase()
if(!syndicate_code_response) syndicate_code_response = generate_code_phrase()
if(!emergency_shuttle) emergency_shuttle = new /datum/emergency_shuttle_controller()
if(!shuttle_controller) shuttle_controller = new /datum/shuttle_controller()
// if(!emergency_shuttle) emergency_shuttle = new /datum/emergency_shuttle_controller() // handled in scheduler
// if(!shuttle_controller) shuttle_controller = new /datum/shuttle_controller()
datum/controller/game_controller/proc/setup()
world.tick_lag = config.Ticklag
@@ -65,12 +64,12 @@ datum/controller/game_controller/proc/setup()
spawn(20)
createRandomZlevel()
if(!air_master)
/* if(!air_master) // handled in scheduler
air_master = new /datum/controller/air_system()
air_master.Setup()
if(!ticker)
ticker = new /datum/controller/gameticker()
ticker = new /datum/controller/gameticker()*/
setup_objects()
setupgenetics()
@@ -80,11 +79,11 @@ datum/controller/game_controller/proc/setup()
transfer_controller = new
spawn(0)
/* spawn(0) // handled in scheduler
if(ticker)
ticker.pregame()
lighting_controller.initializeLighting()
lighting_controller.initializeLighting()*/
datum/controller/game_controller/proc/setup_objects()
@@ -135,10 +134,6 @@ datum/controller/game_controller/proc/process()
while(1) //far more efficient than recursively calling ourself
if(!Failsafe) new /datum/controller/failsafe()
var/currenttime = world.timeofday
last_tick_duration = (currenttime - last_tick_timeofday) / 10
last_tick_timeofday = currenttime
if(processing)
var/timer
var/start_time = world.timeofday