From ed69c23e07e729ba02eae4408a172ac34e992ae8 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Mon, 24 Mar 2014 17:42:27 -0500 Subject: [PATCH] Bugfix for new APC code, gridchecks won't just turn off equipment. Was a problem with me switching the order of the checks. Conflicts: code/modules/power/apc.dm --- code/modules/power/apc.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 33350791007..5c8859a8145 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1125,14 +1125,14 @@ area.poweralert(1, src) if(cell_charge >= 4000) area.poweralert(1, src) - else if(cell_charge < 1250 && longtermpower < 0) // <30%, turn off equipment + else if(cell_charge < 1250 && cell_charge > 750 && longtermpower < 0) // <30%, turn off equipment if(autoflag != 2) equipment = autoset(equipment, 2) lighting = autoset(lighting, 1) environ = autoset(environ, 1) area.poweralert(0, src) autoflag = 2 - else if(cell_charge < 750 && longtermpower < 0) // <15%, turn off lighting & equipment + else if(cell_charge < 750 && cell_charge > 10 && longtermpower < 0) // <15%, turn off lighting & equipment if(autoflag != 1) equipment = autoset(equipment, 2) lighting = autoset(lighting, 2)