From a3e7e394ad3f1ba5ce8cd6fe00f6c06e5aa38296 Mon Sep 17 00:00:00 2001 From: Miniature Date: Sun, 4 Dec 2011 22:52:20 +1030 Subject: [PATCH] Switched charge amounts for automatically turning off machinery and lights, so lights turn off before machinery (like on old code). --- code/modules/power/apc.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index c95aaf65bc5..f1988a6cad5 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -988,16 +988,16 @@ lighting = autoset(lighting, 0) environ = autoset(environ, 0) area.poweralert(0, src) - else if(cell.percent() < 15) // <15%, turn off lighting & equipment - equipment = autoset(equipment, 2) - lighting = autoset(lighting, 2) - environ = autoset(environ, 1) - area.poweralert(0, src) - else if(cell.percent() < 30) // <30%, turn off equipment + else if(cell.percent() < 15) // <15%, turn off equipment equipment = autoset(equipment, 2) lighting = autoset(lighting, 1) environ = autoset(environ, 1) area.poweralert(0, src) + else if(cell.percent() < 30) // <30%, turn off lighting & equipment + equipment = autoset(equipment, 2) + lighting = autoset(lighting, 2) + environ = autoset(environ, 1) + area.poweralert(0, src) else // otherwise all can be on equipment = autoset(equipment, 1) lighting = autoset(lighting, 1)