cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into dev.

Browse Source
This commit is contained in:
Zuhayr
2015-02-12 23:01:08 +10:30
parent d40eecd163 0955b001dc
commit a8089d4437
25 changed files with 1252 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/controllers/master_controller.dm
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