]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix raditation collectors gaslighting you (#31175)
authorslarticodefast <161409025+slarticodefast@users.noreply.github.com>
Sun, 18 Aug 2024 22:25:02 +0000 (00:25 +0200)
committerGitHub <noreply@github.com>
Sun, 18 Aug 2024 22:25:02 +0000 (16:25 -0600)
fix raditation collectors gaslighting you

Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs

index 3fab18b1b75b26b279f1a41a2a5ad7c84762f79d..797e1bda00d5574caf402303fc6d6bafeeb43fdf 100644 (file)
@@ -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