cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

ergh (#20356)

Browse Source
This commit is contained in:
Ryan
2023-02-08 21:16:16 +01:00
committed by GitHub
parent 8119ab13fb
commit 46aa0ec833
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/machinery.dm
+10
View File
@@ -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(.)
code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
+2 -2
View File
@@ -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)