diff --git a/Content.Client/Nyanotrasen/Mail/MailSystem.cs b/Content.Client/Nyanotrasen/Mail/MailSystem.cs
index 58d593712f4..3d622383c1c 100644
--- a/Content.Client/Nyanotrasen/Mail/MailSystem.cs
+++ b/Content.Client/Nyanotrasen/Mail/MailSystem.cs
@@ -38,7 +38,7 @@ protected override void OnAppearanceChange(EntityUid uid, MailComponent componen
             if (args.Sprite == null)
                 return;
 
-            if (_appearance.TryGetData(uid, MailVisuals.JobIcon, out string job) ||
+            if (!_appearance.TryGetData(uid, MailVisuals.JobIcon, out string job) ||
                 !_prototypeManager.TryIndex<JobIconPrototype>(job, out var icon))
                 return;
 
diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.cs
index 8efe169d22a..1c86a899540 100644
--- a/Content.Server/Shipyard/Systems/ShipyardSystem.cs
+++ b/Content.Server/Shipyard/Systems/ShipyardSystem.cs
@@ -84,7 +84,6 @@ private void OnShipyardStartup(EntityUid uid, ShipyardConsoleComponent component
         if (!_enabled)
             return;
         InitializeConsole();
-        SetupShipyard();
     }
 
     private void OnRoundRestart(RoundRestartCleanupEvent ev)
@@ -101,7 +100,7 @@ private void SetShipyardEnabled(bool value)
 
         if (value)
         {
-            SetupShipyard();
+            SetupShipyardIfNeeded();
         }
         else
         {
@@ -148,6 +147,7 @@ public bool TryPurchaseShuttle(EntityUid stationUid, string shuttlePath, [NotNul
     private bool TryAddShuttle(string shuttlePath, [NotNullWhen(true)] out EntityUid? shuttleGrid)
     {
         shuttleGrid = null;
+        SetupShipyardIfNeeded();
         if (ShipyardMap == null)
             return false;
 
@@ -276,7 +276,7 @@ private void CleanupShipyard()
         _mapManager.DeleteMap(ShipyardMap.Value);
     }
 
-    private void SetupShipyard()
+    private void SetupShipyardIfNeeded()
     {
         if (ShipyardMap != null && _mapManager.MapExists(ShipyardMap.Value))
             return;
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 4076736c4ae..4e8740ecfb7 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -4558,3 +4558,30 @@ Entries:
       message: The NSF Marauder is no longer available for purchase.
   id: 5402
   time: '2024-10-14T22:35:31.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: Implanters in loadout selection are now properly labeled.
+  id: 5403
+  time: '2024-10-15T07:41:16.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Skipper kitchen equipment.
+  id: 5404
+  time: '2024-10-15T07:43:15.0000000+00:00'
+- author: MisterMecky
+  changes:
+    - type: Fix
+      message: prebuilt tabletop computers can now be properly deconstructed
+  id: 5405
+  time: '2024-10-15T13:51:09.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Slightly changed how wearable containers (like backpacks etc) work: now
+        it's possible (but rather pointless) to put a belt in backpack, a
+        backpack in duffel, a toolbox fits in a backpack.
+  id: 5406
+  time: '2024-10-15T21:01:40.0000000+00:00'
diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
index 7abfe836af6..7165780941c 100644
--- a/Resources/Maps/_NF/POI/nfsd.yml
+++ b/Resources/Maps/_NF/POI/nfsd.yml
@@ -14857,7 +14857,7 @@ entities:
     - type: Transform
       pos: -0.5,-3.5
       parent: 1
-- proto: SpawnPointSeniorOfficer
+- proto: NFSpawnPointSeniorOfficer
   entities:
   - uid: 2700
     components:
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml
index 17437bf125b..37e8521e108 100644
--- a/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml
+++ b/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml
@@ -2012,9 +2012,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-2.5
       parent: 1
-    - type: DeviceNetwork
-      configurators:
-      - invalid
     - type: AtmosPipeColor
       color: '#AA0000FF'
   - uid: 327
diff --git a/Resources/Maps/_NF/Shuttles/skipper.yml b/Resources/Maps/_NF/Shuttles/skipper.yml
index d3a8498fd39..2945c51c5ee 100644
--- a/Resources/Maps/_NF/Shuttles/skipper.yml
+++ b/Resources/Maps/_NF/Shuttles/skipper.yml
@@ -829,15 +829,15 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -4.5,1.5
+      pos: -4.4,1.5
       parent: 1
 - proto: ButtonFrameGrey
   entities:
-  - uid: 307
+  - uid: 305
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -4.8,1.5
       parent: 1
 - proto: CableApcExtension
   entities:
@@ -1236,6 +1236,13 @@ entities:
     - type: Transform
       pos: -1.2326875,8.501068
       parent: 1
+- proto: ClosetWallO2N2FilledRandom
+  entities:
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
 - proto: ClothingOuterWinterChef
   entities:
   - uid: 415
@@ -1276,8 +1283,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
 - proto: CrateNPCCow
   entities:
@@ -1751,9 +1756,9 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: GasPressurePumpOn
+- proto: GasPressurePumpOnMax
   entities:
-  - uid: 37
+  - uid: 260
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -2016,6 +2021,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,0.5
       parent: 1
+- proto: KitchenAssembler
+  entities:
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
 - proto: KitchenDeepFryer
   entities:
   - uid: 265
@@ -2024,9 +2036,9 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,1.5
       parent: 1
-- proto: KitchenElectricGrill
+- proto: KitchenElectricRange
   entities:
-  - uid: 260
+  - uid: 422
     components:
     - type: Transform
       pos: -2.5,3.5
@@ -2145,8 +2157,7 @@ entities:
   - uid: 225
     components:
     - type: Transform
-      rot: 25.132741228718352 rad
-      pos: -3.0563135,3.7324326
+      pos: -3.3616345,3.6774707
       parent: 1
 - proto: OilJarGhee
   entities:
@@ -2182,20 +2193,16 @@ entities:
       pos: -0.5,8.5
       parent: 1
     - type: FuelGenerator
-      targetPower: 9000
+      targetPower: 10000
       on: False
-    - type: Physics
-      bodyType: Static
   - uid: 149
     components:
     - type: Transform
       pos: -2.5,8.5
       parent: 1
     - type: FuelGenerator
-      targetPower: 9000
+      targetPower: 10000
       on: False
-    - type: Physics
-      bodyType: Static
 - proto: Poweredlight
   entities:
   - uid: 244
@@ -2296,32 +2303,31 @@ entities:
   - uid: 256
     components:
     - type: Transform
-      rot: 25.132741228718352 rad
-      pos: 0.2840351,3.6642082
+      rot: 6.283185307179586 rad
+      pos: -0.64247394,3.4529877
       parent: 1
 - proto: ReagentContainerRice
   entities:
   - uid: 258
     components:
     - type: Transform
-      rot: 25.132741228718352 rad
-      pos: 0.7215351,3.6642084
+      rot: 6.283185307179586 rad
+      pos: -0.9028907,3.6509042
       parent: 1
 - proto: ReagentContainerSalt
   entities:
   - uid: 47
     components:
     - type: Transform
-      rot: 25.132741228718352 rad
-      pos: -3.5050204,3.3574338
+      pos: -3.6637177,3.5941372
       parent: 1
 - proto: ReagentContainerSugar
   entities:
   - uid: 314
     components:
     - type: Transform
-      rot: 25.132741228718352 rad
-      pos: 0.5236185,3.4662917
+      rot: 6.283185307179586 rad
+      pos: -0.9028907,3.4009042
       parent: 1
 - proto: SeedExtractor
   entities:
@@ -2351,6 +2357,14 @@ entities:
           showEnts: False
           occludes: True
           ents: []
+- proto: ShelfKitchen
+  entities:
+  - uid: 37
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,1.5
+      parent: 1
 - proto: ShuttersNormalOpen
   entities:
   - uid: 23
@@ -2641,28 +2655,42 @@ entities:
       parent: 1
 - proto: SignalButton
   entities:
-  - uid: 422
+  - uid: 423
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -4.4,1.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
-        303:
+        17:
         - Pressed: Toggle
-        420:
+        19:
         - Pressed: Toggle
-        302:
+        18:
         - Pressed: Toggle
-        23:
+        316:
         - Pressed: Toggle
-        404:
+        25:
         - Pressed: Toggle
-        183:
+        26:
+        - Pressed: Toggle
+        27:
+        - Pressed: Toggle
+        29:
         - Pressed: Toggle
+  - uid: 426
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.8,1.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
         172:
         - Pressed: Toggle
+        183:
+        - Pressed: Toggle
         152:
         - Pressed: Toggle
         372:
@@ -2685,34 +2713,6 @@ entities:
         - Pressed: Toggle
         28:
         - Pressed: Toggle
-        421:
-        - Pressed: Toggle
-        419:
-        - Pressed: Toggle
-  - uid: 423
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,1.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        17:
-        - Pressed: Toggle
-        19:
-        - Pressed: Toggle
-        18:
-        - Pressed: Toggle
-        316:
-        - Pressed: Toggle
-        25:
-        - Pressed: Toggle
-        26:
-        - Pressed: Toggle
-        27:
-        - Pressed: Toggle
-        29:
-        - Pressed: Toggle
 - proto: Sink
   entities:
   - uid: 40
@@ -2808,12 +2808,6 @@ entities:
     - type: Transform
       pos: -3.5,3.5
       parent: 1
-  - uid: 305
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,3.5
-      parent: 1
   - uid: 309
     components:
     - type: Transform
diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml
index 35f43e5070e..466dd4fbb61 100644
--- a/Resources/Maps/_NF/Test/dev_map.yml
+++ b/Resources/Maps/_NF/Test/dev_map.yml
@@ -6934,7 +6934,7 @@ entities:
     - type: Transform
       pos: -3.5,2.5
       parent: 179
-- proto: SpawnPointSeniorOfficer
+- proto: NFSpawnPointSeniorOfficer
   entities:
   - uid: 382
     components:
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index f4052a3b4b3..28242033e79 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -5,7 +5,7 @@
   description: A cardboard box for storing things.
   components:
   - type: Item
-    size: Large
+    size: Normal # Frontier Large<Normal
     shape:
     - 0,0,2,2
   - type: Storage
@@ -17,6 +17,7 @@
   - type: Tag
     tags:
     - BoxCardboard
+    - Trash # Frontier
 
 - type: entity
   name: mousetrap box
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
index e1c24a9fd0d..daf2e42aa68 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml
@@ -271,14 +271,12 @@
     - type: StorageFill
       contents:
           # Creatures
-        - id: MobCockroach
-          prob: 0.05
-        - id: MobMothroach
-          prob: 0.03
-        - id: MobRosyMothroach # Frontier
-          prob: 0.005 # Frontier
-        - id: MobMouse
-          prob: 0.05
+#        - id: MobCockroach # Frontier
+#          prob: 0.05 # Frontier
+#        - id: MobMothroach # Frontier
+#          prob: 0.03 # Frontier
+#        - id: MobMouse # Frontier
+#          prob: 0.05 # Frontier
           # Food Packaging
         - id: FoodPacketBoritosTrash
           prob: 0.1
@@ -315,10 +313,10 @@
         - id: CigaretteSpent
           prob: 0.15
           # Bacteria
-        - id: FoodBreadMoldySlice
-          prob: 0.15
-        - id: FoodPizzaMoldySlice
-          prob: 0.15
+#        - id: FoodBreadMoldySlice # Frontier
+#          prob: 0.15 # Frontier
+#        - id: FoodPizzaMoldySlice # Frontier
+#          prob: 0.15 # Frontier
           # Botanical Waste
         - id: TrashBananaPeel
           prob: 0.15
@@ -333,8 +331,8 @@
           prob: 0.15
         - id: LightBulbBroken
           prob: 0.15
-        - id: MobMouseDead
-          prob: 0.1
+#        - id: MobMouseDead # Frontier
+#          prob: 0.1 # Frontier
         - id: Syringe
           prob: 0.1
         - id: ShardGlassPlasma
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 0d97de0eebe..ec1a82dcd14 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -33,7 +33,7 @@
   - type: AllowsSleepInside # Frontier
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackClown
   name: giggles von honkerton
   description: It's a backpack made by Honk! Co.
@@ -45,7 +45,7 @@
       collection: BikeHorn
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackIan
   name: Ian's backpack
   description: Sometimes he wears it.
@@ -57,7 +57,7 @@
       collection: IanBark
 
 - type: entity
-  parent: [ClothingBackpack, BaseC2Contraband ] # Frontier: BaseRestrictedContraband<BaseC2Contraband
+  parent: [NFClothingBackpack, BaseC2Contraband ] # Frontier: BaseRestrictedContraband<BaseC2Contraband, ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackSecurity
   name: security backpack
   description: It's a very robust backpack.
@@ -66,7 +66,7 @@
     sprite: Clothing/Back/Backpacks/security.rsi
 
 - type: entity
-  parent: [ClothingBackpack, BaseC2Contraband ] # Frontier: BaseRestrictedContraband<BaseC2Contraband
+  parent: [NFClothingBackpack, BaseC2Contraband ] # Frontier: BaseRestrictedContraband<BaseC2Contraband, ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackBrigmedic
   name: brigmedic backpack
   description: It's a very sterile backpack.
@@ -75,7 +75,7 @@
     sprite: Clothing/Back/Backpacks/brigmedic.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackEngineering
   name: engineering backpack
   description: It's a tough backpack for the daily grind of station life.
@@ -84,7 +84,7 @@
     sprite: Clothing/Back/Backpacks/engineering.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackAtmospherics
   name: atmospherics backpack
   description: It's a backpack made of fire resistant fibers. Smells like plasma.
@@ -93,7 +93,7 @@
     sprite: Clothing/Back/Backpacks/atmospherics.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackMedical
   name: medical backpack
   description: It's a backpack especially designed for use in a sterile environment.
@@ -102,7 +102,7 @@
     sprite: Clothing/Back/Backpacks/medical.rsi
 
 - type: entity
-  parent: ClothingBackpack # Frontier: removed BaseCommandContraband
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack # Frontier: removed BaseCommandContraband
   id: ClothingBackpackCaptain
   name: captain's backpack
   description: It's a special backpack made exclusively for Nanotrasen officers.
@@ -111,7 +111,7 @@
     sprite: Clothing/Back/Backpacks/captain.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackMime
   name: mime backpack
   description: A silent backpack made for those silent workers. Silence Co.
@@ -120,7 +120,7 @@
     sprite: Clothing/Back/Backpacks/mime.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackChemistry
   name: chemistry backpack
   description: A backpack specially designed to repel stains and hazardous liquids.
@@ -129,7 +129,7 @@
     sprite: Clothing/Back/Backpacks/chemistry.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackHydroponics
   name: hydroponics backpack
   description: It's a backpack made of all-natural fibers.
@@ -138,7 +138,7 @@
     sprite: Clothing/Back/Backpacks/hydroponics.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackScience
   name: science backpack
   description: A backpack specially designed to repel stains and hazardous liquids.
@@ -147,7 +147,7 @@
     sprite: Clothing/Back/Backpacks/science.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackVirology
   name: virology backpack
   description: A backpack made of hypo-allergenic fibers. It's designed to help prevent the spread of disease. Smells like monkey.
@@ -156,7 +156,7 @@
     sprite: Clothing/Back/Backpacks/virology.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackGenetics
   name: genetics backpack
   description: A backpack designed to be super tough, just in case someone hulks out on you.
@@ -165,7 +165,7 @@
     sprite: Clothing/Back/Backpacks/genetics.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackCargo
   name: cargo backpack
   description: A robust backpack for stealing cargo's loot.
@@ -174,7 +174,7 @@
       sprite: Clothing/Back/Backpacks/cargo.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackSalvage
   name: salvage bag
   description: A robust backpack for stashing your loot.
@@ -183,7 +183,7 @@
       sprite: Clothing/Back/Backpacks/salvage.rsi
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackMercenary # Frontier - Merc to Mercenary
   name: mercenary backpack
   description: A backpack that has been in many dangerous places, a reliable combat backpack.
@@ -205,7 +205,7 @@
     - 0,0,10,3
 
 - type: entity
-  parent: ClothingBackpackERTLeader
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
   id: ClothingBackpackERTSecurity
   name: ERT security backpack
   description: A spacious backpack with lots of pockets, worn by Security Officers of an Emergency Response Team.
@@ -214,7 +214,7 @@
     sprite: Clothing/Back/Backpacks/ertsec.rsi
 
 - type: entity
-  parent: ClothingBackpackERTLeader
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
   id: ClothingBackpackERTMedical
   name: ERT medical backpack
   description: A spacious backpack with lots of pockets, worn by Medical Officers of an Emergency Response Team.
@@ -223,7 +223,7 @@
     sprite: Clothing/Back/Backpacks/ertmed.rsi
 
 - type: entity
-  parent: ClothingBackpackERTLeader
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
   id: ClothingBackpackERTEngineer
   name: ERT engineer backpack
   description: A spacious backpack with lots of pockets, worn by Engineers of an Emergency Response Team.
@@ -232,7 +232,7 @@
     sprite: Clothing/Back/Backpacks/erteng.rsi
 
 - type: entity
-  parent: ClothingBackpackERTLeader
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
   id: ClothingBackpackERTJanitor
   name: ERT janitor backpack
   description: A spacious backpack with lots of pockets, worn by Janitors of an Emergency Response Team.
@@ -241,7 +241,7 @@
     sprite: Clothing/Back/Backpacks/ertjanitor.rsi
 
 - type: entity
-  parent: ClothingBackpackERTLeader
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
   id: ClothingBackpackERTClown
   name: ERT clown backpack
   description: A spacious backpack with lots of pockets, worn by Clowns of an Emergency Response Team.
@@ -250,7 +250,7 @@
     sprite: Clothing/Back/Backpacks/ertclown.rsi
 
 - type: entity
-  parent: ClothingBackpackERTLeader
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTLeader
   id: ClothingBackpackERTChaplain
   name: ERT chaplain backpack
   description: A spacious backpack with lots of pockets, worn by Chaplains of an Emergency Response Team.
@@ -259,7 +259,7 @@
     sprite: Clothing/Back/Backpacks/ertchaplain.rsi
 
 - type: entity
-  parent: ClothingBackpackERTSecurity
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackERTSecurity
   id: ClothingBackpackDeathSquad
   name: death squad backpack
   description: Holds the kit of CentComm's most feared agents.
@@ -282,7 +282,7 @@
 
 #Special
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackHolding
   name: bag of holding
   description: A backpack that opens into a localized pocket of bluespace.
@@ -319,7 +319,7 @@
     - 0,0,11,4
 
 - type: entity
-  parent: ClothingBackpackClown
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpackClown
   id: ClothingBackpackCluwne
   name: jiggles von jonkerton
   suffix: Unremoveable
@@ -331,7 +331,7 @@
     deleteOnDrop: false
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackElectropack
   name: electropack
   suffix: SelfUnremovable
@@ -355,7 +355,7 @@
 
 # Debug
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackDebug
   name: wackpack
   description: What the fuck is this?
@@ -371,7 +371,7 @@
     - 9,5,9,5
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackDebug2
   name: big wackpack
   description: What the fuck is this?
@@ -382,7 +382,7 @@
     - 0,0,39,24
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackDebug3
   name: gay wackpack
   description: What the fuck is this?
@@ -403,7 +403,7 @@
     - 10,2,10,3
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackDebug4
   name: offset wackpack
   description: What the fuck is this?
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
index 4afa9d3acbe..3de17978649 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -16,7 +16,7 @@
   - type: HeldSpeedModifier
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelEngineering
   name: engineering duffel bag
   description: A large duffel bag for holding extra tools and supplies.
@@ -25,7 +25,7 @@
       sprite: Clothing/Back/Duffels/engineering.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelAtmospherics
   name: atmospherics duffel bag
   description: A large duffel bag made of fire resistant fibers. Smells like plasma.
@@ -34,7 +34,7 @@
       sprite: Clothing/Back/Duffels/atmospherics.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelMedical
   name: medical duffel bag
   description: A large duffel bag for holding extra medical supplies.
@@ -43,7 +43,7 @@
       sprite: Clothing/Back/Duffels/medical.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel # Frontier: removed BaseCommandContraband
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel # Frontier: removed BaseCommandContraband
   id: ClothingBackpackDuffelCaptain
   name: captain's duffel bag
   description: A large duffel bag for holding extra captainly goods.
@@ -52,7 +52,7 @@
       sprite: Clothing/Back/Duffels/captain.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelClown
   name: clown duffel bag
   description: A large duffel bag for holding extra honk goods.
@@ -64,7 +64,7 @@
         collection: BikeHorn
 
 - type: entity
-  parent: [ClothingBackpackDuffel, BaseC2Contraband ] # Frontier: BaseRestrictedContraband<BaseC2Contraband
+  parent: [NFClothingDuffel, BaseC2Contraband ] # Frontier: BaseRestrictedContraband<BaseC2Contraband, ClothingBackpackDuffel<NFClothingDuffel
   id: ClothingBackpackDuffelSecurity
   name: security duffel bag
   description: A large duffel bag for holding extra security related goods.
@@ -73,7 +73,7 @@
       sprite: Clothing/Back/Duffels/security.rsi
 
 - type: entity
-  parent: [ClothingBackpackDuffel, BaseC2Contraband ] # Frontier: BaseRestrictedContraband<BaseC2Contraband
+  parent: [NFClothingDuffel, BaseC2Contraband ] # Frontier: BaseRestrictedContraband<BaseC2Contraband, ClothingBackpackDuffel<NFClothingDuffel
   id: ClothingBackpackDuffelBrigmedic
   name: brigmedic duffel bag
   description: A large duffel bag for holding extra medical related goods.
@@ -82,7 +82,7 @@
       sprite: Clothing/Back/Duffels/brigmedic.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelChemistry
   name: chemistry duffel bag
   description: A large duffel bag for holding extra beakers and test tubes.
@@ -91,7 +91,7 @@
       sprite: Clothing/Back/Duffels/chemistry.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelVirology
   name: virology duffel bag
   description: A large duffel bag made of hypo-allergenic fibers. It's designed to help prevent the spread of disease. Smells like monkey.
@@ -100,7 +100,7 @@
       sprite: Clothing/Back/Duffels/virology.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelGenetics
   name: genetics duffel bag
   description: A large duffel bag for holding extra genetic mutations.
@@ -109,7 +109,7 @@
       sprite: Clothing/Back/Duffels/genetics.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelMime
   name: mime duffel bag
   description: A large duffel bag for holding... mime... stuff.
@@ -122,7 +122,7 @@
         collection: null
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelScience
   name: science duffel bag
   description: A large duffel bag for holding extra science related goods.
@@ -131,7 +131,7 @@
       sprite: Clothing/Back/Duffels/science.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelHydroponics
   name: hydroponics duffel bag
   description: A large duffel bag for holding extra gardening tools.
@@ -140,7 +140,7 @@
       sprite: Clothing/Back/Duffels/hydroponics.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelCargo
   name: cargo duffel bag
   description: A large duffel bag for stealing cargo's precious loot.
@@ -149,7 +149,7 @@
       sprite: Clothing/Back/Duffels/cargo.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelSalvage
   name: salvage duffel bag
   description: A large duffel bag for holding extra exotic treasures.
@@ -158,7 +158,7 @@
       sprite: Clothing/Back/Duffels/salvage.rsi
 
 - type: entity
-  parent: [ClothingBackpackDuffel, BaseC3Contraband, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3Contraband, added ContrabandClothing as parent
+  parent: [NFClothingDuffel, BaseC3Contraband, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3Contraband, added ContrabandClothing as parent
   id: ClothingBackpackDuffelSyndicate
   name: syndicate duffel bag
   description: A large duffel bag for holding various traitor goods.
@@ -172,7 +172,7 @@
     - 0,0,8,4
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicate
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffelSyndicate
   id: ClothingBackpackDuffelSyndicateBundle
   abstract: true
   components:
@@ -180,7 +180,7 @@
       tags: [] # ignore "WhitelistChameleon" tag
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicate
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffelSyndicate
   id: ClothingBackpackDuffelSyndicateAmmo
   name: syndicate duffel bag
   components:
@@ -193,7 +193,7 @@
       equippedPrefix: ammo
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicateAmmo
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffelSyndicateAmmo
   id: ClothingBackpackDuffelSyndicateAmmoBundle
   abstract: true
   components:
@@ -201,7 +201,7 @@
       tags: [] # ignore "WhitelistChameleon" tag
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicate
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffelSyndicate
   id: ClothingBackpackDuffelSyndicateMedical
   name: syndicate duffel bag
   components:
@@ -214,7 +214,7 @@
       equippedPrefix: med
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicateMedical
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffelSyndicateMedical
   id: ClothingBackpackDuffelSyndicateMedicalBundle
   abstract: true
   components:
@@ -222,7 +222,7 @@
       tags: [] # ignore "WhitelistChameleon" tag
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel # Frontier: ClothingBackpackDuffelNFClothingDuffel
   id: ClothingBackpackDuffelHolding
   name: duffelbag of holding
   description: A duffelbag that opens into a localized pocket of bluespace.
@@ -261,7 +261,7 @@
         shader: unshaded # Frontier
 
 - type: entity
-  parent: [ ClothingBackpackDuffel, BaseCentcommContraband ]
+  parent: [ NFClothingDuffel, BaseCentcommContraband ] # Frontier: ClothingBackpackDuffel<NFClothingDuffel
   id: ClothingBackpackDuffelCBURN
   name: CBURN duffel bag
   description: A duffel bag containing a variety of biological containment equipment.
diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
index 7d01c87db90..a8591c91e28 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingBackpack # Frontier: ClothingBackpack<NFClothingBackpack
   id: ClothingBackpackSatchel
   name: satchel
   description: A trendy looking satchel.
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 76db7dc9a47..16b73470987 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -1,7 +1,7 @@
 # Belts that need/have visualizers
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltUtility
   name: utility belt
   description: Can hold various things.
@@ -11,7 +11,7 @@
   - type: Clothing
     sprite: Clothing/Belt/utility.rsi
   - type: Storage
-    maxItemSize: Normal
+    #maxItemSize: Normal# Frontier
     # TODO: Fill this out more.
     # whitelist: # Frontier: commented out whitelist
       # tags:
@@ -81,7 +81,7 @@
   - type: Appearance
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltChiefEngineer
   name: chief engineer's toolbelt
   description: Holds tools, looks snazzy.
@@ -161,7 +161,7 @@
   - type: Appearance
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltAssault
   name: assault belt
   description: A tactical assault belt.
@@ -201,7 +201,7 @@
   - type: Appearance
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltJanitor
   name: janibelt
   description: A belt used to hold most janitorial supplies.
@@ -210,7 +210,7 @@
     sprite: Clothing/Belt/janitor.rsi
   - type: Clothing
     sprite: Clothing/Belt/janitor.rsi
-  - type: Storage
+  #- type: Storage # Frontier
     # whitelist: # Frontier: commented out whitelist
       # tags:
         # - Wrench
@@ -228,7 +228,7 @@
       # components:
         # - LightReplacer
         # - SmokeOnTrigger
-    maxItemSize: Large
+    #maxItemSize: Large # Frontier
   - type: ItemMapper
     mapLayers:
       bottle:
@@ -247,7 +247,7 @@
   - type: Appearance
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltMedical
   name: medical belt
   description: Can hold various medical equipment.
@@ -324,7 +324,7 @@
     sprite: Clothing/Belt/emt.rsi
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltPlant
   name: botanical belt
   description: A belt used to hold most hydroponics supplies. Suprisingly, not green.
@@ -381,7 +381,7 @@
   - type: Appearance
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltChef
   name: chef belt
   description: A belt used to hold kitchen knives and condiments for quick access.
@@ -520,8 +520,8 @@
     state: sheath
   - type: Clothing
     sprite: Clothing/Belt/sheath.rsi
-  - type: Item
-    size: Ginormous
+  #- type: Item # Frontier
+    #size: Ginormous # Frontier
   - type: ItemSlots
     slots:
       item:
@@ -553,8 +553,8 @@
     sprite: Clothing/Belt/bandolier.rsi
   - type: Clothing
     sprite: Clothing/Belt/bandolier.rsi
-  - type: Item
-    size: Huge
+  #- type: Item # Frontier
+    #size: Huge # Frontier
   - type: BallisticAmmoProvider
     whitelist:
       tags:
@@ -577,7 +577,7 @@
     - Kangaroo
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltHolster
   name: shoulder holster
   description: 'A holster to carry a handgun and ammo. WARNING: Badasses only.'
@@ -591,7 +591,7 @@
     # - 0,0,3,1 # Frontier: commented out
 
 - type: entity
-  parent: [ClothingBeltStorageBase, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent
+  parent: [NFClothingBeltStorageBase, BaseC3SyndicateContraband, ContrabandClothing] # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase, BaseSyndicateContraband<BaseC3SyndicateContraband, added ContrabandClothing as parent
   id: ClothingBeltSyndieHolster
   name: syndicate shoulder holster
   description: A deep shoulder holster capable of holding many types of ballistics.
@@ -600,8 +600,8 @@
     sprite: Clothing/Belt/syndieholster.rsi
   - type: Clothing
     sprite: Clothing/Belt/syndieholster.rsi
-  - type: Item
-    size: Ginormous
+  #- type: Item # Frontier
+    #size: Ginormous # Frontier
   # - type: Storage # Frontier: commented out
     # maxItemSize: Huge # Frontier: commented out
     # grid: # Frontier: commented out
@@ -613,7 +613,7 @@
         # - CartridgeAmmo
 
 - type: entity
-  parent: ClothingBeltStorageBase #Frontier - ClothingBeltSecurity<ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltSecurityWebbing
   name: security carrier
   description: Unique and versatile chest rig, can hold security gear.
@@ -624,7 +624,7 @@
     sprite: Clothing/Belt/securitywebbing.rsi
 
 - type: entity
-  parent: ClothingBeltStorageBase # Frontier: remove BaseSecurityCargoContraband
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase, remove BaseSecurityCargoContraband
   id: ClothingBeltMercenaryWebbing # Frontier: Merc to Mercenary
   name: mercenary webbing
   description: Ideal for storing everything from ammo to weapons and combat essentials.
@@ -635,7 +635,7 @@
     sprite: Clothing/Belt/mercwebbing.rsi
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltSalvageWebbing
   name: salvage rig
   description: Universal unloading system for work in space.
@@ -646,7 +646,7 @@
     sprite: Clothing/Belt/salvagewebbing.rsi
 
 - type: entity
-  parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseC1Contraband] # Frontier: BaseSyndicateContraband<BaseC1Contraband
+  parent: [NFClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseC1Contraband] # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase, BaseSyndicateContraband<BaseC1Contraband
   id: ClothingBeltMilitaryWebbing
   name: chest rig
   description: A set of tactical webbing worn by boarding parties. # Frontier
@@ -668,13 +668,13 @@
     sprite: Clothing/Belt/militarywebbingmed.rsi
   - type: Clothing
     sprite: Clothing/Belt/militarywebbingmed.rsi
-  - type: Item
-    size: Huge
+  #- type: Item # Frontier
+    #size: Huge # Frontier
   - type: ExplosionResistance
     damageCoefficient: 0.1
 
 - type: entity
-  parent: ClothingBeltBase
+  parent: NFClothingBeltStorageBase # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase
   id: ClothingBeltSuspendersRed
   name: red suspenders
   description: For holding your pants up.
@@ -700,7 +700,7 @@
     sprite: Clothing/Belt/suspenders_black.rsi
 
 - type: entity
-  parent: [ClothingBeltStorageBase, BaseC3WizardContraband, ContrabandClothing] # Frontier: added BaseC3WizardContraband, ContrabandClothing as parent
+  parent: [NFClothingBeltStorageBase, BaseC3WizardContraband, ContrabandClothing] # Frontier: ClothingBeltStorageBase<NFClothingBeltStorageBase, added BaseC3WizardContraband, ContrabandClothing as parent
   id: ClothingBeltWand
   name: wizard belt # Frontier: changed the name from 'wand belt' -> 'wizard belt'
   description: A belt designed to hold various rods of power. A veritable fanny pack of exotic magic.
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
index 82f91669cd1..910f79a6188 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml
@@ -12,7 +12,9 @@
     grid:
     - 0,0,3,1
   - type: Item
-    size: Large
+    size: Normal # Frontier: Large<Normal
+    shape: # Frontier
+    - 0,0,3,1 # Frontier
     sprite: Objects/Specific/Medical/firstaidkits.rsi
     heldPrefix: firstaid
   - type: PhysicalComposition
diff --git a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
index 7dedf66d76d..9a527952e79 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml
@@ -77,9 +77,6 @@
         behaviors:
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
-  - type: StaticPrice
-    price: 20
-    vendPrice: 12000 # Frontier
 
 - type: entity
   id: Fulton1
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index 391c7837a06..4992a010dce 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -15,7 +15,9 @@
     grid:
     - 0,0,6,3
   - type: Item
-    size: Ginormous
+    size: Large # Frontier: Ginormous<Large
+    shape: # Frontier
+    - 0,0,6,3 # Frontier
   - type: MeleeWeapon
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 0c75fbc92da..422218f1c69 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -122,7 +122,6 @@
   id: ComputerShuttle
   name: shuttle console
   description: Used to pilot a shuttle.
-  categories: [ HideSpawnMenu ] # Frontier
   components:
   - type: Sprite
     layers:
@@ -843,7 +842,7 @@
       enum.WiresUiKey.Key:
         type: WiresBoundUserInterface
   - type: Computer
-    board: Null # Frontier: CargoRequestComputerCircuitboard<Null
+    board: CargoRequestComputerCircuitboard
   - type: PointLight
     radius: 1.5
     energy: 1.6
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
index dc55343af85..ca8e4c68549 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_expedition.yml
@@ -135,7 +135,7 @@
       amount: 1
 
 - type: entity
-  parent: WeaponCaseLong
+  parent: WeaponCaseHeavy # TODO: long gun case
   id: WeaponCaseLongShotgunDoubleBarreledExpedition
   suffix: Dungeon, Double Barreled
   categories: [ HideSpawnMenu ]
@@ -161,7 +161,7 @@
       amount: 1
 
 - type: entity
-  parent: WeaponCaseLong
+  parent: WeaponCaseHeavy # TODO: long gun case
   id: WeaponCaseLongKammererExpedition
   suffix: Dungeon, Kammerer
   categories: [ HideSpawnMenu ]
@@ -339,7 +339,7 @@
     - id: WeaponRifleSVT
       amount: 1
     - id: MagazineLightRifleLowCapacity
-      amount: 2 
+      amount: 2
 
 # Energy
 - type: entity
@@ -503,7 +503,7 @@
 
 # LMG
 - type: entity
-  parent: WeaponCaseLong
+  parent: WeaponCaseHeavy # TODO: handheld weapon long case?
   id: WeaponCaseLongLightMachineGunL6
   suffix: Dungeon, L6
   categories: [ HideSpawnMenu ]
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/base_clothing_backpack.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/base_clothing_backpack.yml
new file mode 100644
index 00000000000..a79b0357d9c
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/base_clothing_backpack.yml
@@ -0,0 +1,53 @@
+
+- type: entity
+  abstract: true
+  parent: ClothingBackpack
+  id: NFClothingBackpack
+  components:
+  - type: Storage
+    maxItemSize: Large
+    defaultStorageOrientation: Vertical
+    grid:
+    - 0,0,6,3
+  - type: Item
+    size: Huge
+    shape:
+    - 0,0,6,3
+
+- type: entity
+  abstract: true
+  parent: ClothingBackpack
+  id: NFClothingDuffel
+  components:
+  - type: Storage
+    maxItemSize: Huge
+    defaultStorageOrientation: Vertical
+    grid:
+    - 0,0,7,4
+  - type: Item
+    size: Huge
+    shape:
+    - 0,0,7,5
+
+- type: entity
+  abstract: true
+  parent: NFClothingBackpack
+  id: NFClothingMessenger
+  components:  
+  ## One 4x4 pocket, four 2x2 pockets
+  - type: Storage
+    grid:
+    - 0,0,1,1
+    - 0,3,1,4
+    - 3,0,6,3
+    - 8,0,9,1
+    - 8,3,9,4
+
+  # Alternative layouts
+  ## Two 2x1 pockets, one 2x3 pocket and one 6x3 pocket
+  # - type: Storage
+    # grid:
+    # - 0,0,1,2
+    # - 3,0,8,2
+    # - 10,0,11,0
+    # - 10,2,11,2
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml
index b678f36bd8d..568b8860cd9 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel
   id: ClothingBackpackDuffelMercenary # Frontier - Merc to Mercenary
   name: mercenary duffel
   description: A duffel that has been in many dangerous places, a reliable combat duffel.
@@ -10,14 +10,14 @@
 - type: entity
   id: ClothingBackpackDuffelArcadia
   name: arcadia duffel
-  parent: [ ClothingBackpackDuffel, BaseC3ContrabandNoValue, ContrabandClothing ]
+  parent: [ NFClothingDuffel, BaseC3ContrabandNoValue, ContrabandClothing ]
   description: A duffelbag produced by Arcadia Industries
   components:
   - type: Sprite
     sprite: _NF/Clothing/Back/Duffels/arcadia.rsi
 
 - type: entity
-  parent: ClothingBackpackDuffel
+  parent: NFClothingDuffel
   id: ClothingBackpackDuffelPilot
   name: pilot duffel
   description: A duffelbag produced for a True Ace.
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
index c9ddcdb217f..dd0d00f7313 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml
@@ -1,6 +1,6 @@
 # BASE
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingMessenger
   id: ClothingBackpackMessengerContractor
   name: contractor messenger bag
   description: A trendy looking messenger bag in tasteful colors.
@@ -38,7 +38,7 @@
         color: "#eeeeee"
 
 - type: entity
-  parent: ClothingBackpack
+  parent: NFClothingMessenger
   id: ClothingBackpackMessenger
   name: messenger bag
   description: A trendy looking messenger bag.
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/base_clothing_belt.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/base_clothing_belt.yml
new file mode 100644
index 00000000000..31eb8c69e63
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/base_clothing_belt.yml
@@ -0,0 +1,30 @@
+
+- type: entity
+  abstract: true
+  parent: ClothingBeltStorageBase
+  id: NFClothingBeltStorageBase
+  components:
+  - type: Storage
+    maxItemSize: Normal
+    defaultStorageOrientation: Vertical
+    grid:
+    - 0,0,7,1
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,3,3
+
+- type: entity
+  abstract: true
+  parent: ClothingBeltAmmoProviderBase
+  id: NFClothingBeltAmmoProviderBase
+  components:
+  - type: BallisticAmmoProvider
+    mayTransfer: true
+  - type: Item
+    size: Large
+    shape:
+    - 0,0,3,3
+  - type: ContainerContainer
+    containers:
+      ballistic-ammo: !type:Container
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
index a8e0f92310f..1a09fc5170a 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: ClothingBeltArcadia
   name: arcadia webbing
-  parent: [ ClothingBeltStorageBase, BaseC3ContrabandNoValue, ContrabandClothing ]
+  parent: [ NFClothingBeltStorageBase, BaseC3ContrabandNoValue, ContrabandClothing ]
   description: A webbing created by Arcadia Industries. Seems very capable of fitting many items.
   components:
   - type: Sprite
@@ -10,7 +10,7 @@
     sprite: _NF/Clothing/Belt/arcadia.rsi
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase
   id: ClothingBeltChaplainSash
   name: chaplain sash
   description: Who knew that scarves can be also tied around your waist?
@@ -52,7 +52,7 @@
   - type: Appearance
 
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase
   id: ClothingBeltPilot
   name: pilot webbing
   description: A webbing designed for someone seating a lot.
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_blood_cult.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_blood_cult.yml
index d1f1a509ac8..61e038a84ae 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_blood_cult.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_blood_cult.yml
@@ -18,7 +18,7 @@
 - type: entity
   parent:
   - BaseC3CultContrabandUnredeemable
-  - ClothingBeltStorageBase
+  - NFClothingBeltStorageBase
   - ContrabandClothing
   id: ClothingBeltCultWebbing
   name: cult webbing
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_crossbow_quiver.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_crossbow_quiver.yml
index 5da2fc5fcc9..eec4c831c22 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_crossbow_quiver.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_crossbow_quiver.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingBeltStorageBase
+  parent: NFClothingBeltStorageBase
   id: ClothingBeltQuiverCrossbow
   name: quiver (bolts)
   description: Can hold up to 25 bolts, and fits snug around your waist.
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml
index 0e347057933..e3fb2aa1989 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts_punk.yml
@@ -1,7 +1,7 @@
 
 - type: entity
   id: ClothingBeltPunkRandomized
-  parent: [ ClothingBeltStorageBase, RecyclableItemClothBasic ]
+  parent: [ NFClothingBeltStorageBase, RecyclableItemClothBasic ]
   name: punk belt
   description: A webbing with functional pockets.
   suffix: Random visuals
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml
index dce9dcb8850..1e5040bc507 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml
@@ -129,7 +129,7 @@
     job_id: Bailiff
 
 - type: entity
-  id: SpawnPointSeniorOfficer
+  id: NFSpawnPointSeniorOfficer
   parent: SpawnPointWarden
   name: sergeant
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml b/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml
index 7dbefb77548..116c4738758 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Storage/weapon_cases.yml
@@ -12,18 +12,22 @@
       state: icon
     - state: unshaded
       shader: unshaded
-  - type: Item
-    sprite: _NF/Objects/Storage/Cases/guncaselong.rsi
   - type: GenericVisualizer
     visuals:
       enum.StorageVisuals.Open:
         base:
           True: { state: icon-open }
           False: { state: icon }
+  - type: Item
+    sprite: _NF/Objects/Storage/Cases/guncaselong.rsi
+    size: Large
+    shape:
+    - 0,0,4,3
   - type: Storage
     maxItemSize: Huge
     grid:
-    - 0,0,4,3
+    - 0,0,3,3
+    - 5,0,6,3
     whitelist:
       components:
       - Gun
@@ -47,8 +51,10 @@
   - type: Sprite
     sprite: _NF/Objects/Storage/Cases/guncaseshort.rsi
   - type: Item
-    size: Large
     sprite: _NF/Objects/Storage/Cases/guncaseshort.rsi
+    size: Normal
+    shape:
+    - 0,0,3,1
   - type: Storage
     maxItemSize: Normal
     grid:
@@ -124,8 +130,10 @@
   - type: Sprite
     sprite: _NF/Objects/Storage/Cases/guncaseheavy.rsi
   - type: Item
-    size: Ginormous
     sprite: _NF/Objects/Storage/Cases/guncaseheavy.rsi
+    size: Ginormous
+    shape:
+    - 0,0,8,3
   - type: Storage
     maxItemSize: Ginormous
     grid:
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/frame_tabletop.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/frame_tabletop.yml
index a794a96a074..75d01454746 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/frame_tabletop.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/frame_tabletop.yml
@@ -21,7 +21,7 @@
     - type: Anchorable
     - type: Construction
       graph: ComputerTabletop
-      node: frameUnsecured
+      node: tabletop computer
     - type: Sprite
       sprite: _NF/Structures/Machines/computer_tabletop.rsi
       drawdepth: SmallObjects
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/implanter.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/implanter.yml
index 882044e4af0..c7ae6475adc 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/implanter.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/implanter.yml
@@ -1,6 +1,7 @@
 #T0
 - type: loadout
   id: ContractorMedicalTrackingImplanter
+  name: medical tracking implanter
   storage:
     back:
     - MedicalTrackingImplanter
@@ -8,6 +9,7 @@
 #T1
 - type: loadout
   id: ContractorLightImplanter
+  name: light implanter
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
@@ -18,6 +20,7 @@
 
 - type: loadout
   id: ContractorBikeHornImplanter
+  name: bike horn implanter
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
@@ -28,6 +31,7 @@
 
 - type: loadout
   id: ContractorSadTromboneImplanter
+  name: sad trombone implanter
   effects:
   - !type:GroupLoadoutEffect
     proto: ContractorT1
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml
index 626dae1e443..a862e3ac2ab 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml
@@ -23,7 +23,7 @@
     back: ClothingBackpackBloodCultLootB
     belt: ClothingBeltCultWebbing
   inhand:
-    - SpawnInhandMeleeWeaponBloodCultHigh
+    - EldritchBlade
 
 # Cultist (Melee)
 - type: startingGear
@@ -37,7 +37,7 @@
     belt: ClothingBeltCultWebbing
     back: ClothingBackpackBloodCultLootD
   inhand:
-    - SpawnInhandMeleeWeaponBloodCultLow
+    - EldritchBlade
 
 # Cultist (Ranged)
 - type: startingGear
@@ -51,7 +51,7 @@
     back: ClothingBackpackBloodCultZealotLootA
     belt: ClothingBeltQuiverCrossbowFilledBolt
   inhand:
-    - SpawnInhandMeleeWeaponBloodCultLow
+    - EldritchBlade
 
 # Cultist (Caster)
 - type: startingGear
@@ -79,4 +79,4 @@
     belt: ClothingBeltCultForceField
     back: ClothingBackpackBloodCultLootA
   inhand:
-    - SpawnInhandMeleeWeaponBloodCultHigh
+    - EldritchBlade