Merge pull request #3651 from SkyMarshal/airfixes

ZAS update, needs testing.
This commit is contained in:
Zuhayr
2013-09-07 05:46:04 -07:00
18 changed files with 522 additions and 362 deletions

View File

@@ -57,7 +57,7 @@ datum/controller/game_controller/proc/setup()
if(!air_master)
air_master = new /datum/controller/air_system()
air_master.setup()
air_master.Setup()
if(!ticker)
ticker = new /datum/controller/gameticker()
@@ -127,8 +127,7 @@ datum/controller/game_controller/proc/process()
timer = world.timeofday
last_thing_processed = air_master.type
air_master.current_cycle++
if(!air_master.tick()) //Runtimed.
if(!air_master.Tick()) //Runtimed.
air_master.failed_ticks++
if(air_master.failed_ticks > 5)
world << "<font color='red'><b>RUNTIMES IN ATMOS TICKER. Killing air simulation!</font></b>"
@@ -137,7 +136,8 @@ datum/controller/game_controller/proc/process()
log_admin("ZASALERT: unable run zone/process() -- [air_master.tick_progress]")
air_processing_killed = 1
air_master.failed_ticks = 0
air_cost = (world.timeofday - timer) / 10
air_cost = (world.timeofday - timer) / 10
sleep(breather_ticks)