Atmos air (6500 kPa) marker (#37061)

* air GM atmosphere

* atmos fix air miner

diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
index d728ba91644bc8d3a5efeb6069368b2bc5872e9a..1f0cd362c6dfc66bea9c90731f3dabebf71adf41 100644 (file)
--- 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 749e705a3141116386d279d410991b1d1abc1261..81149c723789d0e45fad1115b56a1b6b2b7654a6 100644 (file)
--- 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 4f00247684b9345a84e295a2aee5e19438f9cf1f..804baa7b8e8884a6a9874607164089fe0b814b7f 100644 (file)
--- 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 (file)
index 0000000..0b5592b
Binary files /dev/null and b/Resources/Textures/Markers/atmos.rsi/air.png differ

diff --git a/Resources/Textures/Markers/atmos.rsi/meta.json b/Resources/Textures/Markers/atmos.rsi/meta.json
index aaa8485a867e7b13f2237a87b2e39e5e63264d1d..d38e490f0a26ff9c2961d5d4853c43722996c17b 100644 (file)
--- 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"
+        }
+    ]
 }