diff --git a/Resources/Maps/Shuttles/spectre.yml b/Resources/Maps/Shuttles/spectre.yml
index 8be50014cb8..dc6d3d4db98 100644
--- a/Resources/Maps/Shuttles/spectre.yml
+++ b/Resources/Maps/Shuttles/spectre.yml
@@ -93,27 +93,27 @@ entities:
             color: '#DE3A3A96'
             id: 1
           decals:
-            83: -13,-5
+            69: -13,-5
         - node:
             color: '#DE3A3AFF'
             id: 1
           decals:
-            84: -13,-5
+            70: -13,-5
         - node:
             color: '#DE3A3AFF'
             id: 2
           decals:
-            85: -7,-3
+            71: -7,-3
         - node:
             color: '#DE3A3AFF'
             id: 3
           decals:
-            86: 7,-3
+            72: 7,-3
         - node:
             color: '#DE3A3AFF'
             id: 4
           decals:
-            87: 13,-5
+            73: 13,-5
         - node:
             color: '#EFB34196'
             id: BotLeft
@@ -122,129 +122,129 @@ entities:
             17: -7,-6
             18: 7,-6
             19: 13,-8
-            91: -7,6
-            92: -7,5
-            93: -7,4
-            94: -7,3
-            95: 7,3
-            96: 7,4
-            98: 7,6
-            99: 5,6
-            100: 5,5
-            101: 5,4
-            102: 5,3
-            104: -5,4
-            105: -5,5
-            106: -5,6
+            77: -7,6
+            78: -7,5
+            79: -7,4
+            80: -7,3
+            81: 7,3
+            82: 7,4
+            83: 7,6
+            84: 5,6
+            85: 5,5
+            86: 5,4
+            87: 5,3
+            88: -5,4
+            89: -5,5
+            90: -5,6
         - node:
             color: '#EFB341FF'
             id: BotLeft
           decals:
-            211: 7,5
-            212: 5,5
-            213: 5,6
-            214: 5,4
-            215: 5,3
-            216: 7,3
-            217: 7,6
-            218: -5,6
-            219: -5,4
-            220: -5,3
-            221: -5,5
-            222: -7,5
-            223: -7,4
-            224: -7,3
-            225: -7,6
+            180: 7,5
+            181: 5,5
+            182: 5,6
+            183: 5,4
+            184: 5,3
+            185: 7,3
+            186: 7,6
+            187: -5,6
+            188: -5,4
+            189: -5,3
+            190: -5,5
+            191: -7,5
+            192: -7,4
+            193: -7,3
+            194: -7,6
         - node:
             color: '#52B4E9FF'
             id: BotLeftGreyscale
           decals:
-            88: -2,-5
+            74: -2,-5
         - node:
             color: '#DE3A3A96'
             id: BotLeftGreyscale
           decals:
-            89: -1,-6
+            75: -1,-6
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteCornerNe
           decals:
-            125: -10,0
-            153: 8,1
-            166: 13,0
-            167: 14,-1
-            174: 2,7
-            175: 3,6
+            103: -10,0
+            129: 8,1
+            141: 13,0
+            142: 14,-1
+            149: 2,7
+            150: 3,6
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteCornerNw
           decals:
-            120: -14,-1
-            122: -13,0
-            138: -8,1
-            163: 10,0
-            176: -2,7
-            177: -3,6
+            99: -14,-1
+            101: -13,0
+            116: -8,1
+            139: 10,0
+            151: -2,7
+            152: -3,6
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteCornerSe
           decals:
-            127: -10,-2
-            188: 3,2
+            105: -10,-2
+            161: 3,2
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteCornerSw
           decals:
-            161: 10,-2
-            208: -3,2
+            137: 10,-2
+            177: -3,2
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteInnerNe
           decals:
-            154: 7,1
-            155: 13,-1
-            210: 2,6
+            130: 7,1
+            131: 13,-1
+            179: 2,6
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteInnerNw
           decals:
-            121: -13,-1
-            139: -7,1
-            209: -2,6
+            100: -13,-1
+            117: -7,1
+            178: -2,6
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteInnerSe
           decals:
-            129: -12,-2
+            107: -12,-2
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteInnerSw
           decals:
-            156: 12,-2
+            132: 12,-2
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteLineE
           decals:
-            126: -10,-1
-            130: -12,-3
-            131: -12,-4
-            132: -12,-5
-            133: -5,-3
-            134: -5,-2
-            135: -5,-1
-            136: -5,0
-            137: -5,1
-            149: 8,-3
-            150: 8,-2
-            151: 8,-1
-            168: 14,-2
-            169: 14,-3
-            170: 14,-4
-            171: 14,-5
-            173: 8,0
-            184: 3,3
-            185: 3,4
-            186: 3,5
+            104: -10,-1
+            108: -12,-3
+            109: -12,-4
+            110: -12,-5
+            111: -5,-3
+            112: -5,-2
+            113: -5,-1
+            114: -5,0
+            115: -5,1
+            126: 8,-3
+            127: 8,-2
+            128: 8,-1
+            143: 14,-2
+            144: 14,-3
+            145: 14,-4
+            146: 14,-5
+            148: 8,0
+            158: 3,3
+            159: 3,4
+            160: 3,5
         - node:
             color: '#334E6DC8'
             id: BrickTileWhiteLineN
@@ -258,92 +258,92 @@ entities:
             color: '#9FED5896'
             id: BrickTileWhiteLineN
           decals:
-            172: 12,0
+            147: 12,0
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteLineN
           decals:
-            123: -11,0
-            164: 11,0
-            178: -1,7
-            179: 0,7
-            180: 1,7
+            102: -11,0
+            140: 11,0
+            153: -1,7
+            154: 0,7
+            155: 1,7
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteLineS
           decals:
-            128: -11,-2
-            160: 11,-2
+            106: -11,-2
+            136: 11,-2
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineS
           decals:
-            110: 0,2
-            111: 1,2
-            112: 2,2
-            113: 3,2
-            193: -1,2
-            194: -2,2
+            91: 0,2
+            92: 1,2
+            93: 2,2
+            94: 3,2
+            162: -1,2
+            163: -2,2
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteLineW
           decals:
-            114: -14,-5
-            115: -14,-4
-            116: -14,-3
-            117: -14,-2
-            140: -8,0
-            141: -8,-2
-            142: -8,-3
-            143: -8,-1
-            144: 5,-3
-            145: 5,-2
-            146: 5,-1
-            148: 5,1
-            157: 12,-3
-            158: 12,-4
-            159: 12,-5
-            162: 10,-1
-            181: -3,5
-            182: -3,4
-            207: -3,3
+            95: -14,-5
+            96: -14,-4
+            97: -14,-3
+            98: -14,-2
+            118: -8,0
+            119: -8,-2
+            120: -8,-3
+            121: -8,-1
+            122: 5,-3
+            123: 5,-2
+            124: 5,-1
+            125: 5,1
+            133: 12,-3
+            134: 12,-4
+            135: 12,-5
+            138: 10,-1
+            156: -3,5
+            157: -3,4
+            176: -3,3
         - node:
             color: '#951710FF'
             id: Delivery
           decals:
-            195: -1,3
-            196: 0,3
-            197: 1,3
-            198: -2,3
-            199: -2,4
-            200: -2,5
-            201: -1,5
-            202: 1,5
-            203: 1,5
-            204: 2,5
-            205: 2,4
-            206: 2,3
+            164: -1,3
+            165: 0,3
+            166: 1,3
+            167: -2,3
+            168: -2,4
+            169: -2,5
+            170: -1,5
+            171: 1,5
+            172: 1,5
+            173: 2,5
+            174: 2,4
+            175: 2,3
         - node:
             color: '#D381C996'
             id: HalfTileOverlayGreyscale180
           decals:
-            32: 4,2
-            90: -4,2
+            29: 4,2
+            76: -4,2
         - node:
             color: '#52B4E996'
             id: MiniTileWhiteLineN
           decals:
-            45: -12,0
+            32: -12,0
         - node:
             color: '#D381C996'
             id: MiniTileWhiteLineN
           decals:
-            44: -6,6
+            31: -6,6
         - node:
             color: '#DE3A3A96'
             id: MiniTileWhiteLineN
           decals:
-            43: 6,6
+            30: 6,6
         - node:
             color: '#334E6DC8'
             id: ThreeQuarterTileOverlayGreyscale
@@ -388,42 +388,42 @@ entities:
             color: '#DE3A3A96'
             id: WarnLineN
           decals:
-            47: 14,-5
-            48: 13,-5
-            49: 12,-5
-            50: 8,-3
-            51: 7,-3
-            52: 6,-3
-            53: -6,-3
-            54: -7,-3
-            55: -7,-3
-            56: -8,-3
-            57: -6,-3
-            58: -8,-3
-            59: -12,-5
-            60: -12,-5
-            61: -13,-5
-            62: -13,-5
-            63: -14,-5
-            64: -14,-5
-            65: 14,-5
-            66: 14,-5
-            67: 13,-5
-            68: 13,-5
-            69: 12,-5
-            70: 12,-5
-            71: 8,-3
-            72: 7,-3
-            73: 6,-3
-            74: 6,-3
-            75: 7,-3
-            76: 8,-3
-            77: -6,-3
-            78: -7,-3
-            79: -8,-3
-            80: -12,-5
-            81: -13,-5
-            82: -14,-5
+            33: 14,-5
+            34: 13,-5
+            35: 12,-5
+            36: 8,-3
+            37: 7,-3
+            38: 6,-3
+            39: -6,-3
+            40: -7,-3
+            41: -7,-3
+            42: -8,-3
+            43: -6,-3
+            44: -8,-3
+            45: -12,-5
+            46: -12,-5
+            47: -13,-5
+            48: -13,-5
+            49: -14,-5
+            50: -14,-5
+            51: 14,-5
+            52: 14,-5
+            53: 13,-5
+            54: 13,-5
+            55: 12,-5
+            56: 12,-5
+            57: 8,-3
+            58: 7,-3
+            59: 6,-3
+            60: 6,-3
+            61: 7,-3
+            62: 8,-3
+            63: -6,-3
+            64: -7,-3
+            65: -8,-3
+            66: -12,-5
+            67: -13,-5
+            68: -14,-5
       type: DecalGrid
     - version: 2
       data:
@@ -455,13 +455,13 @@ entities:
           2,2:
             0: 2457
           3,0:
-            0: 30591
+            0: 32767
           3,1:
             0: 9011
           3,2:
             0: 818
           -4,0:
-            0: 52430
+            0: 52991
           -4,1:
             0: 34952
           -3,0:
@@ -525,9 +525,9 @@ entities:
           -4,-3:
             0: 60962
           -4,-2:
-            0: 61166
+            0: 65518
           -4,-1:
-            0: 61166
+            0: 65535
           -3,-4:
             0: 12288
           -3,-3:
@@ -572,6 +572,18 @@ entities:
             0: 1092
           -4,2:
             0: 2184
+          -5,-2:
+            0: 32768
+          -5,-1:
+            0: 34952
+          4,-2:
+            0: 12544
+          4,-1:
+            0: 13107
+          4,0:
+            0: 19
+          -5,0:
+            0: 8
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -1805,6 +1817,26 @@ entities:
     - pos: 13.5,-1.5
       parent: 3
       type: Transform
+  - uid: 731
+    components:
+    - pos: -14.5,-1.5
+      parent: 3
+      type: Transform
+  - uid: 732
+    components:
+    - pos: -15.5,-1.5
+      parent: 3
+      type: Transform
+  - uid: 733
+    components:
+    - pos: 15.5,-1.5
+      parent: 3
+      type: Transform
+  - uid: 734
+    components:
+    - pos: 16.5,-1.5
+      parent: 3
+      type: Transform
   - uid: 1086
     components:
     - pos: 0.5,19.5
@@ -4451,6 +4483,8 @@ entities:
     - pos: 2.5,20.5
       parent: 3
       type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
   - uid: 508
     components:
     - rot: 3.141592653589793 rad