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

Conflicts:
	code/controllers/master_controller.dm
	code/game/area/areas.dm

code/controllers/master_controller.dm

@@ -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)

code/game/area/areas.dm

@@ -20,7 +20,11 @@
 
 	..()
 
-//	spawn(15)
+/area/proc/initialize()
+	if(!requires_power || !apc))
+		power_light = 0
+		power_equip = 0
+		power_environ = 0
 	power_change()		// all machines set to current power level, also updates lighting icon
 
 /area/proc/get_contents()