cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 05:52:17 +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

6
code/game/area/areas.dm
View File

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