diff --git a/Resources/Maps/_NF/Shuttles/mailpod.yml b/Resources/Maps/_NF/Shuttles/mailpod.yml
index a8f7153eb48..01585bb32ae 100644
--- a/Resources/Maps/_NF/Shuttles/mailpod.yml
+++ b/Resources/Maps/_NF/Shuttles/mailpod.yml
@@ -866,7 +866,7 @@ entities:
     - type: Transform
       pos: 2.5,1.5
       parent: 1
-- proto: SuitStorageWallmountMailCarrier
+- proto: LockerWallEVAColorMailFilled
   entities:
   - uid: 95
     components:
diff --git a/Resources/Maps/_NF/Shuttles/parcel.yml b/Resources/Maps/_NF/Shuttles/parcel.yml
index 46337f2932c..4f03fabd5ee 100644
--- a/Resources/Maps/_NF/Shuttles/parcel.yml
+++ b/Resources/Maps/_NF/Shuttles/parcel.yml
@@ -1504,7 +1504,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,1.5
       parent: 1
-- proto: SuitStorageWallmountMailCarrier
+- proto: LockerWallEVAColorMailFilled
   entities:
   - uid: 73
     components:
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
index 4809cec01c4..76d1ec313ce 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelCargo: 3
     ClothingBackpackDuffelCargo: 3
     ClothingBackpackMessengerCargo: 3 # Frontier
+    ClothingOuterEVASuitCargo: 3 # Frontier
     ClothingUniformJumpsuitCargo: 3
     ClothingUniformJumpskirtCargo: 3
     ClothingShoesColorBlack: 3
@@ -21,6 +22,7 @@
     ClothingBackpackSatchelSalvage: 2
     ClothingBackpackDuffelSalvage: 2
     ClothingBackpackMessengerSalvage: 2 # Frontier
+    ClothingOuterEVASuitSalvage: 2 # Frontier
     ClothingBeltSalvageWebbing: 2
     ClothingUniformJumpsuitSalvageSpecialist: 2
     ClothingOuterWinterMiner: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
index 069aa036c64..e7837cbccc5 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -15,30 +15,31 @@
     ClothingHeadHatWitch1: 3
     ClothingOuterPlagueSuit: 3
     ClothingMaskPlague: 3
-    ClothingHeadHatKippah: 3
-    ClothingHeadHatWideBrimmed: 3
-    ClothingHeadHatPilgrim: 3
-    ClothingUniformJumpsuitChaplainPilgrimVest: 3
-    ClothingHeadHatBishopMitre: 3
-    ClothingOuterCoatBishop: 3
-    ClothingHeadHatCardinal: 3
-    ClothingOuterCoatCardinal: 3
-    ClothingHeadHatWitchhunter: 3
-    ClothingOuterCoatWitchHunter: 3
-    ClothingNeckScarfChaplainStole: 3
+    ClothingHeadHatKippah: 3 # Frontier
+    ClothingHeadHatWideBrimmed: 3 # Frontier
+    ClothingHeadHatPilgrim: 3 # Frontier
+    ClothingUniformJumpsuitChaplainPilgrimVest: 3 # Frontier
+    ClothingHeadHatBishopMitre: 3 # Frontier
+    ClothingOuterCoatBishop: 3 # Frontier
+    ClothingHeadHatCardinal: 3 # Frontier
+    ClothingOuterCoatCardinal: 3 # Frontier
+    ClothingHeadHatWitchhunter: 3 # Frontier
+    ClothingOuterCoatWitchHunter: 3 # Frontier
+    ClothingNeckScarfChaplainStole: 3 # Frontier
     ClothingNeckStoleChaplain: 3
-    ClothingBeltChaplainSash: 3
+    ClothingBeltChaplainSash: 3 # Frontier
     ClothingHeadsetService: 4
     RubberStampChaplain: 3
     Bible: 3
-    UrnMortuary: 4
-    Censer: 2
-    ClothingNeckCrucifix: 3
     BoxCandle: 2
     BoxCandleSmall: 2
     Urn: 5
+    UrnMortuary: 4 # Frontier
+    Censer: 2 # Frontier
+    ClothingNeckCrucifix: 3 # Frontier
+    ClothingOuterEVASuitChaplain: 3 # Frontier
   emaggedInventory:
-    WoodenStake: 6
+    WoodenStake: 6 # Frontier
     ClothingOuterArmorCult: 1
     ClothingHeadHelmetCult: 1
     ClothingOuterRobesCult: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
index c238e396191..eefa26fab88 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
@@ -1,6 +1,7 @@
 - type: vendingMachineInventory
   id: ChefDrobeInventory
   startingInventory:
+    ClothingOuterEVASuitServiceWorker: 2 # Frontier
     ClothingHeadsetService: 2
     ClothingOuterApronChef: 3
     ClothingOuterWinterChef: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
index cad9c2eac38..7b25a12cef7 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelEngineering: 3
     ClothingBackpackEngineering: 3
     ClothingBackpackMessengerEngineering: 3 # Frontier
+    ClothingOuterEVASuitEngineer: 3 # Frontier
     ClothingUniformJumpsuitEngineering: 3
     ClothingUniformJumpskirtEngineering: 3
     ClothingUniformJumpsuitEngineeringHazard: 3
@@ -24,6 +25,7 @@
     ClothingBackpackSatchelAtmospherics: 2
     ClothingBackpackAtmospherics: 2
     ClothingBackpackMessengerAtmospherics: 2 # Frontier
+    ClothingOuterEVASuitAtmosTech: 2 # Frontier
     ClothingUniformJumpsuitAtmos: 3
     ClothingUniformJumpskirtAtmos: 3
     ClothingUniformJumpsuitAtmosCasual: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
index 0b342a1207c..ceda3f4a8dc 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelHydroponics: 3
     ClothingBackpackDuffelHydroponics: 3
     ClothingBackpackMessengerHydroponics: 3 # Frontier
+    ClothingOuterEVASuitHydro: 3 # Frontier
     ClothingBeltPlant: 3 # Frontier
     ClothingOuterApronBotanist: 3
     ClothingUniformOveralls: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
index 676b2ef2a06..f52174815de 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -14,6 +14,7 @@
     ClothingNeckScarfStripedPurple: 3
     ClothingHeadHatHoodBioJanitor: 1 # Frontier - Bio suit
     ClothingOuterBioJanitor: 1 # Frontier - Bio suit
+    ClothingOuterEVASuitJanitor: 1 # Frontier - EVA
   contrabandInventory: # Frontier - Hidden inventory
     ClothingUniformJumpskirtJanimaid: 2
     ClothingUniformJumpskirtJanimaidmini: 1
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
index b894699f31d..61609fe5173 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelMedical: 4
     ClothingBackpackDuffelMedical: 4
     ClothingBackpackMessengerMedical: 4 # Frontier
+    ClothingOuterEVASuitMedic: 4 # Frontier
     ClothingUniformJumpsuitMedicalDoctor: 4
     ClothingUniformJumpskirtMedicalDoctor: 4
     ClothingOuterWinterMed: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
index 3270f10d24c..92e0de0b6b3 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
@@ -5,6 +5,7 @@
     ClothingBackpackSatchelScience: 3
     ClothingBackpackDuffelScience: 3
     ClothingBackpackMessengerScience: 3 # Frontier
+    ClothingOuterEVASuitScientist: 3 # Frontier
     ClothingUniformJumpsuitScientist: 3
     ClothingUniformJumpskirtScientist: 3
     ClothingUniformJumpsuitScientistFormal: 3
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 567f5226249..b075a8f92d8 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -207,6 +207,8 @@
       - ClothingHeadHelmetEVA # Frontier
       - ClothingHeadHelmetEVALarge # Frontier
       - ClothingOuterHardsuitEVA # Frontier
+      - ClothingOuterEVASuitContractor # Frontier
+      - ClothingOuterEVASuitPilot # Frontier
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - BoxLethalshot
@@ -818,15 +820,14 @@
       - TargetHuman
       - TargetSyndicate
       - WeaponDisablerPractice
-      # Frontier Start
-      - ThrusterSecurityMachineCircuitboard
-      - ClothingOuterSuitEmergency
-      - ClothingHeadHelmetEVA
-      - ClothingHeadHelmetEVALarge
-      - ClothingOuterHardsuitEVAPrisoner
-      # Frontier End
       - WeaponLaserCarbinePractice
       - Zipties
+      - ThrusterSecurityMachineCircuitboard # Frontier
+      - ClothingOuterSuitEmergency # Frontier
+      - ClothingOuterEVASuitNfsd # Frontier
+      - ClothingHeadHelmetEVA # Frontier
+      - ClothingHeadHelmetEVALarge # Frontier
+      - ClothingOuterHardsuitEVAPrisoner # Frontier
     dynamicRecipes:
       - BoxBeanbag
       - BoxShotgunIncendiary
@@ -1006,11 +1007,10 @@
       - Saw
       - Hemostat
       - ClothingEyesGlassesChemical
-      # Frontier Start
-      - ClothingOuterSuitEmergency
-      - ClothingOuterHardsuitVoidParamed
-      # Frontier End
       - WhiteCane
+      - ClothingOuterEVASuitMedic # Frontier
+      - ClothingOuterSuitEmergency # Frontier
+      - ClothingOuterHardsuitVoidParamed # Frontier
     dynamicRecipes:
       - ChemicalPayload
       - CryostasisBeaker
@@ -1018,9 +1018,7 @@
       - SyringeBluespace
       - Jug
       - SyringeCryostasis
-      # Frontier Start
-      - ClothingOuterHardsuitMedical
-      # Frontier End
+      - ClothingOuterHardsuitMedical # Frontier
   - type: Machine
     board: MedicalTechFabCircuitboard
   - type: StealTarget
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml
index 863cdb979e7..415a7bfa4cb 100644
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/boxingdrobe.yml
@@ -7,5 +7,9 @@
     ClothingHandsGlovesBoxingBlue: 2
     ClothingHandsGlovesBoxingGreen: 2
     ClothingHandsGlovesBoxingYellow: 2
+    ClothingOuterEVASuitBoxerRed: 2 # Frontier
+    ClothingOuterEVASuitBoxerGreen: 2 # Frontier
+    ClothingOuterEVASuitBoxerBlue: 2 # Frontier
+    ClothingOuterEVASuitBoxerYellow: 2 # Frontier
   emaggedInventory:
     UniformJabroni: 2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
index 6e6e3d952ff..90857ff282b 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
@@ -23,6 +23,8 @@
   - type: Lathe
     idleState: icon
     runningState: icon
+    staticRecipes: #Frontier
+      - ClothingOuterEVASuitScientist #Frontier
     dynamicRecipes:
       - BluespaceBeaker
       - CryostasisBeaker
@@ -122,10 +124,15 @@
       - Beaker # Frontier
       - LargeBeaker # Frontier
       - ServiceSelectiveDropper # Frontier
-      - ClothingOuterSuitEmergency # Frontier
-      - ClothingHeadHelmetEVA # Frontier
-      - ClothingOuterHardsuitEVA # Frontier
       - ClothingOuterEVASuitHydro # Frontier
+      - ClothingOuterEVASuitJanitor # Frontier
+      - ClothingOuterEVASuitMailman # Frontier
+      - ClothingOuterEVASuitServiceWorker # Frontier
+      - ClothingOuterEVASuitChaplain # Frontier
+      - ClothingOuterEVASuitBoxerRed # Frontier
+      - ClothingOuterEVASuitBoxerGreen # Frontier
+      - ClothingOuterEVASuitBoxerBlue # Frontier
+      - ClothingOuterEVASuitBoxerYellow # Frontier
     dynamicRecipes:
       - Holoprojector
       - HydroponicsToolScythe
@@ -243,6 +250,8 @@
       - ClothingHeadHelmetEVA # Frontier
       - ClothingHeadHelmetEVALarge # Frontier
       - ClothingOuterHardsuitEVA # Frontier
+      - ClothingOuterEVASuitEngineer # Frontier
+      - ClothingOuterEVASuitAtmosTech # Frontier
       - WelderIndustrial # Frontier
       - WelderIndustrialAdvanced # Frontier
       # Engi fab has shuttle power and tech at base
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml
index 4428a35957c..c3952c5e8ad 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/duffelbag.yml
@@ -82,3 +82,142 @@
         - id: Cutlass
         - id: WeaponRevolverPirate
         - id: ClothingEyesEyepatch
+
+#Departmental EVA bundles
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitContractor ]
+  id: ClothingBackpackDuffelEVABundleContractor
+  name: contractor EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelPilot, StorageFillEVASuitPilot ]
+  id: ClothingBackpackDuffelEVABundlePilot
+  name: pilot EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelCaptain, StorageFillEVASuitSr ]
+  id: ClothingBackpackDuffelEVABundleSr
+  name: station representative EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelCaptain, StorageFillEVASuitCaptain ]
+  id: ClothingBackpackDuffelEVABundleCaptain
+  name: captain EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelEngineering, StorageFillEVASuitEngineer ]
+  id: ClothingBackpackDuffelEVABundleEngineer
+  name: engineer EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelAtmospherics, StorageFillEVASuitAtmosTech ]
+  id: ClothingBackpackDuffelEVABundleAtmosTech
+  name: atmospheric technician EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelCargo, StorageFillEVASuitCargo ]
+  id: ClothingBackpackDuffelEVABundleCargo
+  name: cargo technician EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelSalvage, StorageFillEVASuitSalvage ]
+  id: ClothingBackpackDuffelEVABundleSalvage
+  name: salvage specialist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelMedical, StorageFillEVASuitMedic ]
+  id: ClothingBackpackDuffelEVABundleMedical
+  name: medical specialist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelScience, StorageFillEVASuitScientist ]
+  id: ClothingBackpackDuffelEVABundleScientist
+  name: scientist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitJanitor ]
+  id: ClothingBackpackDuffelEVABundleJanitor
+  name: janitor EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitServiceWorker ]
+  id: ClothingBackpackDuffelEVABundleServiceWorker
+  name: service worker EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitChaplain ]
+  id: ClothingBackpackDuffelEVABundleChaplain
+  name: chaplain EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerRed ]
+  id: ClothingBackpackDuffelEVABundleBoxerRed
+  name: boxer EVA bundle
+  suffix: Filled, Red
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerGreen ]
+  id: ClothingBackpackDuffelEVABundleBoxerGreen
+  name: boxer EVA bundle
+  suffix: Filled, Green
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerBlue ]
+  id: ClothingBackpackDuffelEVABundleBoxerBlue
+  name: boxer EVA bundle
+  suffix: Filled, Blue
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerYellow ]
+  id: ClothingBackpackDuffelEVABundleBoxerYellow
+  name: boxer EVA bundle
+  suffix: Filled, Yellow
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitBoxerRandom ]
+  id: ClothingBackpackDuffelEVABundleBoxerRandom
+  name: boxer EVA bundle
+  suffix: Filled, Random
+
+- type: entity
+  parent: [ ClothingBackpackDuffelHydroponics, StorageFillEVASuitHydro ]
+  id: ClothingBackpackDuffelEVABundleHydro
+  name: botanist EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitMail ]
+  id: ClothingBackpackDuffelEVABundleMail
+  name: mail carrier EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelMercenary, StorageFillEVASuitMercenary ]
+  id: ClothingBackpackDuffelEVABundleMercenary
+  name: mercenary EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffel, StorageFillEVASuitPrivateSec ]
+  id: ClothingBackpackDuffelEVABundlePrivateSec
+  name: private security EVA bundle
+  suffix: Filled
+
+- type: entity
+  parent: [ ClothingBackpackDuffelNfsdBrown, StorageFillEVASuitNfsd ]
+  id: ClothingBackpackDuffelEVABundleNfsd
+  name: nfsd EVA bundle
+  suffix: Filled
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml
new file mode 100644
index 00000000000..fab31edc58a
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml
@@ -0,0 +1,179 @@
+#FUEL
+- type: entity
+  parent: [ LockerWallColorFuelPlasma, StorageFillMaterialsFuelPlasma ]
+  id: LockerWallMaterialsFuelPlasmaFilled
+  suffix: Filled, Plasma
+
+- type: entity
+  parent: [ LockerWallColorUranium, StorageFillMaterialsFuelUranium ]
+  id: LockerWallMaterialsFuelUraniumFilled
+  suffix: Filled, Uranium
+
+- type: entity
+  parent: [ LockerWallColorFuelPlasma, StorageFillMaterialsFuelPlasma2 ]
+  id: LockerWallMaterialsFuelPlasmaFilled2
+  suffix: Filled, Plasma (x2 Generators)
+
+- type: entity
+  parent: [ LockerWallColorUranium, StorageFillMaterialsFuelUranium2 ]
+  id: LockerWallMaterialsFuelUraniumFilled2
+  suffix: Filled, Uranium (x2 Generators)
+
+- type: entity
+  parent: [ LockerWallColorBananium, StorageFillMaterialsFuelBananium ]
+  id: LockerWallMaterialsFuelBananiumFilled
+  suffix: Filled, Bananium
+
+- type: entity
+  parent: [ LockerWallColorAme, StorageFillMaterialsFuelAmeJar ]
+  id: LockerWallMaterialsFuelAmeJarFilled
+  suffix: Filled, AME Jar (x2)
+
+- type: entity
+  parent: [ LockerWallColorWelding, StorageFillMaterialsFuelWelding ]
+  id: LockerWallMaterialsFuelWeldingFilled
+  suffix: Filled, Welding Fuel (x2)
+
+#MATERIALS
+- type: entity
+  parent: [ LockerWallColorMaterials, StorageFillMaterialsBasic ]
+  id: LockerWallMaterialsBasicFilled
+  suffix: Filled, Basic Materials (full)
+
+- type: entity
+  parent: [ LockerWallColorMaterials, StorageFillMaterialsBasic10 ]
+  id: LockerWallMaterialsBasic10Filled
+  suffix: Filled, Basic Materials (10)
+
+#SOFTSUITS
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitGoblin ]
+  id: LockerWallEVAColorGoblinFilled
+  name: goblin EVA locker
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorContractor, StorageFillEVASuitContractor ]
+  id: LockerWallEVAColorContractorFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorPilot, StorageFillEVASuitPilot ]
+  id: LockerWallEVAColorPilotFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorSr, StorageFillEVASuitSr ]
+  id: LockerWallEVAColorSrFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorCaptain, StorageFillEVASuitCaptain ]
+  id: LockerWallEVAColorCaptainFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorEngineer, StorageFillEVASuitEngineer ]
+  id: LockerWallEVAColorEngineerFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorAtmosTech, StorageFillEVASuitAtmosTech ]
+  id: LockerWallEVAColorAtmosTechFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorCargo, StorageFillEVASuitCargo ]
+  id: LockerWallEVAColorCargoFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorSalvage, StorageFillEVASuitSalvage ]
+  id: LockerWallEVAColorSalvageFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorMedical, StorageFillEVASuitMedic ]
+  id: LockerWallEVAColorMedicalFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorMedical, StorageFillEVASuitParamedic ]
+  id: LockerWallEVAColorParamedicFilled
+  name: paramedic voidsuit wall locker
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorScientist, StorageFillEVASuitScientist ]
+  id: LockerWallEVAColorScientistFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorJanitor, StorageFillEVASuitJanitor ]
+  id: LockerWallEVAColorJanitorFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorServiceWorker, StorageFillEVASuitServiceWorker ]
+  id: LockerWallEVAColorServiceWorkerFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorChaplain, StorageFillEVASuitChaplain ]
+  id: LockerWallEVAColorChaplainFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitBoxerRed ]
+  id: LockerWallEVAColorBoxerRedFilled
+  name: boxer EVA locker
+  suffix: Filled, Red
+
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitBoxerGreen ]
+  id: LockerWallEVAColorBoxerGreenFilled
+  name: boxer EVA locker
+  suffix: Filled, Green
+
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitBoxerBlue ]
+  id: LockerWallEVAColorBoxerBlueFilled
+  name: boxer EVA locker
+  suffix: Filled, Blue
+
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitBoxerYellow ]
+  id: LockerWallEVAColorBoxerYellowFilled
+  name: boxer EVA locker
+  suffix: Filled, Yellow
+
+- type: entity
+  parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitBoxerRandom ]
+  id: LockerWallEVAColorBoxerRandomFilled
+  name: boxer EVA locker
+  suffix: Filled, Random
+
+- type: entity
+  parent: [ LockerWallEVAColorHydroponics, StorageFillEVASuitHydro ]
+  id: LockerWallEVAColorHydroponicsFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorMail, StorageFillEVASuitMail ]
+  id: LockerWallEVAColorMailFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorMercenary, StorageFillEVASuitMercenary ]
+  id: LockerWallEVAColorMercenaryFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorPrivateSec, StorageFillEVASuitPrivateSec ]
+  id: LockerWallEVAColorPrivateSecFilled
+  suffix: Filled
+
+- type: entity
+  parent: [ LockerWallEVAColorNfsd, StorageFillEVASuitNfsd ]
+  id: LockerWallEVAColorNfsdFilled
+  suffix: Filled
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
index 2915629f93e..1495f5d65d5 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -1,65 +1,181 @@
 #SOFTSUITS
-#Paramedic's voidsuit
 - type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitGoblin ]
+  id: SuitStorageEVAGoblin
+  suffix: EVA, Goblin
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitContractor ]
+  id: SuitStorageEVAContractor
+  suffix: EVA, Contractor
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitPilot ]
+  id: SuitStorageEVAPilot
+  suffix: EVA, Pilot
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitSr ]
+  id: SuitStorageEVASr
+  suffix: EVA, Station Representative
+  components:
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitCaptain ]
+  id: SuitStorageEVACaptain
+  suffix: EVA, Captain
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitEngineer ]
+  id: SuitStorageEVAEngineer
+  suffix: EVA, Engineer
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitAtmosTech ]
+  id: SuitStorageEVAAtmosTech
+  suffix: EVA, Atmospherics Technician
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitCargo ]
+  id: SuitStorageEVACargo
+  suffix: EVA, Cargo Technician
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitSalvage ]
+  id: SuitStorageEVASalvage
+  suffix: EVA, Salvage Specialist
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitMedic ]
+  id: SuitStorageEVAMedical
+  suffix: EVA, Medical Doctor
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitParamedic ]
   id: SuitStorageParamedic
-  parent: SuitStorageBase
-  suffix: Paramedic
+  suffix: EVA, Paramedic
   components:
-  - type: StorageFill
-    contents:
-        - id: AirTankFilled
-        - id: ClothingOuterHardsuitVoidParamed
-        - id: ClothingMaskBreathMedical
-        - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
-#Hydroponics EVA
 - type: entity
-  id: SuitStorageHydro
-  parent: SuitStorageBase
-  suffix: Hydroponics
+  parent: [ SuitStorageBase, StorageFillEVASuitScientist ]
+  id: SuitStorageEVAScientist
+  suffix: EVA, Scientist
   components:
-  - type: StorageFill
-    contents:
-        - id: AirTankFilled
-        - id: ClothingOuterEVASuitHydro
-        - id: ClothingMaskBreath
-        - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
-#Mail Carrier EVA
 - type: entity
-  id: SuitStorageMailCarrier
-  parent: SuitStorageBase
-  suffix: Mail Carrier
+  parent: [ SuitStorageBase, StorageFillEVASuitJanitor ]
+  id: SuitStorageEVAJanitor
+  suffix: EVA, Janitor
   components:
-  - type: StorageFill
-    contents:
-        - id: AirTankFilled
-        - id: ClothingOuterEVASuitMailman
-        - id: ClothingMaskBreath
-        - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
-    access: [["Mail"]]
 
-#Goblin EVA
 - type: entity
-  id: SuitStorageGoblin
-  parent: SuitStorageBase
-  suffix: Goblin
+  parent: [ SuitStorageBase, StorageFillEVASuitServiceWorker ]
+  id: SuitStorageEVAServiceWorker
+  suffix: EVA, Service Worker
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitChaplain ]
+  id: SuitStorageEVAChaplain
+  suffix: EVA, Chaplain
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitBoxerRed ]
+  id: SuitStorageEVABoxerRed
+  suffix: EVA, Boxer, Red
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitBoxerGreen ]
+  id: SuitStorageEVABoxerGreen
+  suffix: EVA, Boxer, Green
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitBoxerBlue ]
+  id: SuitStorageEVABoxerBlue
+  suffix: EVA, Boxer, Blue
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitBoxerYellow ]
+  id: SuitStorageEVABoxerYellow
+  suffix: EVA, Boxer, Yellow
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitBoxerRandom ]
+  id: SuitStorageEVABoxerRandom
+  suffix: EVA, Boxer, Random
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitHydro ]
+  id: SuitStorageEVAHydro
+  suffix: EVA, Hydroponics
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitMail ]
+  id: SuitStorageEVAMail
+  suffix: EVA, Mail Carrier
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitMercenary ]
+  id: SuitStorageEVAMercenary
+  suffix: EVA, Mercenary
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitPrivateSec ]
+  id: SuitStorageEVAPrivateSec
+  suffix: EVA, Private Security
   components:
-  - type: StorageFill
-    contents:
-        - id: AirTankFilled
-        - id: ClothingOuterEVASuitGoblin
-        - id: ClothingMaskBreath
-        - id: JetpackMiniFilled
-        - id: HandheldGPSBasic
   - type: AccessReader
 
+- type: entity
+  parent: [ SuitStorageBase, StorageFillEVASuitNfsd ]
+  id: SuitStorageEVANfsd
+  suffix: EVA, NFSD
+  components:
+  - type: AccessReader
+    access: [["Security"]]
+
 #HARDSUITS
 #Quartermaster hardsuit
 - type: entity
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
index 2993b1a8b35..88caeb174ec 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
@@ -1,23 +1,180 @@
 #SOFTSUITS
-#Paramedic's Voidsuit
 - type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitGoblin ]
+  id: SuitStorageWallmountEVAGoblin
+  suffix: EVA, Goblin
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitContractor ]
+  id: SuitStorageWallmountEVAContractor
+  suffix: EVA, Contractor
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitPilot ]
+  id: SuitStorageWallmountEVAPilot
+  suffix: EVA, Pilot
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitSr ]
+  id: SuitStorageWallmountEVASr
+  suffix: EVA, Station Representative
+  components:
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitCaptain ]
+  id: SuitStorageWallmountEVACaptain
+  suffix: EVA, Captain
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitEngineer ]
+  id: SuitStorageWallmountEVAEngineer
+  suffix: EVA, Engineer
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitAtmosTech ]
+  id: SuitStorageWallmountEVAAtmosTech
+  suffix: EVA, Atmospherics Technician
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitCargo ]
+  id: SuitStorageWallmountEVACargo
+  suffix: EVA, Cargo Technician
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitSalvage ]
+  id: SuitStorageWallmountEVASalvage
+  suffix: EVA, Salvage Specialist
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitMedic ]
+  id: SuitStorageWallmountEVAMedical
+  suffix: EVA, Medical Doctor
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitParamedic ]
   id: SuitStorageWallmountParamedic
-  parent: [SuitStorageWallmount, SuitStorageParamedic]
+  suffix: EVA, Paramedic
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitScientist ]
+  id: SuitStorageWallmountEVAScientist
+  suffix: EVA, Scientist
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitJanitor ]
+  id: SuitStorageWallmountEVAJanitor
+  suffix: EVA, Janitor
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitServiceWorker ]
+  id: SuitStorageWallmountEVAServiceWorker
+  suffix: EVA, Service Worker
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitChaplain ]
+  id: SuitStorageWallmountEVAChaplain
+  suffix: EVA, Chaplain
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitBoxerRed ]
+  id: SuitStorageWallmountEVABoxerRed
+  suffix: EVA, Boxer, Red
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitBoxerGreen ]
+  id: SuitStorageWallmountEVABoxerGreen
+  suffix: EVA, Boxer, Green
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitBoxerBlue ]
+  id: SuitStorageWallmountEVABoxerBlue
+  suffix: EVA, Boxer, Blue
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitBoxerYellow ]
+  id: SuitStorageWallmountEVABoxerYellow
+  suffix: EVA, Boxer, Yellow
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitBoxerRandom ]
+  id: SuitStorageWallmountEVABoxerRandom
+  suffix: EVA, Boxer, Random
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitHydro ]
+  id: SuitStorageWallmountEVAHydro
+  suffix: EVA, Hydroponics
+  components:
+  - type: AccessReader
+
+- type: entity
+  parent: [ SuitStorageWallmount, StorageFillEVASuitMail ]
+  id: SuitStorageWallmountEVAMail
+  suffix: EVA, Mail Carrier
+  components:
+  - type: AccessReader
 
-#Hydroponics EVA
 - type: entity
-  id: SuitStorageWallmountHydro
-  parent: [SuitStorageWallmount, SuitStorageHydro]
+  parent: [ SuitStorageWallmount, StorageFillEVASuitMercenary ]
+  id: SuitStorageWallmountEVAMercenary
+  suffix: EVA, Mercenary
+  components:
+  - type: AccessReader
 
-#Mail Carrier EVA
 - type: entity
-  id: SuitStorageWallmountMailCarrier
-  parent: [SuitStorageWallmount, SuitStorageMailCarrier]
+  parent: [ SuitStorageWallmount, StorageFillEVASuitPrivateSec ]
+  id: SuitStorageWallmountEVAPrivateSec
+  suffix: EVA, Private Security
+  components:
+  - type: AccessReader
 
-#Goblin EVA
 - type: entity
-  id: SuitStorageWallmountGoblin
-  parent: [SuitStorageWallmount, SuitStorageGoblin]
+  parent: [ SuitStorageWallmount, StorageFillEVASuitNfsd ]
+  id: SuitStorageWallmountEVANfsd
+  suffix: EVA, NFSD
+  components:
+  - type: AccessReader
+    access: [["Security"]]
 
 #HARDSUITS
 #Quartermaster hardsuit
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/departmental_eva.yml b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/departmental_eva.yml
new file mode 100644
index 00000000000..26bd2bb2525
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/departmental_eva.yml
@@ -0,0 +1,356 @@
+# Departmental EVA suits
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitContractor
+  description: Contains a standard issue contractor EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitContractor
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitPilot
+  description: Contains a standard issue pilot EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitPilot
+    - id: ClothingMaskPilot
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitSr
+  description: Contains a standard issue station representative EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitSr
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitCaptain
+  description: Contains a standard issue captain EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitCaptain
+    - id: ClothingMaskGasCaptain
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitEngineer
+  description: Contains a standard issue engineer EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitEngineer
+    - id: ClothingMaskGas
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitAtmosTech
+  description: Contains a standard issue atmospheric technician EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitAtmosTech
+    - id: ClothingMaskGasAtmos
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitCargo
+  description: Contains a standard issue cargo technician EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitCargo
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitSalvage
+  description: Contains a standard issue salvage specialist EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitSalvage
+    - id: ClothingMaskGasExplorer
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitMedic
+  description: Contains a standard issue medical specialist EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitMedic
+    - id: ClothingMaskBreathMedical
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitParamedic
+  description: Contains a standard issue paramedic voidsuit kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterHardsuitVoidParamed
+    - id: ClothingMaskBreathMedical
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitScientist
+  description: Contains a standard issue scientist EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitScientist
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitJanitor
+  description: Contains a standard issue janitor EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitJanitor
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitServiceWorker
+  description: Contains a standard issue service worker EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitServiceWorker
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitChaplain
+  description: Contains a standard issue chaplain EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitChaplain
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: Lantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitBoxerRed
+  description: Contains a red boxer EVA suit and standard issue EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitBoxerRed
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: ClothingHandsGlovesBoxingRed
+    - id: ShardCrystalRed
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitBoxerGreen
+  description: Contains a green boxer EVA suit and standard issue EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitBoxerGreen
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: ClothingHandsGlovesBoxingGreen
+    - id: ShardCrystalGreen
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitBoxerBlue
+  description: Contains a blue boxer EVA suit and standard issue EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitBoxerBlue
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: ClothingHandsGlovesBoxingBlue
+    - id: ShardCrystalBlue
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitBoxerYellow
+  description: Contains a yellow boxer EVA suit and standard issue EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitBoxerYellow
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: ClothingHandsGlovesBoxingYellow
+    - id: ShardCrystalOrange
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitBoxerRandom
+  description: Contains a boxer EVA suit and standard issue EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitBoxerRandom
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: ClothingHandsGlovesBoxingBlue
+    - id: ShardCrystalBlue
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitHydro
+  description: Contains a standard issue botanist EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitHydro
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitMail
+  description: Contains a standard issue mail carrier EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitMailman
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightLantern
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitMercenary
+  description: Contains a standard issue mercenary EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: DoubleEmergencyAirTankFilled
+    - id: ClothingOuterEVASuitMercenary
+    - id: ClothingMaskGasMercenary
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightSeclite
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitPrivateSec
+  description: Contains a standard issue private security EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: DoubleEmergencyAirTankFilled
+    - id: ClothingOuterEVASuitPrivateSec
+    - id: ClothingMaskGasSecurity
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightSeclite
+
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitNfsd
+  description: Contains a standard issue NFSD EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: DoubleEmergencyAirTankFilled
+    - id: ClothingOuterEVASuitNfsd
+    - id: ClothingMaskGasNfsd
+    - id: JetpackNfsdFilled
+    - id: HandheldGPSBasic
+    - id: FlashlightNfsdLite
+
+# Other EVA Suits
+- type: entity
+  abstract: true
+  id: StorageFillEVASuitGoblin
+  description: Contains a traditional goblin EVA suit and standard EVA kit.
+  components:
+  - type: StorageFill
+    contents:
+    - id: AirTankFilled
+    - id: ClothingOuterEVASuitGoblin
+    - id: ClothingMaskBreath
+    - id: JetpackMiniFilled
+    - id: HandheldGPSBasic
+    - id: Lantern
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/materials.yml b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/materials.yml
new file mode 100644
index 00000000000..26b5da59489
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/materials.yml
@@ -0,0 +1,81 @@
+# Fuel
+- type: entity # Full stack
+  abstract: true
+  id: StorageFillMaterialsFuelPlasma
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetPlasma
+
+- type: entity # Full stack
+  abstract: true
+  id: StorageFillMaterialsFuelUranium
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetUranium
+
+- type: entity # Full stack
+  abstract: true
+  id: StorageFillMaterialsFuelPlasma2
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetPlasma
+      amount: 2
+
+- type: entity # Full stack
+  abstract: true
+  id: StorageFillMaterialsFuelUranium2
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetUranium
+      amount: 2
+
+- type: entity # Full stack
+  abstract: true
+  id: StorageFillMaterialsFuelBananium
+  components:
+  - type: StorageFill
+    contents:
+    - id: MaterialBananium
+
+- type: entity
+  abstract: true
+  id: StorageFillMaterialsFuelAmeJar
+  components:
+  - type: StorageFill
+    contents:
+    - id: AmeJar
+      amount: 2
+
+- type: entity
+  abstract: true
+  id: StorageFillMaterialsFuelWelding
+  components:
+  - type: StorageFill
+    contents:
+    - id: JerryCanWeldingFuel
+      amount: 2
+
+# Basic Materials
+- type: entity # Full stacks
+  abstract: true
+  id: StorageFillMaterialsBasic
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetSteel
+    - id: SheetGlass
+    - id: SheetPlastic
+
+- type: entity # Stacks of 10
+  abstract: true
+  id: StorageFillMaterialsBasic10
+  components:
+  - type: StorageFill
+    contents:
+    - id: SheetSteel10
+    - id: SheetGlass10
+    - id: SheetPlastic10
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
index 80448b3d525..c91d239d5ff 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
@@ -3,6 +3,7 @@
   startingInventory:
     ClothingOuterHardsuitSpatio: 5
     ClothingShoesBootsMag: 15
+    ClothingOuterEVASuitContractor: 10
     ClothingOuterHardsuitBasic: 5
     ClothingOuterHardsuitEVA: 10
     ClothingHeadHelmetEVA: 15
@@ -27,5 +28,6 @@
     ClothingHandsGlovesPilot: 3
     ClothingHeadHatPilot: 3
     ClothingNeckScarfPilot: 3
+    ClothingOuterEVASuitPilot: 5
     ClothingOuterHardsuitPilot: 3
     ClothingShoesBootsPilot: 3
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
index 85876fddcd5..8bd355b9810 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
@@ -14,6 +14,8 @@
     LogProbeCartridge: 3
     ContrabandAppraisalTool: 10
 #Bounty hunter
+    ClothingOuterEVASuitMercenary: 4
+    ClothingOuterEVASuitPrivateSec: 4
     ClothingUniformJumpsuitBH: 3
     ClothingUniformJumpskirtBH: 3
     ClothingUniformJumpsuitBHGrey: 2
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml
index 44dc9120e0e..764a942414d 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml
@@ -37,5 +37,6 @@
     ClothingShoesBootsNfsdBrown: 6
     ClothingShoesBootsNfsdCream: 6
     ClothingShoesBootsMagNfsd: 3
+    ClothingOuterEVASuitNfsd: 6
   contrabandInventory:
     ClothingUniformJumpskirtOfLife: 3
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml
index e956ba59399..e35879114c2 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/softsuit-helmets.yml
@@ -1,19 +1,16 @@
+# BASE
+
+# DEPARTMENTAL
 - type: entity
   parent: ClothingHeadEVAHelmetBase
   id: ClothingHeadEVAHelmetHydro
   name: botanist EVA helmet
   noSpawn: true
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: _NF/Clothing/Head/Helmets/eva_hydro.rsi
   - type: Clothing
     sprite: _NF/Clothing/Head/Helmets/eva_hydro.rsi
-  - type: Tag
-    tags:
-    - HelmetEVA
-    - HidesHair
-    - WhitelistChameleon
 
 - type: entity
   parent: ClothingHeadEVAHelmetBase
@@ -21,13 +18,551 @@
   name: mailcarrier EVA helmet
   noSpawn: true
   components:
-  - type: BreathMask
   - type: Sprite
     sprite: _NF/Clothing/Head/Helmets/eva_mailman.rsi
   - type: Clothing
     sprite: _NF/Clothing/Head/Helmets/eva_mailman.rsi
-  - type: Tag
-    tags:
-    - HelmetEVA
-    - HidesHair
-    - WhitelistChameleon
+
+# COLORED DEPARTMENTAL
+## CONTRACTORS
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetContractor
+  name: contractor EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#fff4e2"
+      - state: equipped-head-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-head-visor
+
+## COMMAND
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetSr
+  name: station representative EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#194214"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-decals-02
+      color: "#f2b833"
+    - state: icon-visor
+      color: "#fbe6b8"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#194214"
+      - state: equipped-head-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-head-decals-02
+        color: "#f2b833"
+      - state: equipped-head-visor
+        color: "#fbe6b8"
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetCaptain
+  name: captain EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#2d4c5e"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-decals-02
+      color: "#ffce5b"
+    - state: icon-visor
+      color: "#2572bf"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#2d4c5e"
+      - state: equipped-head-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-head-decals-02
+        color: "#ffce5b"
+      - state: equipped-head-visor
+        color: "#2572bf"
+
+## ENGINEERING
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetEngineer
+  name: engineer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#ffee00"
+    - state: icon-reinforced-points
+      color: "#ff7f00"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#ffee00"
+      - state: equipped-head-reinforced-points
+        color: "#ff7f00"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetAtmosTech
+  name: atmospheric technician EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#ffee00"
+    - state: icon-reinforced-points
+      color: "#00a5ff"
+    - state: icon-visor
+      color: "#e1b537"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#ffee00"
+      - state: equipped-head-reinforced-points
+        color: "#00a5ff"
+      - state: equipped-head-visor
+        color: "#e1b537"
+
+## SUPPLY
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetCargo
+  name: cargo EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#deb733"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#deb733"
+      - state: equipped-head-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetSalvage
+  name: salvage specialist EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#deb733"
+    - state: icon-reinforced-points
+      color: "#ad2aea"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#deb733"
+      - state: equipped-head-reinforced-points
+        color: "#ad2aea"
+      - state: equipped-head-visor
+
+## MEDICAL
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetMedic
+  name: medic EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#d6e6f3"
+    - state: icon-reinforced-points
+      color: "#5a96bb"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#d6e6f3"
+      - state: equipped-head-reinforced-points
+        color: "#5a96bb"
+      - state: equipped-head-visor
+
+## SCIENCE
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetScientist
+  name: scientist EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#edeaea"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+      color: "#2accff"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#edeaea"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+        color: "#2accff"
+
+## SERVICE
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetJanitor
+  name: janitor EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#cac4c3"
+    - state: icon-reinforced-points
+      color: "#ebdc36"
+    - state: icon-visor
+      color: "#bb5cc9"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#cac4c3"
+      - state: equipped-head-reinforced-points
+        color: "#ebdc36"
+      - state: equipped-head-visor
+        color: "#bb5cc9"
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetServiceWorker
+  name: service worker EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#fff4e2"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetChaplain
+  name: chaplain EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#a42424"
+    - state: icon-reinforced-points
+      color: "#a42424"
+    - state: icon-visor
+      color: "#ffce5b"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#a42424"
+      - state: equipped-head-reinforced-points
+        color: "#a42424"
+      - state: equipped-head-visor
+        color: "#ffce5b"
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetBoxerRed
+  name: boxer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#d1502c"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#d1502c"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetBoxerGreen
+  name: boxer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#4cd339"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#4cd339"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetBoxerBlue
+  name: boxer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#23a0bb"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#23a0bb"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetBoxerYellow
+  name: boxer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#d9be15"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#d9be15"
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetBoxerRandom
+  name: boxer EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: equipped-head-base
+      map: [ "EVA_helmet_decal_boxing" ]
+    - state: equipped-head-reinforced-points
+      color: "#606275"
+    - state: equipped-head-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        map: [ "EVA_helmet_decal_boxing" ]
+      - state: equipped-head-reinforced-points
+        color: "#606275"
+      - state: equipped-head-visor
+  - type: RandomSprite
+    available:
+      - EVA_helmet_decal_boxing:
+          equipped-head-base: Sixteen # CyberpunkNeon
+
+## WILDCARDS
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetPilot
+  name: pilot EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#496ea0"
+    - state: icon-reinforced-points
+      color: "#784f1e"
+    - state: icon-visor
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#496ea0"
+      - state: equipped-head-reinforced-points
+        color: "#784f1e"
+      - state: equipped-head-visor
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetMercenary
+  name: mercenary EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#7b7b3f"
+    - state: icon-reinforced-points
+      color: "#27272e"
+    - state: icon-visor
+      color: "#f5fc95"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#7b7b3f"
+      - state: equipped-head-reinforced-points
+        color: "#27272e"
+      - state: equipped-head-visor
+        color: "#f5fc95"
+
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetPrivateSec
+  name: private security EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#935c3f"
+    - state: icon-reinforced-points
+      color: "#2286bd"
+    - state: icon-visor
+      color: "#ffd600"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#935c3f"
+      - state: equipped-head-reinforced-points
+        color: "#2286bd"
+      - state: equipped-head-visor
+        color: "#ffd600"
+
+## NFSD
+- type: entity
+  parent: ClothingHeadEVAHelmetBase
+  id: ClothingHeadEVAHelmetNfsd
+  name: nfsd EVA helmet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#a9947d"
+    - state: icon-reinforced-points
+      color: "#384d2f"
+    - state: icon-visor
+      color: "#52843f"
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Helmets/eva_color.rsi
+    clothingVisuals:
+      head:
+      - state: equipped-head-base
+        color: "#a9947d"
+      - state: equipped-head-reinforced-points
+        color: "#384d2f"
+      - state: equipped-head-visor
+        color: "#52843f"
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
index 72c8642d09e..fc7ac21b408 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
@@ -19,7 +19,7 @@
     node: ClothingOuterCoatRobesGoblinNode
 
 - type: entity
-  parent: ClothingOuterEVASuitBase
+  parent: ClothingOuterEVASuitBaseNF
   id: ClothingOuterEVASuitGoblin
   name: goblin EVA suit
   description: Traditional robes of goblinkind made EVA-capable. Very regal.
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml
index ecb96d4636a..52ef05351a4 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/softsuits.yml
@@ -1,13 +1,40 @@
+# BASE
 - type: entity
-  parent: ClothingOuterEVASuitBase
-  id: ClothingOuterEVASuitHydro
-  name: botanist EVA suit
-  description: An emergency EVA suit with a built-in helmet commonly issued to hydroponics workers.
+  abstract: true
+  parent:
+  - ClothingOuterStorageBase # Added pockets to make this suit somewhat viable alternative to hardsuits
+  - ClothingOuterEVASuitBase
+  - GeigerCounterClothing
+  id: ClothingOuterEVASuitBaseNF
   components:
+  - type: Item
+    shape:
+    - 0,0,3,2
+  - type: ClothingSpeedModifier # Changed to 5% because the suit doesn't provide any protection other than from low pressure
+    walkModifier: 0.95
+    sprintModifier: 0.95
+  - type: HeldSpeedModifier
+  - type: Clothing
+    # For immersion
+    equipSound: /Audio/Mecha/mechmove03.ogg
+    unequipSound: /Audio/Mecha/mechmove03.ogg
+    equipDelay: 2
+    unequipDelay: 2
   - type: Tag
     tags:
     - SuitEVA
     - WhitelistChameleon
+    - HidesHarpyWings
+  - type: StaticPrice
+    price: 95
+
+# DEPARTMENTAL
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitHydro
+  name: botanist EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to hydroponics workers.
+  components:
   - type: Sprite
     sprite: _NF/Clothing/OuterClothing/Suits/eva_hydro.rsi
   - type: Clothing
@@ -18,19 +45,13 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
-  - type: StaticPrice
-    price: 65
 
 - type: entity
-  parent: ClothingOuterEVASuitBase
+  parent: ClothingOuterEVASuitBaseNF
   id: ClothingOuterEVASuitMailman
   name: mailcarrier EVA suit
-  description: An emergency EVA suit with a built-in helmet commonly issued to hydroponics workers.
+  description: An EVA suit with a built-in helmet commonly issued to hydroponics workers.
   components:
-  - type: Tag
-    tags:
-    - SuitEVA
-    - WhitelistChameleon
   - type: Sprite
     sprite: _NF/Clothing/OuterClothing/Suits/eva_mailman.rsi
   - type: Clothing
@@ -41,5 +62,1108 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
-  - type: StaticPrice
-    price: 65
+
+# COLORED DEPARTMENTAL
+## CONTRACTORS
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitContractor
+  name: contractor EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to contractors.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-decals-01
+      color: "#3e3e48"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#3e3e48"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#3e3e48"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-decals-01
+        color: "#3e3e48"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetContractor
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## COMMAND
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitSr
+  name: station representative EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to station representatives.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#194214"
+    - state: icon-decals-01
+      color: "#f2b833"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#194214"
+      - state: inhand-left-decals-01
+        color: "#f2b833"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#194214"
+      - state: inhand-right-decals-01
+        color: "#f2b833"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#194214"
+      - state: equipped-decals-01
+        color: "#f2b833"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetSr
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitCaptain
+  name: captain EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to captains.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#3a6781"
+    - state: icon-decals-01
+      color: "#ffce5b"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#3a6781"
+      - state: inhand-left-decals-01
+        color: "#ffce5b"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#3a6781"
+      - state: inhand-right-decals-01
+        color: "#ffce5b"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#3a6781"
+      - state: equipped-decals-01
+        color: "#ffce5b"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetCaptain
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## ENGINEERING
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitEngineer
+  name: engineer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to engineers.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#ffee00"
+    - state: icon-decals-01
+      color: "#ff7f00"
+    - state: icon-reinforced-points
+      color: "#ff7f00"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#ffee00"
+      - state: inhand-left-decals-01
+        color: "#ff7f00"
+      - state: inhand-left-reinforced-points
+        color: "#ff7f00"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#ffee00"
+      - state: inhand-right-decals-01
+        color: "#ff7f00"
+      - state: inhand-right-reinforced-points
+        color: "#ff7f00"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#ffee00"
+      - state: equipped-decals-01
+        color: "#ff7f00"
+      - state: equipped-reinforced-points
+        color: "#ff7f00"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetEngineer
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitAtmosTech
+  name: atmospheric technician EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to atmospheric technicians.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#ffee00"
+    - state: icon-decals-01
+      color: "#00a5ff"
+    - state: icon-reinforced-points
+      color: "#ff7f00"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#ffee00"
+      - state: inhand-left-decals-01
+        color: "#00a5ff"
+      - state: inhand-left-reinforced-points
+        color: "#ff7f00"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#ffee00"
+      - state: inhand-right-decals-01
+        color: "#00a5ff"
+      - state: inhand-right-reinforced-points
+        color: "#ff7f00"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#ffee00"
+      - state: equipped-decals-01
+        color: "#00a5ff"
+      - state: equipped-reinforced-points
+        color: "#ff7f00"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetAtmosTech
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## SUPPLY
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitCargo
+  name: cargo technician EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to cargo technicians.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#deb733"
+    - state: icon-decals-01
+      color: "#c0c0c0"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#deb733"
+      - state: inhand-left-decals-01
+        color: "#c0c0c0"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#deb733"
+      - state: inhand-right-decals-01
+        color: "#c0c0c0"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#deb733"
+      - state: equipped-decals-01
+        color: "#c0c0c0"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetCargo
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitSalvage
+  name: salvage specialist EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to salvage specialists.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#deb733"
+    - state: icon-decals-01
+      color: "#ad2aea"
+    - state: icon-reinforced-points
+      color: "#786243"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#deb733"
+      - state: inhand-left-decals-01
+        color: "#ad2aea"
+      - state: inhand-left-reinforced-points
+        color: "#786243"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#deb733"
+      - state: inhand-right-decals-01
+        color: "#ad2aea"
+      - state: inhand-right-reinforced-points
+        color: "#786243"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#deb733"
+      - state: equipped-decals-01
+        color: "#ad2aea"
+      - state: equipped-reinforced-points
+        color: "#786243"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetSalvage
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## MEDICAL
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitMedic
+  name: medical specialist EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to medical specialists.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#5a96bb"
+    - state: icon-decals-01
+      color: "#d6e6f3"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#5a96bb"
+      - state: inhand-left-decals-01
+        color: "#d6e6f3"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#5a96bb"
+      - state: inhand-right-decals-01
+        color: "#d6e6f3"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#5a96bb"
+      - state: equipped-decals-01
+        color: "#d6e6f3"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetMedic
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## SCIENCE
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitScientist
+  name: scientist EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to scientists.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#edeaea"
+    - state: icon-decals-01
+      color: "#9c0de1"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#edeaea"
+      - state: inhand-left-decals-01
+        color: "#9c0de1"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#edeaea"
+      - state: inhand-right-decals-01
+        color: "#9c0de1"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#edeaea"
+      - state: equipped-decals-01
+        color: "#9c0de1"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetScientist
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## SERVICE
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitJanitor
+  name: janitor EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to janitors.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#cac4c3"
+    - state: icon-decals-01
+      color: "#bb5cc9"
+    - state: icon-reinforced-points
+      color: "#ebdc36"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#cac4c3"
+      - state: inhand-left-decals-01
+        color: "#bb5cc9"
+      - state: inhand-left-reinforced-points
+        color: "#ebdc36"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#cac4c3"
+      - state: inhand-right-decals-01
+        color: "#bb5cc9"
+      - state: inhand-right-reinforced-points
+        color: "#ebdc36"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#cac4c3"
+      - state: equipped-decals-01
+        color: "#bb5cc9"
+      - state: equipped-reinforced-points
+        color: "#ebdc36"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetJanitor
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitServiceWorker
+  name: service worker EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to service workers.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-decals-01
+      color: "#9FED58"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#9FED58"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#9FED58"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-decals-01
+        color: "#9FED58"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetServiceWorker
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitChaplain
+  name: chaplain EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to chaplains.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#3e3e48"
+    - state: icon-decals-01
+      color: "#ffce5b"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#3e3e48"
+      - state: inhand-left-decals-01
+        color: "#ffce5b"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#3e3e48"
+      - state: inhand-right-decals-01
+        color: "#ffce5b"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#3e3e48"
+      - state: equipped-decals-01
+        color: "#ffce5b"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetChaplain
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## Boxing
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitBoxerRed
+  name: boxer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to boxers in the red corner.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-decals-02-boxer
+      color: "#d1502c"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#d1502c"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#d1502c"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-decals-02-boxer
+        color: "#d1502c"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetBoxerRed
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitBoxerGreen
+  name: boxer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to boxers in the green corner.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-decals-02-boxer
+      color: "#4cd339"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#4cd339"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#4cd339"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-decals-02-boxer
+        color: "#4cd339"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetBoxerGreen
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitBoxerBlue
+  name: boxer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to boxers in the blue corner.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-decals-02-boxer
+      color: "#23a0bb"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#23a0bb"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#23a0bb"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-decals-02-boxer
+        color: "#23a0bb"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetBoxerBlue
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitBoxerYellow
+  name: boxer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to boxers in the yellow corner.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#fff4e2"
+    - state: icon-reinforced-points
+      color: "#606275"
+    - state: icon-decals-02-boxer
+      color: "#d9be15"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+        color: "#d9be15"
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+        color: "#d9be15"
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-decals-02-boxer
+        color: "#d9be15"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetBoxerYellow
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitBoxerRandom
+  name: boxer EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to boxers in the random corner.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: equipped-base
+      color: "#fff4e2"
+    - state: equipped-reinforced-points
+      color: "#606275"
+    - state: equipped-decals-02-boxer
+      map: [ "eva_decal_boxing" ]
+    - state: equipped-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#fff4e2"
+      - state: equipped-reinforced-points
+        color: "#606275"
+      - state: equipped-decals-02-boxer
+        map: [ "eva_decal_boxing" ]
+      - state: equipped-breathing-gear
+  - type: RandomSprite
+    available:
+    - eva_decal_boxing:
+        equipped-decals-02-boxer: Cyberpunk
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#fff4e2"
+      - state: inhand-left-decals-01
+      - state: inhand-left-reinforced-points
+        color: "#606275"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#fff4e2"
+      - state: inhand-right-decals-01
+      - state: inhand-right-reinforced-points
+        color: "#606275"
+      - state: inhand-right-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetBoxerRandom
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## WILDCARDS
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitPilot
+  name: pilot EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to pilots.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#496ea0"
+    - state: icon-decals-01
+      color: "#784f1e"
+    - state: icon-reinforced-points
+      color: "#784f1e"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#496ea0"
+      - state: inhand-left-decals-01
+        color: "#784f1e"
+      - state: inhand-left-reinforced-points
+        color: "#784f1e"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#496ea0"
+      - state: inhand-right-decals-01
+        color: "#784f1e"
+      - state: inhand-right-reinforced-points
+        color: "#784f1e"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#496ea0"
+      - state: equipped-decals-01
+        color: "#784f1e"
+      - state: equipped-reinforced-points
+        color: "#784f1e"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetPilot
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitMercenary
+  name: mercenary EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to mercenaries.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#7b7b3f"
+    - state: icon-decals-01
+      color: "#b8b873"
+    - state: icon-reinforced-points
+      color: "#3e3e48"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#7b7b3f"
+      - state: inhand-left-decals-01
+        color: "#b8b873"
+      - state: inhand-left-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#7b7b3f"
+      - state: inhand-right-decals-01
+        color: "#b8b873"
+      - state: inhand-right-reinforced-points
+        color: "#3e3e48"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#7b7b3f"
+      - state: equipped-decals-01
+        color: "#b8b873"
+      - state: equipped-reinforced-points
+        color: "#3e3e48"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetMercenary
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitPrivateSec
+  name: private security EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to private security.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#2286bd"
+    - state: icon-decals-01
+      color: "#9d1c1c"
+    - state: icon-reinforced-points
+      color: "#935c3f"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#2286bd"
+      - state: inhand-left-decals-01
+        color: "#9d1c1c"
+      - state: inhand-left-reinforced-points
+        color: "#935c3f"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#2286bd"
+      - state: inhand-right-decals-01
+        color: "#9d1c1c"
+      - state: inhand-right-reinforced-points
+        color: "#935c3f"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#2286bd"
+      - state: equipped-decals-01
+        color: "#9d1c1c"
+      - state: equipped-reinforced-points
+        color: "#935c3f"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetPrivateSec
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
+
+## NFSD
+- type: entity
+  parent: ClothingOuterEVASuitBaseNF
+  id: ClothingOuterEVASuitNfsd
+  name: nfsd EVA suit
+  description: An EVA suit with a built-in helmet commonly issued to NFSD personnel.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    layers:
+    - state: icon-base
+      color: "#a9947d"
+    - state: icon-decals-01
+      color: "#384d2f"
+    - state: icon-reinforced-points
+      color: "#493926"
+    - state: icon-breathing-gear
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left-base
+        color: "#a9947d"
+      - state: inhand-left-decals-01
+        color: "#384d2f"
+      - state: inhand-left-reinforced-points
+        color: "#493926"
+      - state: inhand-left-breathing-gear
+      right:
+      - state: inhand-right-base
+        color: "#a9947d"
+      - state: inhand-right-decals-01
+        color: "#384d2f"
+      - state: inhand-right-reinforced-points
+        color: "#493926"
+      - state: inhand-right-breathing-gear
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Suits/eva_color.rsi
+    clothingVisuals:
+      outerClothing:
+      - state: equipped-base
+        color: "#a9947d"
+      - state: equipped-decals-01
+        color: "#384d2f"
+      - state: equipped-reinforced-points
+        color: "#493926"
+      - state: equipped-breathing-gear
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadEVAHelmetNfsd
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
index 9be0aa9c8fb..81c486b9732 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_engineering.yml
@@ -228,6 +228,8 @@
     prototypes:
     - SuitStorageBase
     - SuitStorageEVAAlternate
+    - SuitStorageEVAEngineer
+    - SuitStorageEVAAtmosTech
     - SuitStorageBasic
     - SuitStorageEngi
     - SuitStorageAtmos
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
index d3791e8860e..ace8c156c61 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
@@ -153,8 +153,22 @@
     prototypes:
     - SuitStorageBase
     - SuitStorageEVAAlternate
-    - SuitStorageHydro
-    - SuitStorageMailCarrier
+    - SuitStorageEVAContractor
+    - SuitStorageEVAPilot
+    - SuitStorageEVAEngineer
+    - SuitStorageEVAAtmosTech
+    - SuitStorageEVACargo
+    - SuitStorageEVASalvage
+    - SuitStorageEVAMedical
+    - SuitStorageEVAScientist
+    - SuitStorageEVAJanitor
+    - SuitStorageEVAServiceWorker
+    - SuitStorageEVAChaplain
+    - SuitStorageEVABoxerBlue
+    - SuitStorageEVAMercenary
+    - SuitStorageEVAPrivateSec
+    - SuitStorageEVAHydro
+    - SuitStorageEVAMail
     - SuitStorageBasic
     - SuitStoragePilot
     - SuitStorageParamedic
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
index 174cd467504..839b1c46a9e 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
@@ -386,6 +386,8 @@
     prototypes:
     - SuitStorageMercenary
     - SuitStoragePrivateSecurity
+    - SuitStorageEVAMercenary
+    - SuitStorageEVAPrivateSec
     chance: 1
     offset: 0.0
     rarePrototypes:
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml
index a64b43bad1f..cc0dbbd1cb7 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_supply.yml
@@ -182,6 +182,8 @@
     - SuitStorageBase
     - SuitStorageBasic
     - SuitStorageSalv
+    - SuitStorageEVACargo
+    - SuitStorageEVASalvage
     chance: 1
     offset: 0.0
     rarePrototypes:
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index ddad2058bf8..2bc17f53564 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -260,9 +260,8 @@
       #- SheetGlass30
       #- SheetRGlass
       #- SheetPlastic
-      - ClothingOuterSuitEmergency
-      - ClothingHeadHelmetEVA
-      - ClothingOuterHardsuitEVA
+      - ClothingOuterEVASuitCargo
+      - ClothingOuterEVASuitSalvage
       - Wirecutter
       - Signaller
       - Screwdriver
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
index db14ecb4c81..6da7a2772c9 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
@@ -1,4 +1,5 @@
 # Frontier-specific parent for turning regular objects into wallmounts to avoid redefining upstream prototypes.
+# Base
 - type: entity
   parent: BaseStructureUnanchorable
   id: BaseWallmount
@@ -15,6 +16,181 @@
     fixtures: {}
   - type: WallMount
 
+- type: entity # Base for yml-colored lockers
+  abstract: true
+  id: LockerWallColorBase
+  parent: [ BaseWallCloset, BaseWallmount ]
+  suffix: Frontier
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Storage/wall_locker_color.rsi
+  - type: Lock
+  - type: LockVisuals
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBase: base
+    stateDoorOpen: open
+    stateDoorClosed: door
+  - type: GenericVisualizer
+    visuals:
+      enum.StorageVisuals.Open:
+        decal1:
+          True: { visible: false }
+          False: { visible: true }
+        decal2:
+          True: { visible: false }
+          False: { visible: true }
+
+# Fuel / materials storage
+- type: entity
+  id: LockerWallColorFuelPlasma
+  parent: LockerWallColorBase
+  name: plasma fuel wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b97644"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b97644"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#fff4e2"
+    - state: door-decal-fuel-plasma
+      map: [ decal2 ]
+      color: "#fff4e2"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorUranium
+  parent: LockerWallColorBase
+  name: uranium fuel wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#287529"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#287529"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#f4d81e"
+    - state: door-decal-fuel-uranium
+      map: [ decal2 ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorWelding
+  parent: LockerWallColorBase
+  name: welding fuel wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#ae2023"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#ae2023"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#dba124"
+    - state: door-decal-fuel-welding
+      map: [ decal2 ]
+      color: "#dba124"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorAme
+  parent: LockerWallColorBase
+  name: AME fuel wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b97644"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b97644"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#fff4e2"
+    - state: door-decal-fuel-ame
+      map: [ decal2 ]
+      color: "#fff4e2"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorBananium
+  parent: LockerWallColorBase
+  name: bananium fuel wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#c67421"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#c67421"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#ac221c"
+    - state: door-decal-fuel-uranium
+      map: [ decal2 ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorMaterials
+  parent: LockerWallColorBase
+  name: materials wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#707070"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#707070"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#ad8c27"
+    - state: door-decal-engi-01
+      map: [ decal2 ]
+      color: "#ad8c27"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+# Other: Chemistry wall locker
 - type: entity
   id: LockerWallChemistry
   parent: [LockerWallMedical, BaseWallmount]
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department.yml
new file mode 100644
index 00000000000..79f4afac5d6
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department.yml
@@ -0,0 +1,231 @@
+# DEPARTMENTS
+## Command
+- type: entity
+  id: LockerWallColorCaptain
+  parent: LockerWallColorBase
+  name: captain wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#42658d"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#42658d"
+    - state: door-decal-line-03
+      map: [ decal1 ]
+      color: "#cbbd60"
+    - state: door-decal-captain-01
+      map: [ decal2 ]
+      color: "#cbbd60"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Engineering
+- type: entity
+  id: LockerWallColorEngineer
+  parent: LockerWallColorBase
+  name: engineer wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#ead152"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#ead152"
+    - state: door-decal-line-03
+      map: [ decal1 ]
+      color: "#a7333b"
+    - state: door-decal-engi-03
+      map: [ decal2 ]
+      color: "#a7333b"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorAtmosTech
+  parent: LockerWallColorBase
+  name: atmospheric technician wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#ead152"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#ead152"
+    - state: door-decal-line-03
+      map: [ decal1 ]
+      color: "#00a5ff"
+    - state: door-decal-engi-02
+      map: [ decal2 ]
+      color: "#00a5ff"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Supply
+- type: entity
+  id: LockerWallColorCargo
+  parent: LockerWallColorBase
+  name: cargo technician wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b3863c"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b3863c"
+    - state: door-decal-line-03
+      map: [ decal1 ]
+      color: "#707070"
+    - state: door-decal-cargo-01
+      map: [ decal2 ]
+      color: "#707070"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorSalvage
+  parent: LockerWallColorBase
+  name: salvage specialist wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b3863c"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b3863c"
+    - state: door-decal-line-04
+      map: [ decal1 ]
+      color: "#76417b"
+    - state: door-decal-cargo-02
+      map: [ decal2 ]
+      color: "#76417b"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Medical
+- type: entity
+  id: LockerWallColorMedical
+  parent: LockerWallColorBase
+  name: medical wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#fff4e2"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#fff4e2"
+    - state: door-decal-line-04
+      map: [ decal1 ]
+      color: "#5995ba"
+    - state: door-decal-med-01
+      map: [ decal2 ]
+      color: "#5995ba"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  id: LockerWallColorChemistry
+  parent: LockerWallColorBase
+  name: chemistry wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#fff4e2"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#fff4e2"
+    - state: door-decal-line-04
+      map: [ decal1 ]
+      color: "#cc5100"
+    - state: door-decal-med-01
+      map: [ decal2 ]
+      color: "#cc5100"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Service
+- type: entity
+  id: LockerWallColorServiceWorker
+  parent: LockerWallColorBase
+  name: service worker wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#707070"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#707070"
+    - state: door-decal-line-02
+      map: [ decal1 ]
+      color: "#7ca862"
+    - state: door-decal-null
+      map: [ decal2 ]
+      color: "#7ca862"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Generic
+- type: entity
+  id: LockerWallColorGeneric
+  parent: LockerWallColorBase
+  name: wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#707070"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#707070"
+    - state: door-decal-line-02
+      map: [ decal1 ]
+      color: "#fff4e2"
+    - state: door-decal-null
+      map: [ decal2 ]
+      color: "#fff4e2"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department_eva.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department_eva.yml
new file mode 100644
index 00000000000..246af5c0dac
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers_department_eva.yml
@@ -0,0 +1,507 @@
+# DEPARTMENTS
+## Command
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorCaptain
+  parent: LockerWallColorBase
+  name: captain EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#42658d"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#42658d"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#cbbd60"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#cbbd60"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorSr
+  parent: LockerWallColorBase
+  name: station representative EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#09300b"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#09300b"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#f2b833"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#f2b833"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+
+## Engineering
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorEngineer
+  parent: LockerWallColorBase
+  name: engineer EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#ead152"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#ead152"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#a7333b"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#a7333b"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorAtmosTech
+  parent: LockerWallColorBase
+  name: atmospheric technician EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#ead152"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#ead152"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#00a5ff"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#00a5ff"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Supply
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorCargo
+  parent: LockerWallColorBase
+  name: cargo technician EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b3863c"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b3863c"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#707070"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#707070"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorSalvage
+  parent: LockerWallColorBase
+  name: salvage specialist EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#b3863c"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#b3863c"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#76417b"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#76417b"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Medical
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorMedical
+  parent: LockerWallColorBase
+  name: doctor EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#5a96bb"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#5a96bb"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#d6e6f3"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#d6e6f3"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Research
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorScientist
+  parent: LockerWallColorBase
+  name: scientist EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#edeaea"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#edeaea"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#9c0de1"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#9c0de1"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Service
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorJanitor
+  parent: LockerWallColorBase
+  name: janitor EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#7100a4"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#7100a4"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#fff4e2"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#fff4e2"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorMail
+  parent: LockerWallColorBase
+  name: mail carrier EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#0080b8"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#0080b8"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#cfefff"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#cfefff"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorHydroponics
+  parent: LockerWallColorBase
+  name: botanist EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#5fa31e"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#5fa31e"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#074dd1"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#074dd1"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorServiceWorker
+  parent: LockerWallColorBase
+  name: service worker EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#707070"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#707070"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#7ca862"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#7ca862"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorChaplain
+  parent: LockerWallColorBase
+  name: chaplain EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#3e3e48"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#3e3e48"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#ffce5b"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#ffce5b"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## NFSD / Security
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorNfsd
+  parent: LockerWallColorBase
+  name: nfsd EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#a9947d"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#a9947d"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#384d2f"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#384d2f"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+  - type: AccessReader
+    access: [["Security"]]
+
+## Wildcards
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorContractor
+  parent: LockerWallColorBase
+  name: contractor EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#fff4e2"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#fff4e2"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#3e3e48"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#3e3e48"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorPilot
+  parent: LockerWallColorBase
+  name: pilot EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#496ea0"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#496ea0"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#ea6400"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#ea6400"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorMercenary
+  parent: LockerWallColorBase
+  name: mercenary EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#7b7b3f"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#7b7b3f"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#b8b873"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#b8b873"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorPrivateSec
+  parent: LockerWallColorBase
+  name: private security EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#935c3f"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#935c3f"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#2286bd"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#2286bd"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+## Generic
+- type: entity
+  noSpawn: true # debloat spawn menu
+  id: LockerWallEVAColorGeneric
+  parent: LockerWallColorBase
+  name: EVA wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#707070"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#707070"
+    - state: door-decal-line-01
+      map: [ decal1 ]
+      color: "#fff4e2"
+    - state: door-decal-eva-02
+      map: [ decal2 ]
+      color: "#fff4e2"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml
index e18dab710dc..8fd1cdaef18 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml
@@ -135,6 +135,196 @@
     Cloth: 300
     Durathread: 600
 
+- type: latheRecipe
+  id: ClothingOuterEVASuitContractor
+  result: ClothingOuterEVASuitContractor
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitCaptain
+  result: ClothingOuterEVASuitCaptain
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitEngineer
+  result: ClothingOuterEVASuitEngineer
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitAtmosTech
+  result: ClothingOuterEVASuitAtmosTech
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitCargo
+  result: ClothingOuterEVASuitCargo
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitSalvage
+  result: ClothingOuterEVASuitSalvage
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitMedic
+  result: ClothingOuterEVASuitMedic
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitScientist
+  result: ClothingOuterEVASuitScientist
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitJanitor
+  result: ClothingOuterEVASuitJanitor
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitServiceWorker
+  result: ClothingOuterEVASuitServiceWorker
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitPilot
+  result: ClothingOuterEVASuitPilot
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitMercenary
+  result: ClothingOuterEVASuitMercenary
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitPrivateSec
+  result: ClothingOuterEVASuitPrivateSec
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitNfsd
+  result: ClothingOuterEVASuitNfsd
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitChaplain
+  result: ClothingOuterEVASuitChaplain
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitBoxerRed
+  result: ClothingOuterEVASuitBoxerRed
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitBoxerGreen
+  result: ClothingOuterEVASuitBoxerGreen
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitBoxerBlue
+  result: ClothingOuterEVASuitBoxerBlue
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
+- type: latheRecipe
+  id: ClothingOuterEVASuitBoxerYellow
+  result: ClothingOuterEVASuitBoxerYellow
+  category: EVASuits
+  completetime: 4
+  materials:
+    Steel: 150
+    Cloth: 100
+    Durathread: 300
+
 # Basic hardsuits (T1 research)
 - type: latheRecipe
   id: ClothingOuterHardsuitBasic
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/ert_mailcarrier.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Helmets/ert_mailcarrier.rsi/meta.json
index 1e453a28c78..b3ad1ef52ee 100644
--- a/Resources/Textures/_NF/Clothing/Head/Helmets/ert_mailcarrier.rsi/meta.json
+++ b/Resources/Textures/_NF/Clothing/Head/Helmets/ert_mailcarrier.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37, Edited by erhardsteinhauer (Discord)",
+  "copyright": "Sprite taken from https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37 | Edited by erhardsteinhauer (Discord)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-base.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-base.png
new file mode 100644
index 00000000000..99ae08c7510
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-base.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-01.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-01.png
new file mode 100644
index 00000000000..5b71bad337d
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-02.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-02.png
new file mode 100644
index 00000000000..2b27de66fe7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-decals-02.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-reinforced-points.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-reinforced-points.png
new file mode 100644
index 00000000000..ef6e90e0292
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-reinforced-points.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-visor.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-visor.png
new file mode 100644
index 00000000000..e2c3963f6c9
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/equipped-head-visor.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-base.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-base.png
new file mode 100644
index 00000000000..43d6f3cf636
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-base.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-01.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-01.png
new file mode 100644
index 00000000000..3660d8548aa
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-01.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-02.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-02.png
new file mode 100644
index 00000000000..7a9439708ea
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-decals-02.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-reinforced-points.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-reinforced-points.png
new file mode 100644
index 00000000000..3660d8548aa
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-reinforced-points.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-visor.png b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-visor.png
new file mode 100644
index 00000000000..46ed6820aa3
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/icon-visor.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/meta.json
new file mode 100644
index 00000000000..ce22282d093
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_color.rsi/meta.json
@@ -0,0 +1,46 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | Grayscaled and split into layers by erhardsteinhauer (discord/github) | equipped-head-decals-02 and icon-head-decals-02 are based on sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by Emisse for SS14. Vox states by Flareguy for SS14 that were grayscaled and further modified by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon-base"
+    },
+    {
+      "name": "icon-decals-01"
+    },
+    {
+      "name": "icon-decals-02"
+    },
+    {
+      "name": "icon-reinforced-points"
+    },
+    {
+      "name": "icon-visor"
+    },
+    {
+      "name": "equipped-head-base",
+      "directions": 4
+    },
+    {
+      "name": "equipped-head-decals-01",
+      "directions": 4
+    },
+    {
+      "name": "equipped-head-decals-02",
+      "directions": 4
+    },
+    {
+      "name": "equipped-head-reinforced-points",
+      "directions": 4
+    },
+    {
+      "name": "equipped-head-visor",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_hydro.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_hydro.rsi/meta.json
index 90c6d89f347..732faf41d16 100644
--- a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_hydro.rsi/meta.json
+++ b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_hydro.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | Recolored by erhardsteinhauer (discord/github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_mailman.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_mailman.rsi/meta.json
index 90c6d89f347..732faf41d16 100644
--- a/Resources/Textures/_NF/Clothing/Head/Helmets/eva_mailman.rsi/meta.json
+++ b/Resources/Textures/_NF/Clothing/Head/Helmets/eva_mailman.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+  "copyright": "Sprite edited by Flareguy for SS14, original unedited sprite can be found in https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a | Recolored by erhardsteinhauer (discord/github)",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-base.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-base.png
new file mode 100644
index 00000000000..f2150b79082
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-base.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-breathing-gear.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-breathing-gear.png
new file mode 100644
index 00000000000..21edf990dfc
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-breathing-gear.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-01.png
new file mode 100644
index 00000000000..66f8da5e021
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-02-boxer.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-02-boxer.png
new file mode 100644
index 00000000000..f8b8987267c
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-decals-02-boxer.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-reinforced-points.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-reinforced-points.png
new file mode 100644
index 00000000000..5a4cc2d21da
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/equipped-reinforced-points.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-base.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-base.png
new file mode 100644
index 00000000000..efbcb61ce0c
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-base.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-breathing-gear.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-breathing-gear.png
new file mode 100644
index 00000000000..197efec21fc
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-breathing-gear.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-01.png
new file mode 100644
index 00000000000..cf8ff0d3308
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-02-boxer.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-02-boxer.png
new file mode 100644
index 00000000000..7694ab202b3
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-decals-02-boxer.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-reinforced-points.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-reinforced-points.png
new file mode 100644
index 00000000000..f90f4294a20
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/icon-reinforced-points.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-base.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-base.png
new file mode 100644
index 00000000000..dd1623206c7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-base.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-breathing-gear.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-breathing-gear.png
new file mode 100644
index 00000000000..a7be8a84d05
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-breathing-gear.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-decals-01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-decals-01.png
new file mode 100644
index 00000000000..6b136b75cb5
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-decals-01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-reinforced-points.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-reinforced-points.png
new file mode 100644
index 00000000000..a8bb1821ee3
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-left-reinforced-points.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-base.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-base.png
new file mode 100644
index 00000000000..ee5d446a3dd
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-base.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-breathing-gear.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-breathing-gear.png
new file mode 100644
index 00000000000..3e9269ade87
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-breathing-gear.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-decals-01.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-decals-01.png
new file mode 100644
index 00000000000..be110509195
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-decals-01.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-reinforced-points.png b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-reinforced-points.png
new file mode 100644
index 00000000000..fd2a308547b
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/inhand-right-reinforced-points.png differ
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/meta.json
new file mode 100644
index 00000000000..586d06a5917
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_color.rsi/meta.json
@@ -0,0 +1,78 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites by Flareguy & cboyjet, heavily edited from space suit sprites found in https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34 | Grayscaled and split onto layers by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon-base"
+    },
+    {
+      "name": "icon-breathing-gear"
+    },
+    {
+      "name": "icon-decals-01"
+    },
+    {
+      "name": "icon-decals-02-boxer"
+    },
+    {
+      "name": "icon-reinforced-points"
+    },
+    {
+      "name": "equipped-base",
+      "directions": 4
+    },
+    {
+      "name": "equipped-breathing-gear",
+      "directions": 4
+    },
+    {
+      "name": "equipped-decals-01",
+      "directions": 4
+    },
+    {
+      "name": "equipped-decals-02-boxer",
+      "directions": 4
+    },
+    {
+      "name": "equipped-reinforced-points",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-base",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-breathing-gear",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-decals-01",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-reinforced-points",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-base",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-breathing-gear",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-decals-01",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right-reinforced-points",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/base.png
new file mode 100644
index 00000000000..bf83b4692bc
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/base.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-captain-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-captain-01.png
new file mode 100644
index 00000000000..e33cff9c15f
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-captain-01.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-01.png
new file mode 100644
index 00000000000..4866ed8c6d7
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-01.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-02.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-02.png
new file mode 100644
index 00000000000..5a26efce6ec
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-cargo-02.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-01.png
new file mode 100644
index 00000000000..3fce3c0362b
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-01.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-02.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-02.png
new file mode 100644
index 00000000000..5f6ead03b4a
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-02.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-03.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-03.png
new file mode 100644
index 00000000000..79e6ea19bdb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-engi-03.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-01.png
new file mode 100644
index 00000000000..de9acf5e365
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-01.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-02.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-02.png
new file mode 100644
index 00000000000..a4c58ebd662
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-eva-02.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-ame.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-ame.png
new file mode 100644
index 00000000000..711c2e6dfb2
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-ame.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-plasma.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-plasma.png
new file mode 100644
index 00000000000..75dd654f4a3
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-plasma.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-uranium.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-uranium.png
new file mode 100644
index 00000000000..4bc65e0f030
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-uranium.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-welding.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-welding.png
new file mode 100644
index 00000000000..58a918f171f
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-fuel-welding.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-01.png
new file mode 100644
index 00000000000..29c2810f477
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-01.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-02.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-02.png
new file mode 100644
index 00000000000..7f1349079d1
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-02.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-03.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-03.png
new file mode 100644
index 00000000000..f789b5ea3e9
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-03.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-04.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-04.png
new file mode 100644
index 00000000000..4bc88ebb5bb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-line-04.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-med-01.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-med-01.png
new file mode 100644
index 00000000000..f170fb601ca
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-med-01.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-null.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-null.png
new file mode 100644
index 00000000000..2975c479be7
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-null.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door.png
new file mode 100644
index 00000000000..2bdf1a1e11c
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/locked.png
new file mode 100644
index 00000000000..fa739390e75
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/locked.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json
new file mode 100644
index 00000000000..95b67b2cbda
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json
@@ -0,0 +1,83 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from shiptest at commmit https://github.com/shiptest-ss13/Shiptest/commit/440a15fb476a20d77ba28c1fe315c1b659032ce8, edited by Alekshhh | Edited, grayscaled and split into layers added decal sprites by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "door"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "door-decal-line-01"
+    },
+    {
+      "name": "door-decal-line-02"
+    },
+    {
+      "name": "door-decal-line-03"
+    },
+    {
+      "name": "door-decal-line-04"
+    },
+    {
+      "name": "door-decal-captain-01"
+    },
+    {
+      "name": "door-decal-cargo-01"
+    },
+    {
+      "name": "door-decal-cargo-02"
+    },
+    {
+      "name": "door-decal-engi-01"
+    },
+    {
+      "name": "door-decal-engi-02"
+    },
+    {
+      "name": "door-decal-engi-03"
+    },
+    {
+      "name": "door-decal-eva-01"
+    },
+    {
+      "name": "door-decal-eva-02"
+    },
+    {
+      "name": "door-decal-med-01"
+    },
+    {
+      "name": "door-decal-fuel-plasma"
+    },
+    {
+      "name": "door-decal-fuel-uranium"
+    },
+    {
+      "name": "door-decal-fuel-welding"
+    },
+    {
+      "name": "door-decal-fuel-ame"
+    },
+    {
+      "name": "door-decal-null"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/open.png
new file mode 100644
index 00000000000..f1055a1e361
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/open.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/unlocked.png
new file mode 100644
index 00000000000..e89987d0af8
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/unlocked.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/welded.png
new file mode 100644
index 00000000000..92386c4759d
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/welded.png differ