Fix heater and freezer temperature range and wrong unit (#15904)

diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
index 72699ef443c7192c80e16ddcc7e61fba1c537a7c..f9122caf3c4d44f6c61c02a8079778310daa36ce 100644 (file)
--- a/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasThermoMachineComponent.cs
@@ -52,7 +52,7 @@ namespace Content.Server.Atmos.Piping.Unary.Components
         public float MaxTemperature;
 
         /// <summary>
-        ///     Minimum temperature the device can reach with a 0 total laser quality. Usually the quality will be at
+        ///     Minimum temperature the device can reach with a 0 total capacitor quality. Usually the quality will be at
         ///     least 1.
         /// </summary>
         [DataField("baseMinTemperature")]
@@ -60,7 +60,7 @@ namespace Content.Server.Atmos.Piping.Unary.Components
         public float BaseMinTemperature = 96.625f; // Selected so that tier-1 parts can reach 73.15k
 
         /// <summary>
-        ///     Maximum temperature the device can reach with a 0 total laser quality. Usually the quality will be at
+        ///     Maximum temperature the device can reach with a 0 total capacitor quality. Usually the quality will be at
         ///     least 1.
         /// </summary>
         [DataField("baseMaxTemperature")]

diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
index 9f841bef26274bb0e9892528ec62fe2fc1f608c0..98c68a8bc3ddb201027bccaf43d5a72345a7bc18 100644 (file)
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs
@@ -57,22 +57,22 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnGasThermoRefreshParts(EntityUid uid, GasThermoMachineComponent thermoMachine, RefreshPartsEvent args)
         {
-            var matterBinRating = args.PartRatings[thermoMachine.MachinePartHeatCapacity];
-            var laserRating = args.PartRatings[thermoMachine.MachinePartTemperature];
+            var heatCapacityPartRating = args.PartRatings[thermoMachine.MachinePartHeatCapacity];
+            var temperatureRangePartRating = args.PartRatings[thermoMachine.MachinePartTemperature];
 
-            thermoMachine.HeatCapacity = thermoMachine.BaseHeatCapacity * MathF.Pow(matterBinRating, 2);
+            thermoMachine.HeatCapacity = thermoMachine.BaseHeatCapacity * MathF.Pow(heatCapacityPartRating, 2);
 
             switch (thermoMachine.Mode)
             {
                 // 593.15K with stock parts.
                 case ThermoMachineMode.Heater:
-                    thermoMachine.MaxTemperature = thermoMachine.BaseMaxTemperature + thermoMachine.MaxTemperatureDelta * laserRating;
+                    thermoMachine.MaxTemperature = thermoMachine.BaseMaxTemperature + thermoMachine.MaxTemperatureDelta * temperatureRangePartRating;
                     thermoMachine.MinTemperature = Atmospherics.T20C;
                     break;
                 // 73.15K with stock parts.
                 case ThermoMachineMode.Freezer:
                     thermoMachine.MinTemperature = MathF.Max(
-                        thermoMachine.BaseMinTemperature - thermoMachine.MinTemperatureDelta * laserRating, Atmospherics.TCMB);
+                        thermoMachine.BaseMinTemperature - thermoMachine.MinTemperatureDelta * temperatureRangePartRating, Atmospherics.TCMB);
                     thermoMachine.MaxTemperature = Atmospherics.T20C;
                     break;
             }

diff --git a/Resources/Locale/en-US/atmos/gas-thermomachine-system.ftl b/Resources/Locale/en-US/atmos/gas-thermomachine-system.ftl
index b5a44a268c171c38f17685142a5ac3930f9dd566..20b3ec985cbebc8b73a4a12bcac5cc208938c592 100644 (file)
--- a/Resources/Locale/en-US/atmos/gas-thermomachine-system.ftl
+++ b/Resources/Locale/en-US/atmos/gas-thermomachine-system.ftl
@@ -1,2 +1,2 @@
 # Examine Text
-gas-thermomachine-system-examined = The {$machineName} thermostat is set to [color={$tempColor}]{$temp} °C[/color].
+gas-thermomachine-system-examined = The {$machineName} thermostat is set to [color={$tempColor}]{$temp} °K[/color].

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 4a8815cce6ff4e0e8c0ce5b4488a56b55af14ec6..33da740127b7ac5b7c965d92674597cb0e18c966 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: AutolatheMachineCircuitboard
   parent: BaseMachineCircuitboard
   name: autolathe machine board
@@ -230,7 +230,7 @@
     prototype: GasThermoMachineFreezer
     requirements:
       MatterBin: 2
-      Manipulator: 2
+      Capacitor: 2
     materialRequirements:
       Cable: 5
   - type: Construction
@@ -250,7 +250,7 @@
     prototype: GasThermoMachineHeater
     requirements:
       MatterBin: 2
-      Manipulator: 2
+      Capacitor: 2
     materialRequirements:
       Cable: 5
   - type: Construction