From bc2e6a7f9b72cd82da58520aba160bf92e824e89 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Thu, 12 Dec 2019 17:35:35 +0100 Subject: [PATCH] Ports "Fixes powernet avail checks" --- code/modules/power/apc.dm | 4 ++-- code/modules/power/cable.dm | 4 ++-- code/modules/power/power.dm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 5e3888a8c5..474424fe3f 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1113,9 +1113,9 @@ if(terminal && terminal.powernet) terminal.add_load(amount) -/obj/machinery/power/apc/avail() +/obj/machinery/power/apc/avail(amount) if(terminal) - return terminal.avail() + return terminal.avail(amount) else return 0 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index a3dc6e7394..cc03976f79 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -217,9 +217,9 @@ By design, d1 is the smallest direction and d2 is the highest else return 0 -/obj/structure/cable/proc/avail() +/obj/structure/cable/proc/avail(amount) if(powernet) - return powernet.avail + return amount ? powernet.avail >= amount : powernet.avail else return 0 diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 58a259de3a..d2d3d60066 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -46,9 +46,9 @@ else return 0 -/obj/machinery/power/proc/avail() +/obj/machinery/power/proc/avail(amount) if(powernet) - return powernet.avail + return amount ? powernet.avail >= amount : powernet.avail else return 0