diff --git a/Content.Shared/DrawDepth/DrawDepth.cs b/Content.Shared/DrawDepth/DrawDepth.cs
index 002ea45645a..dda027e1bc7 100644
--- a/Content.Shared/DrawDepth/DrawDepth.cs
+++ b/Content.Shared/DrawDepth/DrawDepth.cs
@@ -79,7 +79,7 @@ public enum DrawDepth
         /// <summary>
         ///     Posters, APCs, air alarms, etc. This also includes most lights & lamps.
         /// </summary>
-        WallMountedItems = DrawDepthTag.Default + 2,
+        WallMountedItems = DrawDepthTag.Default + 5,
 
         /// <summary>
         ///     Generic items. Things that should be above crates & tables, but underneath mobs.
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index 40f43e4d6d1..5d1d41f7fab 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -23,7 +23,7 @@
     node: tubeLight
   - type: Sprite
     sprite: Structures/Wallmounts/Lighting/light_tube.rsi
-    drawdepth: WallMountedItems
+    drawdepth: Mobs
     layers:
     - map: ["enum.PoweredLightLayers.Base"]
       state: base
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 91f94a9515e..d7c34ff3370 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -15,7 +15,7 @@
   - type: Physics
     canCollide: false
   - type: Sprite
-    drawdepth: SmallObjects
+    drawdepth: OverMobs
     sprite: Structures/Wallmounts/switch.rsi
     state: on
   - type: SignalSwitch
@@ -55,7 +55,7 @@
   - type: Physics
     canCollide: false
   - type: Sprite
-    drawdepth: SmallObjects
+    drawdepth: OverMobs
     sprite: Structures/Wallmounts/switch.rsi
     state: dead
   - type: UseDelay
@@ -117,7 +117,7 @@
     - type: Transform
       anchored: true
     - type: Sprite
-      drawdepth: SmallObjects
+      drawdepth: OverMobs
       sprite: Structures/Wallmounts/switch.rsi
       state: on
     - type: Rotatable
@@ -143,7 +143,7 @@
     - type: Clickable
     - type: InteractionOutline
     - type: Sprite
-      drawdepth: HighFloorObjects
+      drawdepth: OverMobs
       sprite: Structures/conveyor.rsi
       layers:
         - state: switch-off
@@ -234,7 +234,8 @@
   - type: LockVisuals
   - type: AccessReader
   - type: Sprite
-    drawdepth: WallMountedItems
+    drawdepth: OverMobs
+
     sprite: Structures/Wallmounts/locked_switch.rsi
     layers:
     - state: base
@@ -500,7 +501,7 @@
   - type: Physics
     canCollide: false
   - type: Sprite
-    drawdepth: SmallObjects
+    drawdepth: OverMobs
     sprite: Structures/Wallmounts/switch_frame.rsi
     state: grey
   - type: Rotatable
@@ -512,7 +513,7 @@
   suffix: grey
   components:
   - type: Sprite
-    drawdepth: SmallObjects
+    drawdepth: OverMobs
     sprite: Structures/Wallmounts/switch_frame.rsi
     state: grey
 
@@ -522,7 +523,7 @@
   suffix: caution
   components:
   - type: Sprite
-    drawdepth: SmallObjects
+    drawdepth: OverMobs
     sprite: Structures/Wallmounts/switch_frame.rsi
     state: caution
 
@@ -532,7 +533,7 @@
   suffix: caution
   components:
   - type: Sprite
-    drawdepth: SmallObjects
+    drawdepth: OverMobs
     sprite: Structures/Wallmounts/switch_frame.rsi
     state: caution_security
 
@@ -542,7 +543,7 @@
   suffix: exit
   components:
   - type: Sprite
-    drawdepth: SmallObjects
+    drawdepth: OverMobs
     sprite: Structures/Wallmounts/switch_frame.rsi
     state: exit
 
@@ -552,6 +553,6 @@
   suffix: janitor
   components:
   - type: Sprite
-    drawdepth: SmallObjects
+    drawdepth: OverMobs
     sprite: Structures/Wallmounts/switch_frame.rsi
     state: janitor
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 2c50e51db31..daef8f9ea47 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -587,9 +587,9 @@
   name: reinforced wall
   components:
   - type: Sprite
-    sprite: Structures/Walls/solid.rsi
+    sprite: _Encore/Structures/Walls/tall/metal.rsi
   - type: Icon
-    sprite: Structures/Walls/solid.rsi
+    sprite: _Encore/Structures/Walls/tall/metal.rsi
     state: rgeneric
   - type: Construction
     graph: Girder
diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
index 5053ce2f736..ae8326c0385 100644
--- a/Resources/Prototypes/Tiles/plating.yml
+++ b/Resources/Prototypes/Tiles/plating.yml
@@ -9,6 +9,7 @@
     collection: FootstepPlating
   friction: 0.3
   heatCapacity: 10000
+  weather: false
 
 - type: tile
   id: PlatingDamaged
diff --git a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml
index 9779e4123af..77c1ecf53fd 100644
--- a/Resources/Prototypes/_Nuclear14/Tiles/floors.yml
+++ b/Resources/Prototypes/_Nuclear14/Tiles/floors.yml
@@ -12,7 +12,7 @@
   itemDrop: FloorTileItemMetalBlue
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalBlueSolid
@@ -27,7 +27,7 @@
   itemDrop: FloorTileItemMetalBlueSolid
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalGreen
@@ -42,7 +42,7 @@
   itemDrop: FloorTileItemMetalGreen
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalGreenSolid
@@ -57,7 +57,7 @@
   itemDrop: FloorTileItemMetalGreenSolid
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalGrey
@@ -72,7 +72,7 @@
   itemDrop: FloorTileItemMetalGrey
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalGreySolid
@@ -87,7 +87,7 @@
   itemDrop: FloorTileItemMetalGreySolid
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalGreyDark
@@ -102,7 +102,7 @@
   itemDrop: FloorTileItemMetalGreyDark
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalGreyDarkSolid
@@ -117,7 +117,7 @@
   itemDrop: FloorTileItemMetalGreyDarkSolid
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalPurple
@@ -132,7 +132,7 @@
   itemDrop: FloorTileItemMetalPurple
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalPurpleSolid
@@ -147,7 +147,7 @@
   itemDrop: FloorTileItemMetalPurpleSolid
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalRed
@@ -162,7 +162,7 @@
   itemDrop: FloorTileItemMetalRed
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalRedSolid
@@ -177,7 +177,7 @@
   itemDrop: FloorTileItemMetalRedSolid
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalTeal
@@ -192,7 +192,7 @@
   itemDrop: FloorTileItemMetalTeal
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalTealSolid
@@ -207,7 +207,7 @@
   itemDrop: FloorTileItemMetalTealSolid
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalWhite
@@ -222,7 +222,7 @@
   itemDrop: FloorTileItemMetalWhite
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalWhiteSolid
@@ -237,7 +237,7 @@
   itemDrop: FloorTileItemMetalWhiteSolid
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalYellow
@@ -252,7 +252,7 @@
   itemDrop: FloorTileItemMetalYellow
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalYellowSolid
@@ -267,7 +267,7 @@
   itemDrop: FloorTileItemMetalYellowSolid
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalFreezer
@@ -282,7 +282,7 @@
   itemDrop: FloorTileItemMetalFreezer
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalTunnel
@@ -296,7 +296,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalTunnelRusty
@@ -310,7 +310,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMetalTunnelWasteland
@@ -344,7 +344,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13MetalTile
@@ -361,7 +361,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13MetalGrate
@@ -378,7 +378,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13MetalSolid
@@ -413,7 +413,7 @@
   itemDrop: FloorTileItemWoodOak
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorWoodOakBroken
@@ -429,7 +429,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorWoodHouse
@@ -478,7 +478,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorWoodMaple
@@ -495,7 +495,7 @@
   itemDrop: FloorTileItemWoodMaple
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 # MS13 wood
 - type: tile
@@ -513,7 +513,7 @@
   # itemDrop: FloorTileItemWoodMaple
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13WoodCommonDamaged
@@ -530,7 +530,7 @@
   # itemDrop: FloorTileItemWoodMaple
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13WoodFancy
@@ -547,7 +547,7 @@
   # itemDrop: FloorTileItemWoodMaple
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13WoodFancyDamaged
@@ -564,7 +564,7 @@
   # itemDrop: FloorTileItemWoodMaple
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13WoodMosaic
@@ -581,7 +581,7 @@
   # itemDrop: FloorTileItemWoodMaple
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13WoodMosaicDamaged
@@ -598,7 +598,7 @@
   # itemDrop: FloorTileItemWoodMaple
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13WoodWide
@@ -615,7 +615,7 @@
   # itemDrop: FloorTileItemWoodMaple
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13WoodWideDamaged
@@ -632,7 +632,7 @@
   # itemDrop: FloorTileItemWoodMaple
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 # Carpet
 - type: tile
@@ -648,7 +648,7 @@
   itemDrop: FloorTileItemCarpetRed
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 # MS13 Carpet
 - type: tile
@@ -664,7 +664,7 @@
   # itemDrop: FloorTileItemCarpetRed
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13CarpetFancyRed
@@ -679,7 +679,7 @@
   # itemDrop: FloorTileItemCarpetRed
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13CarpetBlue
@@ -694,7 +694,7 @@
   # itemDrop: FloorTileItemCarpetRed
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13CarpetFancyBlue
@@ -709,7 +709,7 @@
   # itemDrop: FloorTileItemCarpetRed
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13CarpetGreen
@@ -724,7 +724,7 @@
   # itemDrop: FloorTileItemCarpetRed
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13CarpetFancyGreen
@@ -739,7 +739,7 @@
   # itemDrop: FloorTileItemCarpetRed
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13CarpetViolet
@@ -754,7 +754,7 @@
   # itemDrop: FloorTileItemCarpetRed
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 # Paths and Roads
 # Concrete
@@ -982,7 +982,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileSierra
@@ -995,7 +995,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileSierraBroken
@@ -1010,7 +1010,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileBlack
@@ -1025,7 +1025,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileBlackFull
@@ -1040,7 +1040,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileBlackLarge
@@ -1055,7 +1055,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileLongBlue
@@ -1070,7 +1070,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileBrown
@@ -1085,7 +1085,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileCafe
@@ -1100,7 +1100,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileCeramic
@@ -1113,7 +1113,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileCeramicBroken
@@ -1128,7 +1128,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileCheck
@@ -1158,7 +1158,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileGreenFull
@@ -1173,7 +1173,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileGrey
@@ -1188,7 +1188,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileGreyLarge
@@ -1203,7 +1203,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileGreyLong
@@ -1218,7 +1218,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileNavy
@@ -1233,7 +1233,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileNavyFull
@@ -1248,7 +1248,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileNavyLarge
@@ -1263,7 +1263,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileWhiteLarge
@@ -1278,7 +1278,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileWhiteFull
@@ -1293,7 +1293,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 - type: tile
   id: FloorMS13TileOrnate
@@ -1308,7 +1308,7 @@
   friction: 0.30
   thermalConductivity: 0.04
   heatCapacity: 10000
-  weather: true
+  weather: false
 
 # Roads
 - type: tile