Skip to content

Replace thermomachine dynamic per-tick power with flat target-based draw #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 3 commits into
base: master
Choose a base branch
from
+28 −31
Open

Replace thermomachine dynamic per-tick power with flat target-based draw #617

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fb8152
Initial plan
Copilot Mar 9, 2026
e5d167b
Fix thermomachine power calculation race condition with flat target-b…
Copilot Mar 9, 2026
5ed524f
Fix thermomachine power calculation to ensure accurate power usage ba…
Ossa88 Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 28 additions & 31 deletions code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
var/target_temperature = T20C
var/heat_capacity = 0
var/interactive = TRUE // So mapmakers can disable interaction.
var/last_registered_power = 0 // PENTEST FIX - THERMOMACHINE POWER CALCULATION - Track what power draw is registered with the area

/obj/machinery/atmospherics/components/unary/thermomachine/Initialize(mapload)
. = ..()
Expand All @@ -41,6 +40,22 @@
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
B += M.rating
heat_capacity = 5000 * ((B - 1) ** 2)
// PENTEST FIX - THERMOMACHINE POWER CALCULATION - START
recalculate_power()

/// Recalculates the power usage of the machine based on the current target temperature and the temperature of the gas in the pipes. Should be called whenever the target temperature changes, or when the machine is turned on or off.
/obj/machinery/atmospherics/components/unary/thermomachine/proc/recalculate_power(old_temperature)
var/temperature_difference = abs(target_temperature - old_temperature)
// Baseline active power (200W) + temperature-based scaling
// This ensures the machine always draws meaningful power when active
var/new_active_power = idle_power_usage + (heat_capacity * temperature_difference) / 1000
set_no_power()
active_power_usage = new_active_power
if(on)
set_active_power()
else
set_idle_power()
// PENTEST FIX - THERMOMACHINE POWER CALCULATION - END

/obj/machinery/atmospherics/components/unary/thermomachine/update_icon_state()

Expand Down Expand Up @@ -84,24 +99,12 @@
air_contents.set_temperature(combined_energy/combined_heat_capacity)

// PENTEST FIX - THERMOMACHINE POWER CALCULATION - START
var/temperature_delta = abs(old_temperature - air_contents.return_temperature())
var/new_power_usage = 0
if(temperature_delta > 1)
// Use absolute value to ensure always positive, and ensure minimum power draw
new_power_usage = abs((heat_capacity * temperature_delta) / 5) + idle_power_usage
// The orginal system used to calculate the delta difference and set it to a varible but never told the set_active_power() proc to update
// the power usage based on the new delta. This meant that if you changed the target temperature, or turned it on and off
// the machine would see the incorrect delta and would then pass that to the APC resulting in infinite power gain or draw regardless of the machines power status.
if(abs(old_temperature - air_contents.return_temperature()) > 1)
recalculate_power(old_temperature)
update_parents()
else
new_power_usage = idle_power_usage

// Update area power registration only if the power usage changed
if(new_power_usage != last_registered_power)
var/area/A = get_area(src)
if(A)
// Remove old registration and add new one
removeStaticPower(last_registered_power, power_channel + 3, A)
addStaticPower(new_power_usage, power_channel + 3, A)
last_registered_power = new_power_usage
active_power_usage = new_power_usage
// PENTEST FIX - THERMOMACHINE POWER CALCULATION - END
return 1

Expand Down Expand Up @@ -168,12 +171,7 @@
switch(action)
if("power")
on = !on
if(on)
set_active_power()
last_registered_power = active_power_usage // PENTEST FIX - THERMOMACHINE POWER CALCULATION
else
set_idle_power()
last_registered_power = 0 // PENTEST FIX - THERMOMACHINE POWER CALCULATION
recalculate_power() // PENTEST FIX - THERMOMACHINE POWER CALCULATION
investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS)
. = TRUE
if("target")
Expand All @@ -191,6 +189,7 @@
. = TRUE
if(.)
target_temperature = clamp(target, min_temperature, max_temperature)
recalculate_power() // PENTEST FIX - THERMOMACHINE POWER CALCULATION
investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS)

update_appearance()
Expand All @@ -203,15 +202,9 @@
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE))
return
on = !on
if(on)
set_active_power()
last_registered_power = active_power_usage // PENTEST FIX - THERMOMACHINE POWER CALCULATION
else
set_idle_power()
last_registered_power = 0 // PENTEST FIX - THERMOMACHINE POWER CALCULATION
recalculate_power() // PENTEST FIX - THERMOMACHINE POWER CALCULATION
investigate_log("was turned [on ? "on" : "off"] by [key_name(user)]", INVESTIGATE_ATMOS)
update_appearance()
investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS)
message_admins("[src.name] was turned [on ? "on" : "off"] [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]")

/obj/machinery/atmospherics/components/unary/thermomachine/freezer
Expand All @@ -232,13 +225,15 @@
. = ..()
if(target_temperature == initial(target_temperature))
target_temperature = min_temperature
recalculate_power() // PENTEST FIX - THERMOMACHINE POWER CALCULATION

/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom
name = "cold room freezer"

/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom/Initialize()
. = ..()
target_temperature = T0C-80
recalculate_power() // PENTEST FIX - THERMOMACHINE POWER CALCULATION

/obj/machinery/atmospherics/components/unary/thermomachine/freezer/RefreshParts()
..()
Expand All @@ -254,6 +249,7 @@
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE))
return
target_temperature = min_temperature
recalculate_power() // PENTEST FIX - THERMOMACHINE POWER CALCULATION
investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS)
message_admins("[src.name] was minimized by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(T)], [A]")
to_chat(user, span_notice("You minimize the target temperature on [src] to [target_temperature] K."))
Expand Down Expand Up @@ -286,6 +282,7 @@
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE))
return
target_temperature = max_temperature
recalculate_power() // PENTEST FIX - THERMOMACHINE POWER CALCULATION
investigate_log("was set to [target_temperature] K by [key_name(user)]", INVESTIGATE_ATMOS)
message_admins("[src.name] was maximized by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(T)], [A]")
to_chat(user, span_notice("You maximize the target temperature on [src] to [target_temperature] K."))
Loading