Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream

# Conflicts:
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs

Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs

@@ -237,7 +237,7 @@ namespace Content.Server.Atmos.EntitySystems
                     // TODO: Technically these directions won't be correct but uhh I'm just here for optimisations buddy not to fix my old bugs.
                     if (throwTarget != EntityCoordinates.Invalid)
                     {
-                        var pos = ((throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition).Normalized() + dirVec).Normalized();
+                        var pos = ((_transformSystem.ToMapCoordinates(throwTarget).Position - _transformSystem.GetWorldPosition(xform)).Normalized() + dirVec).Normalized();
                         _physics.ApplyLinearImpulse(uid, pos * moveForce, body: physics);
                     }
                     else

Content.Server/Atmos/EntitySystems/FlammableSystem.cs

@@ -73,6 +73,7 @@ namespace Content.Server.Atmos.EntitySystems
             SubscribeLocalEvent<FlammableComponent, IsHotEvent>(OnIsHot);
             SubscribeLocalEvent<FlammableComponent, TileFireEvent>(OnTileFire);
             SubscribeLocalEvent<FlammableComponent, RejuvenateEvent>(OnRejuvenate);
+            SubscribeLocalEvent<FlammableComponent, ResistFireAlertEvent>(OnResistFireAlert);
 
             SubscribeLocalEvent<IgniteOnCollideComponent, StartCollideEvent>(IgniteOnCollide);
             SubscribeLocalEvent<IgniteOnCollideComponent, LandEvent>(OnIgniteLand);
@@ -251,6 +252,15 @@ namespace Content.Server.Atmos.EntitySystems
             Extinguish(uid, component);
         }
 
+        private void OnResistFireAlert(Entity<FlammableComponent> ent, ref ResistFireAlertEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            Resist(ent, ent);
+            args.Handled = true;
+        }
+
         public void UpdateAppearance(EntityUid uid, FlammableComponent? flammable = null, AppearanceComponent? appearance = null)
         {
             if (!Resolve(uid, ref flammable, ref appearance))

Content.Server/Atmos/EntitySystems/GasMinerSystem.cs

@@ -0,0 +1,90 @@
+using System.Diagnostics.CodeAnalysis;
+using Content.Server.Atmos.Piping.Components;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
+using JetBrains.Annotations;
+using Robust.Server.GameObjects;
+
+namespace Content.Server.Atmos.EntitySystems;
+
+[UsedImplicitly]
+public sealed class GasMinerSystem : SharedGasMinerSystem
+{
+    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
+    [Dependency] private readonly TransformSystem _transformSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<GasMinerComponent, AtmosDeviceUpdateEvent>(OnMinerUpdated);
+    }
+
+    private void OnMinerUpdated(Entity<GasMinerComponent> ent, ref AtmosDeviceUpdateEvent args)
+    {
+        var miner = ent.Comp;
+        var oldState = miner.MinerState;
+        float toSpawn;
+
+        if (!GetValidEnvironment(ent, out var environment) || !Transform(ent).Anchored)
+        {
+            miner.MinerState = GasMinerState.Disabled;
+        }
+        // SpawnAmount is declared in mol/s so to get the amount of gas we hope to mine, we have to multiply this by
+        // how long we have been waiting to spawn it and further cap the number according to the miner's state.
+        else if ((toSpawn = CapSpawnAmount(ent, miner.SpawnAmount * args.dt, environment)) == 0)
+        {
+            miner.MinerState = GasMinerState.Idle;
+        }
+        else
+        {
+            miner.MinerState = GasMinerState.Working;
+
+            // Time to mine some gas.
+            var merger = new GasMixture(1) { Temperature = miner.SpawnTemperature };
+            merger.SetMoles(miner.SpawnGas, toSpawn);
+            _atmosphereSystem.Merge(environment, merger);
+        }
+
+        if (miner.MinerState != oldState)
+        {
+            Dirty(ent);
+        }
+    }
+
+    private bool GetValidEnvironment(Entity<GasMinerComponent> ent, [NotNullWhen(true)] out GasMixture? environment)
+    {
+        var (uid, miner) = ent;
+        var transform = Transform(uid);
+        var position = _transformSystem.GetGridOrMapTilePosition(uid, transform);
+
+        // Treat space as an invalid environment
+        if (_atmosphereSystem.IsTileSpace(transform.GridUid, transform.MapUid, position))
+        {
+            environment = null;
+            return false;
+        }
+
+        environment = _atmosphereSystem.GetContainingMixture((uid, transform), true, true);
+        return environment != null;
+    }
+
+    private float CapSpawnAmount(Entity<GasMinerComponent> ent, float toSpawnTarget, GasMixture environment)
+    {
+        var (uid, miner) = ent;
+
+        // How many moles could we theoretically spawn. Cap by pressure and amount.
+        var allowableMoles = Math.Min(
+            (miner.MaxExternalPressure - environment.Pressure) * environment.Volume / (miner.SpawnTemperature * Atmospherics.R),
+            miner.MaxExternalAmount - environment.TotalMoles);
+
+        var toSpawnReal = Math.Clamp(allowableMoles, 0f, toSpawnTarget);
+
+        if (toSpawnReal < Atmospherics.GasMinMoles) {
+            return 0f;
+        }
+
+        return toSpawnReal;
+    }
+}