From 86b358be4b707b1135ffcb447477d684af509691 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Mon, 19 Aug 2024 00:25:02 +0200 Subject: [PATCH] Fix raditation collectors gaslighting you (#31175) fix raditation collectors gaslighting you --- .../Singularity/EntitySystems/RadiationCollectorSystem.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs index 3fab18b1b7..797e1bda00 100644 --- a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs @@ -103,7 +103,7 @@ public sealed class RadiationCollectorSystem : EntitySystem if (gas.Byproduct != null) { - gasTankComponent.Air.AdjustMoles((int) gas.Byproduct, delta * gas.MolarRatio); + gasTankComponent.Air.AdjustMoles((int)gas.Byproduct, delta * gas.MolarRatio); } } @@ -204,13 +204,14 @@ public sealed class RadiationCollectorSystem : EntitySystem if (!Resolve(uid, ref appearance, false)) return; + // gas canisters can fill tanks up to 10 atm, so we set the warning level thresholds 1/3 and 2/3 of that if (gasTank == null || gasTank.Air.Pressure < 10) _appearance.SetData(uid, RadiationCollectorVisuals.PressureState, 0, appearance); - else if (gasTank.Air.Pressure < Atmospherics.OneAtmosphere) + else if (gasTank.Air.Pressure < 3.33f * Atmospherics.OneAtmosphere) _appearance.SetData(uid, RadiationCollectorVisuals.PressureState, 1, appearance); - else if (gasTank.Air.Pressure < 3f * Atmospherics.OneAtmosphere) + else if (gasTank.Air.Pressure < 6.66f * Atmospherics.OneAtmosphere) _appearance.SetData(uid, RadiationCollectorVisuals.PressureState, 2, appearance); else -- 2.52.0