From 1cfc3b8d5ffa3f7e7f6561dbe4f55b2d923bf782 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 19 Aug 2014 01:14:18 -0400 Subject: [PATCH] Fixes APCs eating up all the power even when fully charged --- code/modules/power/apc.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index fa9fb93d55..03d124fb12 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1194,7 +1194,11 @@ if (!src.avail()) main_status = 0 else - var/power_drawn = add_load(perapc) + var/target_draw = perapc + if (charging == 2) + target_draw = min(target_draw, lastused_total) //if we're fully charged, only take what we need to meet demand + + var/power_drawn = add_load(target_draw) //get some power from the powernet //figure out how much power is left over after meeting demand power_excess = power_drawn - lastused_total