diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml
index a0baff75601..a3bcb2743a3 100644
--- a/Resources/Maps/_NF/Shuttles/mccargo.yml
+++ b/Resources/Maps/_NF/Shuttles/mccargo.yml
@@ -70,55 +70,55 @@ entities:
             color: '#FFFFFFFF'
             id: Box
           decals:
-            333: -9,14
-            334: -9,13
-            335: -9,12
-            336: -8,12
-            337: -8,13
-            338: -8,14
-            339: -7,14
-            340: -7,13
-            341: -7,12
+            326: -9,14
+            327: -9,13
+            328: -9,12
+            329: -8,12
+            330: -8,13
+            331: -8,14
+            332: -7,14
+            333: -7,13
+            334: -7,12
         - node:
             color: '#A4610696'
             id: CheckerNWSE
           decals:
-            287: 6,9
-            288: 7,9
-            289: 9,9
-            290: 6,8
-            291: 7,8
-            292: 6,7
-            293: 7,7
-            294: 9,7
-            295: 6,6
-            296: 7,6
-            297: 6,5
-            298: 7,5
-            299: 9,5
-            300: 8,5
-            301: 7,4
-            302: 8,7
-            303: 8,9
+            280: 6,9
+            281: 7,9
+            282: 9,9
+            283: 6,8
+            284: 7,8
+            285: 6,7
+            286: 7,7
+            287: 9,7
+            288: 6,6
+            289: 7,6
+            290: 6,5
+            291: 7,5
+            292: 9,5
+            293: 8,5
+            294: 7,4
+            295: 8,7
+            296: 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
-            284: 7,14
-            285: 6,11
-            286: -1,10
-            328: -5,3
-            329: -7,3
+            201: -4,3
+            202: -6,3
+            204: -8,3
+            208: -8,8
+            212: -6,8
+            215: -5,10
+            218: -5,12
+            221: -2,12
+            222: 0,12
+            277: 7,14
+            278: 6,11
+            279: -1,10
+            321: -5,3
+            322: -7,3
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -126,16 +126,16 @@ entities:
           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
-            280: 6,12
-            325: -5,4
-            327: -8,5
+            211: -7,8
+            217: -3,10
+            220: -3,12
+            225: 0,14
+            228: -3,14
+            232: 0,15
+            233: 0,13
+            273: 6,12
+            318: -5,4
+            320: -8,5
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -143,16 +143,16 @@ entities:
           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
-            330: -6,3
-            331: -5,4
+            203: -4,4
+            205: -4,5
+            206: -8,6
+            209: -8,9
+            224: 0,13
+            227: -2,14
+            229: -4,14
+            230: -1,15
+            323: -6,3
+            324: -5,4
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -160,187 +160,187 @@ entities:
           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
-            238: -2,15
-            281: 6,14
-            282: 6,13
-            283: 7,11
-            326: -8,4
-            332: -5,5
+            207: -8,7
+            210: -7,9
+            213: -6,9
+            214: -5,9
+            216: -4,10
+            219: -4,12
+            223: -1,13
+            226: -1,14
+            231: -2,15
+            274: 6,14
+            275: 6,13
+            276: 7,11
+            319: -8,4
+            325: -5,5
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteCornerNe
           decals:
-            252: 4,8
-            264: 4,12
+            245: 4,8
+            257: 4,12
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteCornerNw
           decals:
-            253: -2,8
-            265: 2,12
+            246: -2,8
+            258: 2,12
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteCornerSe
           decals:
-            255: 4,3
-            266: 4,10
+            248: 4,3
+            259: 4,10
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteCornerSw
           decals:
-            254: -2,3
-            267: 2,10
+            247: -2,3
+            260: 2,10
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteInnerNe
           decals:
-            193: 4,-4
-            194: 0,-3
-            195: -4,-3
-            196: -8,-4
+            189: 4,-4
+            190: 0,-3
+            191: -4,-3
+            192: -8,-4
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteInnerNw
           decals:
-            197: -4,-4
-            198: 0,-3
-            199: 4,-3
-            200: 8,-4
+            193: -4,-4
+            194: 0,-3
+            195: 4,-3
+            196: 8,-4
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteInnerSe
           decals:
-            201: 4,-1
-            202: 0,0
-            203: -4,0
-            204: -8,-1
+            197: 4,-1
+            198: 0,0
+            199: -4,0
+            200: -8,-1
         - node:
             color: '#A46106FF'
             id: MiniTileWhiteInnerSw
           decals:
-            189: -4,-1
-            190: 0,0
-            191: 4,0
-            192: 8,-1
+            185: -4,-1
+            186: 0,0
+            187: 4,0
+            188: 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
+            157: 4,-3
+            158: 4,-2
+            159: 0,-1
+            160: 0,-2
+            161: -4,-1
+            162: -4,-2
+            163: -8,-2
+            164: -8,-3
+            249: 4,4
+            250: 4,5
+            251: 4,6
+            252: 4,7
+            264: 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
+            145: -5,-4
+            146: -6,-4
+            147: -7,-4
+            148: -3,-3
+            149: -2,-3
+            150: -1,-3
+            151: 1,-3
+            152: 2,-3
+            153: 3,-3
+            154: 5,-4
+            155: 6,-4
+            156: 7,-4
+            235: -1,8
+            236: 0,8
+            237: 1,8
+            238: 2,8
+            239: 3,8
+            263: 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
+            165: -7,-1
+            166: -6,-1
+            167: -5,-1
+            168: -3,0
+            169: -2,0
+            170: -1,0
+            171: 1,0
+            172: 2,0
+            173: 3,0
+            174: 5,-1
+            175: 6,-1
+            176: 7,-1
+            240: -1,3
+            241: 0,3
+            242: 1,3
+            243: 2,3
+            244: 3,3
+            262: 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
+            177: 8,-2
+            178: 8,-3
+            179: 4,-1
+            180: 4,-2
+            181: 0,-1
+            182: 0,-2
+            183: -4,-2
+            184: -4,-3
+            253: -2,4
+            254: -2,5
+            255: -2,6
+            256: -2,7
+            261: 2,11
         - node:
             color: '#D381C996'
             id: WarnCornerGreyscaleNE
           decals:
-            275: 7,14
+            268: 7,14
         - node:
             color: '#D381C996'
             id: WarnCornerGreyscaleNW
           decals:
-            274: 6,14
+            267: 6,14
         - node:
             color: '#D381C996'
             id: WarnCornerGreyscaleSE
           decals:
-            272: 7,11
+            265: 7,11
         - node:
             color: '#D381C996'
             id: WarnCornerGreyscaleSW
           decals:
-            273: 6,11
+            266: 6,11
         - node:
             color: '#A4610696'
             id: WarnCornerNE
           decals:
-            116: -4,5
-            144: 0,15
+            115: -4,5
+            141: 0,15
         - node:
             color: '#A4610696'
             id: WarnCornerNW
           decals:
-            109: -8,9
-            352: -5,14
-            355: -4,15
+            108: -8,9
+            345: -5,14
+            348: -4,15
         - node:
             color: '#A4610696'
             id: WarnCornerSE
@@ -352,58 +352,58 @@ entities:
             color: '#9FED5896'
             id: WarnCornerSW
           decals:
-            142: -8,3
+            140: -8,3
         - node:
             color: '#9FED5896'
             id: WarnCornerSmallNE
           decals:
-            322: -8,4
+            315: -8,4
         - node:
             color: '#A4610696'
             id: WarnCornerSmallNE
           decals:
-            126: -5,10
-            127: -5,12
-            324: -5,5
+            125: -5,10
+            126: -5,12
+            317: -5,5
         - node:
             color: '#9FED5896'
             id: WarnCornerSmallNW
           decals:
-            323: -5,4
+            316: -5,4
         - node:
             color: '#A4610696'
             id: WarnCornerSmallNW
           decals:
-            128: -1,10
-            129: -1,12
-            138: -5,9
-            354: -4,14
+            127: -1,10
+            128: -1,12
+            136: -5,9
+            347: -4,14
         - node:
             color: '#A4610696'
             id: WarnCornerSmallSE
           decals:
-            130: -8,8
-            131: -5,12
-            136: -1,12
-            137: -5,10
-            353: -5,14
+            129: -8,8
+            130: -5,12
+            134: -1,12
+            135: -5,10
+            346: -5,14
         - node:
             color: '#A4610696'
             id: WarnCornerSmallSW
           decals:
-            133: -1,14
-            134: -1,12
-            135: -5,8
+            131: -1,14
+            132: -1,12
+            133: -5,8
         - node:
             color: '#B02E26FF'
             id: WarnFullGreyscale
           decals:
-            241: 4,12
+            234: 4,12
         - node:
             color: '#9FED5896'
             id: WarnLineE
           decals:
-            319: -8,5
+            312: -8,5
         - node:
             color: '#A4610696'
             id: WarnLineE
@@ -419,9 +419,9 @@ entities:
             95: -5,13
             96: 0,13
             97: 0,14
-            110: -8,6
-            111: -8,7
-            123: -1,11
+            109: -8,6
+            110: -8,7
+            122: -1,11
         - node:
             color: '#FFFFFFFF'
             id: WarnLineE
@@ -442,29 +442,29 @@ entities:
             67: 8,3
             68: 5,14
             69: 1,14
-            307: 8,5
-            308: 8,7
-            309: 8,9
-            313: -11,-3
+            300: 8,5
+            301: 8,7
+            302: 8,9
+            306: -11,-3
         - node:
             color: '#D381C996'
             id: WarnLineGreyscaleE
           decals:
-            276: 7,13
-            277: 7,12
+            269: 7,13
+            270: 7,12
         - node:
             color: '#D381C996'
             id: WarnLineGreyscaleW
           decals:
-            278: 6,12
-            279: 6,13
+            271: 6,12
+            272: 6,13
         - node:
             color: '#9FED5896'
             id: WarnLineN
           decals:
-            141: -6,3
-            315: -7,3
-            317: -5,3
+            139: -6,3
+            308: -7,3
+            310: -5,3
         - node:
             color: '#A4610696'
             id: WarnLineN
@@ -480,8 +480,8 @@ entities:
             86: -4,10
             87: -3,10
             88: -2,10
-            112: -7,8
-            113: -6,8
+            111: -7,8
+            112: -6,8
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -503,15 +503,15 @@ entities:
             63: 7,-9
             64: 8,-9
             70: -1,9
-            311: 7,4
-            351: -3,16
+            304: 7,4
+            344: -3,16
         - node:
             color: '#9FED5896'
             id: WarnLineS
           decals:
-            318: -5,5
-            320: -8,5
-            321: -8,4
+            311: -5,5
+            313: -8,5
+            314: -8,4
         - node:
             color: '#A4610696'
             id: WarnLineS
@@ -525,10 +525,10 @@ entities:
             105: -5,11
             106: -5,12
             107: -5,13
-            114: -5,7
-            115: -5,6
-            124: -1,11
-            125: -1,13
+            113: -5,7
+            114: -5,6
+            123: -1,11
+            124: -1,13
         - node:
             color: '#FFFFFFFF'
             id: WarnLineS
@@ -549,33 +549,33 @@ entities:
             44: 8,3
             45: 1,14
             46: 5,14
-            304: 8,9
-            305: 8,7
-            306: 8,5
-            312: -11,-3
+            297: 8,9
+            298: 8,7
+            299: 8,5
+            305: -11,-3
         - node:
             color: '#9FED5896'
             id: WarnLineW
           decals:
-            314: -6,4
-            316: -7,4
+            307: -6,4
+            309: -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
-            146: -3,15
-            147: -2,15
-            148: -1,15
+            116: -4,12
+            117: -3,12
+            118: -2,12
+            119: -2,10
+            120: -3,10
+            121: -4,10
+            137: -7,9
+            138: -6,9
+            142: -3,15
+            143: -2,15
+            144: -1,15
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -597,30 +597,30 @@ entities:
             57: -7,-9
             58: -6,-9
             71: -1,9
-            310: 7,4
-            350: -3,16
+            303: 7,4
+            343: -3,16
         - node:
             angle: -1.5707963267948966 rad
             color: '#A4610696'
             id: food
           decals:
-            348: -12,-1
-            349: -12,-3
+            341: -12,-1
+            342: -12,-3
         - node:
             color: '#A4610696'
             id: food
           decals:
-            342: 6,-8
-            343: 8,-8
-            346: -8,-8
-            347: -6,-8
+            335: 6,-8
+            336: 8,-8
+            339: -8,-8
+            340: -6,-8
         - node:
             angle: 1.5707963267948966 rad
             color: '#A4610696'
             id: food
           decals:
-            344: 12,-1
-            345: 12,-3
+            337: 12,-1
+            338: 12,-3
       type: DecalGrid
     - version: 2
       data:
@@ -2668,13 +2668,23 @@ entities:
     - pos: -5.533075,6.638674
       parent: 1
       type: Transform
-- proto: ComputerFrame
+- 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: ComputerShuttle
   entities:
   - uid: 873
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 07a1a5a83b2..d53ce1272c7 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml
@@ -20,3 +20,13 @@
     - Fighter
     - Cleric
     - Rogue
+
+# The mccargo console
+- type: entity
+  id: McCargoMothershipComputer
+  name: McCargo delivery ship console
+  parent: BaseMothershipComputer
+  components:
+  - type: ShipyardListing
+    shuttles:
+    - McDelivery
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
index ab2b71fd911..e1b8e1c2e3b 100644
--- a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml
+++ b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml
@@ -6,21 +6,21 @@
 # 
 
 - type: vessel
-  id: mcdelivery
+  id: McDelivery
   name: DC McDelivery
   description: "WIP"
   price: 10500
-  category: Medium
-  group: Civilian
+  category: Small
+  group: None
   shuttlePath: /Maps/_NF/Shuttles/mcdelivery.yml
 
 - type: gameMap
-  id: mcdelivery
+  id: McDelivery
   mapName: 'DC McDelivery'
   mapPath: /Maps/_NF/Shuttles/mcdelivery.yml
   minPlayers: 0
   stations:
-    mcdelivery:
+    McDelivery:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup