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
This commit is contained in:
Ccomp5950
2014-03-24 17:42:27 -05:00
committed by alex-gh
parent e915af4fe5
commit ed69c23e07
+2 -2
View File
@@ -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)