Cleanup and fix disposal pipes (#34986)

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
index afeba380ae049435845f190842743962fbb951b1..fca28e99a6ffa2776bd9f9b2ca6d4b3543520d77 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -9,6 +9,8 @@
     - Disposal
   components:
   - type: Sprite
+    drawdepth: ThickPipe
+    sprite: Structures/Piping/disposal.rsi
     visible: false
   - type: Appearance
   - type: SubFloorHide
@@ -78,8 +80,6 @@
   description: A BBP (big broken pipe).
   components:
   - type: Sprite
-    drawdepth: ThickPipe
-    sprite: Structures/Piping/disposal.rsi
     layers:
     - map: [ "pipe" ]
       state: pipe-b
@@ -94,8 +94,6 @@
   description: A huge pipe segment used for constructing disposal systems.
   components:
   - type: Sprite
-    drawdepth: ThickPipe
-    sprite: Structures/Piping/disposal.rsi
     layers:
     - map: [ "pipe" ]
       state: conpipe-s
@@ -114,6 +112,8 @@
   - type: Construction
     graph: DisposalPipe
     node: pipe
+    containers:
+    - DisposalTransit
 
 - type: entity
   id: DisposalTagger
@@ -122,8 +122,6 @@
   description: A pipe that tags entities for routing.
   components:
   - type: Sprite
-    drawdepth: ThickPipe
-    sprite: Structures/Piping/disposal.rsi
     layers:
     - map: [ "pipe" ]
       state: conpipe-tagger
@@ -148,6 +146,8 @@
   - type: Construction
     graph: DisposalPipe
     node: tagger
+    containers:
+    - DisposalTagger
 
 - type: entity
   id: DisposalTrunk
@@ -156,8 +156,6 @@
   description: A pipe trunk used as an entry point for disposal systems.
   components:
   - type: Sprite
-    drawdepth: ThickPipe
-    sprite: Structures/Piping/disposal.rsi
     layers:
     - map: [ "pipe" ]
       state: conpipe-t
@@ -184,6 +182,8 @@
   - type: Construction
     graph: DisposalPipe
     node: trunk
+    containers:
+    - DisposalEntry
 
 - type: entity
   id: DisposalRouter
@@ -192,8 +192,6 @@
   description: A three-way router. Entities with matching tags get routed to the side via configurable filters.
   components:
   - type: Sprite
-    drawdepth: ThickPipe
-    sprite: Structures/Piping/disposal.rsi
     layers:
     - map: [ "pipe" ]
       state: conpipe-j1s
@@ -232,6 +230,8 @@
   - type: Construction
     graph: DisposalPipe
     node: router
+    containers:
+    - DisposalRouter
 
 - type: entity
   id: DisposalRouterFlipped
@@ -240,8 +240,6 @@
   suffix: flipped
   components:
   - type: Sprite
-    drawdepth: ThickPipe
-    sprite: Structures/Piping/disposal.rsi
     layers:
     - map: [ "pipe" ]
       state: conpipe-j2s
@@ -273,6 +271,8 @@
         - SubfloorMask
   - type: Construction
     node: routerflipped
+    containers:
+    - DisposalRouter
 
 - type: entity
   id: DisposalJunction
@@ -281,8 +281,6 @@
   description: A three-way junction. The arrow indicates where items exit.
   components:
   - type: Sprite
-    drawdepth: ThickPipe
-    sprite: Structures/Piping/disposal.rsi
     layers:
     - map: [ "pipe" ]
       state: conpipe-j1
@@ -316,6 +314,8 @@
   - type: Construction
     graph: DisposalPipe
     node: junction
+    containers:
+    - DisposalJunction
 
 - type: entity
   id: DisposalJunctionFlipped
@@ -324,8 +324,6 @@
   suffix: flipped
   components:
   - type: Sprite
-    drawdepth: ThickPipe
-    sprite: Structures/Piping/disposal.rsi
     layers:
     - map: [ "pipe" ]
       state: conpipe-j2
@@ -357,6 +355,8 @@
         - SubfloorMask
   - type: Construction
     node: junctionflipped
+    containers:
+    - DisposalJunction
 
 - type: entity
   id: DisposalYJunction
@@ -365,8 +365,6 @@
   description: A three-way junction with another exit point.
   components:
   - type: Sprite
-    drawdepth: ThickPipe
-    sprite: Structures/Piping/disposal.rsi
     layers:
     - map: [ "pipe" ]
       state: conpipe-y
@@ -397,6 +395,8 @@
   - type: Construction
     graph: DisposalPipe
     node: yJunction
+    containers:
+    - DisposalJunction
 
 - type: entity
   id: DisposalBend
@@ -405,8 +405,6 @@
   description: A tube bent at a 90 degree angle.
   components:
   - type: Sprite
-    drawdepth: ThickPipe
-    sprite: Structures/Piping/disposal.rsi
     layers:
     - map: [ "pipe" ]
       state: conpipe-c
@@ -433,6 +431,8 @@
   - type: Construction
     graph: DisposalPipe
     node: bend
+    containers:
+    - DisposalBend
 
 - type: entity
   parent: DisposalJunction
@@ -441,7 +441,6 @@
   description: A signal-controlled three-way router.
   components:
   - type: Sprite
-    drawdepth: ThickPipe
     layers:
     - map: [ "pipe" ]
       state: signal-router-free
@@ -472,6 +471,8 @@
   - type: Construction
     graph: DisposalPipe
     node: signal_router
+    containers:
+    - DisposalSignalRouter
 
 - type: entity
   parent: DisposalSignalRouter