Rotatable Pumps (#2223)

* Pump textures

* PumpVisualizer enabled state

* Pump rotation

* Pump tests fix

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

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

@@ -9,48 +9,35 @@
   - type: Collidable
   - type: SnapGrid
     offset: Center
-  - type: Sprite
-  - type: Icon
-    sprite: Constructible/Atmos/pressurepump.rsi
-    state: pumpEnabledSouth2North2
-  - type: Appearance
-    visuals:
-    - type: PipeVisualizer
-      pipeRSI: Constructible/Atmos/pipe.rsi
-    - type: PumpVisualizer
-      pumpRSI: Constructible/Atmos/pressurepump.rsi
   - type: Destructible
     thresholdvalue: 100
     resistances: metallicResistances
+  - type: Sprite
+    sprite: Constructible/Atmos/pump.rsi
+  - type: Icon
+    sprite: Constructible/Atmos/pump.rsi
 
 - type: entity
-  abstract: true
   parent: PumpBase
-  id: NorthwardLongitudinalPump
+  id: DebugPressurePump
+  name: Debug Pressure Pump
   components:
   - type: NodeContainer
     nodes:
     - !type:PipeNode
       nodeGroupID: Pipe
-      pipeDirection: South
+      pipeDirection: West
     - !type:PipeNode
       nodeGroupID: Pipe
-      pipeDirection: North
-
-- type: entity
-  parent: NorthwardLongitudinalPump
-  id: NorthwardLongitudinalVolumePump
-  name: Northward Longitudinal Volume Pump
-  components:
-  - type: VolumePump
-    inletDirection: South
-    outletDirection: North
-
-- type: entity
-  parent: NorthwardLongitudinalPump
-  id: NorthwardLongitudinalPressurePump
-  name: Northward Longitudinal Pressure Pump
-  components:
+      pipeDirection: East
   - type: PressurePump
-    inletDirection: South
-    outletDirection: North
+    inletDirection: West
+    outletDirection: East
+  - type: Sprite
+    state: pumpPressure2
+  - type: Icon
+    state: pumpPressure2
+  - type: Appearance
+    visuals:
+    - type: PumpVisualizer
+      pumpEnabledState: pumpPressure2On

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

@@ -1,51 +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":"pumpEast2West2",
-         "directions":1,
-         "delays":[ [ 1.0 ] ]
-      },
-      {
-         "name":"pumpNorth2South2",
-         "directions":1,
-         "delays":[ [ 1.0 ] ]
-      },
-      {
-         "name":"pumpSouth2North2",
-         "directions":1,
-         "delays":[ [ 1.0 ] ]
-      },
-      {
-         "name":"pumpWest2East2",
-         "directions":1,
-         "delays":[ [ 1.0 ] ]
-      },
-      {
-         "name":"pumpEnabledEast2West2",
-         "directions":1,
-         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
-      },
-      {
-         "name":"pumpEnabledNorth2South2",
-         "directions":1,
-         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
-      },
-      {
-         "name":"pumpEnabledSouth2North2",
-         "directions":1,
-         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
-      },
-      {
-         "name":"pumpEnabledWest2East2",
-         "directions":1,
-         "delays":[ [ 0.1, 0.1, 0.1, 0.1, 0.1 ] ]
-      }
-   ]
-}

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

@@ -0,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": "pumpDigitalValve2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpManualValve2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPassiveGate2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPassiveGate2On", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPressure2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpPressure2On", "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": "pumpVolume2", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pumpVolume2On", "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]]}]}