From 46aa0ec8330d6bfee540b55a62af9bd3fd88bfa6 Mon Sep 17 00:00:00 2001 From: Ryan <80364400+Sirryan2002@users.noreply.github.com> Date: Wed, 8 Feb 2023 15:16:16 -0500 Subject: [PATCH] ergh (#20356) --- code/game/machinery/machinery.dm | 10 ++++++++++ .../components/unary_devices/thermomachine.dm | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index f778a428703..03b0ac6bc29 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -149,6 +149,16 @@ power_state = use_type +/obj/machinery/proc/update_idle_power_consumption(channel = power_channel, amount) + if(power_state == ACTIVE_POWER_USE) + machine_powernet.adjust_static_power(power_channel, amount - idle_power_consumption) + idle_power_consumption = amount + +/obj/machinery/proc/update_active_power_consumption(channel = power_channel, amount) + if(power_state == ACTIVE_POWER_USE) + machine_powernet.adjust_static_power(power_channel, amount - active_power_consumption) + active_power_consumption = amount + /obj/machinery/default_welder_repair(mob/user, obj/item/I) . = ..() if(.) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index c26483f89b0..82b9e9b66e1 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -107,10 +107,10 @@ var/temperature_delta= abs(old_temperature - air_contents.temperature) if(temperature_delta > 1) - active_power_consumption = (heat_capacity * temperature_delta) / 10 + idle_power_consumption + update_active_power_consumption(power_channel, (heat_capacity * temperature_delta) / 10 + idle_power_consumption) parent.update = 1 else - active_power_consumption = idle_power_consumption + update_active_power_consumption(power_channel, idle_power_consumption) return 1 /obj/machinery/atmospherics/unary/thermomachine/attackby(obj/item/I, mob/user, params)