cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Final ZAS BS12 fixes, not touching it anymore :)

Browse Source
This commit is contained in:
ZomgPonies
2013-11-08 10:08:10 -05:00
parent 0e201cc4a5
commit 1f31f91afa
5 changed files with 4 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master_controller.dm
-4
View File
@@ -130,12 +130,8 @@ 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>"