diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
new file mode 100644
index 00000000000..0fc264e5e30
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage_wallmount.yml
@@ -0,0 +1,454 @@
+#SOFTSUITS
+#Paramedic's hardsuit
+- type: entity
+  id: SuitStorageWallmountParamedic
+  parent: SuitStorageWallmount
+  suffix: Paramedic
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingHeadHelmetVoidParamed
+        - id: ClothingOuterHardsuitVoidParamed
+        - id: ClothingMaskBreathMedical
+        - id: JetpackMiniFilled
+        - id: HandheldGPSBasic
+  - type: AccessReader
+#    access: [["Medical"]]
+
+#HARDSUITS
+#Brigmedic's hardsuit
+- type: entity
+  id: SuitStorageWallmountBrigmedic
+  parent: SuitStorageWallmount
+  suffix: Brigmedic
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitBrigmedic
+        - id: ClothingMaskBreathMedicalSecurity
+        - id: JetpackSecurityFilled
+        - id: HandheldGPSBasic
+        - id: ClothingShoesBootsMagCombatFilled # Frontier
+  - type: AccessReader
+    access: [["Security"]]
+
+#Quartermaster hardsuit
+- type: entity
+  id: SuitStorageWallmountQuartermaster
+  parent: SuitStorageWallmount
+  suffix: Quartermaster
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingShoesBootsMag
+        - id: ClothingOuterHardsuitLuxury
+        - id: ClothingMaskGasExplorer
+        - id: JetpackMiniFilled
+        - id: HandheldGPSBasic
+  - type: AccessReader
+    # access: [["Quartermaster"]]
+
+#Mercenary hardsuit
+- type: entity
+  id: SuitStorageWallmountMercenary
+  parent: SuitStorageWallmount
+  suffix: Mercenary
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitMercenary
+        - id: ClothingMaskGasMercenary
+        - id: JetpackMiniFilled
+        - id: HandheldGPSBasic
+#        - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
+  - type: AccessReader
+    access: [["Mercenary"]]
+
+#SOFTSUITS
+#Basic EVA
+- type: entity
+  id: SuitStorageWallmountEVA
+  parent: SuitStorageWallmount
+  suffix: EVA
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitEVA
+        - id: ClothingHeadHelmetEVA
+        - id: ClothingMaskBreath
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+
+#Basic EVA (Big Ass Helmet)
+- type: entity
+  id: SuitStorageWallmountEVAAlternate
+  parent: SuitStorageWallmount
+  suffix: EVA, Large Helmet
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitEVA
+        - id: ClothingHeadHelmetEVALarge
+        - id: ClothingMaskBreath
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+
+#Emergency EVA
+- type: entity
+  id: SuitStorageWallmountEVAEmergency
+  parent: SuitStorageWallmount
+  suffix: Emergency EVA
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterSuitEmergency
+        - id: ClothingMaskBreath
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+
+#Prisoner EVA
+- type: entity
+  id: SuitStorageWallmountEVAPrisoner
+  parent: SuitStorageWallmount
+  suffix: Prisoner EVA
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitEVAPrisoner
+        - id: ClothingHeadHelmetEVALarge
+        - id: ClothingMaskBreath
+
+#Syndicate EVA
+- type: entity
+  id: SuitStorageWallmountEVASyndicate
+  parent: SuitStorageWallmount
+  suffix: Syndicate EVA
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitSyndicate
+        - id: ClothingHeadHelmetSyndicate
+        - id: ClothingMaskGasSyndicate
+        - id: JetpackBlackFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+
+#Pirate EVA
+- type: entity
+  id: SuitStorageWallmountEVAPirate
+  parent: SuitStorageWallmount
+  suffix: Pirate EVA
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitPirateEVA
+        - id: ClothingMaskGas
+        - id: JetpackBlackFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+        - id: ClothingShoesBootsMagPirateFilled # Frontier
+
+#NTSRA Voidsuit
+- type: entity
+  id: SuitStorageWallmountNTSRA
+  parent: SuitStorageWallmount
+  suffix: Ancient EVA
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+#        - id: JetpackVoidFilled # Frontier
+        - id: ClothingOuterHardsuitAncientEVA
+        - id: ClothingHeadHelmetAncient
+        - id: ClothingMaskBreath
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+
+#HARDSUITS
+#Basic hardsuit
+- type: entity
+  id: SuitStorageWallmountBasic
+  parent: SuitStorageWallmount
+  suffix: Basic Hardsuit
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitBasic
+        - id: ClothingMaskBreath
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+
+#Engineering hardsuit
+- type: entity
+  id: SuitStorageWallmountEngi
+  parent: SuitStorageWallmount
+  suffix: Station Engineer
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingShoesBootsMag
+        - id: ClothingOuterHardsuitEngineering
+        - id: ClothingMaskBreath
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+  - type: AccessReader
+    # access: [["Engineering"]] # Frontier
+
+#Atmospherics hardsuit
+- type: entity
+  id: SuitStorageWallmountAtmos
+  parent: SuitStorageWallmount
+  suffix: Atmospheric Technician
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitAtmos
+        - id: ClothingMaskBreath
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+  - type: AccessReader
+    # access: [["Atmospherics"]] # Frontier
+
+#Security hardsuit
+- type: entity
+  id: SuitStorageWallmountSec
+  parent: SuitStorageWallmount
+  suffix: Security
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitSecurity
+          orGroup: HardsuitSecurity
+        - id: ClothingOuterHardsuitSecuritypatrol # Frontier - 50% to get the patrol suit
+          orGroup: HardsuitSecurity
+        - id: ClothingMaskBreath
+        - id: JetpackSecurityFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+        - id: ClothingShoesBootsMagCombatFilled # Frontier
+  - type: AccessReader
+    access: [["Security"]]
+
+#CE's hardsuit
+- type: entity
+  id: SuitStorageWallmountCE
+  parent: SuitStorageWallmount
+  suffix: Chief Engineer
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+#        - id: JetpackVoidFilled # Frontier
+#        - id: ClothingShoesBootsMagAdv # Frontier
+        - id: ClothingShoesBootsMag # Frontier
+        - id: ClothingOuterHardsuitEngineeringWhite
+        - id: ClothingMaskBreath
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+  - type: AccessReader
+    # access: [["ChiefEngineer"]] # Frontier
+
+#CMO's hardsuit
+- type: entity
+  id: SuitStorageWallmountCMO
+  parent: SuitStorageWallmount
+  suffix: Chief Medical Officer
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitMedical
+        - id: ClothingMaskBreathMedical
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+  - type: AccessReader
+    # access: [ [ "ChiefMedicalOfficer" ] ] # Frontier
+
+#RD's hardsuit
+- type: entity
+  id: SuitStorageWallmountRD
+  parent: SuitStorageWallmount
+  suffix: Research Director
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitRd
+        - id: ClothingMaskBreath
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+  - type: AccessReader
+    # access: [ [ "ResearchDirector" ] ] # Frontier
+
+#HOS's hardsuit
+- type: entity
+  id: SuitStorageWallmountHOS
+  parent: SuitStorageWallmount
+  suffix: Head of Security
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: JetpackSecurityFilled
+        - id: ClothingOuterHardsuitSecurityRed
+        - id: ClothingMaskGasSwat
+        - id: HandheldGPSBasic # Frontier
+        - id: ClothingShoesBootsMagCombatFilled # Frontier
+  - type: AccessReader
+    access: [["HeadOfSecurity"]]
+
+#Warden's hardsuit
+- type: entity
+  id: SuitStorageWallmountWarden
+  parent: SuitStorageWallmount
+  suffix: Warden
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitWarden
+        - id: ClothingMaskBreath
+        - id: JetpackSecurityFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+        - id: ClothingShoesBootsMagCombatFilled # Frontier
+  - type: AccessReader
+    access: [["Armory"]]
+
+#Captain's hardsuit
+- type: entity
+  id: SuitStorageWallmountCaptain
+  parent: SuitStorageWallmount
+  suffix: Captain
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitCap
+        - id: ClothingMaskGasCaptain
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+  - type: AccessReader
+    # access: [["Captain"]] # Frontier
+
+#Salvage hardsuit
+- type: entity
+  id: SuitStorageWallmountSalv
+  parent: SuitStorageWallmount
+  suffix: Salvage
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingShoesBootsMag
+        - id: ClothingOuterHardsuitSpatio
+        - id: ClothingMaskGasExplorer
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+  - type: AccessReader
+    # access: [["Salvage"]] # Frontier
+
+#Blood-red hardsuit
+- type: entity
+  id: SuitStorageWallmountSyndie
+  parent: SuitStorageWallmount
+  suffix: Syndicate Hardsuit
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitSyndie
+        - id: ClothingShoesBootsMagSyndie
+        - id: ClothingMaskGasSyndicate
+        - id: JetpackBlackFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+
+#Pirate Captain's hardsuit
+- type: entity
+  id: SuitStorageWallmountPirateCap
+  parent: SuitStorageWallmount
+  suffix: Pirate Captain
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitPirateCap
+        - id: ClothingMaskGas
+        - id: ClothingNeckCloakPirateCap # Frontier
+        - id: JetpackBlackFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
+        - id: ClothingShoesBootsMagPirateFilled # Frontier
+
+#Wizard
+- type: entity
+  id: SuitStorageWallmountWizard
+  parent: SuitStorageWallmount
+  suffix: Wizard
+  components:
+  - type: StorageFill
+    contents:
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingOuterHardsuitWizard
+        - id: ClothingMaskBreath
+        - id: JetpackBlackFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/suit_storagge_wall.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/suit_storage_wall.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/suit_storagge_wall.yml
rename to Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/suit_storage_wall.yml
index 3fc0521d67d..b82a69a3e8c 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/suit_storagge_wall.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/suit_storage_wall.yml
@@ -1,9 +1,7 @@
 - type: entity
   id: SuitStorageWallmount
-#  parent: SuitStorageBase
-  name: a suit storage unit
-  suffix: Wallmount
-  description: A fancy hi-tech storage unit made for storing space suits.
+  parent: SuitStorageBase
+  name: suit wallstorage unit
   placement:
     mode: SnapgridCenter
   components:
@@ -50,4 +48,4 @@
     openSound:
       path: /Audio/Machines/airlock_open.ogg
     denySound:
-      path: /Audio/Machines/airlock_deny.ogg
\ No newline at end of file
+      path: /Audio/Machines/airlock_deny.ogg
diff --git a/Resources/Textures/_NF/Structures/Storage/suit_storage_wall.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/suit_storage_wall.rsi/meta.json
index 862e90f4443..df90670edc3 100644
--- a/Resources/Textures/_NF/Structures/Storage/suit_storage_wall.rsi/meta.json
+++ b/Resources/Textures/_NF/Structures/Storage/suit_storage_wall.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from /tg/station commit https://github.com/tgstation/tgstation/commit/af7b7043df593807f7a98b7a07880d7a977cda14 and slightly edited, welded state drawn by Flareguy for Space Station 14",
+  "copyright": "Sprited for NF by erhardsteinhauer (discord), used as a base SS14 default sprites wall_locker.rsi, suit_storage.rsi, directional.rsi (window), basic.rsi (hardsuit), emergency.rsi (tank) and black.rsi (jetpack)",
   "size": {
     "x": 32,
     "y": 32