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 remote-tracking branch 'upstream/dev' into subsystems

Browse Source 
Conflicts:
	code/game/machinery/camera/camera.dm
	code/modules/mob/mob.dm
This commit is contained in:
PsiOmega
2015-02-17 08:36:12 +01:00
parent 2e9c266a2f bee187d5bc
commit ec4b8c78a1
297 changed files with 11567 additions and 9431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/controllers/master_controller.dm
View File

@@ -294,6 +294,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