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

Fixes machines being usable after a power failure

Browse Source 
Fixes machines not gaining the NOPOWER flag after a power failure
because they were turned off and had use_power set to 0.
Fixes machines not gaining the NOPOWER flag after being moved into an
area with no power.

Both bugs allowed power using machines to be used in areas with no
power.
This commit is contained in:
mwerezak
2015-02-11 23:27:36 -05:00
parent 4deeebfe3e
commit b7e3a14e0d
2 changed files with 5 additions and 2 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

6
code/modules/power/power.dm
View File

@@ -63,8 +63,10 @@
if(!src.loc)
return 0
if(!use_power)
return 1
//Don't do this. It allows machines that set use_power to 0 when off (many machines) to
//be turned on again and used after a power failure because they never gain the NOPOWER flag.
//if(!use_power)
// return 1
var/area/A = src.loc.loc // make sure it's in an area
if(!A || !isarea(A) || !A.master)