Varied and semi-sprited atmos markers (#4944)

Resources/Maps/saltern.yml

@@ -69368,109 +69368,109 @@ entities:
     parent: 853
     type: Transform
 - uid: 6651
-  type: AtmosFixBlockerMarker
+  type: AtmosFixOxygenMarker
   components:
   - pos: 37.5,22.5
     parent: 853
     type: Transform
 - uid: 6652
-  type: AtmosFixBlockerMarker
+  type: AtmosFixOxygenMarker
   components:
   - pos: 37.5,21.5
     parent: 853
     type: Transform
 - uid: 6653
-  type: AtmosFixBlockerMarker
+  type: AtmosFixOxygenMarker
   components:
   - pos: 38.5,22.5
     parent: 853
     type: Transform
 - uid: 6654
-  type: AtmosFixBlockerMarker
+  type: AtmosFixOxygenMarker
   components:
   - pos: 38.5,21.5
     parent: 853
     type: Transform
 - uid: 6655
-  type: AtmosFixBlockerMarker
+  type: AtmosFixOxygenMarker
   components:
   - pos: 39.5,22.5
     parent: 853
     type: Transform
 - uid: 6656
-  type: AtmosFixBlockerMarker
+  type: AtmosFixOxygenMarker
   components:
   - pos: 39.5,21.5
     parent: 853
     type: Transform
 - uid: 6657
-  type: AtmosFixBlockerMarker
+  type: AtmosFixNitrogenMarker
   components:
   - pos: 41.5,22.5
     parent: 853
     type: Transform
 - uid: 6658
-  type: AtmosFixBlockerMarker
+  type: AtmosFixNitrogenMarker
   components:
   - pos: 41.5,21.5
     parent: 853
     type: Transform
 - uid: 6659
-  type: AtmosFixBlockerMarker
+  type: AtmosFixNitrogenMarker
   components:
   - pos: 42.5,22.5
     parent: 853
     type: Transform
 - uid: 6660
-  type: AtmosFixBlockerMarker
+  type: AtmosFixNitrogenMarker
   components:
   - pos: 42.5,21.5
     parent: 853
     type: Transform
 - uid: 6661
-  type: AtmosFixBlockerMarker
+  type: AtmosFixNitrogenMarker
   components:
   - pos: 43.5,22.5
     parent: 853
     type: Transform
 - uid: 6662
-  type: AtmosFixBlockerMarker
+  type: AtmosFixNitrogenMarker
   components:
   - pos: 43.5,21.5
     parent: 853
     type: Transform
 - uid: 6663
-  type: AtmosFixBlockerMarker
+  type: AtmosFixPlasmaMarker
   components:
   - pos: 45.5,22.5
     parent: 853
     type: Transform
 - uid: 6664
-  type: AtmosFixBlockerMarker
+  type: AtmosFixPlasmaMarker
   components:
   - pos: 45.5,21.5
     parent: 853
     type: Transform
 - uid: 6665
-  type: AtmosFixBlockerMarker
+  type: AtmosFixPlasmaMarker
   components:
   - pos: 46.5,22.5
     parent: 853
     type: Transform
 - uid: 6666
-  type: AtmosFixBlockerMarker
+  type: AtmosFixPlasmaMarker
   components:
   - pos: 46.5,21.5
     parent: 853
     type: Transform
 - uid: 6667
-  type: AtmosFixBlockerMarker
+  type: AtmosFixPlasmaMarker
   components:
   - pos: 47.5,22.5
     parent: 853
     type: Transform
 - uid: 6668
-  type: AtmosFixBlockerMarker
+  type: AtmosFixPlasmaMarker
   components:
   - pos: 47.5,21.5
     parent: 853

Resources/Prototypes/Entities/Markers/atmos_blocker.yml

@@ -1,13 +1,68 @@
 - type: entity
-  name: Atmos Fix Blocker Marker
+  name: Atmos Fix Vacuum Marker
   id: AtmosFixBlockerMarker
+  description: "Vacuum, T20C"
   parent: MarkerBase
   components:
     - type: Sprite
       layers:
-        - state: red
-        - texture: Objects/Specific/Atmos/gasanalyzer.rsi/icon.png
-    - type: Tag
-      tags:
-        - AtmosFixBlocking
+        - sprite: Markers/atmos.rsi # {
+          state: base
+          shader: unshaded
+        - sprite: Markers/atmos.rsi
+          shader: unshaded # }
+          state: vacuum
+    - type: AtmosFixMarker
+      mode: 1
+
+- type: entity
+  name: Atmos Fix Oxygen Marker
+  id: AtmosFixOxygenMarker
+  description: "Oxygen @ gas miner pressure, T20C"
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - sprite: Markers/atmos.rsi # {
+          state: base
+          shader: unshaded
+        - sprite: Markers/atmos.rsi
+          shader: unshaded # }
+          state: oxygen
+    - type: AtmosFixMarker
+      mode: 2
+
+- type: entity
+  name: Atmos Fix Nitrogen Marker
+  id: AtmosFixNitrogenMarker
+  description: "Nitrogen @ gas miner pressure, T20C"
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - sprite: Markers/atmos.rsi # {
+          state: base
+          shader: unshaded
+        - sprite: Markers/atmos.rsi
+          shader: unshaded # }
+          state: nitrogen
+    - type: AtmosFixMarker
+      mode: 3
+
+- type: entity
+  name: Atmos Fix Plasma Marker
+  id: AtmosFixPlasmaMarker
+  description: "Plasma @ gas miner pressure, T20C"
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - sprite: Markers/atmos.rsi # {
+          state: base
+          shader: unshaded
+        - sprite: Markers/atmos.rsi
+          shader: unshaded # }
+          state: plasma
+    - type: AtmosFixMarker
+      mode: 4
 

Resources/Prototypes/tags.yml

@@ -214,6 +214,3 @@
 - type: Tag
   id: HideContextMenu
 
-- type: Tag
-  id: AtmosFixBlocking
-

Resources/Textures/Markers/atmos.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Space Wizards Federation",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "vacuum"
+    },
+    {
+      "name": "oxygen"
+    },
+    {
+      "name": "nitrogen"
+    },
+    {
+      "name": "plasma"
+    },
+    {
+      "name": "watervapour"
+    }
+  ]
+}