internal gas sale point, better piping

Resources/Prototypes/_NF/Entities/Structures/Piping/Atmospherics/binary.yml

@@ -32,10 +32,9 @@
 - type: entity
   parent: BaseStructure
   id: BaseGaslock
+  abstract: true
   name: gaslock
   components:
-  - type: Anchorable
-  - type: Rotatable
   - type: Docking
     radarColor: darkcyan
     highlightedRadarColor: cyan
@@ -87,8 +86,8 @@
 
 - type: entity
   parent: BaseGaslock
-  id: BasePumpGaslock
-  suffix: Docking
+  id: BasePressurePumpGaslock
+  abstract: true
   name: external gaslock
   description: Connects gas pipes on separate ships or stations together to allow gas transfer. Both sides must be docked and pumping in the same direction to accept flow.
   components:
@@ -139,9 +138,8 @@
       - ForceNoFixRotations
 
 - type: entity
-  parent: BasePumpGaslock
+  parent: BasePressurePumpGaslock
   id: Gaslock
-  suffix: Airtight
   placement:
     mode: SnapgridCenter
   components:
@@ -158,8 +156,7 @@
       shader: unshaded
       map: ["docked-unlit"]
       visible: false
-    - sprite: Structures/Piping/Atmospherics/pipe.rsi
-      state: pipeStraight
+    - state: pipeStraight
       map: [ "enum.PipeVisualLayers.Pipe" ]
     - state: pumpPressure
     - state: pumpPressureOnOut
@@ -191,14 +188,15 @@
     mode: NoSprite
 
 - type: entity
-  parent: BasePumpGaslock
+  parent: BasePressurePumpGaslock
   id: GaslockFrame
-  suffix: Docking
   name: portable gaslock
   description: Pumps gas through. Accepts docking, but cannot dock. Both sides must be docked and pumping in the same direction for gas to flow.
   placement:
     mode: SnapgridCenter
   components:
+  - type: Anchorable
+  - type: Rotatable
   - type: Sprite
     sprite: _NF/Structures/Piping/Atmospherics/portable_gaslock.rsi
     drawdepth: Doors
@@ -208,8 +206,7 @@
       shader: unshaded
       map: ["docked-unlit"]
       visible: false
-    - sprite: Structures/Piping/Atmospherics/pipe.rsi
-      state: pipeStraight
+    - state: pipeStraight
       map: [ "enum.PipeVisualLayers.Pipe" ]
     - state: pumpPressure
     - state: pumpPressureOnOut

Resources/Prototypes/_NF/Entities/Structures/Piping/Atmospherics/unary.yml

@@ -86,8 +86,9 @@
 
 - type: entity
   parent: [ BaseStructureIndestructible, BaseStructureDisableToolUse, BaseGaslock ]
-  id: GasSalePoint
-  name: gas sale point
+  id: GasSalePort
+  name: gas sale port
+  suffix: Dockable
   description: Gas piped into here can be sold using the linked console. Bluespace linked to massive storage vaults off-site.
   components:
   - type: NodeContainer
@@ -101,17 +102,18 @@
   - type: WiredNetworkConnection
   - type: Sprite
     sprite: _NF/Structures/Piping/Atmospherics/salepoint.rsi
-    snapCardinals: true
-    granularLayersRendering: true
     layers:
       - state: base
       - state: base-unlit
         shader: unshaded
+      - state: struts
       - state: docked-unlit
         shader: unshaded
       - state: on-unlit
         shader: unshaded
         map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      - state: pipe
+        map: [ "enum.PipeVisualLayers.Pipe" ]
   # - type: GenericVisualizer # TODO: fill this in
   - type: ApcPowerReceiver
     load: 1000
@@ -140,11 +142,35 @@
         occludes: True
         ents: []
 
+- type: entity
+  parent: GasSalePort
+  id: GasSalePoint
+  name: gas sale point
+  suffix: Internal
+  components:
+  - type: NodeContainer
+    nodes:
+      inlet:
+        !type:PipeNode
+        nodeGroupID: Pipe
+        pipeDirection: South
+  - type: Sprite
+    sprite: _NF/Structures/Piping/Atmospherics/salepoint.rsi
+    layers:
+      - state: base
+      - state: base-unlit
+        shader: unshaded
+      - state: on-unlit
+        shader: unshaded
+        map: [ "enum.PowerDeviceVisualLayers.Powered" ]
+      - state: pipe
+        map: [ "enum.PipeVisualLayers.Pipe" ]
+
 - type: entity
   parent: [ BaseStructureIndestructible, BaseStructureDisableToolUse, BaseComputer ]
   id: GasSaleConsole
   name: gas sale console
-  description: Sells gas pumped into a linked gas sale point.
+  description: Sells gas pumped into a linked gas sale port/point.
   components:
   - type: GasSaleConsole
   - type: ActivatableUI

Resources/Textures/_NF/Structures/Piping/Atmospherics/salepoint.rsi/meta.json

@@ -17,6 +17,9 @@
                 0.1, 0.1, 0.1
             ]]
         },
+        {
+            "name": "struts"
+        },
         {
             "name": "docked-unlit"
         },
@@ -26,6 +29,10 @@
                 0.2, 0.2, 0.2,
                 0.2, 0.2, 0.5
             ]]
+        },
+        {
+            "name": "pipe",
+            "directions": 4
         }
     ]
 }