cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/controllers/master_controller.dm
	code/game/area/areas.dm
This commit is contained in:
PsiOmega
2015-08-10 17:42:40 +02:00
parent c98b6a1d97 fc0841faad
commit a710e77d46
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/master_controller.dm
View File

@@ -49,6 +49,11 @@ datum/controller/game_controller/proc/setup_objects()
sleep(-1)
for(var/atom/movable/object in world)
object.initialize()
world << "<span class='danger>Initializing areas</span>"
sleep(-1)
for(var/area/area in all_areas)
area.initialize()
admin_notice("<span class='danger'>Initializing pipe networks</span>", R_DEBUG)
sleep(-1)