cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6059 from mwerezak/power-net

Browse Source 
Fixes APCs eating up all the power even when fully charged
This commit is contained in:
Ccomp5950
2014-08-19 06:02:34 -05:00
parent cf2be93916 1cfc3b8d5f
commit 3c19520df2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/power/apc.dm
View File

@@ -1194,7 +1194,11 @@
if (!src.avail()) if (!src.avail())
main_status = 0 main_status = 0
else 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 //figure out how much power is left over after meeting demand
power_excess = power_drawn - lastused_total power_excess = power_drawn - lastused_total