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

Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

Browse Source 
Conflicts:
	code/game/gamemodes/objective.dm
This commit is contained in:
Spamcat
2013-07-01 19:49:29 +04:00
parent 10ee1fbcfe 2a10d6e5e1
commit 11e27c5999
161 changed files with 4191 additions and 2367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master_controller.dm
+2 -1
View File
@@ -51,7 +51,8 @@ datum/controller/game_controller/New()
datum/controller/game_controller/proc/setup()
world.tick_lag = config.Ticklag
createRandomZlevel()
spawn(20)
createRandomZlevel()
if(!air_master)
air_master = new /datum/controller/air_system()