Piping Unit test fixes (#3471)

* PipeNetDevice on piping prototypes

* client component ignore

* NodeContainer OnRemove bugfix

* Moves some NodeContainer code from OnRemove to Shutdown

* yaml indentation fix

Content.Client/IgnoredComponents.cs

@@ -152,6 +152,7 @@ namespace Content.Client
             "VolumePump",
             "PressureSiphon",
             "PipeHeater",
+            "PipeNetDevice",
             "SignalReceiver",
             "SignalSwitch",
             "SignalTransmitter",

Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs

@@ -60,13 +60,14 @@ namespace Content.Server.GameObjects.Components.NodeContainer
             }
         }
 
-        public override void OnRemove()
+        protected override void Shutdown()
         {
+            base.Shutdown();
+
             foreach (var node in _nodes)
             {
-                node.OnContainerRemove();
+                node.OnContainerShutdown();
             }
-            base.OnRemove();
         }
 
         private void AnchorUpdate()

Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs

@@ -11,8 +11,10 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
     {
         protected override IEnumerable<Node> GetReachableNodes()
         {
-            var cells = Owner.GetComponent<SnapGridComponent>()
+            if (!Owner.TryGetComponent(out SnapGridComponent? grid))
-                .GetCardinalNeighborCells();
+                yield break;
+
+            var cells = grid.GetCardinalNeighborCells();
 
             foreach (var cell in cells)
             {

Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs

@@ -74,7 +74,7 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
             }
         }
 
-        public virtual void OnContainerRemove()
+        public virtual void OnContainerShutdown()
         {
             _deleting = true;
             NodeGroup.RemoveNode(this);

Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs

@@ -109,9 +109,9 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
             UpdateAppearance();
         }
 
-        public override void OnContainerRemove()
+        public override void OnContainerShutdown()
         {
-            base.OnContainerRemove();
+            base.OnContainerShutdown();
             UpdateAdjacentConnectedDirections();
         }
 
@@ -173,8 +173,10 @@ namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
         /// </summary>
         private IEnumerable<PipeNode> PipesInDirection(PipeDirection pipeDir)
         {
-            var entities = Owner.GetComponent<SnapGridComponent>()
+            if (!Owner.TryGetComponent(out SnapGridComponent? grid))
-                .GetInDir(pipeDir.ToDirection());
+                yield break;
+
+            var entities = grid.GetInDir(pipeDir.ToDirection());
 
             foreach (var entity in entities)
             {

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

@@ -29,6 +29,7 @@
       - !type:DoActsBehavior
         acts: ["Destruction"]
   - type: GasCanisterPort
+  - type: PipeNetDevice
 
 - type: entity
   parent: GasCanisterPortBase

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

@@ -30,6 +30,7 @@
     visuals:
     - type: PipeConnectorVisualizer
     - type: GasFilterVisualizer
+  - type: PipeNetDevice
 
 - type: entity
   parent: GasFilterBase

Resources/Prototypes/Entities/Constructible/Piping/gasgenerator.yml

@@ -23,6 +23,7 @@
   - type: SnapGrid
     offset: Center
   - type: GasGenerator
+  - type: PipeNetDevice
     
 - type: entity
   parent: GasGeneratorBase

Resources/Prototypes/Entities/Constructible/Piping/heaters.yml

@@ -30,4 +30,5 @@
     - !type:PipeNode
       nodeGroupID: Pipe
       pipeDirection: East
-  - type: PipeHeater
+  - type: PipeHeater
+  - type: PipeNetDevice

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

@@ -30,7 +30,8 @@
     visuals:
     - type: PipeConnectorVisualizer
     - type: PumpVisualizer
-
+  - type: PipeNetDevice
+  
 - type: entity
   parent: PumpBase
   id: DebugPressurePump

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

@@ -30,6 +30,7 @@
     visuals:
     - type: PipeConnectorVisualizer
     - type: SiphonVisualizer
+  - type: PipeNetDevice
 
 - type: entity
   parent: ScrubberBase

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

@@ -30,6 +30,7 @@
     visuals:
     - type: PipeConnectorVisualizer
     - type: VentVisualizer
+  - type: PipeNetDevice
 
 - type: entity
   parent: VentBase