diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs index b964da9c5a..5d3e989e41 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs @@ -31,7 +31,7 @@ public sealed partial class AtmosphereSystem : SharedAtmosphereSystem [Dependency] private readonly TransformSystem _transformSystem = default!; [Dependency] private readonly TileSystem _tile = default!; - public const float ExposedUpdateDelay = 1f; + private const float ExposedUpdateDelay = 1f; private float _exposedTimer = 0f; public override void Initialize() diff --git a/Content.Server/Chemistry/Components/SolutionManager/SolutionGasHeatConductivityComponent.cs b/Content.Server/Chemistry/Components/SolutionManager/SolutionGasHeatConductivityComponent.cs deleted file mode 100644 index a70bc3a08b..0000000000 --- a/Content.Server/Chemistry/Components/SolutionManager/SolutionGasHeatConductivityComponent.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace Content.Server.Chemistry.Components.SolutionManager; - -/// -/// Lets the solution conduct heat to/from atmos gases. -/// -[RegisterComponent] -public sealed class SolutionGasHeatConductivityComponent : Component -{ - /// - /// Solution that conducts heat. - /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("solution")] - public string Solution { get; set; } = "default"; - - /// - /// The heat conductivity between the gas and solution. - /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("wattsPerKelvin")] - public float WattsPerKelvin = 1; -} diff --git a/Content.Server/Chemistry/EntitySystems/SolutionGasHeatConductivitySystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionGasHeatConductivitySystem.cs deleted file mode 100644 index 0b81bf9c8a..0000000000 --- a/Content.Server/Chemistry/EntitySystems/SolutionGasHeatConductivitySystem.cs +++ /dev/null @@ -1,37 +0,0 @@ -using Content.Server.Atmos.EntitySystems; -using Content.Server.Chemistry.Components.SolutionManager; -using Robust.Shared.Timing; - -namespace Content.Server.Chemistry.EntitySystems; - -public sealed class SolutionGasHeatConductivitySystem : EntitySystem -{ - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; - - /// - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(AtmosUpdate); - } - - private void AtmosUpdate(EntityUid uid, SolutionGasHeatConductivityComponent solutionGasHeatConductivity, ref AtmosExposedUpdateEvent args) - { - if (!_solutionContainerSystem.TryGetSolution(uid, solutionGasHeatConductivity.Solution, out var solution) || solution.Volume == 0) - return; - - var heatDifferenceKelvin = args.GasMixture.Temperature - solution.Temperature; - if (Math.Abs(heatDifferenceKelvin) < 0.5) - return; // close enough - - var thermalEnergyTransferWatts = heatDifferenceKelvin * solutionGasHeatConductivity.WattsPerKelvin; - var thermalEnergyTransferJoules = thermalEnergyTransferWatts * AtmosphereSystem.ExposedUpdateDelay; - - _solutionContainerSystem.AddThermalEnergy(uid, solution, thermalEnergyTransferJoules); - var gasHeatCapacity = _atmosphereSystem.GetHeatCapacity(args.GasMixture); - args.GasMixture.Temperature += gasHeatCapacity == 0 ? 0 : -thermalEnergyTransferJoules / gasHeatCapacity; - } -} diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index d627dc20bb..bf2b56067e 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -142,9 +142,6 @@ - type: SolutionContainerManager solutions: puddle: { maxVol: 1000 } - - type: AtmosExposed - - type: SolutionGasHeatConductivity - solution: puddle - type: Puddle - type: Appearance - type: EdgeSpreader diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 7499e6cd38..4baaa3f3bc 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -30,9 +30,6 @@ solution: drink - type: DrainableSolution solution: drink - - type: AtmosExposed - - type: SolutionGasHeatConductivity - solution: drink - type: UserInterface interfaces: - key: enum.TransferAmountUiKey.Key diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 8873c72e48..34f27450c7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -34,9 +34,6 @@ solution: drink - type: DrainableSolution solution: drink - - type: AtmosExposed - - type: SolutionGasHeatConductivity - solution: drink - type: Appearance - type: GenericVisualizer visuals: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index dd9800820f..fa91eb4fd4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -21,9 +21,6 @@ - type: SolutionTransfer canChangeTransferAmount: true maxTransferAmount: 10 - - type: AtmosExposed - - type: SolutionGasHeatConductivity - solution: drink - type: UserInterface interfaces: - key: enum.TransferAmountUiKey.Key diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index 7f0b081123..684681074e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -22,9 +22,6 @@ canChangeTransferAmount: true - type: Spillable solution: drink - - type: AtmosExposed - - type: SolutionGasHeatConductivity - solution: drink - type: Sprite sprite: Objects/Consumable/Drinks/shaker.rsi state: icon diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml index ac0b95cf66..a1a1eef3f3 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml @@ -33,9 +33,6 @@ solution: drink - type: DrainableSolution solution: drink - - type: AtmosExposed - - type: SolutionGasHeatConductivity - solution: drink - type: UserInterface interfaces: - key: enum.TransferAmountUiKey.Key diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index ba743d7f70..83947e6eb5 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -40,9 +40,6 @@ solution: beaker - type: SolutionTransfer canChangeTransferAmount: true - - type: AtmosExposed - - type: SolutionGasHeatConductivity - solution: beaker - type: UserInterface interfaces: - key: enum.TransferAmountUiKey.Key @@ -134,9 +131,6 @@ solution: beaker - type: SolutionTransfer canChangeTransferAmount: true - - type: AtmosExposed - - type: SolutionGasHeatConductivity - solution: beaker - type: UserInterface interfaces: - key: enum.TransferAmountUiKey.Key