Piping sprites cleanup (#3022)

* Moves piping visualizers to own folder

* Pump visualizer update

* Siphon and vent visualiser only set enabled visibility

* PipeVisualizer cleanup

* Replaces off vent/scrubber sprites

* Gas filter sprite update

* Revert "Gas filter sprite update"

This reverts commit 676e5d55e1157a229b1445eeea53a5c8032dbbb5.

* Rotates gas filter sprites to match T-junction pipe directions

* Removes pipes from scruber and vent state

* Makes sprite components use layers

* disabled sprite netsync on piping entities

* piping meta.json cleanup

Co-authored-by: py01 <pyronetics01@gmail.com>

Content.Client/GameObjects/Components/Atmos/Piping/GasFilterVisualizer.cs

@@ -5,7 +5,6 @@ using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Serialization;
-using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.GameObjects.Components.Atmos

Content.Client/GameObjects/Components/Atmos/Piping/PipeVisualizer.cs

@@ -10,6 +10,7 @@ using Robust.Shared.GameObjects.Components.Renderable;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
@@ -18,14 +19,18 @@ namespace Content.Client.GameObjects.Components.Atmos
     [UsedImplicitly]
     public class PipeVisualizer : AppearanceVisualizer
     {
+        private string _rsiString;
+
         private RSI _pipeRSI;
 
         public override void LoadData(YamlMappingNode node)
         {
             base.LoadData(node);
 
-            var rsiString = node.GetNode("pipeRSI").ToString();
+            var serializer = YamlObjectSerializer.NewReader(node);
-            var rsiPath = SharedSpriteComponent.TextureRoot / rsiString;
+            serializer.DataField(ref _rsiString, "rsiString", "Constructible/Atmos/pipe.rsi");
+
+            var rsiPath = SharedSpriteComponent.TextureRoot / _rsiString;
             try
             {
                 var resourceCache = IoCManager.Resolve<IResourceCache>();

Content.Client/GameObjects/Components/Atmos/Piping/PumpVisualizer.cs

@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Atmos;
+using Content.Shared.GameObjects.Components.Atmos;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Utility;
+using Robust.Shared.Serialization;
 using YamlDotNet.RepresentationModel;
 
 namespace Content.Client.GameObjects.Components.Atmos
@@ -16,7 +16,9 @@ namespace Content.Client.GameObjects.Components.Atmos
         public override void LoadData(YamlMappingNode node)
         {
             base.LoadData(node);
-            _pumpEnabledState = node.GetNode("pumpEnabledState").ToString();
+
+            var serializer = YamlObjectSerializer.NewReader(node);
+            serializer.DataField(ref _pumpEnabledState, "pumpEnabledState", "pumpPressureOn");
         }
 
         public override void InitializeEntity(IEntity entity)

Content.Client/GameObjects/Components/Atmos/Piping/SiphonVisualizer.cs

@@ -0,0 +1,51 @@
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Client.Interfaces.GameObjects.Components;
+using Content.Shared.GameObjects.Components.Atmos;
+using YamlDotNet.RepresentationModel;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Serialization;
+
+namespace Content.Client.GameObjects.Components.Atmos
+{
+    [UsedImplicitly]
+    public class SiphonVisualizer : AppearanceVisualizer
+    {
+        private string _siphonOnState;
+
+        public override void LoadData(YamlMappingNode node)
+        {
+            base.LoadData(node);
+
+            var serializer = YamlObjectSerializer.NewReader(node);
+            serializer.DataField(ref _siphonOnState, "siphonOnState", "scrubOn");
+        }
+
+        public override void InitializeEntity(IEntity entity)
+        {
+            base.InitializeEntity(entity);
+
+            if (!entity.TryGetComponent(out ISpriteComponent sprite)) return;
+
+            sprite.LayerMapReserveBlank(Layer.SiphonEnabled);
+            var layer = sprite.LayerMapGet(Layer.SiphonEnabled);
+            sprite.LayerSetState(layer, _siphonOnState);
+        }
+
+        public override void OnChangeData(AppearanceComponent component)
+        {
+            base.OnChangeData(component);
+
+            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return;
+            if (!component.TryGetData(SiphonVisuals.VisualState, out SiphonVisualState siphonVisualState)) return;
+
+            var layer = sprite.LayerMapGet(Layer.SiphonEnabled);
+            sprite.LayerSetVisible(layer, siphonVisualState.SiphonEnabled);
+        }
+
+        private enum Layer : byte
+        {
+            SiphonEnabled,
+        }
+    }
+}

Content.Client/GameObjects/Components/Atmos/Piping/VentVisualizer.cs

@@ -0,0 +1,51 @@
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+using Robust.Client.Interfaces.GameObjects.Components;
+using Content.Shared.GameObjects.Components.Atmos;
+using YamlDotNet.RepresentationModel;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Serialization;
+
+namespace Content.Client.GameObjects.Components.Atmos
+{
+    [UsedImplicitly]
+    public class VentVisualizer : AppearanceVisualizer
+    {
+        private string _ventOnstate;
+
+        public override void LoadData(YamlMappingNode node)
+        {
+            base.LoadData(node);
+
+            var serializer = YamlObjectSerializer.NewReader(node);
+            serializer.DataField(ref _ventOnstate, "ventOnState", "ventOn");
+        }
+
+        public override void InitializeEntity(IEntity entity)
+        {
+            base.InitializeEntity(entity);
+
+            if (!entity.TryGetComponent(out ISpriteComponent sprite)) return;
+
+            sprite.LayerMapReserveBlank(Layer.VentEnabled);
+            var layer = sprite.LayerMapGet(Layer.VentEnabled);
+            sprite.LayerSetState(layer, _ventOnstate);
+        }
+
+        public override void OnChangeData(AppearanceComponent component)
+        {
+            base.OnChangeData(component);
+
+            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return;
+            if (!component.TryGetData(VentVisuals.VisualState, out VentVisualState ventVisualState)) return;
+
+            var layer = sprite.LayerMapGet(Layer.VentEnabled);
+            sprite.LayerSetVisible(layer, ventVisualState.VentEnabled);
+        }
+
+        private enum Layer : byte
+        {
+            VentEnabled,
+        }
+    }
+}

Content.Client/GameObjects/Components/Atmos/SiphonVisualizer.cs

@@ -1,72 +0,0 @@
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Client.Interfaces.ResourceManagement;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.GameObjects.Components.Renderable;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Utility;
-using System;
-using Content.Shared.GameObjects.Components.Atmos;
-using YamlDotNet.RepresentationModel;
-using Robust.Shared.Interfaces.GameObjects;
-
-namespace Content.Client.GameObjects.Components.Atmos
-{
-    [UsedImplicitly]
-    public class SiphonVisualizer : AppearanceVisualizer
-    {
-        private RSI _siphonRSI;
-
-        public override void LoadData(YamlMappingNode node)
-        {
-            base.LoadData(node);
-
-            var rsiString = node.GetNode("siphonRSI").ToString();
-            var rsiPath = SharedSpriteComponent.TextureRoot / rsiString;
-            try
-            {
-                var resourceCache = IoCManager.Resolve<IResourceCache>();
-                var resource = resourceCache.GetResource<RSIResource>(rsiPath);
-                _siphonRSI = resource.RSI;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorS("go.siphonvisualizer", "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath, e);
-            }
-        }
-
-        public override void InitializeEntity(IEntity entity)
-        {
-            base.InitializeEntity(entity);
-            if (!entity.TryGetComponent(out ISpriteComponent sprite)) return;
-            sprite.LayerMapReserveBlank(Layer.SiphonBase);
-            var pipeBaseLayer = sprite.LayerMapGet(Layer.SiphonBase);
-            sprite.LayerSetRSI(pipeBaseLayer, _siphonRSI);
-            sprite.LayerSetVisible(pipeBaseLayer, true);
-        }
-
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            base.OnChangeData(component);
-
-            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return;
-            if (!component.TryGetData(SiphonVisuals.VisualState, out SiphonVisualState siphonVisualState)) return;
-
-            var siphonBaseState = "scrub";
-            siphonBaseState += siphonVisualState.SiphonEnabled ? "On" : "Off";
-
-            var baseSiphonLayer = sprite.LayerMapGet(Layer.SiphonBase);
-            sprite.LayerSetRSI(baseSiphonLayer, _siphonRSI);
-            sprite.LayerSetState(baseSiphonLayer, siphonBaseState);
-            sprite.LayerSetVisible(baseSiphonLayer, true);
-        }
-
-        private enum Layer : byte
-        {
-            SiphonBase,
-        }
-    }
-}

Content.Client/GameObjects/Components/Atmos/VentVisualizer.cs

@@ -1,72 +0,0 @@
-using JetBrains.Annotations;
-using Robust.Client.GameObjects;
-using Robust.Client.Graphics;
-using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Client.Interfaces.ResourceManagement;
-using Robust.Client.ResourceManagement;
-using Robust.Shared.GameObjects.Components.Renderable;
-using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Utility;
-using System;
-using Content.Shared.GameObjects.Components.Atmos;
-using YamlDotNet.RepresentationModel;
-using Robust.Shared.Interfaces.GameObjects;
-
-namespace Content.Client.GameObjects.Components.Atmos
-{
-    [UsedImplicitly]
-    public class VentVisualizer : AppearanceVisualizer
-    {
-        private RSI _ventRSI;
-
-        public override void LoadData(YamlMappingNode node)
-        {
-            base.LoadData(node);
-
-            var rsiString = node.GetNode("ventRSI").ToString();
-            var rsiPath = SharedSpriteComponent.TextureRoot / rsiString;
-            try
-            {
-                var resourceCache = IoCManager.Resolve<IResourceCache>();
-                var resource = resourceCache.GetResource<RSIResource>(rsiPath);
-                _ventRSI = resource.RSI;
-            }
-            catch (Exception e)
-            {
-                Logger.ErrorS("go.ventvisualizer", "Unable to load RSI '{0}'. Trace:\n{1}", rsiPath, e);
-            }
-        }
-
-        public override void InitializeEntity(IEntity entity)
-        {
-            base.InitializeEntity(entity);
-            if (!entity.TryGetComponent(out ISpriteComponent sprite)) return;
-            sprite.LayerMapReserveBlank(Layer.VentBase);
-            var pipeBaseLayer = sprite.LayerMapGet(Layer.VentBase);
-            sprite.LayerSetRSI(pipeBaseLayer, _ventRSI);
-            sprite.LayerSetVisible(pipeBaseLayer, true);
-        }
-
-        public override void OnChangeData(AppearanceComponent component)
-        {
-            base.OnChangeData(component);
-
-            if (!component.Owner.TryGetComponent(out ISpriteComponent sprite)) return;
-            if (!component.TryGetData(VentVisuals.VisualState, out VentVisualState ventVisualState)) return;
-
-            var ventBaseState = "vent";
-            ventBaseState += ventVisualState.VentEnabled ? "On" : "Off";
-
-            var baseVentLayer = sprite.LayerMapGet(Layer.VentBase);
-            sprite.LayerSetRSI(baseVentLayer, _ventRSI);
-            sprite.LayerSetState(baseVentLayer, ventBaseState);
-            sprite.LayerSetVisible(baseVentLayer, true);
-        }
-
-        private enum Layer : byte
-        {
-            VentBase,
-        }
-    }
-}

Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml

@@ -10,15 +10,12 @@
   - type: SnapGrid
     offset: Center
   - type: Sprite
+    netsync: false
     sprite: Constructible/Atmos/gascanisterport.rsi
-    state: gasCanisterPort
+    layers:
-  - type: Icon
+    - sprite: Constructible/Atmos/pipe.rsi
-    sprite: Constructible/Atmos/gascanisterport.rsi
+      state: pipeHalf
-    state: gasCanisterPort
+    - state: gasCanisterPort
-  - type: Appearance
-    visuals:
-    - type: PipeVisualizer
-      pipeRSI: Constructible/Atmos/pipe.rsi
   - type: Damageable
   - type: Destructible
     thresholds:

Resources/Prototypes/Entities/Constructible/Ground/gasfilters.yml

@@ -17,19 +17,23 @@
         behaviors:
         - !type:DoActsBehavior
           acts: ["Destruction"]
-
+  - type: Sprite
+    netsync: false
+    sprite: Constructible/Atmos/gasfilter.rsi
+    layers:
+    - sprite: Constructible/Atmos/pipe.rsi
+      state: pipeTJunction
+    - state: gasFilter
+  - type: Appearance
+    visuals:
+    - type: GasFilterVisualizer
+    
 - type: entity
   parent: GasFilterBase
   id: GasFilter
   name: Gas Filter
   description: It filters gases.
   components:
-  - type: Sprite
-    sprite: Constructible/Atmos/gasfilter.rsi
-    state: gasFilter
-  - type: Icon
-    sprite: Constructible/Atmos/gasfilter.rsi
-    state: gasFilter
   - type: NodeContainer
     nodes:
     - !type:PipeNode
@@ -45,7 +49,3 @@
     inletDirection: South
     filterOutletDirection: East
     outletDirection: North 
-  - type: Appearance
-    visuals:
-    - type: GasFilterVisualizer
-      filerEnabledState: gasFilterOn

Resources/Prototypes/Entities/Constructible/Ground/pipes.yml

@@ -19,10 +19,10 @@
         - !type:DoActsBehavior
           acts: ["Destruction"]
   - type: Sprite
+    netsync: false
   - type: Appearance
     visuals:
     - type: PipeVisualizer
-      pipeRSI: Constructible/Atmos/pipe.rsi
   - type: Icon
     sprite: Constructible/Atmos/pipe.rsi
 

Resources/Prototypes/Entities/Constructible/Ground/pumps.yml

@@ -18,9 +18,15 @@
         - !type:DoActsBehavior
           acts: ["Destruction"]
   - type: Sprite
+    netsync: false
     sprite: Constructible/Atmos/pump.rsi
-  - type: Icon
+    layers:
-    sprite: Constructible/Atmos/pump.rsi
+    - sprite: Constructible/Atmos/pipe.rsi
+      state: pipeStraight
+    - state: pumpPressure
+  - type: Appearance
+    visuals:
+    - type: PumpVisualizer
 
 - type: entity
   parent: PumpBase
@@ -38,11 +44,4 @@
   - type: PressurePump
     inletDirection: West
     outletDirection: East
-  - type: Sprite
+    
-    state: pumpPressure
-  - type: Icon
-    state: pumpPressure
-  - type: Appearance
-    visuals:
-    - type: PumpVisualizer
-      pumpEnabledState: pumpPressureOn

Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml

@@ -9,16 +9,6 @@
   - type: Physics
   - type: SnapGrid
     offset: Center
-
-  - type: Sprite
-    sprite: Constructible/Atmos/pipeitems.rsi
-    state: scrubber
-  - type: Appearance
-    visuals:
-    - type: PipeVisualizer
-      pipeRSI: Constructible/Atmos/pipe.rsi
-    - type: SiphonVisualizer
-      siphonRSI: Constructible/Atmos/scrubber.rsi
   - type: Damageable
     resistances: metallicResistances
   - type: Destructible
@@ -27,7 +17,17 @@
         behaviors:
         - !type:DoActsBehavior
           acts: ["Destruction"]
-
+  - type: Sprite
+    netsync: false
+    sprite: Constructible/Atmos/scrubber.rsi
+    layers:
+    - sprite: Constructible/Atmos/pipe.rsi
+      state: pipeHalf
+    - state: scrubOff
+  - type: Appearance
+    visuals:
+    - type: SiphonVisualizer
+      
 - type: entity
   parent: ScrubberBase
   id: Scrubber

Resources/Prototypes/Entities/Constructible/Ground/vents.yml

@@ -9,16 +9,6 @@
   - type: Physics
   - type: SnapGrid
     offset: Center
-
-  - type: Sprite
-    sprite: Constructible/Atmos/pipeitems.rsi
-    state: vent
-  - type: Appearance
-    visuals:
-    - type: PipeVisualizer
-      pipeRSI: Constructible/Atmos/pipe.rsi
-    - type: VentVisualizer
-      ventRSI: Constructible/Atmos/vent.rsi
   - type: Damageable
     resistances: metallicResistances
   - type: Destructible
@@ -27,7 +17,17 @@
         behaviors:
         - !type:DoActsBehavior
           acts: ["Destruction"]
-
+  - type: Sprite
+    netsync: false
+    sprite: Constructible/Atmos/vent.rsi
+    layers:
+    - sprite: Constructible/Atmos/pipe.rsi
+      state: pipeHalf
+    - state: ventOff      
+  - type: Appearance
+    visuals:
+    - type: VentVisualizer
+    
 - type: entity
   parent: VentBase
   id: Vent

Resources/Textures/Constructible/Atmos/gascanisterport.rsi/meta.json

@@ -1 +1,15 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da", "states": [{"name": "gasCanisterPort", "directions": 1, "delays": [[1.0]]}]}
+{
+   "version":1,
+   "size":{
+      "x":32,
+      "y":32
+   },
+   "license":"CC-BY-SA-3.0",
+   "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
+   "states":[
+      {
+         "name":"gasCanisterPort",
+         "directions":1
+      }
+   ]
+}

Resources/Textures/Constructible/Atmos/gasfilter.rsi/meta.json

@@ -1 +1,20 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da", "states": [{"name": "gasFilter", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "gasFilterOn", "directions": 4, "delays": [[0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2], [0.2, 0.2, 0.2, 0.2]]}]}
+{
+   "version":1,
+   "size":{
+      "x":32,
+      "y":32
+   },
+   "license":"CC-BY-SA-3.0",
+   "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
+   "states":[
+      {
+         "name":"gasFilter",
+         "directions":4
+      },
+      {
+         "name":"gasFilterOn",
+         "directions":4,
+         "delays":[ [ 0.2, 0.2, 0.2, 0.2 ], [ 0.2, 0.2, 0.2, 0.2 ], [ 0.2, 0.2, 0.2, 0.2 ], [ 0.2, 0.2, 0.2, 0.2 ] ]
+      }
+   ]
+}

Resources/Textures/Constructible/Atmos/pipe.rsi/meta.json

@@ -9,84 +9,23 @@
    "states":[
       {
          "name":"pipeTJunction",
-         "directions":4,
+         "directions":4
-         "delays":[
-            [
-               1.0
-            ],
-            [
-               1.0
-            ],
-            [
-               1.0
-            ],
-            [
-               1.0
-            ]
-         ]
       },
       {
          "name":"pipeHalf",
-         "directions":4,
+         "directions":4
-         "delays":[
-            [
-               1.0
-            ],
-            [
-               1.0
-            ],
-            [
-               1.0
-            ],
-            [
-               1.0
-            ]
-         ]
       },
       {
          "name":"pipeBend",
-         "directions":4,
+         "directions":4
-         "delays":[
-            [
-               1.0
-            ],
-            [
-               1.0
-            ],
-            [
-               1.0
-            ],
-            [
-               1.0
-            ]
-         ]
       },
       {
          "name":"pipeFourway",
-         "directions":1,
+         "directions":1
-         "delays":[
-            [
-               1.0
-            ]
-         ]
       },
       {
          "name":"pipeStraight",
-         "directions":4,
+         "directions":4
-         "delays":[
-            [
-               1.0
-            ],
-            [
-               1.0
-            ],
-            [
-               1.0
-            ],
-            [
-               1.0
-            ]
-         ]
       }
    ]
 }

Resources/Textures/Constructible/Atmos/pipeitems.rsi/meta.json

@@ -1,47 +0,0 @@
-{
-   "version":1,
-   "size":{
-      "x":32,
-      "y":32
-   },
-   "license":"CC-BY-SA-3.0",
-   "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
-   "states":[
-     {
-       "name": "scrubber",
-       "directions": 4,
-       "delays": [
-         [
-           1
-         ],
-         [
-           1
-         ],
-         [
-           1
-         ],
-         [
-           1
-         ]
-       ]
-     },
-     {
-       "name": "vent",
-       "directions": 4,
-       "delays": [
-         [
-           1
-         ],
-         [
-           1
-         ],
-         [
-           1
-         ],
-         [
-           1
-         ]
-       ]
-     }
-   ]
-}

Resources/Textures/Constructible/Atmos/pump.rsi/meta.json

@@ -1 +1,45 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da", "states": [{"name": "pumpDigitalValve", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpManualValve", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPassiveGate", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPassiveGateOn", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPressure", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPressureOn", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "pumpVolume", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpVolumeOn", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}]}
+{
+   "version":1,
+   "size":{
+      "x":32,
+      "y":32
+   },
+   "license":"CC-BY-SA-3.0",
+   "copyright":"Taken from https://github.com/tgstation/tgstation at commit 57cd1d59ca019dd0e7811ac451f295f818e573da",
+   "states":[
+      {
+         "name":"pumpDigitalValve",
+         "directions":4
+      },
+      {
+         "name":"pumpManualValve",
+         "directions":4
+      },
+      {
+         "name":"pumpPassiveGate",
+         "directions":4
+      },
+      {
+         "name":"pumpPassiveGateOn",
+         "directions":4
+      },
+      {
+         "name":"pumpPressure",
+         "directions":4
+      },
+      {
+         "name":"pumpPressureOn",
+         "directions":4,
+         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
+      },
+      {
+         "name":"pumpVolume",
+         "directions":4
+      },
+      {
+         "name":"pumpVolumeOn",
+         "directions":4,
+         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
+      }
+   ]
+}

Resources/Textures/Constructible/Atmos/scrubber.rsi/meta.json

@@ -9,40 +9,12 @@
    "states":[
       {
          "name":"scrubOff",
-         "directions":1,
+         "directions":4
-         "delays":[ [ 1.0 ] ]
       },
       {
          "name":"scrubOn",
          "directions":1,
-         "delays":[
+         "delays":[ [ 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08, 0.08 ] ]
-            [
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08,
-               0.08
-            ]
-         ]
       }
    ]
 }

Resources/Textures/Constructible/Atmos/vent.rsi/meta.json

@@ -9,20 +9,12 @@
    "states":[
       {
          "name":"ventOff",
-         "directions":1,
+         "directions":4
-         "delays":[ [ 1.0 ] ]
       },
       {
          "name":"ventOn",
          "directions":1,
-         "delays":[
+         "delays":[ [ 0.08, 0.08, 0.08, 0.08 ] ]
-            [
-               0.08,
-               0.08,
-               0.08,
-               0.08
-            ]
-         ]
       }
    ]
 }