diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm index 51cdb3929c..1843061aa7 100644 --- a/code/ATMOSPHERICS/components/unary/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm @@ -15,7 +15,7 @@ var/on = 0 use_power = 0 idle_power_usage = 5 //5 Watts for thermostat related circuitry - active_power_usage = 50000 //50 kW. The power rating of the freezer + active_power_usage //50 kW. The power rating of the freezer var/max_power_usage = 50000 //power rating when the usage is turned up to 1 var/power_setting = 100 @@ -35,6 +35,8 @@ component_parts += new /obj/item/weapon/stock_parts/capacitor(src) component_parts += new /obj/item/weapon/stock_parts/capacitor(src) component_parts += new /obj/item/weapon/stock_parts/manipulator(src) + + active_power_usage = max_power_usage * (power_setting/100) /obj/machinery/atmospherics/unary/freezer/initialize() if(node) return @@ -111,7 +113,6 @@ else src.set_temperature = max(src.set_temperature+amount, 0) if(href_list["setPower"]) //setting power to 0 is redundant anyways - world << "href_list\[\"setPower\"\] = [href_list["setPower"]]" var/new_setting = between(0, text2num(href_list["setPower"]), 100) set_power_level(new_setting) diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm index d6e8d7bbbf..90db969920 100644 --- a/code/ATMOSPHERICS/components/unary/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary/heat_source.dm @@ -16,10 +16,10 @@ var/on = 0 use_power = 0 idle_power_usage = 5 //5 Watts for thermostat related circuitry - active_power_usage = 50000 //50 kW. The power rating of the heater + active_power_usage //50 kW. The power rating of the heater var/max_power_usage = 50000 //power rating when the usage is turned up to 1 - var/power_setting = 1.0 //between 0 and 1 + var/power_setting = 100 var/heating = 0 //mainly for icon updates var/opened = 0 //for deconstruction @@ -34,6 +34,8 @@ component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) component_parts += new /obj/item/weapon/stock_parts/capacitor(src) component_parts += new /obj/item/weapon/stock_parts/capacitor(src) + + active_power_usage = max_power_usage * (power_setting/100) /obj/machinery/atmospherics/unary/heater/initialize() if(node) return