Merge resolution.

This commit is contained in:
Zuhayr
2015-01-31 19:09:20 +10:30
102 changed files with 13968 additions and 10707 deletions
-3
View File
@@ -61,9 +61,6 @@ datum/controller/game_controller/New()
datum/controller/game_controller/proc/setup()
world.tick_lag = config.Ticklag
spawn(20)
createRandomZlevel()
if(!air_master)
air_master = new /datum/controller/air_system()
air_master.Setup()