cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-09 14:15:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Going back to BS12 ZAS, permanently

Browse Source
This commit is contained in:
ZomgPonies
2013-11-08 09:51:22 -05:00
parent 950011d4d8
commit 0e201cc4a5
33 changed files with 3205 additions and 3019 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master_controller.dm
+7 -1
View File
@@ -58,7 +58,8 @@ datum/controller/game_controller/proc/setup()
if(!air_master)
air_master = new /datum/controller/air_system()
air_master.setup()
// air_master.setup()
air_master.Setup()
if(!ticker)
ticker = new /datum/controller/gameticker()
@@ -129,7 +130,12 @@ datum/controller/game_controller/proc/process()
last_thing_processed = air_master.type
air_master.current_cycle++
<<<<<<< HEAD
if(!air_master.tick()) //Runtimed.
=======
// if(!air_master.tick()) Runtimed.
if(!air_master.Tick())
>>>>>>> parent of 0227baa... Reverting ZAS back to /vg/ style
air_master.failed_ticks++
if(air_master.failed_ticks > 5)
world << "<font color='red'><b>RUNTIMES IN ATMOS TICKER. Killing air simulation!</font></b>"