From ea64d4d1066682cfb032e50920f0924137e6e703 Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Fri, 2 May 2025 10:03:47 +1200
Subject: [PATCH] Atmos air (6500 kPa) marker (#37061)

* air GM atmosphere

* atmos fix air miner
---
 .../AtmosphereSystem.Commands.cs              |   6 +-
 Content.Shared/Atmos/Atmospherics.cs          |   3 +
 .../Entities/Markers/atmos_blocker.yml        |  17 ++++
 Resources/Textures/Markers/atmos.rsi/air.png  | Bin 0 -> 501 bytes
 .../Textures/Markers/atmos.rsi/meta.json      |  75 +++++++++---------
 5 files changed, 64 insertions(+), 37 deletions(-)
 create mode 100644 Resources/Textures/Markers/atmos.rsi/air.png

diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
index d728ba9164..1f0cd362c6 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
@@ -36,7 +36,7 @@ public sealed partial class AtmosphereSystem
            return;
        }
 
-       var mixtures = new GasMixture[8];
+       var mixtures = new GasMixture[9];
        for (var i = 0; i < mixtures.Length; i++)
            mixtures[i] = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
 
@@ -68,6 +68,10 @@ public sealed partial class AtmosphereSystem
        // 7: Nitrogen (101kpa) for vox rooms
        mixtures[7].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellStandard);
 
+       // 8: Air (GM)
+       mixtures[8].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner);
+       mixtures[8].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellGasMiner);
+
        foreach (var arg in args)
        {
            if (!NetEntity.TryParse(arg, out var netEntity) || !TryGetEntity(netEntity, out var euid))
diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs
index 749e705a31..81149c7237 100644
--- a/Content.Shared/Atmos/Atmospherics.cs
+++ b/Content.Shared/Atmos/Atmospherics.cs
@@ -96,6 +96,9 @@ namespace Content.Shared.Atmos
         public const float OxygenMolesFreezer = MolesCellFreezer * OxygenStandard;
         public const float NitrogenMolesFreezer = MolesCellFreezer * NitrogenStandard;
 
+        public const float OxygenMolesGasMiner = MolesCellGasMiner * OxygenStandard;
+        public const float NitrogenMolesGasMiner = MolesCellGasMiner * NitrogenStandard;
+
         #endregion
 
         /// <summary>
diff --git a/Resources/Prototypes/Entities/Markers/atmos_blocker.yml b/Resources/Prototypes/Entities/Markers/atmos_blocker.yml
index 4f00247684..804baa7b8e 100644
--- a/Resources/Prototypes/Entities/Markers/atmos_blocker.yml
+++ b/Resources/Prototypes/Entities/Markers/atmos_blocker.yml
@@ -108,3 +108,20 @@
   components:
   - type: AtmosFixMarker
     mode: 7
+
+- type: entity
+  parent: MarkerBase
+  id: AtmosFixAirMarker
+  name: Atmos Fix Air Marker
+  description: "Oxygen (21%) and nitrogen (79%) @ gas miner pressure, T20C"
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Markers/atmos.rsi # {
+      state: base
+      shader: unshaded
+    - sprite: Markers/atmos.rsi
+      shader: unshaded # }
+      state: air
+  - type: AtmosFixMarker
+    mode: 8
diff --git a/Resources/Textures/Markers/atmos.rsi/air.png b/Resources/Textures/Markers/atmos.rsi/air.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b5592b3194751e3d714fa5a74c6cb2cbb59b88c
GIT binary patch
literal 501
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DcoAk4Vx(cMWvL5ULAh?3y^w370~qEv=}#LT=BJwMkF1yemk
zJ@f8s-z|Y^BtdGN^K)}k^GX<;i&7IyQd1PlGfOfQ+&z5*!W;R-fr_rAMtG)qdTKFn
z06DA-QjDw&j6jwb5KBYZASY`uGK0mLfNVoXCI$f@9R<Xh?JQvNEFc>M?oVc6c)^UI
z(OkyB!oV<r9Yiu17#SP1O=4mY0<sqXG2;S=4ItZD7eGwi1Z0B%hT|ESfVMJ$%?Yx!
z0J5NF8X6dY)URK>k>j4sc{Lz2(bL5-B*OjerPEvu20Shoul)a?ZhGm2K(E4Er-$==
z<wV$SN!g`}8rold`HpEzd8OReFIATq-rx2sUv=wo@3q&8>#nSiO`kqr>70)!qtueU
pr$4VatsWv6)*4m~H2s158MDBH$(uyiI|qU+_H^}gS?83{1ON$NeqaCq

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Markers/atmos.rsi/meta.json b/Resources/Textures/Markers/atmos.rsi/meta.json
index aaa8485a86..d38e490f0a 100644
--- a/Resources/Textures/Markers/atmos.rsi/meta.json
+++ b/Resources/Textures/Markers/atmos.rsi/meta.json
@@ -1,38 +1,41 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Space Wizards Federation",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "base"
-    },
-    {
-      "name": "base-hot"
-    },
-    {
-      "name": "vacuum"
-    },
-    {
-      "name": "oxygen"
-    },
-    {
-      "name": "nitrogen"
-    },
-    {
-      "name": "plasma"
-    },
-    {
-      "name": "watervapour"
-    },
-    {
-      "name": "fire"
-    },
-    {
-     "name": "freeze"
-    }
-  ]
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Space Wizards Federation",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "base"
+        },
+        {
+            "name": "base-hot"
+        },
+        {
+            "name": "vacuum"
+        },
+        {
+            "name": "oxygen"
+        },
+        {
+            "name": "nitrogen"
+        },
+        {
+            "name": "plasma"
+        },
+        {
+            "name": "watervapour"
+        },
+        {
+            "name": "fire"
+        },
+        {
+            "name": "freeze"
+        },
+        {
+            "name": "air"
+        }
+    ]
 }
-- 
2.51.2