diff --git a/Content.Shared/DrawDepth/DrawDepth.cs b/Content.Shared/DrawDepth/DrawDepth.cs
index a52a7c1f05..a6e1492884 100644
--- a/Content.Shared/DrawDepth/DrawDepth.cs
+++ b/Content.Shared/DrawDepth/DrawDepth.cs
@@ -9,11 +9,19 @@ namespace Content.Shared.DrawDepth
         /// <summary>
         ///     This is for sub-floors, the floors you see after prying off a tile.
         /// </summary>
-        LowFloors = DrawDepthTag.Default - 6,
+        LowFloors = DrawDepthTag.Default - 10,
+
+        // various entity types that require different
+        // draw depths, as to avoid hiding
+        #region SubfloorEntities
+        ThickPipe = DrawDepthTag.Default - 9,
+        ThickWire = DrawDepthTag.Default - 8,
+        ThinPipe = DrawDepthTag.Default - 7,
+        ThinWire = DrawDepthTag.Default - 6,
+        #endregion
 
         /// <summary>
-        ///     Things that are beneath regular floors, such as wires or pipes. vents/scrubbers also use this to ensure
-        ///     that they appear below carpets.
+        ///     Things that are beneath regular floors.
         /// </summary>
         BelowFloor = DrawDepthTag.Default - 5,
 
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index 44cc8d5e11..6a9c17d91e 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -51,7 +51,7 @@
         acts: ["Destruction"]
   - type: Sprite
     sprite: Structures/Piping/Atmospherics/pipe.rsi
-    drawdepth: BelowFloor
+    drawdepth: ThinPipe
     netsync: false
   - type: Appearance
     visuals:
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
index 0e45064c1d..b9b8f418b4 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -46,7 +46,7 @@
   description: A huge pipe segment used for constructing disposal systems
   components:
   - type: Sprite
-    drawdepth: BelowFloor
+    drawdepth: ThickPipe
     sprite: Structures/Piping/disposal.rsi
     state: conpipe-s
   - type: DisposalTransit
@@ -70,7 +70,7 @@
   description: A pipe that tags entities for routing
   components:
   - type: Sprite
-    drawdepth: BelowFloor
+    drawdepth: ThickPipe
     sprite: Structures/Piping/disposal.rsi
     state: conpipe-tagger
   - type: DisposalTagger
@@ -98,7 +98,7 @@
   description: A pipe trunk used as an entry point for disposal systems
   components:
   - type: Sprite
-    drawdepth: BelowFloor
+    drawdepth: ThickPipe
     sprite: Structures/Piping/disposal.rsi
     state: conpipe-t
   - type: DisposalEntry
@@ -122,7 +122,7 @@
   description: A three-way router. Entities with matching tags get routed to the side
   components:
   - type: Sprite
-    drawdepth: BelowFloor
+    drawdepth: ThickPipe
     sprite: Structures/Piping/disposal.rsi
     state: conpipe-j1s
   - type: DisposalRouter
@@ -155,7 +155,7 @@
   suffix: flipped
   components:
   - type: Sprite
-    drawdepth: BelowFloor
+    drawdepth: ThickPipe
     sprite: Structures/Piping/disposal.rsi
     state: conpipe-j2s
   - type: DisposalRouter
@@ -185,7 +185,7 @@
   description: A three-way junction. The arrow indicates where items exit
   components:
   - type: Sprite
-    drawdepth: BelowFloor
+    drawdepth: ThickPipe
     sprite: Structures/Piping/disposal.rsi
     state: conpipe-j1
   - type: DisposalJunction
@@ -214,7 +214,7 @@
   suffix: flipped
   components:
   - type: Sprite
-    drawdepth: BelowFloor
+    drawdepth: ThickPipe
     sprite: Structures/Piping/disposal.rsi
     state: conpipe-j2
   - type: DisposalJunction
@@ -244,7 +244,7 @@
   description: A three-way junction with another exit point.
   components:
   - type: Sprite
-    drawdepth: BelowFloor
+    drawdepth: ThickPipe
     sprite: Structures/Piping/disposal.rsi
     state: conpipe-y
   - type: DisposalJunction
@@ -272,7 +272,7 @@
   description: A tube bent at a 90 degree angle.
   components:
   - type: Sprite
-    drawdepth: BelowFloor
+    drawdepth: ThickPipe
     sprite: Structures/Piping/disposal.rsi
     state: conpipe-c
   - type: DisposalBend
diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml
index 9f6c33e79d..a25b4b85d5 100644
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -17,7 +17,7 @@
     anchored: true
   - type: Sprite
     netsync: false
-    drawdepth: BelowFloor
+    drawdepth: ThinWire
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Metallic
@@ -48,6 +48,7 @@
   - type: Sprite
     sprite: Structures/Power/Cables/hv_cable.rsi
     state: hvcable_0
+    drawdepth: ThickWire
   - type: Icon
     sprite: Structures/Power/Cables/hv_cable.rsi
     state: hvcable_4