diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml
index 66f0f231d06..546ecb74b40 100644
--- a/Resources/Maps/_NF/Shuttles/mccargo.yml
+++ b/Resources/Maps/_NF/Shuttles/mccargo.yml
@@ -28,7 +28,7 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAagAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAagAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
@@ -40,7 +40,7 @@ entities:
           version: 6
         -1,1:
           ind: -1,1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,1:
           ind: 0,1
@@ -70,558 +70,566 @@ entities:
             color: '#FFFFFFFF'
             id: Box
           decals:
-            337: -9,14
-            338: -9,13
-            339: -9,12
-            340: -8,12
-            341: -8,13
-            342: -8,14
-            343: -7,14
-            344: -7,13
-            345: -7,12
+            309: -9,14
+            310: -9,13
+            311: -9,12
+            312: -8,12
+            313: -8,13
+            314: -8,14
+            315: -7,14
+            316: -7,13
+            317: -7,12
         - node:
             color: '#A4610696'
             id: CheckerNWSE
           decals:
-            289: 6,9
-            290: 7,9
-            291: 9,9
-            292: 6,8
-            293: 7,8
-            294: 6,7
-            295: 7,7
-            296: 9,7
-            297: 6,6
-            298: 7,6
-            299: 6,5
-            300: 7,5
-            301: 9,5
-            302: 8,5
-            303: 7,4
-            304: 8,7
-            305: 8,9
+            266: 6,9
+            267: 7,9
+            268: 9,9
+            269: 6,8
+            270: 7,8
+            271: 6,7
+            272: 7,7
+            273: 9,7
+            274: 6,6
+            275: 7,6
+            276: 6,5
+            277: 7,5
+            278: 9,5
+            279: 8,5
+            280: 7,4
+            281: 8,7
+            282: 8,9
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            205: -4,3
-            206: -6,3
-            208: -8,3
-            212: -8,8
-            216: -6,8
-            219: -5,10
-            222: -5,12
-            225: -2,12
-            226: 0,12
-            236: -5,15
-            286: 7,14
-            287: 6,11
-            288: -1,10
-            330: -5,3
-            331: -7,3
+            190: -4,3
+            191: -6,3
+            193: -8,3
+            196: -8,8
+            200: -6,8
+            203: -5,10
+            206: -5,12
+            209: -2,12
+            210: 0,12
+            263: 7,14
+            264: 6,11
+            265: -1,10
+            305: -5,3
+            306: -7,3
+            351: -1,11
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            4: 7,13
-            5: 7,12
-            215: -7,8
-            221: -3,10
-            224: -3,12
-            229: 0,14
-            232: -3,14
-            239: 0,15
-            240: 0,13
-            282: 6,12
-            327: -5,4
-            329: -8,5
+            3: 7,13
+            4: 7,12
+            199: -7,8
+            205: -3,10
+            208: -3,12
+            212: 0,14
+            214: -3,14
+            218: 0,15
+            219: 0,13
+            259: 6,12
+            302: -5,4
+            304: -8,5
+            348: -4,6
+            349: -5,6
+            350: -4,5
+            353: -1,14
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
             0: -8,3
-            1: -1,12
-            207: -4,4
-            209: -4,5
-            210: -8,6
-            213: -8,9
-            228: 0,13
-            231: -2,14
-            233: -4,14
-            237: -1,15
-            332: -6,3
-            333: -5,4
+            192: -4,4
+            194: -8,6
+            197: -8,9
+            211: 0,13
+            213: -2,14
+            215: -4,14
+            216: -1,15
+            307: -6,3
+            308: -5,4
+            347: -5,5
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            2: 7,12
-            3: 9,11
-            211: -8,7
-            214: -7,9
-            217: -6,9
-            218: -5,9
-            220: -4,10
-            223: -4,12
-            227: -1,13
-            230: -1,14
-            234: -5,14
-            235: -4,15
-            238: -2,15
-            283: 6,14
-            284: 6,13
-            285: 7,11
-            328: -8,4
-            334: -5,5
+            1: 7,12
+            2: 9,11
+            195: -8,7
+            198: -7,9
+            201: -6,9
+            202: -5,9
+            204: -4,10
+            207: -4,12
+            217: -2,15
+            260: 6,14
+            261: 6,13
+            262: 7,11
+            303: -8,4
+            352: -1,12
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteCornerNe
           decals:
-            252: 4,8
-            264: 4,12
+            231: 4,8
+            243: 4,12
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteCornerNw
           decals:
-            253: -2,8
-            265: 2,12
+            232: -2,8
+            244: 2,12
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteCornerSe
           decals:
-            255: 4,3
-            266: 4,10
+            234: 4,3
+            245: 4,10
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteCornerSw
           decals:
-            254: -2,3
-            267: 2,10
+            233: -2,3
+            246: 2,10
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteInnerNe
           decals:
-            193: 4,-4
-            194: 0,-3
-            195: -4,-3
-            196: -8,-4
+            178: 4,-4
+            179: 0,-3
+            180: -4,-3
+            181: -8,-4
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteInnerNw
           decals:
-            197: -4,-4
-            198: 0,-3
-            199: 4,-3
-            200: 8,-4
+            182: -4,-4
+            183: 0,-3
+            184: 4,-3
+            185: 8,-4
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteInnerSe
           decals:
-            201: 4,-1
-            202: 0,0
-            203: -4,0
-            204: -8,-1
+            186: 4,-1
+            187: 0,0
+            188: -4,0
+            189: -8,-1
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteInnerSw
           decals:
-            189: -4,-1
-            190: 0,0
-            191: 4,0
-            192: 8,-1
+            174: -4,-1
+            175: 0,0
+            176: 4,0
+            177: 8,-1
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteLineE
           decals:
-            161: 4,-3
-            162: 4,-2
-            163: 0,-1
-            164: 0,-2
-            165: -4,-1
-            166: -4,-2
-            167: -8,-2
-            168: -8,-3
-            256: 4,4
-            257: 4,5
-            258: 4,6
-            259: 4,7
-            271: 4,11
+            146: 4,-3
+            147: 4,-2
+            148: 0,-1
+            149: 0,-2
+            150: -4,-1
+            151: -4,-2
+            152: -8,-2
+            153: -8,-3
+            235: 4,4
+            236: 4,5
+            237: 4,6
+            238: 4,7
+            250: 4,11
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteLineN
           decals:
-            149: -5,-4
-            150: -6,-4
-            151: -7,-4
-            152: -3,-3
-            153: -2,-3
-            154: -1,-3
-            155: 1,-3
-            156: 2,-3
-            157: 3,-3
-            158: 5,-4
-            159: 6,-4
-            160: 7,-4
-            242: -1,8
-            243: 0,8
-            244: 1,8
-            245: 2,8
-            246: 3,8
-            270: 3,12
+            134: -5,-4
+            135: -6,-4
+            136: -7,-4
+            137: -3,-3
+            138: -2,-3
+            139: -1,-3
+            140: 1,-3
+            141: 2,-3
+            142: 3,-3
+            143: 5,-4
+            144: 6,-4
+            145: 7,-4
+            221: -1,8
+            222: 0,8
+            223: 1,8
+            224: 2,8
+            225: 3,8
+            249: 3,12
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteLineS
           decals:
-            169: -7,-1
-            170: -6,-1
-            171: -5,-1
-            172: -3,0
-            173: -2,0
-            174: -1,0
-            175: 1,0
-            176: 2,0
-            177: 3,0
-            178: 5,-1
-            179: 6,-1
-            180: 7,-1
-            247: -1,3
-            248: 0,3
-            249: 1,3
-            250: 2,3
-            251: 3,3
-            269: 3,10
+            154: -7,-1
+            155: -6,-1
+            156: -5,-1
+            157: -3,0
+            158: -2,0
+            159: -1,0
+            160: 1,0
+            161: 2,0
+            162: 3,0
+            163: 5,-1
+            164: 6,-1
+            165: 7,-1
+            226: -1,3
+            227: 0,3
+            228: 1,3
+            229: 2,3
+            230: 3,3
+            248: 3,10
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteLineW
           decals:
-            181: 8,-2
-            182: 8,-3
-            183: 4,-1
-            184: 4,-2
-            185: 0,-1
-            186: 0,-2
-            187: -4,-2
-            188: -4,-3
-            260: -2,4
-            261: -2,5
-            262: -2,6
-            263: -2,7
-            268: 2,11
+            166: 8,-2
+            167: 8,-3
+            168: 4,-1
+            169: 4,-2
+            170: 0,-1
+            171: 0,-2
+            172: -4,-2
+            173: -4,-3
+            239: -2,4
+            240: -2,5
+            241: -2,6
+            242: -2,7
+            247: 2,11
+        - node:
+            color: '#FFFFFFFF'
+            id: StandClear
+          decals:
+            332: -3,15
         - node:
             color: '#D381C996'
             id: WarnCornerGreyscaleNE
           decals:
-            277: 7,14
+            254: 7,14
         - node:
             color: '#D381C996'
             id: WarnCornerGreyscaleNW
           decals:
-            276: 6,14
+            253: 6,14
         - node:
             color: '#D381C996'
             id: WarnCornerGreyscaleSE
           decals:
-            274: 7,11
+            251: 7,11
         - node:
             color: '#D381C996'
             id: WarnCornerGreyscaleSW
           decals:
-            275: 6,11
+            252: 6,11
         - node:
             color: '#A4610696'
             id: WarnCornerNE
           decals:
-            116: -4,5
-            144: 0,15
+            130: 0,15
+            343: -4,6
         - node:
             color: '#A4610696'
             id: WarnCornerNW
           decals:
-            109: -8,9
-            143: -5,15
+            104: -8,9
+            328: -5,14
+            331: -4,15
         - node:
             color: '#A4610696'
             id: WarnCornerSE
           decals:
-            98: -4,3
-            99: -1,10
-            100: 0,12
+            94: -4,3
+            95: -1,10
+            96: 0,12
         - node:
             color: '#9FED5896'
             id: WarnCornerSW
           decals:
-            142: -8,3
+            129: -8,3
         - node:
             color: '#9FED5896'
             id: WarnCornerSmallNE
           decals:
-            324: -8,4
+            300: -8,4
         - node:
             color: '#A4610696'
             id: WarnCornerSmallNE
           decals:
-            126: -5,10
-            127: -5,12
-            326: -5,5
+            118: -5,10
+            119: -5,12
+            344: -5,6
         - node:
             color: '#9FED5896'
             id: WarnCornerSmallNW
           decals:
-            325: -5,4
+            301: -5,4
         - node:
             color: '#A4610696'
             id: WarnCornerSmallNW
           decals:
-            128: -1,10
-            129: -1,12
-            138: -5,9
+            120: -1,10
+            125: -5,9
+            330: -4,14
+            335: 0,12
         - node:
             color: '#A4610696'
             id: WarnCornerSmallSE
           decals:
-            130: -8,8
-            131: -5,12
-            132: -5,14
-            136: -1,12
-            137: -5,10
+            121: -8,8
+            122: -5,12
+            124: -5,10
+            329: -5,14
+            334: -1,12
         - node:
             color: '#A4610696'
             id: WarnCornerSmallSW
           decals:
-            133: -1,14
-            134: -1,12
-            135: -5,8
+            123: -5,8
+            333: -1,12
+            336: 0,14
         - node:
             color: '#B02E26FF'
             id: WarnFullGreyscale
           decals:
-            241: 4,12
+            220: 4,12
         - node:
             color: '#9FED5896'
             id: WarnLineE
           decals:
-            321: -8,5
+            297: -8,5
         - node:
             color: '#A4610696'
             id: WarnLineE
           decals:
-            72: -6,-8
-            73: 8,-8
-            89: -5,9
-            90: -5,8
-            91: -5,7
-            92: -5,6
-            93: -4,4
-            94: -5,11
-            95: -5,13
-            96: 0,13
-            97: 0,14
-            110: -8,6
-            111: -8,7
-            123: -1,11
+            69: -6,-8
+            70: 8,-8
+            86: -5,9
+            87: -5,8
+            88: -5,7
+            89: -4,4
+            90: -5,11
+            91: -5,13
+            92: 0,13
+            93: 0,14
+            105: -8,6
+            106: -8,7
+            116: -1,11
+            342: -4,5
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            23: 11,-1
-            24: 11,-2
-            25: 11,-3
-            26: -11,-1
-            27: -11,-2
-            34: -13,-1
-            35: -13,-2
-            36: -13,-3
-            37: 13,-1
-            38: 13,-2
-            39: 13,-3
-            65: -3,3
-            66: 5,3
-            67: 8,3
-            68: 5,14
-            69: 1,14
-            309: 8,5
-            310: 8,7
-            311: 8,9
-            315: -11,-3
+            22: 11,-1
+            23: 11,-2
+            24: 11,-3
+            25: -11,-1
+            26: -11,-2
+            33: -13,-1
+            34: -13,-2
+            35: -13,-3
+            36: 13,-1
+            37: 13,-2
+            38: 13,-3
+            63: 5,3
+            64: 8,3
+            65: 5,14
+            66: 1,14
+            286: 8,5
+            287: 8,7
+            288: 8,9
+            292: -11,-3
+            341: -3,4
         - node:
             color: '#D381C996'
             id: WarnLineGreyscaleE
           decals:
-            278: 7,13
-            279: 7,12
+            255: 7,13
+            256: 7,12
         - node:
             color: '#D381C996'
             id: WarnLineGreyscaleW
           decals:
-            280: 6,12
-            281: 6,13
+            257: 6,12
+            258: 6,13
         - node:
             color: '#9FED5896'
             id: WarnLineN
           decals:
-            141: -6,3
-            317: -7,3
-            319: -5,3
+            128: -6,3
+            294: -7,3
+            296: -5,3
         - node:
             color: '#A4610696'
             id: WarnLineN
           decals:
-            78: 12,-3
-            79: -12,-3
-            80: -4,14
-            81: -3,14
-            82: -2,14
-            83: -4,12
-            84: -3,12
-            85: -2,12
-            86: -4,10
-            87: -3,10
-            88: -2,10
-            112: -7,8
-            113: -6,8
+            75: 12,-3
+            76: -12,-3
+            77: -4,14
+            78: -3,14
+            79: -2,14
+            80: -4,12
+            81: -3,12
+            82: -2,12
+            83: -4,10
+            84: -3,10
+            85: -2,10
+            107: -7,8
+            108: -6,8
+            338: -1,14
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
           decals:
-            17: -8,-7
-            18: -7,-7
-            19: -6,-7
-            20: 6,-7
-            21: 7,-7
-            22: 8,-7
-            40: -4,2
-            41: 6,10
-            47: 6,15
-            52: 3,9
-            59: -8,-9
-            60: -7,-9
-            61: -6,-9
-            62: 6,-9
-            63: 7,-9
-            64: 8,-9
-            70: -1,9
-            313: 7,4
+            16: -8,-7
+            17: -7,-7
+            18: -6,-7
+            19: 6,-7
+            20: 7,-7
+            21: 8,-7
+            39: -4,2
+            40: 6,10
+            45: 6,15
+            50: 3,9
+            57: -8,-9
+            58: -7,-9
+            59: -6,-9
+            60: 6,-9
+            61: 7,-9
+            62: 8,-9
+            67: -1,9
+            290: 7,4
+            327: -3,16
         - node:
             color: '#9FED5896'
             id: WarnLineS
           decals:
-            320: -5,5
-            322: -8,5
-            323: -8,4
+            298: -8,5
+            299: -8,4
+            346: -5,5
         - node:
             color: '#A4610696'
             id: WarnLineS
           decals:
-            76: -8,-8
-            77: 6,-8
-            101: -8,6
-            102: -8,7
-            103: -8,8
-            104: -5,10
-            105: -5,11
-            106: -5,12
-            107: -5,13
-            108: -5,14
-            114: -5,7
-            115: -5,6
-            124: -1,11
-            125: -1,13
+            73: -8,-8
+            74: 6,-8
+            97: -8,6
+            98: -8,7
+            99: -8,8
+            100: -5,10
+            101: -5,11
+            102: -5,12
+            103: -5,13
+            109: -5,7
+            117: -1,11
+            337: 0,13
+            345: -5,6
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
           decals:
-            6: -11,-1
-            7: -11,-2
-            8: 11,-1
-            9: 11,-2
-            10: 11,-3
-            28: 13,-3
-            29: 13,-2
-            30: 13,-1
-            31: -13,-3
-            32: -13,-2
-            33: -13,-1
-            42: -3,3
-            43: 5,3
-            44: 8,3
-            45: 1,14
-            46: 5,14
-            306: 8,9
-            307: 8,7
-            308: 8,5
-            314: -11,-3
+            5: -11,-1
+            6: -11,-2
+            7: 11,-1
+            8: 11,-2
+            9: 11,-3
+            27: 13,-3
+            28: 13,-2
+            29: 13,-1
+            30: -13,-3
+            31: -13,-2
+            32: -13,-1
+            41: 5,3
+            42: 8,3
+            43: 1,14
+            44: 5,14
+            283: 8,9
+            284: 8,7
+            285: 8,5
+            291: -11,-3
+            340: -3,4
         - node:
             color: '#9FED5896'
             id: WarnLineW
           decals:
-            316: -6,4
-            318: -7,4
+            293: -6,4
+            295: -7,4
         - node:
             color: '#A4610696'
             id: WarnLineW
           decals:
-            74: -12,-1
-            75: 12,-1
-            117: -4,12
-            118: -3,12
-            119: -2,12
-            120: -2,10
-            121: -3,10
-            122: -4,10
-            139: -7,9
-            140: -6,9
-            145: -4,15
-            146: -3,15
-            147: -2,15
-            148: -1,15
+            71: -12,-1
+            72: 12,-1
+            110: -4,12
+            111: -3,12
+            112: -2,12
+            113: -2,10
+            114: -3,10
+            115: -4,10
+            126: -7,9
+            127: -6,9
+            131: -3,15
+            132: -2,15
+            133: -1,15
+            339: -1,12
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
           decals:
-            11: 6,-7
-            12: 7,-7
-            13: 8,-7
-            14: -8,-7
-            15: -7,-7
-            16: -6,-7
-            48: 6,15
-            49: -4,2
-            50: 6,10
-            51: 3,9
-            53: 8,-9
-            54: 7,-9
-            55: 6,-9
-            56: -8,-9
-            57: -7,-9
-            58: -6,-9
-            71: -1,9
-            312: 7,4
+            10: 6,-7
+            11: 7,-7
+            12: 8,-7
+            13: -8,-7
+            14: -7,-7
+            15: -6,-7
+            46: 6,15
+            47: -4,2
+            48: 6,10
+            49: 3,9
+            51: 8,-9
+            52: 7,-9
+            53: 6,-9
+            54: -8,-9
+            55: -7,-9
+            56: -6,-9
+            68: -1,9
+            289: 7,4
+            326: -3,16
         - node:
             angle: -1.5707963267948966 rad
             color: '#A4610696'
             id: food
           decals:
-            352: -12,-1
-            353: -12,-3
+            324: -12,-1
+            325: -12,-3
         - node:
             color: '#A4610696'
             id: food
           decals:
-            346: 6,-8
-            347: 8,-8
-            350: -8,-8
-            351: -6,-8
+            318: 6,-8
+            319: 8,-8
+            322: -8,-8
+            323: -6,-8
         - node:
             angle: 1.5707963267948966 rad
             color: '#A4610696'
             id: food
           decals:
-            348: 12,-1
-            349: 12,-3
+            320: 12,-1
+            321: 12,-3
       type: DecalGrid
     - version: 2
       data:
@@ -633,26 +641,32 @@ entities:
           0,1:
             0: 65535
           0,2:
-            0: 65535
+            0: 13311
+            1: 52224
           0,3:
-            0: 65535
+            0: 65523
+            1: 12
           1,0:
             0: 65535
           1,1:
             0: 65535
           1,2:
-            0: 65535
+            0: 61183
+            1: 4352
           1,3:
-            0: 65535
+            1: 1
+            0: 65534
           2,0:
-            0: 30719
+            0: 30591
+            2: 128
           2,1:
             0: 30583
           2,2:
-            0: 30583
+            0: 14199
+            2: 16384
           2,3:
-            1: 17
-            0: 30566
+            0: 13107
+            2: 17476
           -2,0:
             0: 65535
           -2,1:
@@ -678,38 +692,45 @@ entities:
           2,-1:
             0: 65535
           -3,0:
-            0: 52463
+            0: 52431
+            2: 32
           -3,1:
             0: 52428
           -3,2:
-            0: 50380
-            1: 2048
-          -3,3:
             0: 52428
+          -3,3:
+            0: 36044
+            2: 16384
           -3,-2:
-            0: 60616
+            2: 8256
+            0: 52360
           -3,-1:
             0: 65535
           -2,-2:
             0: 65535
           -1,-2:
-            0: 65296
+            2: 16
+            0: 65280
           0,-2:
             0: 65280
           1,-2:
-            0: 65534
+            2: 16
+            0: 65518
           2,-2:
-            0: 63347
+            0: 30515
+            2: 32832
           -2,4:
-            0: 12
+            0: 4
+            2: 8
           -1,4:
             0: 15
           0,4:
-            0: 15
+            0: 1
+            2: 14
           1,4:
-            0: 15
+            2: 15
           2,4:
-            0: 7
+            2: 7
           3,0:
             0: 3
           -4,0:
@@ -743,10 +764,25 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
+          temperature: 235
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
           moles:
-          - 20.078888
-          - 75.53487
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -773,18 +809,13 @@ entities:
       type: Physics
 - proto: AirlockCargo
   entities:
-  - uid: 8
-    components:
-    - pos: -2.5,3.5
-      parent: 1
-      type: Transform
   - uid: 27
     components:
     - pos: 1.5,14.5
       parent: 1
       type: Transform
     - links:
-      - 691
+      - 805
       type: DeviceLinkSink
   - uid: 193
     components:
@@ -793,7 +824,7 @@ entities:
       parent: 1
       type: Transform
     - links:
-      - 675
+      - 173
       type: DeviceLinkSink
   - uid: 300
     components:
@@ -802,13 +833,19 @@ entities:
       parent: 1
       type: Transform
     - links:
-      - 675
+      - 859
       type: DeviceLinkSink
   - uid: 301
     components:
     - pos: -0.5,9.5
       parent: 1
       type: Transform
+  - uid: 843
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -2.5,4.5
+      parent: 1
+      type: Transform
 - proto: AirlockExternalGlass
   entities:
   - uid: 838
@@ -999,6 +1036,12 @@ entities:
     - pos: 7.5,-8.5
       parent: 1
       type: Transform
+  - uid: 819
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -2.5,16.5
+      parent: 1
+      type: Transform
   - uid: 923
     components:
     - pos: 8.5,-8.5
@@ -1138,15 +1181,15 @@ entities:
       type: Transform
 - proto: APCBasic
   entities:
-  - uid: 392
+  - uid: 123
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -2.5,6.5
+    - pos: 0.5,9.5
       parent: 1
       type: Transform
-  - uid: 405
+  - uid: 186
     components:
-    - pos: 1.5,9.5
+    - rot: 3.141592653589793 rad
+      pos: -2.5,9.5
       parent: 1
       type: Transform
   - uid: 406
@@ -1232,6 +1275,11 @@ entities:
     - pos: 3.5,9.5
       parent: 1
       type: Transform
+  - uid: 702
+    components:
+    - pos: -2.5,16.5
+      parent: 1
+      type: Transform
   - uid: 905
     components:
     - rot: 1.5707963267948966 rad
@@ -1244,30 +1292,190 @@ entities:
       pos: 6.5,-8.5
       parent: 1
       type: Transform
-- proto: BannerCargo
+- proto: AtmosFixBlockerMarker
   entities:
-  - uid: 14
+  - uid: 890
     components:
-    - pos: 4.5,-4.5
+    - pos: 1.5,16.5
       parent: 1
       type: Transform
-  - uid: 258
+  - uid: 891
     components:
-    - pos: -3.5,-4.5
+    - pos: 2.5,16.5
+      parent: 1
+      type: Transform
+  - uid: 892
+    components:
+    - pos: 3.5,16.5
+      parent: 1
+      type: Transform
+  - uid: 893
+    components:
+    - pos: 4.5,16.5
+      parent: 1
+      type: Transform
+  - uid: 1040
+    components:
+    - pos: 5.5,16.5
+      parent: 1
+      type: Transform
+  - uid: 1041
+    components:
+    - pos: 6.5,16.5
+      parent: 1
+      type: Transform
+  - uid: 1042
+    components:
+    - pos: 7.5,16.5
+      parent: 1
+      type: Transform
+  - uid: 1043
+    components:
+    - pos: 8.5,16.5
+      parent: 1
+      type: Transform
+  - uid: 1044
+    components:
+    - pos: 9.5,16.5
+      parent: 1
+      type: Transform
+  - uid: 1045
+    components:
+    - pos: 10.5,16.5
+      parent: 1
+      type: Transform
+  - uid: 1046
+    components:
+    - pos: 10.5,15.5
+      parent: 1
+      type: Transform
+  - uid: 1047
+    components:
+    - pos: 10.5,14.5
+      parent: 1
+      type: Transform
+  - uid: 1048
+    components:
+    - pos: 10.5,13.5
+      parent: 1
+      type: Transform
+  - uid: 1049
+    components:
+    - pos: 10.5,12.5
+      parent: 1
+      type: Transform
+  - uid: 1050
+    components:
+    - pos: 10.5,11.5
+      parent: 1
+      type: Transform
+  - uid: 1051
+    components:
+    - pos: -3.5,-6.5
+      parent: 1
+      type: Transform
+  - uid: 1052
+    components:
+    - pos: -10.5,-4.5
+      parent: 1
+      type: Transform
+  - uid: 1053
+    components:
+    - pos: -9.5,-6.5
+      parent: 1
+      type: Transform
+  - uid: 1054
+    components:
+    - pos: -10.5,1.5
       parent: 1
       type: Transform
-- proto: Bed
+  - uid: 1055
+    components:
+    - pos: 4.5,-6.5
+      parent: 1
+      type: Transform
+  - uid: 1056
+    components:
+    - pos: 10.5,-6.5
+      parent: 1
+      type: Transform
+  - uid: 1057
+    components:
+    - pos: 11.5,-4.5
+      parent: 1
+      type: Transform
+  - uid: 1058
+    components:
+    - pos: 11.5,1.5
+      parent: 1
+      type: Transform
+  - uid: 1059
+    components:
+    - pos: -4.5,16.5
+      parent: 1
+      type: Transform
+  - uid: 1060
+    components:
+    - pos: -9.5,15.5
+      parent: 1
+      type: Transform
+- proto: AtmosFixFreezerMarker
   entities:
-  - uid: 555
+  - uid: 404
     components:
-    - pos: -8.5,8.5
+    - pos: 3.5,12.5
+      parent: 1
+      type: Transform
+  - uid: 866
+    components:
+    - pos: 2.5,12.5
+      parent: 1
+      type: Transform
+  - uid: 874
+    components:
+    - pos: 4.5,12.5
+      parent: 1
+      type: Transform
+  - uid: 1014
+    components:
+    - pos: 4.5,11.5
+      parent: 1
+      type: Transform
+  - uid: 1016
+    components:
+    - pos: 3.5,11.5
+      parent: 1
+      type: Transform
+  - uid: 1023
+    components:
+    - pos: 2.5,11.5
       parent: 1
       type: Transform
-- proto: BedsheetQM
+  - uid: 1028
+    components:
+    - pos: 2.5,10.5
+      parent: 1
+      type: Transform
+  - uid: 1063
+    components:
+    - pos: 3.5,10.5
+      parent: 1
+      type: Transform
+  - uid: 1064
+    components:
+    - pos: 4.5,10.5
+      parent: 1
+      type: Transform
+- proto: BannerCargo
   entities:
-  - uid: 729
+  - uid: 14
     components:
-    - pos: -8.5,8.5
+    - pos: 4.5,-4.5
+      parent: 1
+      type: Transform
+  - uid: 258
+    components:
+    - pos: -3.5,-4.5
       parent: 1
       type: Transform
 - proto: BenchSofaLeft
@@ -1416,33 +1624,45 @@ entities:
     components:
     - flags: InContainer
       type: MetaData
-    - parent: 123
+    - parent: 405
       type: Transform
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
+- proto: BoxPaperOffice
+  entities:
+  - uid: 729
+    components:
+    - pos: -8.511633,9.621821
+      parent: 1
+      type: Transform
 - proto: BrbSign
   entities:
   - uid: 755
     components:
-    - pos: -6.0586023,7.0368977
+    - pos: -6.444375,7.512438
       parent: 1
       type: Transform
   - uid: 756
     components:
-    - pos: -6.2252693,6.8702307
+    - pos: -6.6110415,7.6791043
       parent: 1
       type: Transform
 - proto: Bucket
   entities:
-  - uid: 768
+  - uid: 17
     components:
-    - pos: -3.7585487,6.0110874
+    - pos: -3.4331908,7.0847335
       parent: 1
       type: Transform
-  - uid: 769
+  - uid: 1070
+    components:
+    - pos: -3.6727743,7.15765
+      parent: 1
+      type: Transform
+  - uid: 1073
     components:
-    - pos: -3.2481322,6.0215044
+    - pos: -3.2248573,7.1680665
       parent: 1
       type: Transform
 - proto: ButchCleaver
@@ -1479,6 +1699,21 @@ entities:
     - pos: -5.5,-3.5
       parent: 1
       type: Transform
+  - uid: 80
+    components:
+    - pos: -3.5,10.5
+      parent: 1
+      type: Transform
+  - uid: 86
+    components:
+    - pos: -2.5,9.5
+      parent: 1
+      type: Transform
+  - uid: 94
+    components:
+    - pos: -2.5,10.5
+      parent: 1
+      type: Transform
   - uid: 120
     components:
     - pos: -0.5,12.5
@@ -1579,16 +1814,6 @@ entities:
     - pos: 4.5,14.5
       parent: 1
       type: Transform
-  - uid: 449
-    components:
-    - pos: -2.5,6.5
-      parent: 1
-      type: Transform
-  - uid: 450
-    components:
-    - pos: -3.5,6.5
-      parent: 1
-      type: Transform
   - uid: 451
     components:
     - pos: -4.5,6.5
@@ -1631,7 +1856,7 @@ entities:
       type: Transform
   - uid: 467
     components:
-    - pos: 1.5,9.5
+    - pos: 0.5,9.5
       parent: 1
       type: Transform
   - uid: 468
@@ -1659,21 +1884,6 @@ entities:
     - pos: 3.5,8.5
       parent: 1
       type: Transform
-  - uid: 473
-    components:
-    - pos: 1.5,10.5
-      parent: 1
-      type: Transform
-  - uid: 474
-    components:
-    - pos: 1.5,11.5
-      parent: 1
-      type: Transform
-  - uid: 475
-    components:
-    - pos: 2.5,11.5
-      parent: 1
-      type: Transform
   - uid: 476
     components:
     - pos: 3.5,11.5
@@ -2094,6 +2304,16 @@ entities:
     - pos: 7.5,15.5
       parent: 1
       type: Transform
+  - uid: 1074
+    components:
+    - pos: 3.5,9.5
+      parent: 1
+      type: Transform
+  - uid: 1075
+    components:
+    - pos: 3.5,10.5
+      parent: 1
+      type: Transform
 - proto: CableHV
   entities:
   - uid: 196
@@ -2128,69 +2348,74 @@ entities:
       type: Transform
 - proto: CableMV
   entities:
+  - uid: 19
+    components:
+    - pos: -2.5,9.5
+      parent: 1
+      type: Transform
   - uid: 25
     components:
     - pos: 4.5,7.5
       parent: 1
       type: Transform
-  - uid: 159
+  - uid: 34
     components:
-    - pos: -4.5,9.5
+    - pos: -0.5,6.5
       parent: 1
       type: Transform
-  - uid: 169
+  - uid: 38
     components:
-    - pos: -4.5,10.5
+    - pos: -0.5,9.5
       parent: 1
       type: Transform
-  - uid: 264
+  - uid: 67
     components:
-    - pos: -8.5,11.5
+    - pos: -0.5,8.5
       parent: 1
       type: Transform
-  - uid: 267
+  - uid: 79
     components:
-    - pos: -8.5,10.5
+    - pos: -0.5,7.5
       parent: 1
       type: Transform
-  - uid: 393
+  - uid: 85
     components:
-    - pos: -4.5,6.5
+    - pos: -0.5,10.5
       parent: 1
       type: Transform
-  - uid: 394
+  - uid: 99
     components:
-    - pos: -7.5,10.5
+    - pos: -3.5,10.5
       parent: 1
       type: Transform
-  - uid: 395
+  - uid: 105
     components:
-    - pos: -4.5,7.5
+    - pos: 0.5,9.5
       parent: 1
       type: Transform
-  - uid: 396
+  - uid: 169
     components:
-    - pos: -3.5,6.5
+    - pos: -4.5,10.5
       parent: 1
       type: Transform
-  - uid: 397
+  - uid: 183
     components:
-    - pos: -2.5,6.5
+    - pos: -2.5,10.5
       parent: 1
       type: Transform
-  - uid: 398
+  - uid: 264
     components:
-    - pos: 1.5,9.5
+    - pos: -8.5,11.5
       parent: 1
       type: Transform
-  - uid: 399
+  - uid: 267
     components:
-    - pos: 1.5,8.5
+    - pos: -8.5,10.5
       parent: 1
       type: Transform
-  - uid: 400
+  - uid: 394
     components:
-    - pos: 1.5,7.5
+    - pos: -7.5,10.5
       parent: 1
       type: Transform
   - uid: 401
@@ -2203,16 +2428,6 @@ entities:
     - pos: 0.5,6.5
       parent: 1
       type: Transform
-  - uid: 403
-    components:
-    - pos: -0.5,6.5
-      parent: 1
-      type: Transform
-  - uid: 404
-    components:
-    - pos: -1.5,6.5
-      parent: 1
-      type: Transform
   - uid: 410
     components:
     - pos: 5.5,9.5
@@ -2278,9 +2493,9 @@ entities:
     - pos: 6.5,2.5
       parent: 1
       type: Transform
-  - uid: 1028
+  - uid: 807
     components:
-    - pos: -4.5,8.5
+    - pos: -1.5,10.5
       parent: 1
       type: Transform
   - uid: 1029
@@ -2329,6 +2544,12 @@ entities:
       pos: 7.5,16.5
       parent: 1
       type: Transform
+  - uid: 124
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 0.5,11.5
+      parent: 1
+      type: Transform
   - uid: 197
     components:
     - rot: 1.5707963267948966 rad
@@ -2341,6 +2562,12 @@ entities:
       pos: -5.5,11.5
       parent: 1
       type: Transform
+  - uid: 269
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -0.5,13.5
+      parent: 1
+      type: Transform
   - uid: 312
     components:
     - rot: 3.141592653589793 rad
@@ -2502,11 +2729,6 @@ entities:
     - pos: -5.5,5.5
       parent: 1
       type: Transform
-  - uid: 1016
-    components:
-    - pos: -3.5,6.5
-      parent: 1
-      type: Transform
   - uid: 1017
     components:
     - pos: -3.5,7.5
@@ -2537,11 +2759,6 @@ entities:
     - pos: -1.5,11.5
       parent: 1
       type: Transform
-  - uid: 1023
-    components:
-    - pos: 0.5,11.5
-      parent: 1
-      type: Transform
   - uid: 1024
     components:
     - pos: 0.5,10.5
@@ -2598,7 +2815,7 @@ entities:
   entities:
   - uid: 190
     components:
-    - pos: -5.9440193,7.422314
+    - pos: -5.978369,7.652311
       parent: 1
       type: Transform
 - proto: CigPackRed
@@ -2607,7 +2824,7 @@ entities:
     components:
     - flags: InContainer
       type: MetaData
-    - parent: 703
+    - parent: 1081
       type: Transform
     - canCollide: False
       type: Physics
@@ -2636,45 +2853,64 @@ entities:
         - 0
         - 0
       type: EntityStorage
-- proto: ClosetWallFireFilledRandom
-  entities:
-  - uid: 249
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -2.5,9.5
-      parent: 1
-      type: Transform
 - proto: ClothingBeltPlantFilled
   entities:
   - uid: 765
     components:
-    - pos: -5.817134,6.56853
+    - pos: -5.5230618,6.6331215
       parent: 1
       type: Transform
 - proto: ClothingBeltUtilityEngineering
   entities:
   - uid: 192
     components:
-    - pos: -5.533075,6.638674
+    - pos: -5.8251452,6.872705
       parent: 1
       type: Transform
-- proto: ComputerShuttle
+- proto: ClothingHeadHatMcCrown
   entities:
-  - uid: 873
+  - uid: 128
+    components:
+    - pos: 4.4425836,2.6006465
+      parent: 1
+      type: Transform
+  - uid: 705
+    components:
+    - pos: 4.61538,2.741904
+      parent: 1
+      type: Transform
+  - uid: 708
+    components:
+    - pos: 4.220203,2.741904
+      parent: 1
+      type: Transform
+  - uid: 1079
+    components:
+    - pos: 4.6165376,2.4320714
+      parent: 1
+      type: Transform
+  - uid: 1080
+    components:
+    - pos: 4.213417,2.4443965
+      parent: 1
+      type: Transform
+- proto: ComputerTabletopShuttle
+  entities:
+  - uid: 1061
     components:
     - pos: -6.5,10.5
       parent: 1
       type: Transform
-- proto: ComputerStationRecords
+- proto: ComputerTabletopStationRecords
   entities:
-  - uid: 872
+  - uid: 1062
     components:
     - pos: -5.5,10.5
       parent: 1
       type: Transform
-- proto: ComputerSurveillanceCameraMonitor
+- proto: ComputerTabletopSurveillanceCameraMonitor
   entities:
-  - uid: 874
+  - uid: 1082
     components:
     - pos: -7.5,10.5
       parent: 1
@@ -2706,16 +2942,16 @@ entities:
     - type: ItemSlots
 - proto: CrateFoodBarSupply
   entities:
-  - uid: 195
+  - uid: 106
     components:
-    - pos: 0.5805821,10.414998
+    - pos: 0.5,11.5
       parent: 1
       type: Transform
 - proto: CrateFoodCooking
   entities:
-  - uid: 748
+  - uid: 349
     components:
-    - pos: 0.5849985,11.125421
+    - pos: 2.5,10.5
       parent: 1
       type: Transform
 - proto: CrateFreezer
@@ -2725,13 +2961,6 @@ entities:
     - pos: 4.5,11.5
       parent: 1
       type: Transform
-- proto: CrateFunMysteryFigurines
-  entities:
-  - uid: 1014
-    components:
-    - pos: 0.58529973,11.835589
-      parent: 1
-      type: Transform
 - proto: CrateFunParty
   entities:
   - uid: 230
@@ -2739,13 +2968,6 @@ entities:
     - pos: 4.5,10.5
       parent: 1
       type: Transform
-- proto: CrateHydroponicsTools
-  entities:
-  - uid: 105
-    components:
-    - pos: -5.5,5.5
-      parent: 1
-      type: Transform
 - proto: CrateTrashCartJani
   entities:
   - uid: 671
@@ -2783,12 +3005,12 @@ entities:
   entities:
   - uid: 753
     components:
-    - pos: -6.4043546,7.0158014
+    - pos: -6.4547915,7.106188
       parent: 1
       type: Transform
   - uid: 754
     components:
-    - pos: -6.6647716,7.067885
+    - pos: -6.7047915,7.2103543
       parent: 1
       type: Transform
 - proto: DisposalBend
@@ -3061,9 +3283,9 @@ entities:
       type: Transform
 - proto: DogBed
   entities:
-  - uid: 804
+  - uid: 844
     components:
-    - pos: -8.5,9.5
+    - pos: -3.5,5.5
       parent: 1
       type: Transform
 - proto: DrinkGlass
@@ -3108,44 +3330,130 @@ entities:
     - pos: 1.7190523,4.7299657
       parent: 1
       type: Transform
-  - uid: 106
+  - uid: 131
     components:
-    - pos: -7.36764,1.8236554
+    - pos: 1.291969,4.584132
       parent: 1
       type: Transform
-  - uid: 131
+  - uid: 231
     components:
-    - pos: 1.291969,4.584132
+    - pos: -7.91405,1.8492602
       parent: 1
       type: Transform
-  - uid: 269
+  - uid: 304
     components:
-    - pos: -7.6488905,1.8132387
+    - pos: -7.6328,1.8492602
       parent: 1
       type: Transform
-  - uid: 759
+  - uid: 403
     components:
-    - pos: -7.9197235,1.8028221
+    - pos: -7.361967,1.8492602
       parent: 1
       type: Transform
-- proto: DrinkSodaWaterCan
-  entities:
-  - uid: 705
+  - uid: 1083
     components:
     - flags: InContainer
+      desc: A sweet, carbonated soft drink. Caffeine free.
+      name: cola glass
       type: MetaData
-    - parent: 703
+    - parent: 1081
       type: Transform
+    - solutions:
+        drink:
+          temperature: 293.15
+          canMix: False
+          canReact: True
+          maxVol: 30
+          reagents:
+          - data: null
+            ReagentId: Cola
+            Quantity: 30
+      type: SolutionContainerManager
+    - transformed: True
+      currentReagent:
+        metamorphicSprite: null
+        footstepSound: !type:SoundCollectionSpecifier
+          params:
+            variation: null
+            playoffset: 0
+            loop: False
+            referenceDistance: 1
+            rolloffFactor: 1
+            maxdistance: 25
+            busname: Master
+            pitchscale: 1
+            volume: 0
+            attenuation: Default
+          collection: FootstepWater
+        flavor: soda
+        flavorMinimum: 0.1
+        slippery: True
+        viscosity: 0
+        metabolisms:
+          Drink:
+            effects:
+            - !type:SatiateThirst
+              shouldLog: False
+              logImpact: Low
+              factor: 2
+              probability: 1
+              conditions: null
+            metabolismRate: 0.5
+        reactiveEffects:
+          Extinguish:
+            effects:
+            - !type:ExtinguishReaction
+              shouldLog: False
+              logImpact: Low
+              probability: 1
+              conditions: null
+            methods:
+            - Touch
+        tileReactions:
+        - !type:ExtinguishTileReaction
+          coolingTemperature: 2
+        - !type:SpillIfPuddlePresentTileReaction {}
+        plantMetabolism:
+        - !type:PlantAdjustNutrition
+          shouldLog: False
+          logImpact: Low
+          prob: 1
+          amount: 0.1
+          probability: 1
+          conditions: null
+        - !type:PlantAdjustWater
+          shouldLog: False
+          logImpact: Low
+          prob: 1
+          amount: 0.1
+          probability: 1
+          conditions: null
+        - !type:PlantAdjustHealth
+          shouldLog: False
+          logImpact: Low
+          prob: 1
+          amount: -0.1
+          probability: 1
+          conditions: null
+        pricePerUnit: 0
+        id: Cola
+        meltingPoint: null
+        name: reagent-name-cola
+        group: Drinks
+        parent:
+        - BaseSoda
+        abstract: False
+        desc: reagent-desc-cola
+        physicalDesc: reagent-physical-desc-fizzy
+        color: '#422912FF'
+        specificHeat: 1
+        boilingPoint: null
+        recognizable: True
+      type: TransformableContainer
     - canCollide: False
       type: Physics
 - proto: EmergencyLight
   entities:
-  - uid: 67
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,4.5
-      parent: 1
-      type: Transform
   - uid: 208
     components:
     - rot: 1.5707963267948966 rad
@@ -3173,6 +3481,12 @@ entities:
     - pos: 5.5,1.5
       parent: 1
       type: Transform
+  - uid: 396
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -3.5,5.5
+      parent: 1
+      type: Transform
   - uid: 425
     components:
     - rot: -1.5707963267948966 rad
@@ -3219,9 +3533,15 @@ entities:
     - pos: 8.5,2.5
       parent: 1
       type: Transform
-  - uid: 194
+  - uid: 392
     components:
-    - pos: 0.5,9.5
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,11.5
+      parent: 1
+      type: Transform
+  - uid: 473
+    components:
+    - pos: 1.5,9.5
       parent: 1
       type: Transform
   - uid: 714
@@ -3238,9 +3558,9 @@ entities:
       type: Transform
 - proto: FaxMachineShip
   entities:
-  - uid: 232
+  - uid: 873
     components:
-    - pos: -6.5,7.5
+    - pos: -8.5,10.5
       parent: 1
       type: Transform
 - proto: FireAlarm
@@ -3254,7 +3574,6 @@ entities:
       - 39
       - 41
       - 70
-      - 79
       - 646
       - 647
       - 644
@@ -3314,6 +3633,12 @@ entities:
       type: DeviceList
 - proto: Firelock
   entities:
+  - uid: 8
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -2.5,4.5
+      parent: 1
+      type: Transform
   - uid: 39
     components:
     - pos: 3.5,9.5
@@ -3330,12 +3655,6 @@ entities:
       pos: 5.5,3.5
       parent: 1
       type: Transform
-  - uid: 79
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,3.5
-      parent: 1
-      type: Transform
   - uid: 171
     components:
     - rot: 1.5707963267948966 rad
@@ -3476,7 +3795,7 @@ entities:
     components:
     - flags: InContainer
       type: MetaData
-    - parent: 703
+    - parent: 1081
       type: Transform
     - canCollide: False
       type: Physics
@@ -3507,7 +3826,7 @@ entities:
     components:
     - flags: InContainer
       type: MetaData
-    - parent: 703
+    - parent: 1081
       type: Transform
     - canCollide: False
       type: Physics
@@ -3565,6 +3884,16 @@ entities:
     - pos: -0.10305256,2.6391692
       parent: 1
       type: Transform
+- proto: FoodMealFries
+  entities:
+  - uid: 902
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 1081
+      type: Transform
+    - canCollide: False
+      type: Physics
 - proto: FoodPlatePlastic
   entities:
   - uid: 89
@@ -3577,16 +3906,6 @@ entities:
     - pos: 9.511152,1.7718108
       parent: 1
       type: Transform
-  - uid: 124
-    components:
-    - pos: 9.507014,1.948894
-      parent: 1
-      type: Transform
-  - uid: 125
-    components:
-    - pos: -5.5395737,1.917644
-      parent: 1
-      type: Transform
   - uid: 763
     components:
     - pos: -5.529157,1.605144
@@ -4339,21 +4658,11 @@ entities:
     - pos: 7.5,15.5
       parent: 1
       type: Transform
-  - uid: 642
-    components:
-    - pos: -4.5,16.5
-      parent: 1
-      type: Transform
   - uid: 643
     components:
     - pos: -3.5,16.5
       parent: 1
       type: Transform
-  - uid: 696
-    components:
-    - pos: -2.5,16.5
-      parent: 1
-      type: Transform
   - uid: 697
     components:
     - pos: -1.5,16.5
@@ -4423,11 +4732,14 @@ entities:
       type: Transform
 - proto: GunSafeShuttleCaptain
   entities:
-  - uid: 123
+  - uid: 405
     components:
-    - pos: -8.5,10.5
+    - anchored: True
+      pos: -8.5,8.5
       parent: 1
       type: Transform
+    - bodyType: Static
+      type: Physics
     - air:
         volume: 200
         immutable: False
@@ -4469,76 +4781,67 @@ entities:
   entities:
   - uid: 147
     components:
-    - pos: 0.61389744,5.578879
+    - pos: 0.63235265,5.615782
       parent: 1
       type: Transform
+    - assignedLabel: McMeal
+      type: HandLabeler
+    - type: ItemCooldown
   - uid: 710
     components:
-    - pos: -5.5434914,7.0192184
+    - pos: -5.5050435,7.2214174
       parent: 1
       type: Transform
-- proto: HappyHonk
+- proto: HappyHonkCargo
   entities:
-  - uid: 128
-    components:
-    - pos: 0.70903397,4.7924657
-      parent: 1
-      type: Transform
   - uid: 129
     components:
-    - pos: 0.36528397,4.938299
+    - pos: 0.362599,4.8363476
       parent: 1
       type: Transform
   - uid: 130
     components:
-    - pos: 0.70903397,4.9487157
+    - pos: 0.38343233,4.9509306
       parent: 1
       type: Transform
   - uid: 136
     components:
-    - pos: 0.35486734,4.8028827
+    - pos: 0.6959323,4.9509306
       parent: 1
       type: Transform
   - uid: 137
     components:
-    - pos: 0.33403397,4.657049
+    - pos: 0.7271823,4.815514
       parent: 1
       type: Transform
   - uid: 176
     components:
-    - pos: 0.69861734,4.657049
+    - pos: 0.33134896,4.7321806
       parent: 1
       type: Transform
   - uid: 703
     components:
-    - name: happy honk meal (McCargo Meal)
-      type: MetaData
-    - pos: -1.4680494,4.705127
+    - pos: 0.74801564,4.721764
+      parent: 1
+      type: Transform
+  - uid: 1081
+    components:
+    - pos: -1.4760247,3.7039404
       parent: 1
       type: Transform
-    - storageUsed: 21
+    - storageUsed: 25
       type: Storage
     - containers:
         storagebase: !type:Container
           showEnts: False
           occludes: True
           ents:
-          - 704
-          - 705
-          - 706
           - 707
-          - 708
+          - 706
+          - 704
+          - 1083
+          - 902
       type: ContainerContainer
-    - originalName: happy honk meal
-      currentLabel: McCargo Meal
-      type: Label
-- proto: HospitalCurtainsOpen
-  entities:
-  - uid: 902
-    components:
-    - pos: -8.5,8.5
-      parent: 1
-      type: Transform
 - proto: hydroponicsTrayAnchored
   entities:
   - uid: 62
@@ -4619,17 +4922,9 @@ entities:
       type: Transform
 - proto: Lighter
   entities:
-  - uid: 708
-    components:
-    - flags: InContainer
-      type: MetaData
-    - parent: 703
-      type: Transform
-    - canCollide: False
-      type: Physics
   - uid: 828
     components:
-    - pos: -5.829664,7.266064
+    - pos: -6.071316,7.3206215
       parent: 1
       type: Transform
 - proto: MaterialReclaimer
@@ -4639,6 +4934,23 @@ entities:
     - pos: 8.5,14.5
       parent: 1
       type: Transform
+- proto: McCargoMothershipComputer
+  entities:
+  - uid: 806
+    components:
+    - pos: -3.5,15.5
+      parent: 1
+      type: Transform
+    - containers:
+        ShipyardConsole-targetId: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+      type: ContainerContainer
 - proto: Mirror
   entities:
   - uid: 865
@@ -4665,11 +4977,19 @@ entities:
       pos: 5.5,8.5
       parent: 1
       type: Transform
-- proto: OilJarGhee
+- proto: NoticeBoardNF
   entities:
-  - uid: 45
+  - uid: 872
     components:
-    - pos: 4.7203918,4.6294155
+    - rot: 1.5707963267948966 rad
+      pos: -9.5,9.5
+      parent: 1
+      type: Transform
+- proto: OilJarGhee
+  entities:
+  - uid: 45
+    components:
+    - pos: 4.7203918,4.6294155
       parent: 1
       type: Transform
   - uid: 160
@@ -4687,13 +5007,6 @@ entities:
     - pos: 4.3558083,4.650249
       parent: 1
       type: Transform
-- proto: PaperBin10
-  entities:
-  - uid: 341
-    components:
-    - pos: -5.5,7.5
-      parent: 1
-      type: Transform
 - proto: PartRodMetal
   entities:
   - uid: 861
@@ -4705,14 +5018,14 @@ entities:
   entities:
   - uid: 204
     components:
-    - pos: -5.9083214,7.6910467
+    - pos: -8.387869,10.03673
       parent: 1
       type: Transform
     - stampedName: Unknown
       type: Stamp
   - uid: 205
     components:
-    - pos: -5.91171,7.5681477
+    - pos: -8.625716,10.012696
       parent: 1
       type: Transform
     - stampedName: Unknown
@@ -4721,7 +5034,18 @@ entities:
   entities:
   - uid: 9
     components:
-    - pos: 4.5,12.5
+    - anchored: True
+      pos: 4.5,12.5
+      parent: 1
+      type: Transform
+    - canCollide: True
+      bodyType: Static
+      type: Physics
+- proto: PosterContrabandEAT
+  entities:
+  - uid: 1076
+    components:
+    - pos: -2.5,7.5
       parent: 1
       type: Transform
 - proto: PosterContrabandSpaceUp
@@ -4741,10 +5065,10 @@ entities:
       type: Transform
 - proto: Poweredlight
   entities:
-  - uid: 60
+  - uid: 33
     components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,9.5
+    - rot: 1.5707963267948966 rad
+      pos: -8.5,3.5
       parent: 1
       type: Transform
   - uid: 110
@@ -4753,27 +5077,15 @@ entities:
       pos: -1.5,10.5
       parent: 1
       type: Transform
-  - uid: 173
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -8.5,10.5
-      parent: 1
-      type: Transform
-  - uid: 200
-    components:
-    - pos: 7.5,9.5
-      parent: 1
-      type: Transform
   - uid: 207
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,14.5
+    - rot: 1.5707963267948966 rad
+      pos: 6.5,12.5
       parent: 1
       type: Transform
   - uid: 227
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 6.5,2.5
+    - pos: 9.5,1.5
       parent: 1
       type: Transform
   - uid: 262
@@ -4790,20 +5102,14 @@ entities:
       type: Transform
   - uid: 287
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 6.5,12.5
-      parent: 1
-      type: Transform
-  - uid: 304
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,13.5
+    - rot: 3.141592653589793 rad
+      pos: 3.5,14.5
       parent: 1
       type: Transform
-  - uid: 333
+  - uid: 397
     components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,7.5
+    - rot: 1.5707963267948966 rad
+      pos: -8.5,8.5
       parent: 1
       type: Transform
   - uid: 428
@@ -4817,21 +5123,15 @@ entities:
     - pos: 3.5,12.5
       parent: 1
       type: Transform
-  - uid: 445
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 9.5,5.5
-      parent: 1
-      type: Transform
   - uid: 448
     components:
     - pos: -8.5,1.5
       parent: 1
       type: Transform
-  - uid: 688
+  - uid: 691
     components:
     - rot: -1.5707963267948966 rad
-      pos: -3.5,6.5
+      pos: -3.5,8.5
       parent: 1
       type: Transform
   - uid: 720
@@ -4858,6 +5158,12 @@ entities:
       pos: 9.5,3.5
       parent: 1
       type: Transform
+  - uid: 804
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 0.5,11.5
+      parent: 1
+      type: Transform
   - uid: 833
     components:
     - rot: 3.141592653589793 rad
@@ -4888,23 +5194,41 @@ entities:
       pos: 12.5,-2.5
       parent: 1
       type: Transform
-- proto: Rack
+- proto: PoweredlightColoredBlack
   entities:
-  - uid: 64
+  - uid: 60
     components:
-    - pos: 0.5,4.5
+    - rot: 3.141592653589793 rad
+      pos: 9.5,9.5
       parent: 1
       type: Transform
-  - uid: 80
+  - uid: 200
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,4.5
+    - pos: 7.5,9.5
       parent: 1
       type: Transform
-  - uid: 86
+  - uid: 333
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,7.5
+    - rot: 3.141592653589793 rad
+      pos: 9.5,7.5
+      parent: 1
+      type: Transform
+  - uid: 445
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 9.5,5.5
+      parent: 1
+      type: Transform
+- proto: Rack
+  entities:
+  - uid: 23
+    components:
+    - pos: -5.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 64
+    components:
+    - pos: 0.5,4.5
       parent: 1
       type: Transform
   - uid: 87
@@ -4937,6 +5261,12 @@ entities:
     - pos: 2.5,4.5
       parent: 1
       type: Transform
+  - uid: 145
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -1.5,3.5
+      parent: 1
+      type: Transform
   - uid: 152
     components:
     - pos: -1.5,11.5
@@ -4957,6 +5287,12 @@ entities:
     - pos: -5.5,12.5
       parent: 1
       type: Transform
+  - uid: 395
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -0.5,13.5
+      parent: 1
+      type: Transform
   - uid: 884
     components:
     - pos: -1.5,13.5
@@ -4978,10 +5314,10 @@ entities:
       type: Transform
 - proto: RailingCorner
   entities:
-  - uid: 730
+  - uid: 125
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,10.5
+    - rot: 3.141592653589793 rad
+      pos: 0.5,10.5
       parent: 1
       type: Transform
 - proto: RandomArcade
@@ -5093,21 +5429,11 @@ entities:
       pos: -2.5,-5.5
       parent: 1
       type: Transform
-  - uid: 700
-    components:
-    - pos: -4.5,16.5
-      parent: 1
-      type: Transform
   - uid: 701
     components:
     - pos: -3.5,16.5
       parent: 1
       type: Transform
-  - uid: 702
-    components:
-    - pos: -2.5,16.5
-      parent: 1
-      type: Transform
   - uid: 745
     components:
     - pos: -1.5,16.5
@@ -5214,6 +5540,22 @@ entities:
     - links:
       - 751
       type: DeviceLinkSink
+  - uid: 151
+    components:
+    - pos: -3.5,2.5
+      parent: 1
+      type: Transform
+    - links:
+      - 173
+      type: DeviceLinkSink
+  - uid: 170
+    components:
+    - pos: 0.5,16.5
+      parent: 1
+      type: Transform
+    - links:
+      - 455
+      type: DeviceLinkSink
   - uid: 336
     components:
     - pos: 10.5,7.5
@@ -5264,6 +5606,38 @@ entities:
     - links:
       - 885
       type: DeviceLinkSink
+  - uid: 475
+    components:
+    - pos: 1.5,14.5
+      parent: 1
+      type: Transform
+    - links:
+      - 805
+      type: DeviceLinkSink
+  - uid: 560
+    components:
+    - pos: -2.5,16.5
+      parent: 1
+      type: Transform
+    - links:
+      - 455
+      type: DeviceLinkSink
+  - uid: 640
+    components:
+    - pos: -1.5,16.5
+      parent: 1
+      type: Transform
+    - links:
+      - 455
+      type: DeviceLinkSink
+  - uid: 642
+    components:
+    - pos: -0.5,16.5
+      parent: 1
+      type: Transform
+    - links:
+      - 455
+      type: DeviceLinkSink
   - uid: 669
     components:
     - pos: 9.5,12.5
@@ -5286,7 +5660,7 @@ entities:
       parent: 1
       type: Transform
     - links:
-      - 675
+      - 859
       type: DeviceLinkSink
   - uid: 677
     components:
@@ -5294,7 +5668,7 @@ entities:
       parent: 1
       type: Transform
     - links:
-      - 675
+      - 859
       type: DeviceLinkSink
   - uid: 678
     components:
@@ -5302,7 +5676,7 @@ entities:
       parent: 1
       type: Transform
     - links:
-      - 675
+      - 859
       type: DeviceLinkSink
   - uid: 679
     components:
@@ -5310,7 +5684,7 @@ entities:
       parent: 1
       type: Transform
     - links:
-      - 675
+      - 859
       type: DeviceLinkSink
   - uid: 680
     components:
@@ -5318,7 +5692,7 @@ entities:
       parent: 1
       type: Transform
     - links:
-      - 675
+      - 859
       type: DeviceLinkSink
   - uid: 681
     components:
@@ -5326,7 +5700,7 @@ entities:
       parent: 1
       type: Transform
     - links:
-      - 675
+      - 859
       type: DeviceLinkSink
   - uid: 682
     components:
@@ -5334,15 +5708,7 @@ entities:
       parent: 1
       type: Transform
     - links:
-      - 675
-      type: DeviceLinkSink
-  - uid: 683
-    components:
-    - pos: -3.5,2.5
-      parent: 1
-      type: Transform
-    - links:
-      - 675
+      - 859
       type: DeviceLinkSink
   - uid: 684
     components:
@@ -5350,7 +5716,7 @@ entities:
       parent: 1
       type: Transform
     - links:
-      - 675
+      - 859
       type: DeviceLinkSink
   - uid: 689
     components:
@@ -5360,6 +5726,14 @@ entities:
     - links:
       - 885
       type: DeviceLinkSink
+  - uid: 696
+    components:
+    - pos: -3.5,16.5
+      parent: 1
+      type: Transform
+    - links:
+      - 455
+      type: DeviceLinkSink
   - uid: 758
     components:
     - pos: 8.5,15.5
@@ -5432,54 +5806,6 @@ entities:
     - links:
       - 885
       type: DeviceLinkSink
-  - uid: 839
-    components:
-    - pos: -4.5,16.5
-      parent: 1
-      type: Transform
-    - links:
-      - 116
-      type: DeviceLinkSink
-  - uid: 840
-    components:
-    - pos: -3.5,16.5
-      parent: 1
-      type: Transform
-    - links:
-      - 116
-      type: DeviceLinkSink
-  - uid: 841
-    components:
-    - pos: -2.5,16.5
-      parent: 1
-      type: Transform
-    - links:
-      - 116
-      type: DeviceLinkSink
-  - uid: 842
-    components:
-    - pos: -1.5,16.5
-      parent: 1
-      type: Transform
-    - links:
-      - 116
-      type: DeviceLinkSink
-  - uid: 843
-    components:
-    - pos: -0.5,16.5
-      parent: 1
-      type: Transform
-    - links:
-      - 116
-      type: DeviceLinkSink
-  - uid: 844
-    components:
-    - pos: 0.5,16.5
-      parent: 1
-      type: Transform
-    - links:
-      - 116
-      type: DeviceLinkSink
   - uid: 854
     components:
     - pos: 9.5,11.5
@@ -5560,33 +5886,26 @@ entities:
       type: DeviceLinkSink
 - proto: SignalButton
   entities:
-  - uid: 116
+  - uid: 150
     components:
-    - pos: -5.5,15.5
+    - pos: 9.5,6.5
       parent: 1
       type: Transform
     - linkedPorts:
-        839:
-        - Pressed: Toggle
-        840:
-        - Pressed: Toggle
-        841:
-        - Pressed: Toggle
-        842:
-        - Pressed: Toggle
-        843:
-        - Pressed: Toggle
-        844:
+        337:
         - Pressed: Toggle
       type: DeviceLinkSource
-  - uid: 150
+  - uid: 173
     components:
-    - pos: 9.5,6.5
+    - rot: -1.5707963267948966 rad
+      pos: -2.5,3.5
       parent: 1
       type: Transform
     - linkedPorts:
-        337:
+        151:
         - Pressed: Toggle
+        193:
+        - Pressed: DoorBolt
       type: DeviceLinkSource
   - uid: 331
     components:
@@ -5597,45 +5916,22 @@ entities:
         336:
         - Pressed: Toggle
       type: DeviceLinkSource
-  - uid: 675
+  - uid: 455
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -2.5,4.5
+    - pos: -4.5,15.5
       parent: 1
       type: Transform
     - linkedPorts:
-        683:
-        - Pressed: Toggle
-        676:
-        - Pressed: Toggle
-        677:
-        - Pressed: Toggle
-        678:
+        696:
         - Pressed: Toggle
-        679:
-        - Pressed: Toggle
-        680:
+        560:
         - Pressed: Toggle
-        681:
+        640:
         - Pressed: Toggle
-        682:
+        642:
         - Pressed: Toggle
-        684:
+        170:
         - Pressed: Toggle
-        193:
-        - Pressed: DoorBolt
-        300:
-        - Pressed: DoorBolt
-      type: DeviceLinkSource
-  - uid: 691
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.4849963,15.219261
-      parent: 1
-      type: Transform
-    - linkedPorts:
-        27:
-        - Pressed: DoorBolt
       type: DeviceLinkSource
   - uid: 749
     components:
@@ -5695,6 +5991,44 @@ entities:
         777:
         - Pressed: Toggle
       type: DeviceLinkSource
+  - uid: 805
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,13.5
+      parent: 1
+      type: Transform
+    - linkedPorts:
+        27:
+        - Pressed: DoorBolt
+        475:
+        - Pressed: Toggle
+      type: DeviceLinkSource
+  - uid: 859
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -2.5,3.5
+      parent: 1
+      type: Transform
+    - linkedPorts:
+        676:
+        - Pressed: Toggle
+        677:
+        - Pressed: Toggle
+        684:
+        - Pressed: Toggle
+        678:
+        - Pressed: Toggle
+        679:
+        - Pressed: Toggle
+        680:
+        - Pressed: Toggle
+        681:
+        - Pressed: Toggle
+        682:
+        - Pressed: Toggle
+        300:
+        - Pressed: DoorBolt
+      type: DeviceLinkSource
   - uid: 885
     components:
     - rot: 1.5707963267948966 rad
@@ -5791,6 +6125,13 @@ entities:
         958:
         - Pressed: Toggle
       type: DeviceLinkSource
+- proto: SignCargo
+  entities:
+  - uid: 474
+    components:
+    - pos: 1.5,10.5
+      parent: 1
+      type: Transform
 - proto: SignDirectionalFood
   entities:
   - uid: 738
@@ -5819,10 +6160,10 @@ entities:
       type: Transform
 - proto: SignDirectionalHydro
   entities:
-  - uid: 740
+  - uid: 159
     components:
     - rot: -1.5707963267948966 rad
-      pos: -2.4910388,4.210334
+      pos: -2.5,5.5
       parent: 1
       type: Transform
 - proto: SignDirectionalJanitor
@@ -5892,23 +6233,23 @@ entities:
       type: Transform
 - proto: soda_dispenser
   entities:
-  - uid: 231
+  - uid: 232
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,6.5
+    - pos: -8.5,1.5
       parent: 1
       type: Transform
-  - uid: 608
+  - uid: 449
     components:
-    - pos: -8.5,1.5
+    - rot: 1.5707963267948966 rad
+      pos: -1.5,5.5
       parent: 1
       type: Transform
 - proto: SpawnMobCow
   entities:
-  - uid: 859
+  - uid: 140
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,10.5
+    - rot: -1.5707963267948966 rad
+      pos: 0.5,10.5
       parent: 1
       type: Transform
 - proto: SpawnPointBorg
@@ -5932,16 +6273,16 @@ entities:
       type: Transform
 - proto: SpawnPointCargoTechnician
   entities:
-  - uid: 17
+  - uid: 793
     components:
-    - pos: 0.5,8.5
+    - pos: -5.5,8.5
       parent: 1
       type: Transform
 - proto: SpawnPointChef
   entities:
-  - uid: 23
+  - uid: 1071
     components:
-    - pos: 2.5,8.5
+    - pos: 2.5,6.5
       parent: 1
       type: Transform
 - proto: SpawnPointJanitor
@@ -5953,16 +6294,16 @@ entities:
       type: Transform
 - proto: SpawnPointLatejoin
   entities:
-  - uid: 177
+  - uid: 81
     components:
-    - pos: 1.5,8.5
+    - pos: 0.5,6.5
       parent: 1
       type: Transform
 - proto: SpawnPointQuartermaster
   entities:
-  - uid: 800
+  - uid: 177
     components:
-    - pos: -6.5,9.5
+    - pos: -6.5,8.5
       parent: 1
       type: Transform
 - proto: StoolBar
@@ -6028,27 +6369,27 @@ entities:
       nameSet: True
       id: Storage 2
       type: SurveillanceCamera
-  - uid: 636
+  - uid: 393
     components:
-    - rot: 3.141592653589793 rad
-      pos: 8.5,14.5
+    - rot: 1.5707963267948966 rad
+      pos: -3.5,5.5
       parent: 1
       type: Transform
     - setupAvailableNetworks:
       - SurveillanceCameraSupply
       nameSet: True
-      id: Janitor
+      id: Storage 1
       type: SurveillanceCamera
-  - uid: 723
+  - uid: 636
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -3.5,4.5
+    - rot: 3.141592653589793 rad
+      pos: 8.5,14.5
       parent: 1
       type: Transform
     - setupAvailableNetworks:
       - SurveillanceCameraSupply
       nameSet: True
-      id: Storage 1
+      id: Janitor
       type: SurveillanceCamera
   - uid: 724
     components:
@@ -6106,52 +6447,24 @@ entities:
     - pos: -0.5,2.5
       parent: 1
       type: Transform
-  - uid: 4
-    components:
-    - pos: 0.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 5
-    components:
-    - pos: 1.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 6
-    components:
-    - pos: 2.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 7
-    components:
-    - pos: 3.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 19
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,7.5
-      parent: 1
-      type: Transform
-  - uid: 32
+  - uid: 4
     components:
-    - pos: 1.5,7.5
+    - pos: 0.5,2.5
       parent: 1
       type: Transform
-  - uid: 33
+  - uid: 5
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 0.5,5.5
+    - pos: 1.5,2.5
       parent: 1
       type: Transform
-  - uid: 38
+  - uid: 6
     components:
-    - pos: 1.5,5.5
+    - pos: 2.5,2.5
       parent: 1
       type: Transform
-  - uid: 44
+  - uid: 7
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,7.5
+    - pos: 3.5,2.5
       parent: 1
       type: Transform
   - uid: 100
@@ -6160,19 +6473,8 @@ entities:
       pos: 4.5,2.5
       parent: 1
       type: Transform
-  - uid: 145
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 2.5,5.5
-      parent: 1
-      type: Transform
 - proto: TableReinforced
   entities:
-  - uid: 94
-    components:
-    - pos: -5.5,7.5
-      parent: 1
-      type: Transform
   - uid: 121
     components:
     - pos: -5.5,6.5
@@ -6190,23 +6492,6 @@ entities:
       pos: 4.5,6.5
       parent: 1
       type: Transform
-  - uid: 140
-    components:
-    - pos: -2.5,5.5
-      parent: 1
-      type: Transform
-  - uid: 183
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,7.5
-      parent: 1
-      type: Transform
-  - uid: 186
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -1.5,6.5
-      parent: 1
-      type: Transform
   - uid: 187
     components:
     - pos: -6.5,1.5
@@ -6222,6 +6507,11 @@ entities:
     - pos: -8.5,1.5
       parent: 1
       type: Transform
+  - uid: 194
+    components:
+    - pos: -8.5,9.5
+      parent: 1
+      type: Transform
   - uid: 233
     components:
     - pos: 9.5,1.5
@@ -6232,15 +6522,31 @@ entities:
     - pos: -5.5,1.5
       parent: 1
       type: Transform
+  - uid: 249
+    components:
+    - pos: -6.5,10.5
+      parent: 1
+      type: Transform
+  - uid: 277
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -2.5,6.5
+      parent: 1
+      type: Transform
   - uid: 307
     components:
     - rot: 1.5707963267948966 rad
       pos: 6.5,6.5
       parent: 1
       type: Transform
+  - uid: 341
+    components:
+    - pos: -5.5,10.5
+      parent: 1
+      type: Transform
   - uid: 343
     components:
-    - pos: -6.5,7.5
+    - pos: -7.5,10.5
       parent: 1
       type: Transform
   - uid: 389
@@ -6248,11 +6554,62 @@ entities:
     - pos: 6.5,5.5
       parent: 1
       type: Transform
+  - uid: 399
+    components:
+    - pos: -8.5,10.5
+      parent: 1
+      type: Transform
+  - uid: 400
+    components:
+    - pos: -5.5,7.5
+      parent: 1
+      type: Transform
+  - uid: 450
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,7.5
+      parent: 1
+      type: Transform
+  - uid: 555
+    components:
+    - pos: -6.5,7.5
+      parent: 1
+      type: Transform
+  - uid: 576
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,7.5
+      parent: 1
+      type: Transform
+  - uid: 581
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 608
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 1
+      type: Transform
   - uid: 649
     components:
     - pos: -6.5,6.5
       parent: 1
       type: Transform
+  - uid: 675
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 0.5,7.5
+      parent: 1
+      type: Transform
+  - uid: 683
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,5.5
+      parent: 1
+      type: Transform
   - uid: 692
     components:
     - rot: 3.141592653589793 rad
@@ -6265,6 +6622,12 @@ entities:
       pos: 6.5,8.5
       parent: 1
       type: Transform
+  - uid: 723
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -1.5,5.5
+      parent: 1
+      type: Transform
 - proto: TableWood
   entities:
   - uid: 11
@@ -6424,6 +6787,20 @@ entities:
       pos: 9.5,9.5
       parent: 1
       type: Transform
+- proto: ToyFigurineCargoTech
+  entities:
+  - uid: 1077
+    components:
+    - pos: -5.64046,7.7318344
+      parent: 1
+      type: Transform
+- proto: ToyFigurineQuartermaster
+  entities:
+  - uid: 1078
+    components:
+    - pos: -5.35921,7.836001
+      parent: 1
+      type: Transform
 - proto: ToySpawner
   entities:
   - uid: 764
@@ -6454,23 +6831,23 @@ entities:
       type: Transform
 - proto: VendingMachineChefvend
   entities:
-  - uid: 81
+  - uid: 740
     components:
-    - pos: 4.5,8.5
+    - pos: 4.5,7.5
       parent: 1
       type: Transform
 - proto: VendingMachineCigs
   entities:
-  - uid: 455
+  - uid: 700
     components:
-    - pos: -4.5,15.5
+    - pos: -1.5,15.5
       parent: 1
       type: Transform
 - proto: VendingMachineColaBlack
   entities:
-  - uid: 851
+  - uid: 826
     components:
-    - pos: -1.5,15.5
+    - pos: -0.5,15.5
       parent: 1
       type: Transform
 - proto: VendingMachineCondiments
@@ -6480,25 +6857,11 @@ entities:
     - pos: -1.5,2.5
       parent: 1
       type: Transform
-- proto: VendingMachineCuddlyCritterVend
-  entities:
-  - uid: 852
-    components:
-    - pos: -0.5,15.5
-      parent: 1
-      type: Transform
 - proto: VendingMachineDinnerware
   entities:
-  - uid: 146
-    components:
-    - pos: 4.5,7.5
-      parent: 1
-      type: Transform
-- proto: VendingMachineDonut
-  entities:
-  - uid: 819
+  - uid: 398
     components:
-    - pos: -2.5,15.5
+    - pos: 4.5,8.5
       parent: 1
       type: Transform
 - proto: VendingMachineHappyHonk
@@ -6529,15 +6892,18 @@ entities:
     - pos: -8.5,3.5
       parent: 1
       type: Transform
-- proto: VendingMachinePride
+- proto: VendingMachineRestockBooze
   entities:
-  - uid: 866
+  - uid: 840
     components:
-    - pos: 0.5,13.5
+    - pos: -2.598885,13.865319
+      parent: 1
+      type: Transform
+  - uid: 841
+    components:
+    - pos: -2.3384683,13.781985
       parent: 1
       type: Transform
-- proto: VendingMachineRestockBooze
-  entities:
   - uid: 894
     components:
     - pos: -2.606868,13.727668
@@ -6550,86 +6916,90 @@ entities:
       type: Transform
 - proto: VendingMachineRestockChefvend
   entities:
-  - uid: 349
+  - uid: 748
     components:
-    - pos: -3.3606324,7.799815
+    - pos: -0.56509566,13.911346
       parent: 1
       type: Transform
-  - uid: 581
+  - uid: 1065
     components:
-    - pos: -3.589799,7.9143987
+    - pos: -0.5755123,13.734262
       parent: 1
       type: Transform
-- proto: VendingMachineRestockCondimentStation
-  entities:
-  - uid: 892
+  - uid: 1066
     components:
-    - pos: -2.5964513,13.863084
+    - pos: -0.3255123,13.828012
       parent: 1
       type: Transform
-  - uid: 893
+  - uid: 1067
     components:
-    - pos: -2.325618,13.769334
+    - pos: -0.30467892,13.671762
       parent: 1
       type: Transform
-- proto: VendingMachineRestockCostumes
+- proto: VendingMachineRestockClothes
   entities:
   - uid: 91
     components:
-    - pos: -3.6016417,8.945648
+    - pos: -3.6114817,8.886418
       parent: 1
       type: Transform
-  - uid: 793
+  - uid: 146
     components:
-    - pos: -3.3099751,8.851898
+    - pos: -3.3718984,8.803084
       parent: 1
       type: Transform
-- proto: VendingMachineRestockCuddlyCritterVend
-  entities:
-  - uid: 806
+  - uid: 800
     components:
-    - pos: -2.3244715,11.857673
+    - pos: -3.4031484,8.678085
       parent: 1
       type: Transform
-  - uid: 826
+  - uid: 1072
     components:
-    - pos: -2.5848882,11.96184
+    - pos: -3.6531487,8.730168
       parent: 1
       type: Transform
-- proto: VendingMachineRestockDinnerware
+- proto: VendingMachineRestockCondimentStation
   entities:
-  - uid: 306
+  - uid: 839
     components:
-    - pos: -3.631466,7.695648
+    - pos: -3.5885057,13.942069
       parent: 1
       type: Transform
-  - uid: 576
+  - uid: 842
     components:
-    - pos: -3.3397992,7.633148
+    - pos: -3.3593388,13.660819
       parent: 1
       type: Transform
-- proto: VendingMachineRestockDonut
-  entities:
-  - uid: 170
+  - uid: 851
     components:
-    - pos: -3.5964513,13.915168
+    - pos: -3.3801723,13.848319
       parent: 1
       type: Transform
-  - uid: 889
+  - uid: 852
     components:
-    - pos: -3.325618,13.811001
+    - pos: -3.5989223,13.744152
       parent: 1
       type: Transform
-- proto: VendingMachineRestockGetmoreChocolateCorp
+- proto: VendingMachineRestockDinnerware
   entities:
-  - uid: 890
+  - uid: 730
     components:
-    - pos: -3.6277013,13.717251
+    - pos: -2.3180861,11.673373
       parent: 1
       type: Transform
-  - uid: 891
+  - uid: 759
+    components:
+    - pos: -2.5680861,11.912956
+      parent: 1
+      type: Transform
+  - uid: 768
+    components:
+    - pos: -2.391003,11.819206
+      parent: 1
+      type: Transform
+  - uid: 769
     components:
-    - pos: -3.325618,13.633918
+    - pos: -2.5680861,11.71504
       parent: 1
       type: Transform
 - proto: VendingMachineRestockHappyHonk
@@ -6658,19 +7028,12 @@ entities:
   entities:
   - uid: 563
     components:
-    - pos: -3.3308084,8.643565
-      parent: 1
-      type: Transform
-- proto: VendingMachineRestockPride
-  entities:
-  - uid: 805
-    components:
-    - pos: -2.6369717,11.753507
+    - pos: -5.3109856,5.773668
       parent: 1
       type: Transform
-  - uid: 807
+  - uid: 1069
     components:
-    - pos: -2.3244715,11.670173
+    - pos: -5.290152,5.6590843
       parent: 1
       type: Transform
 - proto: VendingMachineRestockRobustSoftdrinks
@@ -6699,7 +7062,12 @@ entities:
   entities:
   - uid: 562
     components:
-    - pos: -3.6433086,8.758148
+    - pos: -5.6443186,5.8882513
+      parent: 1
+      type: Transform
+  - uid: 1068
+    components:
+    - pos: -5.6859856,5.711168
       parent: 1
       type: Transform
 - proto: VendingMachineRestockSmokes
@@ -6731,13 +7099,6 @@ entities:
     - pos: -8.5,4.5
       parent: 1
       type: Transform
-- proto: VendingMachineSnackGreen
-  entities:
-  - uid: 560
-    components:
-    - pos: -3.5,15.5
-      parent: 1
-      type: Transform
 - proto: WallmountTelevisionFrame
   entities:
   - uid: 737
@@ -7020,6 +7381,11 @@ entities:
       pos: -10.5,0.5
       parent: 1
       type: Transform
+  - uid: 889
+    components:
+    - pos: -4.5,15.5
+      parent: 1
+      type: Transform
   - uid: 903
     components:
     - pos: 9.5,-8.5
@@ -7062,11 +7428,6 @@ entities:
     - pos: -4.5,2.5
       parent: 1
       type: Transform
-  - uid: 34
-    components:
-    - pos: -2.5,6.5
-      parent: 1
-      type: Transform
   - uid: 37
     components:
     - pos: -2.5,9.5
@@ -7140,10 +7501,10 @@ entities:
     - pos: -8.5,2.5
       parent: 1
       type: Transform
-  - uid: 151
+  - uid: 195
     components:
     - rot: -1.5707963267948966 rad
-      pos: -2.5,4.5
+      pos: -2.5,3.5
       parent: 1
       type: Transform
   - uid: 224
@@ -7263,6 +7624,12 @@ entities:
     - pos: 4.5,9.5
       parent: 1
       type: Transform
+  - uid: 688
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -2.5,5.5
+      parent: 1
+      type: Transform
   - uid: 694
     components:
     - rot: 3.141592653589793 rad
@@ -7301,6 +7668,11 @@ entities:
     - pos: 9.5,-5.5
       parent: 1
       type: Transform
+  - uid: 116
+    components:
+    - pos: -4.5,16.5
+      parent: 1
+      type: Transform
   - uid: 256
     components:
     - rot: 3.141592653589793 rad
@@ -7393,11 +7765,6 @@ entities:
     - pos: -9.5,15.5
       parent: 1
       type: Transform
-  - uid: 640
-    components:
-    - pos: -5.5,16.5
-      parent: 1
-      type: Transform
   - uid: 736
     components:
     - rot: 3.141592653589793 rad
@@ -7413,23 +7780,23 @@ entities:
       type: Transform
 - proto: WaterTankHighCapacity
   entities:
-  - uid: 277
+  - uid: 306
     components:
-    - pos: -3.5,6.5
+    - pos: -3.5,7.5
       parent: 1
       type: Transform
 - proto: WindoorSecure
   entities:
-  - uid: 85
+  - uid: 32
     components:
     - rot: -1.5707963267948966 rad
-      pos: -2.5,5.5
+      pos: -2.5,6.5
       parent: 1
       type: Transform
-  - uid: 99
+  - uid: 44
     components:
     - rot: 1.5707963267948966 rad
-      pos: -2.5,5.5
+      pos: -2.5,6.5
       parent: 1
       type: Transform
   - uid: 141
diff --git a/Resources/Maps/_NF/Shuttles/mcdelivery.yml b/Resources/Maps/_NF/Shuttles/mcdelivery.yml
new file mode 100644
index 00000000000..385ae8232c9
--- /dev/null
+++ b/Resources/Maps/_NF/Shuttles/mcdelivery.yml
@@ -0,0 +1,963 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  97: FloorTechMaint
+  113: Lattice
+  114: Plating
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - name: grid
+      type: MetaData
+    - pos: -0.5104167,-0.46875
+      parent: invalid
+      type: Transform
+    - chunks:
+        0,0:
+          ind: 0,0
+          tiles: YQAAAAAAYQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAA
+          version: 6
+      type: MapGrid
+    - type: Broadphase
+    - bodyStatus: InAir
+      angularDamping: 0.05
+      linearDamping: 0.05
+      fixedRotation: False
+      bodyType: Dynamic
+      type: Physics
+    - fixtures: {}
+      type: Fixtures
+    - type: OccluderTree
+    - type: SpreaderGrid
+    - type: Shuttle
+    - type: GridPathfinding
+    - gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+      type: Gravity
+    - chunkCollection:
+        version: 2
+        nodes:
+        - node:
+            color: '#FFFFFFFF'
+            id: Delivery
+          decals:
+            11: 1,2
+        - node:
+            color: '#3C44AAFF'
+            id: DeliveryGreyscale
+          decals:
+            10: 1,1
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: LoadingArea
+          decals:
+            0: 0,0
+        - node:
+            color: '#A4610696'
+            id: WarnCornerNE
+          decals:
+            8: 2,4
+        - node:
+            color: '#A4610696'
+            id: WarnCornerNW
+          decals:
+            4: 0,4
+        - node:
+            color: '#A4610696'
+            id: WarnCornerSmallNE
+          decals:
+            6: 1,4
+        - node:
+            color: '#A4610696'
+            id: WarnCornerSmallNW
+          decals:
+            7: 1,4
+            9: 0,2
+        - node:
+            color: '#A4610696'
+            id: WarnEndN
+          decals:
+            5: 1,5
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            2: 0,-1
+        - node:
+            color: '#A4610696'
+            id: WarnLineS
+          decals:
+            3: 0,3
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineW
+          decals:
+            1: 0,-1
+      type: DecalGrid
+    - version: 2
+      data:
+        tiles:
+          0,0:
+            0: 30583
+            1: 34952
+          0,-1:
+            0: 28672
+            1: 32768
+          -1,0:
+            0: 34952
+          -1,-1:
+            0: 32768
+          0,1:
+            0: 2047
+            1: 2048
+          -1,1:
+            0: 136
+            1: 2048
+        uniqueMixes:
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+        chunkSize: 4
+      type: GridAtmosphere
+    - type: GasTileOverlay
+    - type: RadiationGridResistance
+- proto: AirCanister
+  entities:
+  - uid: 32
+    components:
+    - anchored: True
+      pos: 1.5,1.5
+      parent: 1
+      type: Transform
+    - bodyType: Static
+      type: Physics
+- proto: AirlockGlassShuttle
+  entities:
+  - uid: 8
+    components:
+    - pos: 0.5,-0.5
+      parent: 1
+      type: Transform
+- proto: APCBasic
+  entities:
+  - uid: 49
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
+      parent: 1
+      type: Transform
+- proto: AtmosDeviceFanTiny
+  entities:
+  - uid: 7
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 0.5,-0.5
+      parent: 1
+      type: Transform
+- proto: AtmosFixBlockerMarker
+  entities:
+  - uid: 2
+    components:
+    - pos: 3.5,-0.5
+      parent: 1
+      type: Transform
+  - uid: 41
+    components:
+    - pos: 3.5,3.5
+      parent: 1
+      type: Transform
+  - uid: 102
+    components:
+    - pos: 3.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 103
+    components:
+    - pos: 3.5,1.5
+      parent: 1
+      type: Transform
+  - uid: 104
+    components:
+    - pos: 3.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 105
+    components:
+    - pos: 3.5,6.5
+      parent: 1
+      type: Transform
+  - uid: 106
+    components:
+    - pos: -0.5,6.5
+      parent: 1
+      type: Transform
+- proto: BoxPaperOffice
+  entities:
+  - uid: 39
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 71
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: CableApcExtension
+  entities:
+  - uid: 20
+    components:
+    - pos: -0.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 22
+    components:
+    - pos: 2.5,3.5
+      parent: 1
+      type: Transform
+  - uid: 33
+    components:
+    - pos: 0.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 43
+    components:
+    - pos: -0.5,3.5
+      parent: 1
+      type: Transform
+  - uid: 48
+    components:
+    - pos: 2.5,1.5
+      parent: 1
+      type: Transform
+  - uid: 51
+    components:
+    - pos: -0.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 53
+    components:
+    - pos: -0.5,1.5
+      parent: 1
+      type: Transform
+  - uid: 54
+    components:
+    - pos: -0.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 79
+    components:
+    - pos: -0.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 80
+    components:
+    - pos: 0.5,6.5
+      parent: 1
+      type: Transform
+  - uid: 81
+    components:
+    - pos: 1.5,6.5
+      parent: 1
+      type: Transform
+  - uid: 82
+    components:
+    - pos: 2.5,6.5
+      parent: 1
+      type: Transform
+  - uid: 83
+    components:
+    - pos: 2.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 84
+    components:
+    - pos: 3.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 85
+    components:
+    - pos: 3.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 86
+    components:
+    - pos: 3.5,3.5
+      parent: 1
+      type: Transform
+  - uid: 88
+    components:
+    - pos: 2.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 94
+    components:
+    - pos: 2.5,2.5
+      parent: 1
+      type: Transform
+- proto: CableHV
+  entities:
+  - uid: 21
+    components:
+    - pos: 2.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 95
+    components:
+    - pos: 1.5,2.5
+      parent: 1
+      type: Transform
+- proto: CableMV
+  entities:
+  - uid: 4
+    components:
+    - pos: 0.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 19
+    components:
+    - pos: -0.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 98
+    components:
+    - pos: 2.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 99
+    components:
+    - pos: 1.5,2.5
+      parent: 1
+      type: Transform
+- proto: ChairPilotSeat
+  entities:
+  - uid: 56
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 1.5,4.5
+      parent: 1
+      type: Transform
+- proto: ClosetWall
+  entities:
+  - uid: 23
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,0.5
+      parent: 1
+      type: Transform
+    - air:
+        volume: 200
+        immutable: False
+        temperature: 293.1496
+        moles:
+        - 1.8856695
+        - 7.0937095
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+      type: EntityStorage
+    - containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 91
+          - 89
+          - 67
+      type: ContainerContainer
+  - uid: 71
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,3.5
+      parent: 1
+      type: Transform
+    - air:
+        volume: 200
+        immutable: False
+        temperature: 293.1496
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+      type: EntityStorage
+    - containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 39
+      type: ContainerContainer
+- proto: ComputerTabletopShuttle
+  entities:
+  - uid: 13
+    components:
+    - pos: 1.5,5.5
+      parent: 1
+      type: Transform
+- proto: ComputerTabletopStationRecords
+  entities:
+  - uid: 36
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,4.5
+      parent: 1
+      type: Transform
+- proto: ComputerWallmountWithdrawBankATM
+  entities:
+  - uid: 63
+    components:
+    - pos: -0.5,-0.5
+      parent: 1
+      type: Transform
+    - containers:
+        board: !type:Container
+          ents: []
+        bank-ATM-cashSlot: !type:ContainerSlot {}
+      type: ContainerContainer
+    - type: ItemSlots
+- proto: CrowbarRed
+  entities:
+  - uid: 89
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 23
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 34
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,1.5
+      parent: 1
+      type: Transform
+- proto: EmergencyLight
+  entities:
+  - uid: 50
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,2.5
+      parent: 1
+      type: Transform
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 108
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+      type: Transform
+- proto: FaxMachineShip
+  entities:
+  - uid: 55
+    components:
+    - pos: 0.5,4.5
+      parent: 1
+      type: Transform
+- proto: FirelockGlass
+  entities:
+  - uid: 9
+    components:
+    - pos: 0.5,-0.5
+      parent: 1
+      type: Transform
+- proto: GasPassiveVent
+  entities:
+  - uid: 37
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 3.5,2.5
+      parent: 1
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+- proto: GasPipeStraight
+  entities:
+  - uid: 27
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,2.5
+      parent: 1
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+- proto: GasPort
+  entities:
+  - uid: 65
+    components:
+    - pos: 1.5,1.5
+      parent: 1
+      type: Transform
+    - color: '#0055CCFF'
+      type: AtmosPipeColor
+- proto: GasVentPump
+  entities:
+  - uid: 45
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 1.5,0.5
+      parent: 1
+      type: Transform
+    - color: '#0055CCFF'
+      type: AtmosPipeColor
+- proto: GasVentScrubber
+  entities:
+  - uid: 3
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 1.5,2.5
+      parent: 1
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 90
+    components:
+    - pos: 3.5,2.5
+      parent: 1
+      type: Transform
+- proto: Grille
+  entities:
+  - uid: 6
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 17
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 28
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 30
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+      type: Transform
+  - uid: 31
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 1.5,6.5
+      parent: 1
+      type: Transform
+  - uid: 57
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 0.5,6.5
+      parent: 1
+      type: Transform
+  - uid: 61
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 3.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 64
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 70
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,6.5
+      parent: 1
+      type: Transform
+  - uid: 76
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
+      parent: 1
+      type: Transform
+- proto: Gyroscope
+  entities:
+  - uid: 38
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 1
+      type: Transform
+- proto: NoticeBoardNF
+  entities:
+  - uid: 96
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,3.5
+      parent: 1
+      type: Transform
+- proto: PlasticFlapsAirtightClear
+  entities:
+  - uid: 52
+    components:
+    - pos: 1.5,-0.5
+      parent: 1
+      type: Transform
+- proto: PortableGeneratorPacman
+  entities:
+  - uid: 44
+    components:
+    - anchored: True
+      pos: 1.5,2.5
+      parent: 1
+      type: Transform
+    - storage:
+        Plasma: 3000
+      type: MaterialStorage
+    - bodyType: Static
+      type: Physics
+    - type: InsertingMaterialStorage
+- proto: PosterContrabandEAT
+  entities:
+  - uid: 93
+    components:
+    - pos: 2.5,-0.5
+      parent: 1
+      type: Transform
+- proto: Poweredlight
+  entities:
+  - uid: 18
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 1
+      type: Transform
+- proto: ReinforcedWindow
+  entities:
+  - uid: 5
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 25
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 0.5,6.5
+      parent: 1
+      type: Transform
+  - uid: 35
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,6.5
+      parent: 1
+      type: Transform
+  - uid: 40
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 42
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 1.5,6.5
+      parent: 1
+      type: Transform
+  - uid: 58
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 69
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 74
+    components:
+    - pos: 3.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 77
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,5.5
+      parent: 1
+      type: Transform
+  - uid: 100
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 1
+      type: Transform
+- proto: SheetPlasma1
+  entities:
+  - uid: 91
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 23
+      type: Transform
+    - count: 15
+      type: Stack
+    - size: 15
+      type: Item
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+- proto: ShuttersNormalOpen
+  entities:
+  - uid: 60
+    components:
+    - pos: 0.5,-0.5
+      parent: 1
+      type: Transform
+    - links:
+      - 24
+      type: DeviceLinkSink
+- proto: SignalButton
+  entities:
+  - uid: 24
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+      type: Transform
+    - linkedPorts:
+        60:
+        - Pressed: Toggle
+      type: DeviceLinkSource
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 72
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 0.5,3.5
+      parent: 1
+      type: Transform
+- proto: SubstationWallBasic
+  entities:
+  - uid: 97
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 2.5,2.5
+      parent: 1
+      type: Transform
+- proto: Table
+  entities:
+  - uid: 46
+    components:
+    - pos: 1.5,-0.5
+      parent: 1
+      type: Transform
+- proto: TableReinforced
+  entities:
+  - uid: 16
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 0.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 78
+    components:
+    - pos: 2.5,4.5
+      parent: 1
+      type: Transform
+  - uid: 101
+    components:
+    - pos: 1.5,5.5
+      parent: 1
+      type: Transform
+- proto: Thruster
+  entities:
+  - uid: 29
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 3.5,-0.5
+      parent: 1
+      type: Transform
+  - uid: 62
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 3.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 68
+    components:
+    - pos: 3.5,6.5
+      parent: 1
+      type: Transform
+  - uid: 75
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,6.5
+      parent: 1
+      type: Transform
+- proto: WallReinforced
+  entities:
+  - uid: 10
+    components:
+    - pos: 2.5,-0.5
+      parent: 1
+      type: Transform
+  - uid: 12
+    components:
+    - pos: -0.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 14
+    components:
+    - pos: -0.5,1.5
+      parent: 1
+      type: Transform
+  - uid: 15
+    components:
+    - pos: -0.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 47
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 2.5,0.5
+      parent: 1
+      type: Transform
+  - uid: 59
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 2.5,2.5
+      parent: 1
+      type: Transform
+  - uid: 66
+    components:
+    - pos: 2.5,3.5
+      parent: 1
+      type: Transform
+  - uid: 87
+    components:
+    - pos: -0.5,-0.5
+      parent: 1
+      type: Transform
+  - uid: 107
+    components:
+    - pos: -0.5,3.5
+      parent: 1
+      type: Transform
+- proto: WallSolidDiagonal
+  entities:
+  - uid: 73
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 3.5,3.5
+      parent: 1
+      type: Transform
+- proto: WarpPointShip
+  entities:
+  - uid: 26
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,3.5
+      parent: 1
+      type: Transform
+- proto: WindoorSecure
+  entities:
+  - uid: 11
+    components:
+    - pos: 1.5,-0.5
+      parent: 1
+      type: Transform
+    - links:
+      - 92
+      type: DeviceLinkSink
+    - linkedPorts:
+        92:
+        - DoorStatus: Close
+      type: DeviceLinkSource
+  - uid: 92
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 1.5,-0.5
+      parent: 1
+      type: Transform
+    - links:
+      - 11
+      type: DeviceLinkSink
+    - linkedPorts:
+        11:
+        - DoorStatus: Close
+      type: DeviceLinkSource
+- proto: Wrench
+  entities:
+  - uid: 67
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 23
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+...
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
index df1432611ba..98c986fef13 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
@@ -3,7 +3,9 @@
   startingInventory:
     HappyHonk: 10
     HappyHonkMime: 4
-    MysteryFigureBoxBulk: 5
+    HappyHonkCargo: 10 # Frontier
+    ClothingHeadHatMcCrown: 10 # Frontier
+    MysteryFigureBoxBulk: 5 # Frontier
   emaggedInventory:
     HappyHonkCluwne: 1
     HappyHonkNukie: 1
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
index 99fc5758056..606ba5a530e 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
@@ -109,6 +109,20 @@
     tags:
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatMcCrown
+  name: mccargo crown
+  description: 'Crowns and tiaras, McCargo King.'
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hoods/mccargocrown.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hoods/mccargocrown.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatPilot
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
new file mode 100644
index 00000000000..10538c960c5
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -0,0 +1,19 @@
+- type: entity
+  id: HappyHonkCargo
+  parent: HappyHonk
+  name: mccargo meal
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Happyhonk/cargo.rsi
+    state: box
+  - type: Item
+    sprite: _NF/Objects/Storage/Happyhonk/cargo.rsi
+    heldPrefix: box
+  - type: StorageFill
+    contents:
+      - id: MysteryFigureBox
+        orGroup: GiftPool
+      - id: ClothingHeadHatMcCrown
+        orGroup: GiftPool
+  - type: StaticPrice
+    price: 40
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml
index 356b4a065c6..71dd1a4b2e7 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml
@@ -20,6 +20,16 @@
     - Fighter
     - Cleric
     - Rogue
+
+# The mccargo console
+- type: entity
+  id: McCargoMothershipComputer
+  name: McCargo delivery ship console
+  parent: BaseMothershipComputer
+  components:
+  - type: ShipyardListing
+    shuttles:
+    - McDelivery
  
 # The caduceus console
 - type: entity
diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml
index 05a92d396d3..87d35fe561b 100644
--- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml
+++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml
@@ -6,21 +6,21 @@
 # 
 
 - type: vessel
-  id: mccargo
+  id: McCargo
   name: DC McCargo
   description: "Your very own McCargo :tm: franchisee! comes fully stocked and ready for production of McCargo meals"
-  price: 72000 # 10% up from sell
+  price: 68900 # 10% up from sell
   category: Medium
   group: Civilian
   shuttlePath: /Maps/_NF/Shuttles/mccargo.yml
 
 - type: gameMap
-  id: mccargo
+  id: McCargo
   mapName: 'DC McCargo'
   mapPath: /Maps/_NF/Shuttles/mccargo.yml
   minPlayers: 0
   stations:
-    mccargo:
+    McCargo:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
diff --git a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml
new file mode 100644
index 00000000000..d60bb242643
--- /dev/null
+++ b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml
@@ -0,0 +1,33 @@
+# Maintainer Info
+# GitHub: dvir001
+# Discord: dvir01 (84770870936997888)
+
+# Shuttle Notes:
+# 
+
+- type: vessel
+  id: McDelivery
+  name: DC McDelivery
+  description: "Fast food fast ship, bring the McCargo meals to the people"
+  price: 11300
+  category: Small
+  group: None
+  shuttlePath: /Maps/_NF/Shuttles/mcdelivery.yml
+
+- type: gameMap
+  id: McDelivery
+  mapName: 'DC McDelivery'
+  mapPath: /Maps/_NF/Shuttles/mcdelivery.yml
+  minPlayers: 0
+  stations:
+    McDelivery:
+      stationProto: StandardFrontierVessel
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'McDelivery {1}'
+          nameGenerator:
+            !type:NanotrasenNameGenerator
+            prefixCreator: '14'
+        - type: StationJobs
+          overflowJobs: []
+          availableJobs: {}
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..b1081f212cf
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/icon.png
new file mode 100644
index 00000000000..16460121610
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/inhand-left.png
new file mode 100644
index 00000000000..6ef862d3bd6
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/inhand-right.png
new file mode 100644
index 00000000000..91089ea1e32
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/meta.json
new file mode 100644
index 00000000000..3111bdb74b2
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by gentlebutter",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-inhand-left.png
new file mode 100644
index 00000000000..b32610fd295
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-inhand-right.png b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-inhand-right.png
new file mode 100644
index 00000000000..ee900a3a1e7
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-open.png b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-open.png
new file mode 100644
index 00000000000..7e6163cc56f
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-open.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box.png b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box.png
new file mode 100644
index 00000000000..cea221cb920
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/meta.json
new file mode 100644
index 00000000000..cfe7e8a6c9d
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by gentlebutter",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "box"
+    },
+    {
+      "name": "box-open"
+    },
+    {
+      "name": "box-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "box-inhand-right",
+      "directions": 4
+    }
+  ]
+}