Merge pull request #11862 from Ty-Omaha/grid-check-fix

Fixes Grid Check
This commit is contained in:
variableundefined
2019-08-25 06:37:22 -04:00
committed by GitHub
2 changed files with 9 additions and 1 deletions
+7
View File
@@ -45,6 +45,11 @@
continue
if(C.cell)
C.cell.charge = 0
for(var/obj/machinery/power/P in GLOB.machines)
var/area/current_area = get_area(P)
if((current_area.type in skipped_areas_apc) || (current_area.type in skipped_areas) || !is_station_level(P.z))
continue
P.malfunction = TRUE
/proc/power_restore(var/announce = 1)
var/list/skipped_areas = list(/area/turret_protected/ai)
@@ -67,6 +72,8 @@
S.input_attempt = S.last_input_attempt
S.update_icon()
S.power_change()
for(var/obj/machinery/power/P in GLOB.machines)
P.malfunction = FALSE
/proc/power_restore_quick(var/announce = 1)
if(announce)
+2 -1
View File
@@ -15,6 +15,7 @@
use_power = NO_POWER_USE
idle_power_usage = 0
active_power_usage = 0
var/malfunction = FALSE
/obj/machinery/power/Destroy()
disconnect_from_network()
@@ -30,7 +31,7 @@
// Non-machines should use add_delayedload(), delayed_surplus(), newavail()
/obj/machinery/power/proc/add_avail(amount)
if(powernet)
if(powernet && !malfunction)
powernet.newavail += amount
return TRUE
else