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

ZAS revert fixes

Browse Source
This commit is contained in:
ZomgPonies
2013-11-07 16:05:46 -05:00
parent 0227baa319
commit 900262ec9c
4 changed files with 0 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master_controller.dm
-5
View File
@@ -129,12 +129,7 @@ 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())
=======
if(!air_master.tick()) //Runtimed.
>>>>>>> parent of e4a82df... ZAS switched from /vg/ to BS12
air_master.failed_ticks++
if(air_master.failed_ticks > 5)
world << "<font color='red'><b>RUNTIMES IN ATMOS TICKER. Killing air simulation!</font></b>"