cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power

Browse Source
This commit is contained in:
Atlantiscze
2015-02-17 16:05:47 +01:00
parent 1da43cee08 eb4a75c9b3
commit 2d4926f72d
194 changed files with 5292 additions and 4509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master_controller.dm
+1
View File
@@ -288,6 +288,7 @@ datum/controller/game_controller/proc/process_machines_process()
last_thing_processed = Machine.type
if(Machine.process() != PROCESS_KILL)
if(Machine)
Machine.power_change()
if(Machine.use_power)
Machine.auto_use_power()
continue