cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-02 05:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution, using dev-freeze map.

Browse Source
This commit is contained in:
Zuhayr
2013-09-09 21:59:47 -07:00
parent 161ec9ab98 ee156376a3
commit 7ab7a61812
203 changed files with 577 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/master_controller.dm
View File

@@ -126,11 +126,6 @@ datum/controller/game_controller/proc/process()
if(!air_processing_killed)
timer = world.timeofday
last_thing_processed = air_master.type
air_master.tick()
air_cost = (world.timeofday - timer) / 10 // this might make atmos slower
// 1. atmos won't process if the game is generally lagged out(no deadlocks)
// 2. if the server frequently crashes during atmos processing we will knowif(!kill_air)
//src.set_debug_state("Air Master")
air_master.current_cycle++
if(!air_master.tick()) //Runtimed.