diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
index 9724f5fdb49..15dc724ca57 100644
--- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs
+++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -41,7 +41,7 @@ public sealed partial class IdCardConsoleComponent : Component
         "Command",
         "Engineering",
         "External",
-        "Frontier",
+        "Frontier", // Frontier
         "HeadOfPersonnel",
         "HeadOfSecurity",
         "Hydroponics",
@@ -49,6 +49,7 @@ public sealed partial class IdCardConsoleComponent : Component
         "Kitchen",
         "Maintenance",
         "Medical",
+        "Mercenary", // Frontier
         "Quartermaster",
         "Research",
         "ResearchDirector",
diff --git a/Resources/Locale/en-US/_NF/nf-jobs.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl
similarity index 50%
rename from Resources/Locale/en-US/_NF/nf-jobs.ftl
rename to Resources/Locale/en-US/_NF/job/job-description.ftl
index 92f48f35cd2..0ee7916ad72 100644
--- a/Resources/Locale/en-US/_NF/nf-jobs.ftl
+++ b/Resources/Locale/en-US/_NF/job/job-description.ftl
@@ -1,2 +1,2 @@
-job-name-mercenary = Mercenary
-job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law. 
\ No newline at end of file
+job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law.
+job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships.
diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl
new file mode 100644
index 00000000000..fbfa777dfb0
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/job/job-names.ftl
@@ -0,0 +1,6 @@
+job-name-mercenary = Mercenary
+job-name-stc = Station Traffic Controller
+
+# Role timers - Make these alphabetical or I cut you
+JobMercenary = Mercenary
+JobSTC = Station Traffic Controller
diff --git a/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl
new file mode 100644
index 00000000000..9fb314d22a7
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl
@@ -0,0 +1,3 @@
+id-card-access-level-frontier = Station Traffic Controller
+
+id-card-access-level-mercenary = Mercenary
diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl
index 6e9575dee97..a4aab9e68bb 100644
--- a/Resources/Locale/en-US/job/job-description.ftl
+++ b/Resources/Locale/en-US/job/job-description.ftl
@@ -48,4 +48,3 @@ job-description-senior-engineer = Teach new engineers the basics of the station'
 job-description-senior-researcher = Teach new scientists the basics of item printing, artifact research and anomalous objects.
 job-description-senior-physician = Teach new medics the basics of tending to the wounded, chemistry, diagnosing the diseased and disposing of the dead.
 job-description-senior-officer = Teach new deputies the basics of searches, preforming arrests, prison times and how to properly shoot a firearm.
-job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships.
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
index f1bb9c4ffb7..e2197e9c9c9 100644
--- a/Resources/Locale/en-US/job/job-names.ftl
+++ b/Resources/Locale/en-US/job/job-names.ftl
@@ -48,7 +48,6 @@ job-name-senior-engineer = Senior Engineer
 job-name-senior-researcher = Senior Researcher
 job-name-senior-physician = Senior Physician
 job-name-senior-officer = Sergeant
-job-name-stc = Station Traffic Controller
 
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Atmospheric Technician
@@ -97,7 +96,6 @@ JobSeniorOfficer = Sergeant
 JobSeniorPhysician = Senior Physician
 JobSeniorResearcher = Senior Researcher
 JobServiceWorker = Service Worker
-JobSTC = Station Traffic Controller
 JobStationEngineer = Station Engineer
 JobTechnicalAssistant = Technical Assistant
 JobWarden = Bailiff
diff --git a/Resources/Locale/en-US/prototypes/access/accesses.ftl b/Resources/Locale/en-US/prototypes/access/accesses.ftl
index c2f413c97de..a7a7795c11e 100644
--- a/Resources/Locale/en-US/prototypes/access/accesses.ftl
+++ b/Resources/Locale/en-US/prototypes/access/accesses.ftl
@@ -1,7 +1,6 @@
 id-card-access-level-command = Command
 id-card-access-level-captain = Captain
 id-card-access-level-head-of-personnel = Station Representative
-id-card-access-level-frontier = Station Traffic Controller
 
 id-card-access-level-head-of-security = Sheriff
 id-card-access-level-security = Security
diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml
index aaa5f442287..001c35e0162 100644
--- a/Resources/Prototypes/Access/command.yml
+++ b/Resources/Prototypes/Access/command.yml
@@ -2,10 +2,6 @@
   id: Command
   name: id-card-access-level-command
 
-- type: accessLevel
-  id: Frontier
-  name: id-card-access-level-frontier
-
 - type: accessLevel
   id: Captain
   name: id-card-access-level-captain
@@ -17,7 +13,7 @@
 - type: accessGroup
   id: Command
   tags:
-  - Frontier
+  - Frontier # Frontier
   - Command
   - Captain
   - HeadOfPersonnel
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
index 60974873b97..f820cb67a78 100644
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@@ -8,7 +8,7 @@
   - ChiefMedicalOfficer
   - HeadOfSecurity
   - ResearchDirector
-  - Frontier
+  - Frontier # Frontier
   - Command
   - Security
   - Detective
@@ -16,6 +16,7 @@
   - Brig
   - Engineering
   - Medical
+  - Mercenary # Frontier
   - Quartermaster
   - Salvage
   - Cargo
diff --git a/Resources/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml
index ec832bc761c..4dc9e5943d9 100644
--- a/Resources/Prototypes/Access/security.yml
+++ b/Resources/Prototypes/Access/security.yml
@@ -26,6 +26,7 @@
   - Armory
   - Brig
   - Detective
+  - Mercenary # Frontier
 
 - type: accessGroup
   id: Armory
@@ -33,3 +34,4 @@
   - Security
   - Armory
   - Brig
+  - Mercenary # Frontier
diff --git a/Resources/Prototypes/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/Catalog/Fills/Items/misc.yml
index 8f58df7ce5b..cb45a1a74bb 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/misc.yml
@@ -8,11 +8,10 @@
       - id: CombatKnife
 
 - type: entity
-  id: ClothingShoesBootsMercFilled
-  parent: ClothingShoesBootsMerc
+  id: ClothingShoesBootsMercenaryFilled # Frontier - Merc to Mercenary
+  parent: ClothingShoesBootsMercenary
   suffix: Filled
   components:
   - type: StorageFill
     contents:
       - id: KukriKnife
-
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index 9fdf7332b9a..6ce5d0204db 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -6,8 +6,9 @@
   - type: StorageFill
     contents:
       - id: ClothingOuterHardsuitSpatio
-      - id: YellowOxygenTankFilled
-      - id: NitrogenTankFilled
+#      - id: NitrogenTankFilled
+#      - id: OxygenTankFilled
+      - id: AirTankFilled
       - id: ClothingShoesBootsMag
       - id: ClothingMaskGasExplorer
 # Currently do not function as 'true' mesons, so they're useless for salvagers.
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
index ffb0eb6c62b..a1a2d3a328a 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -82,8 +82,9 @@
     contents:
       - id: ClothingOuterHardsuitAtmos
       - id: ClothingMaskGasAtmos
-      - id: YellowOxygenTankFilled
-      - id: NitrogenTankFilled
+#      - id: NitrogenTankFilled
+#      - id: OxygenTankFilled
+      - id: AirTankFilled
       - id: ClothingOuterSuitAtmosFire
       - id: ClothingHeadHelmetAtmosFire
       - id: GasAnalyzer
@@ -125,8 +126,9 @@
       - id: ClothingOuterHardsuitEngineering
       - id: ClothingHandsGlovesColorYellow
       - id: ClothingMaskGas
-      - id: OxygenTankFilled
-      - id: NitrogenTankFilled
+#      - id: NitrogenTankFilled
+#      - id: OxygenTankFilled
+      - id: AirTankFilled
       - id: ClothingShoesBootsMag
       - id: trayScanner # Frontier
       - id: JetpackMiniFilled # Frontier
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 75dbd998cde..9568bd88bd8 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -64,8 +64,9 @@
       - id: ClothingHeadHatCapcap
       - id: ClothingNeckMantleCap # Frontier
       - id: DrinkFlask # Frontier
-      - id: OxygenTankFilled # Frontier
-      - id: NitrogenTankFilled # Frontier
+#      - id: NitrogenTankFilled
+#      - id: OxygenTankFilled
+      - id: AirTankFilled
       - id: JetpackMiniFilled # Frontier
       - id: HandheldGPSBasic # Frontier
       - id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
@@ -155,8 +156,9 @@
       - id: ClothingMaskBreath
 #      - id: ClothingUniformJumpsuitChiefEngineerTurtle
 #      - id: ClothingUniformJumpskirtChiefEngineerTurtle
-      - id: OxygenTankFilled
-      - id: NitrogenTankFilled
+#      - id: NitrogenTankFilled
+#      - id: OxygenTankFilled
+      - id: AirTankFilled
 #      - id: ClothingNeckCloakCe
       - id: ClothingEyesGlassesMeson
 #      - id: ClothingBeltChiefEngineerFilled # Frontier
@@ -226,8 +228,9 @@
       - id: MaterialBiomass
         amount: 1 # Frontier - 3<1
 #      - id: BoxEncryptionKeyMedical # Frontier - bloat
-      - id: NitrogenTankFilled # Frontier
-      - id: OxygenTankFilled # Frontier
+#      - id: NitrogenTankFilled
+#      - id: OxygenTankFilled
+      - id: AirTankFilled
       - id: ClothingMaskBreathMedical # Frontier
       - id: JetpackMiniFilled # Frontier
       - id: HandheldGPSBasic # Frontier
@@ -280,8 +283,9 @@
 #      - id: BoxEncryptionKeyScience
 #      - id: BoxEncryptionKeyRobo # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
-      - id: NitrogenTankFilled # Frontier
-      - id: OxygenTankFilled # Frontier
+#      - id: NitrogenTankFilled
+#      - id: OxygenTankFilled
+      - id: AirTankFilled
       - id: ClothingMaskBreath # Frontier
       - id: JetpackMiniFilled # Frontier
       - id: HandheldGPSBasic # Frontier
@@ -337,7 +341,7 @@
       - id: SecurityTechFabCircuitboard
 #      - id: JetpackSecurityFilled # Frontier
       - id: BoxEncryptionKeySecurity
-      - id: HoloprojectorSecurity
+#      - id: HoloprojectorSecurity # Frontier
 #      - id: NitrogenTankFilled
 #      - id: OxygenTankFilled
       - id: AirTankFilled
@@ -372,7 +376,7 @@
 #      - id: RubberStampHos # Frontier
       - id: SecurityTechFabCircuitboard
       - id: BoxEncryptionKeySecurity
-      - id: HoloprojectorSecurity
+#      - id: HoloprojectorSecurity # Frontier
 #      - id: BookSecretDocuments # Frontier
       - id: ClothingNeckMantleHOS # Frontier
       - id: ClothingOuterWinterHoS # Frontier
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 62139b378f8..a79bfe1c2fa 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -7,8 +7,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitEVA
         - id: ClothingHeadHelmetEVA
         - id: ClothingMaskBreath
@@ -23,8 +24,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitEVA
         - id: ClothingHeadHelmetEVALarge
         - id: ClothingMaskBreath
@@ -39,8 +41,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterSuitEmergency
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
@@ -54,8 +57,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitEVAPrisoner
         - id: ClothingHeadHelmetEVALarge
         - id: ClothingMaskBreath
@@ -68,8 +72,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitSyndicate
         - id: ClothingHeadHelmetSyndicate
         - id: ClothingMaskGasSyndicate
@@ -84,8 +89,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitPirateEVA
         - id: ClothingMaskGas
         - id: JetpackBlackFilled # Frontier
@@ -100,7 +106,10 @@
   components:
   - type: StorageFill
     contents:
-        - id: JetpackVoidFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+#        - id: JetpackVoidFilled # Frontier
         - id: ClothingOuterHardsuitAncientEVA
         - id: ClothingHeadHelmetAncient
         - id: ClothingMaskBreath
@@ -116,8 +125,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitBasic
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
@@ -131,8 +141,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingShoesBootsMag
         - id: ClothingOuterHardsuitEngineering
         - id: ClothingMaskBreath
@@ -149,8 +160,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitAtmos
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
@@ -166,8 +178,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitSecurity
           orGroup: HardsuitSecurity
         - id: ClothingOuterHardsuitSecuritypatrol # Frontier - 50% to get the patrol suit
@@ -187,8 +200,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
 #        - id: JetpackVoidFilled # Frontier
 #        - id: ClothingShoesBootsMagAdv # Frontier
         - id: ClothingShoesBootsMag # Frontier
@@ -207,8 +221,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitMedical
         - id: ClothingMaskBreathMedical
         - id: JetpackMiniFilled # Frontier
@@ -224,8 +239,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitRd
         - id: ClothingMaskBreath
         - id: JetpackMiniFilled # Frontier
@@ -241,8 +257,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: JetpackSecurityFilled
         - id: ClothingOuterHardsuitSecurityRed
         - id: ClothingMaskGasSwat
@@ -259,8 +276,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitWarden
         - id: ClothingMaskBreath
         - id: JetpackSecurityFilled # Frontier
@@ -277,8 +295,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitCap
         - id: ClothingMaskGasCaptain
         - id: JetpackMiniFilled # Frontier
@@ -294,13 +313,14 @@
   components:
   - type: StorageFill
     contents:
-      - id: NitrogenTankFilled
-      - id: YellowOxygenTankFilled
-      - id: ClothingShoesBootsMag
-      - id: ClothingOuterHardsuitSpatio
-      - id: ClothingMaskGasExplorer
-      - id: JetpackMiniFilled # Frontier
-      - id: HandheldGPSBasic # Frontier
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
+        - id: ClothingShoesBootsMag
+        - id: ClothingOuterHardsuitSpatio
+        - id: ClothingMaskGasExplorer
+        - id: JetpackMiniFilled # Frontier
+        - id: HandheldGPSBasic # Frontier
   - type: AccessReader
     # access: [["Salvage"]] # Frontier
 
@@ -312,8 +332,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitSyndie
         - id: ClothingShoesBootsMagSyndie
         - id: ClothingMaskGasSyndicate
@@ -328,8 +349,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitPirateCap
         - id: ClothingMaskGas
         - id: ClothingNeckCloakPirateCap # Frontier
@@ -346,8 +368,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitWizard
         - id: ClothingMaskBreath
         - id: JetpackBlackFilled # Frontier
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index 54c7f6b4f0a..ea261c5c82c 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -179,8 +179,8 @@
 
 - type: entity
   parent: ClothingBackpack
-  id: ClothingBackpackMerc
-  name: mercenary bag
+  id: ClothingBackpackMercenary # Frontier - Merc to Mercenary
+  name: mercenary backpack
   description: A backpack that has been in many dangerous places, a reliable combat backpack.
   components:
     - type: Sprite
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index 41867960a30..07a64e8354f 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -486,7 +486,7 @@
 
 - type: entity
   parent: ClothingBeltStorageBase
-  id: ClothingBeltMercWebbing
+  id: ClothingBeltMercenaryWebbing # Frontier - Merc to Mercenary
   name: mercenary webbing
   description: Ideal for storing everything from ammo to weapons and combat essentials.
   components:
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index ddecf376e77..be4687e8d01 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -245,7 +245,7 @@
 
 - type: entity
   parent: ClothingHandsGlovesCombat
-  id: ClothingHandsMercGlovesCombat
+  id: ClothingHandsMercenaryGlovesCombat # Frontier - Merc to Mercenary
   name: mercenary combat gloves
   description: High-quality combat gloves to protect hands from mechanical damage during combat.
   components:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
index 1d1d5878602..1b362065b99 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml
@@ -93,7 +93,7 @@
 
 - type: entity
   parent: ClothingHeadBaseButcherable
-  id: ClothingHeadBandMerc
+  id: ClothingHeadBandMercenary # Frontier - Name fix
   name: mercenary bandana
   description: To protect the head from the sun, insects and other dangers of the higher path.
   components:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index ac6ef8be247..8d07dff55d2 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -153,31 +153,6 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-        
-#Security Patrol Hardsuit
-- type: entity
-  parent: ClothingHeadHardsuitWithLightBase
-  id: ClothingHeadHelmetHardsuitSecuritypatrol
-  noSpawn: true
-  name: security patrol hardsuit helmet
-  description: Lightly armored hardsuit helmet for security beat-cop needs.
-  components:
-  - type: Sprite
-    sprite: Clothing/Head/Hardsuits/security-patrol.rsi
-  - type: Clothing
-    sprite: Clothing/Head/Hardsuits/security-patrol.rsi
-  - type: PointLight
-    color: "#ffeead"
-  - type: PressureProtection
-    highPressureMultiplier: 0.525
-    lowPressureMultiplier: 10000
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.9
-        Slash: 0.9
-        Piercing: 0.9
-        Heat: 0.9
 
 #Brigmedic Hardsuit
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index 57b3b66001c..10eaa433893 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -124,7 +124,7 @@
 
 - type: entity
   parent: ClothingHeadBase
-  id: ClothingHeadHatBeretMerc
+  id: ClothingHeadHatBeretMercenary # Frontier - Merc to Mercenary
   name: mercenary beret
   description: Olive beret, the badge depicts a jackal on a rock.
   components:
diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
index 53d24b092ab..4dbc092a43a 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml
@@ -26,7 +26,7 @@
 #Mercenary Helmet
 - type: entity
   parent: ClothingHeadHelmetBasic
-  id: ClothingHeadHelmetMerc
+  id: ClothingHeadHelmetMercenary # Frontier - Name fix
   name: mercenary helmet
   description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle.
   components:
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 4909d6e3937..6986a70451c 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -300,7 +300,7 @@
 
 - type: entity
   parent: ClothingMaskGasExplorer
-  id: ClothingMaskGasMerc
+  id: ClothingMaskGasMercenary # Frontier - Merc to Mercenary
   name: mercenary gas mask
   description: Slightly outdated, but reliable military-style gas mask.
   components:
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 4886bff0bf1..f60a9f4d065 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -186,37 +186,6 @@
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitSecurity
 
-#Security Patrol Hardsuit NF14
-- type: entity
-  parent: ClothingOuterHardsuitBase
-  id: ClothingOuterHardsuitSecuritypatrol
-  name: security patrol hardsuit
-  description: A special suit that protects from the danger of space, employed by security patrol officers. Not certified to be blunderbuss proof.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi
-  - type: PressureProtection
-    highPressureMultiplier: 0.525
-    lowPressureMultiplier: 10000
-  - type: ExplosionResistance
-    damageCoefficient: 0.5
-  - type: Armor
-    modifiers:
-      coefficients:
-        Blunt: 0.7
-        Slash: 0.7
-        Piercing: 0.65
-        Heat: 0.70
-        Radiation: 0.70
-        Caustic: 0.8
-  - type: ClothingSpeedModifier
-    walkModifier: 0.85
-    sprintModifier: 0.80
-  - type: ToggleableClothing
-    clothingPrototype: ClothingHeadHelmetHardsuitSecuritypatrol
-
 #Brigmedic Hardsuit
 - type: entity
   parent: ClothingOuterHardsuitBase
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
index dbba265020d..8fcf43be654 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -22,7 +22,7 @@
 #Mercenary web vest
 - type: entity
   parent: ClothingOuterStorageBase #web vest so it should have some pockets for ammo
-  id: ClothingOuterVestWebMerc
+  id: ClothingOuterVestWebMercenary # Frontier - Merc to Mercenary
   name: mercenary web vest
   description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating.
   components:
@@ -33,12 +33,13 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.7 #slightly better overall protection but slightly worse than bulletproof armor against bullets seems sensible
-        Slash: 0.7
-        Piercing: 0.5
-        Heat: 0.9
+        Blunt: 0.70
+        Slash: 0.70
+        Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
+        Heat: 0.80
+        Caustic: 0.9
   - type: ExplosionResistance
-    damageCoefficient: 0.9
+    damageCoefficient: 0.90
 
 #Detective's vest
 - type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
index 912e4d8594d..9347f27d80d 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
@@ -69,7 +69,7 @@
 
 - type: entity
   parent: ClothingShoesStorageBase
-  id: ClothingShoesBootsMerc
+  id: ClothingShoesBootsMercenary # Frontier - Merc to Mercenary
   name: mercenary boots
   description: Boots that have gone through many conflicts and that have proven their combat reliability.
   components:
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
index a0e0ea3e15e..c7269763154 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -953,7 +953,7 @@
       mode: SensorOff
 
 - type: entity
-  parent: UnsensoredClothingUniformBase
+  parent: ClothingUniformBase
   id: ClothingUniformJumpsuitMercenary
   name: mercenary jumpsuit
   description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned.
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 1d61ca9c7d9..98bb693eb8c 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -41,7 +41,7 @@
         - ClothingHandsGlovesNitrile
         - ClothingHandsGlovesPowerglove
         - ClothingHeadHatAnimalHeadslime
-        - ClothingHeadHatBeretMerc
+        - ClothingHeadHatBeretMercenary # Frontier - Name fix
         - ClothingHeadHatOutlawHat
         - ClothingHeadHatUshanka
         - ClothingHeadHatBunny
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
index 14a1dfbb5eb..2bfd5c6b93b 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml
@@ -298,7 +298,7 @@
         orGroup: GiftPool
       - id: ClothingOuterHoodieGrey
         orGroup: GiftPool
-      - id: ClothingOuterVestWebMerc
+      - id: ClothingOuterVestWebMercenary # Frontier - Name fix
         orGroup: GiftPool
       - id: ClothingShoesFlippers
         orGroup: GiftPool
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
index 01a1a8b6fea..f5a2f951e57 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
@@ -64,10 +64,9 @@
       map: ["enum.PinpointerLayers.Screen"]
       shader: unshaded
       visible: false
-  - type: StaticPrice
+  - type: StaticPrice # Frontier
     price: 150
 
-
 - type: entity
   parent: PinpointerBase
   id: PinpointerStation
diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
index 1ff15a91886..75ff960d8c8 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
@@ -30,7 +30,7 @@
       - Chemistry
       - ChiefEngineer
       - ChiefMedicalOfficer
-      - Frontier
+      - Frontier # Frontier
       - Command
       - Engineering
       - External
@@ -41,6 +41,7 @@
       - Kitchen
       - Maintenance
       - Medical
+      - Mercenary # Frontier
       - Quartermaster
       - Research
       - ResearchDirector
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index aa5a6ee5082..f59af15bfd6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -317,8 +317,6 @@
     - type: GuideHelp
       guides:
       - Security
-    - type: StaticPrice
-      price: 800
 
 - type: entity
   name: practice disabler
diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
index b22d11826ce..180f03deab0 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
@@ -13,6 +13,7 @@
     science:     Structures/Doors/Airlocks/Standard/science.rsi
     security:    Structures/Doors/Airlocks/Standard/security.rsi
     virology:    Structures/Doors/Airlocks/Standard/virology.rsi
+    mercenary:   _NF/Structures/Doors/Airlocks/Standard/mercenary.rsi
 
 - type: AirlockGroup
   id: Glass
@@ -28,6 +29,7 @@
     medical:     Structures/Doors/Airlocks/Glass/medical.rsi
     security:    Structures/Doors/Airlocks/Glass/security.rsi
     virology:    Structures/Doors/Airlocks/Glass/virology.rsi
+    mercenary:   _NF/Structures/Doors/Airlocks/Glass/mercenary.rsi
 
 - type: AirlockGroup
   id: Windoor
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 23bbc770457..ddd15ae274a 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -47,6 +47,7 @@
 #  - HeadOfSecurity # Frontier - Whitelist for sheriff only.
   - ResearchDirector # Frontier
   - Armory # Frontier
+  - Mercenary # Frontier
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ] # Frontier - Added TrackingImplant
diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml
index 0decdec2a8f..7b501a69b59 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml
@@ -19,6 +19,8 @@
   - Brig
   - Maintenance
   - External
+  - Mercenary # Frontier
+  - Captain # Frontier
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
index 31b743ba2b0..8611237de60 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -16,6 +16,8 @@
   - Maintenance
   - Service
   - Detective
+  - Mercenary # Frontier
+  - Captain # Frontier
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index 7c740f6680d..31c8fccf84b 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -28,7 +28,7 @@
   canBeAntag: false
   access:
   - HeadOfSecurity
-  - HeadOfPersonnel # Frontier - This should probably be removed after we confirm they can get into SR office
+  - HeadOfPersonnel # Frontier - This should probably be removed after we confirm they can get into SR office + Bank
   - Command
   - Brig
   - Frontier
@@ -38,7 +38,7 @@
   - Service
   - External
   - Detective
-#  - Mercenary # Frontier
+  - Mercenary # Frontier
   - Bar # Frontier
   - Janitor # Frontier
   - Theatre # Frontier
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index ddd10d16668..459d0f76d1b 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -20,6 +20,8 @@
   - Maintenance
   - Service # Frontier
   - External # Frontier
+  - Mercenary # Frontier
+  - Captain # Frontier
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index 65dc26a729f..ab094a722e3 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -16,6 +16,8 @@
   - Maintenance
   - Service
   - External
+  - Mercenary # Frontier
+  - Captain # Frontier
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
index fc38b0cb1c1..d624f95bddc 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
@@ -26,6 +26,8 @@
   - Maintenance
   - Service
   - External
+  - Mercenary # Frontier
+  - Captain # Frontier
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ]
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index 9289ca9d208..284375308c2 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -21,6 +21,8 @@
   - Brig
   - External
   - Detective
+  - Mercenary # Frontier
+  - Captain # Frontier
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ] # Frontier
diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml
index 47430538e86..8be71cc6155 100644
--- a/Resources/Prototypes/StatusEffects/job.yml
+++ b/Resources/Prototypes/StatusEffects/job.yml
@@ -367,10 +367,3 @@
   icon:
     sprite: Interface/Misc/job_icons.rsi
     state: SeniorResearcher
-##NF
-- type: statusIcon
-  parent: JobIcon
-  id: JobIconMailCarrier
-  icon:
-    sprite: Interface/Misc/job_icons.rsi
-    state: MailCarrier
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Access/command.yml b/Resources/Prototypes/_NF/Access/command.yml
new file mode 100644
index 00000000000..5f09d5dcde8
--- /dev/null
+++ b/Resources/Prototypes/_NF/Access/command.yml
@@ -0,0 +1,3 @@
+- type: accessLevel
+  id: Frontier
+  name: id-card-access-level-frontier
diff --git a/Resources/Prototypes/_NF/Access/security.yml b/Resources/Prototypes/_NF/Access/security.yml
new file mode 100644
index 00000000000..d97c4d14fd3
--- /dev/null
+++ b/Resources/Prototypes/_NF/Access/security.yml
@@ -0,0 +1,3 @@
+- type: accessLevel
+  id: Mercenary
+  name: id-card-access-level-mercenary 
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index c277b7a2f65..317af5b1ca0 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -1,7 +1,7 @@
 - type: entity
   noSpawn: true
-  parent: ClothingBackpackMerc
-  id: ClothingBackpackMercFilled
+  parent: ClothingBackpackMercenary
+  id: ClothingBackpackMercenaryFilled
   components:
     - type: StorageFill
       contents:
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
index 5d603525faa..1a2e4185b70 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -1,3 +1,15 @@
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackDuffelMercenary
+  id: ClothingBackpackDuffelMercenaryFilled
+  components:
+    - type: StorageFill
+      contents:
+      - id: BoxSurvival
+      - id: Lighter
+      - id: CigPackBlack
+      - id: Flash
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackDuffel
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml
index d78ecd674d1..b04a513a46a 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -1,3 +1,15 @@
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelMercenary
+  id: ClothingBackpackSatchelMercenaryFilled
+  components:
+    - type: StorageFill
+      contents:
+      - id: BoxSurvival
+      - id: Lighter
+      - id: CigPackBlack
+      - id: Flash
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackSatchel
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml
index 5755ad6305d..a52c245e197 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml
@@ -7,6 +7,15 @@
     contents:
       - id: CombatKnife
 
+- type: entity
+  id: ClothingShoesBootsMagMercenaryFilled
+  parent: ClothingShoesBootsMagMercenary
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: KukriKnife
+
 - type: entity
   id: ClothingShoesBootsMagPirateFilled
   parent: ClothingShoesBootsMagPirate
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
index da9a8e06aff..f56b6e6094d 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml
@@ -25,7 +25,8 @@
       - id: ClothingHeadsetAltCargo
 #      - id: BoxEncryptionKeyCargo # Frontier
       - id: ClothingBeltUtilityEngineering # Frontier
-      - id: OxygenTankFilled # Frontier
-      - id: NitrogenTankFilled # Frontier
+#      - id: NitrogenTankFilled
+#      - id: OxygenTankFilled
+      - id: AirTankFilled
       - id: ClothingMaskGasExplorer # Frontier
       - id: ClothingOuterHardsuitLuxury # Frontier
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml
index 06d72b0d796..7a1498ce24c 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml
@@ -71,3 +71,15 @@
 #      - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
 #        prob: 0.15
       - id: Hypospray # Frontier
+
+- type: entity
+  id: LockerMercenaryFilled
+  suffix: Filled
+  parent: LockerMercenary
+  components:
+  - type: StorageFill
+    contents:
+      - id: PinpointerUniversal
+      - id: HandHeldMassScanner
+      - id: WeaponGrapplingGun
+      - id: BoxZiptie
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
index f4b1ad65e6b..090438bc77e 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
@@ -7,8 +7,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingHeadHelmetVoidParamed
         - id: ClothingOuterHardsuitVoidParamed
         - id: ClothingMaskBreathMedical
@@ -26,8 +27,9 @@
   components:
   - type: StorageFill
     contents:
-        - id: NitrogenTankFilled
-        - id: OxygenTankFilled
+#        - id: NitrogenTankFilled
+#        - id: OxygenTankFilled
+        - id: AirTankFilled
         - id: ClothingOuterHardsuitBrigmedic
         - id: ClothingMaskBreathMedicalSecurity
         - id: JetpackSecurityFilled
@@ -44,12 +46,32 @@
   components:
   - type: StorageFill
     contents:
-      - id: NitrogenTankFilled
-      - id: YellowOxygenTankFilled
-      - id: ClothingShoesBootsMag
-      - id: ClothingOuterHardsuitLuxury
-      - id: ClothingMaskGasExplorer
-      - id: JetpackMiniFilled
-      - id: HandheldGPSBasic
+#        - 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: SuitStorageMercenary
+  parent: SuitStorageBase
+  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"]]
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
index b7a28af0799..e7e44ac497b 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
@@ -9,4 +9,25 @@
     Zipties: 20
     Flash: 15
     ClothingEyesGlassesSunglasses: 12
-    ClothingHeadHatHoshat: 4
+#Bounty hunter
+    ClothingUniformJumpsuitBH: 3
+    ClothingUniformJumpskirtBH: 3
+    ClothingOuterCoatBHTrench: 3
+    ClothingHeadHatBH: 3
+#Mercenary
+    ClothingBackpackMercenary: 3
+    ClothingBackpackSatchelMercenary: 3
+    ClothingBackpackDuffelMercenary: 3
+    ClothingUniformJumpsuitMercenary: 3
+    ClothingUniformJumpskirtMercenary: 3
+    ClothingShoesBootsMercenary: 3
+    ClothingHeadBandMercenary: 3
+    ClothingHeadHatBeretMercenary: 3
+    ClothingHeadHelmetMercenary: 3
+    ClothingOuterVestWebMercenary: 3
+    ClothingMaskGasMercenary: 3
+    ClothingEyesGlassesMercenary: 3
+    ClothingBeltMercenaryWebbing: 3
+    ClothingHandsGlovesMercFingerless: 3
+    ClothingHandsMercenaryGlovesCombat: 3
+    ClothingHeadsetAltMercenary: 3
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml
index 13ffd36b16e..ce0dfcbda44 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml
@@ -1,3 +1,12 @@
+- type: entity
+  parent: ClothingBackpackDuffel
+  id: ClothingBackpackDuffelMercenary # Frontier - Merc to Mercenary
+  name: mercenary duffel
+  description: A duffel that has been in many dangerous places, a reliable combat duffel.
+  components:
+    - type: Sprite
+      sprite: _NF/Clothing/Back/Duffels/mercenary.rsi
+
 - type: entity
   parent: ClothingBackpackDuffel
   id: ClothingBackpackDuffelArcadia
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml
index 7635fa37395..b0953218143 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml
@@ -1,3 +1,12 @@
+- type: entity
+  parent: ClothingBackpackSatchel
+  id: ClothingBackpackSatchelMercenary # Frontier - Merc to Mercenary
+  name: mercenary satchel
+  description: A satchel that has been in many dangerous places, a reliable combat satchel.
+  components:
+    - type: Sprite
+      sprite: _NF/Clothing/Back/Satchels/mercenary.rsi
+
 - type: entity
   parent: ClothingBackpackSatchel
   id: ClothingBackpackSatchelArcadia
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
index 422179a328a..84b5f9f0975 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
@@ -13,3 +13,18 @@
     sprite: Clothing/Ears/Headsets/security.rsi
   - type: Clothing
     sprite: Clothing/Ears/Headsets/security.rsi
+
+- type: entity
+  parent: ClothingHeadsetAlt
+  id: ClothingHeadsetAltMercenary
+  name: mercenary over-ear headset
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeyCommon
+      - EncryptionKeyMedical
+  - type: Sprite
+    sprite: _NF/Clothing/Ears/Headsets/mercenary.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Ears/Headsets/mercenary.rsi
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml
new file mode 100644
index 00000000000..112261a99f6
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -0,0 +1,54 @@
+#When adding new hardsuits, please try to keep the organization consistent with hardsuit.yml (if possible.)
+
+#For now, since locational damage is not a thing, all "combat" hardsuits (with the exception of the deathsquad hardsuit) have the equvilent of a helmet in terms of armor. This is so people don't need to wear both regular, on-station helmets and hardsuits to get full protection.
+#Generally, unless you're adding something like caustic damage, you should probably avoid messing with armor outside of the above scenario.
+
+#Security Patrol Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitSecuritypatrol
+  noSpawn: true
+  name: security patrol hardsuit helmet
+  description: Lightly armored hardsuit helmet for security beat-cop needs.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/security-patrol.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/security-patrol.rsi
+  - type: PointLight
+    color: "#ffeead"
+  - type: PressureProtection
+    highPressureMultiplier: 0.525
+    lowPressureMultiplier: 10000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
+
+#Mercenary Hardsuit
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetHardsuitMercenary
+  noSpawn: true
+  name: mercenary hardsuit helmet
+  description: Lightly armored hardsuit helmet for mercenary needs.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Head/Hardsuits/mercenary.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hardsuits/mercenary.rsi
+  - type: PointLight
+    color: "#ffeead"
+  - type: PressureProtection
+    highPressureMultiplier: 0.525
+    lowPressureMultiplier: 10000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.9
+        Heat: 0.9
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
new file mode 100644
index 00000000000..2b387e73a24
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
@@ -0,0 +1,5 @@
+- type: entity
+  parent: ClothingHeadHatHoshat
+  id: ClothingHeadHatBH
+  name: "bounty hunter's hat"
+  description: "There's a new bounty hunter in the sector."
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml
new file mode 100644
index 00000000000..bd59dc63e24
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml
@@ -0,0 +1,15 @@
+- type: entity
+  parent: ClothingOuterCoatHoSTrench
+  id: ClothingOuterCoatBHTrench
+  name: "bounty hunter's flak trenchcoat"
+  description: A greatcoat enhanced with a bullet proof alloy for some extra protection and style for those with a charismatic presence.
+  components:
+  - type: Armor # ClothingOuterArmorBulletproof stats
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.4
+        Heat: 0.9
+  - type: ExplosionResistance
+    damageCoefficient: 0.80
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml
new file mode 100644
index 00000000000..06bcab25495
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -0,0 +1,61 @@
+#Security Patrol Hardsuit
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitSecuritypatrol
+  name: security patrol hardsuit
+  description: A special suit that protects from the danger of space, employed by security patrol officers. Not certified to be blunderbuss proof.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/security-patrol.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.525
+    lowPressureMultiplier: 10000
+  - type: ExplosionResistance
+    damageCoefficient: 0.5
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.7
+        Slash: 0.7
+        Piercing: 0.65
+        Heat: 0.70
+        Radiation: 0.70
+        Caustic: 0.8
+  - type: ClothingSpeedModifier
+    walkModifier: 0.85
+    sprintModifier: 0.80
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitSecuritypatrol
+
+#Mercenary Hardsuit
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitMercenary # stats are of luxury mining hardsuit
+  name: mercenary hardsuit
+  description: A special suit that protects from the danger of space, employed by mercenary forces. Not certified to be blunderbuss proof.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.5
+    lowPressureMultiplier: 1000
+  - type: ExplosionResistance
+    damageCoefficient: 0.6 # Removed 10%
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.9
+        Slash: 0.9
+        Piercing: 0.8
+        Heat: 0.9 # Added 10%
+        Radiation: 0.5
+        Caustic: 0.8
+  - type: ClothingSpeedModifier
+    walkModifier: 0.85
+    sprintModifier: 0.9
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetHardsuitMercenary
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml
index 9dc2288c389..d3b98d6bb62 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/magboots.yml
@@ -38,6 +38,20 @@
     - key: enum.StorageUiKey.Key
       type: StorageBoundUserInterface
 
+- type: entity
+  parent: ClothingShoesBootsMagCombat
+  id: ClothingShoesBootsMagMercenary
+  name: mercenary magboots
+  description: mercenary magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Shoes/Boots/magboots-mercenary.rsi
+    state: icon
+  - type: Clothing
+    sprite: _NF/Clothing/Shoes/Boots/magboots-mercenary.rsi
+  - type: Magboots
+    toggleAction: ActionToggleMagbootsMercenary
+
 - type: entity
   parent: ClothingShoesBootsMagCombat
   id: ClothingShoesBootsMagPirate
@@ -61,6 +75,15 @@
     icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi, state: icon }
     iconOn: _NF/Clothing/Shoes/Boots/magboots-combat.rsi/icon-on.png
 
+- type: entity
+  id: ActionToggleMagbootsMercenary
+  parent: ActionBaseToggleMagboots
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-mercenary.rsi, state: icon }
+    iconOn: _NF/Clothing/Shoes/Boots/magboots-mercenary.rsi/icon-on.png
+
 - type: entity
   id: ActionToggleMagbootsPirate
   parent: ActionBaseToggleMagboots
@@ -68,4 +91,4 @@
   components:
   - type: InstantAction
     icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi, state: icon }
-    iconOn: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png
+    iconOn: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi/icon-on.png
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
index a6eefb9391d..c7ed9db151b 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -19,3 +19,21 @@
     sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi
+
+- type: entity
+  parent: ClothingUniformJumpskirtDetective
+  id: ClothingUniformJumpskirtBH
+  name: bounty hunter's hard-worn suit
+  description: Someone who wears this means business.
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtMercenary
+  name: mercenary jumpskirt
+  description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned.
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Uniforms/Jumpskirt/mercenary.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Uniforms/Jumpskirt/mercenary.rsi
+
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
index 32e93038464..be2e1376f93 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -19,3 +19,9 @@
     sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi
+
+- type: entity
+  parent: ClothingUniformJumpsuitDetective
+  id: ClothingUniformJumpsuitBH
+  name: bounty hunter's hard-worn suit
+  description: Someone who wears this means business.
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml
index 5522509fcbc..991ba893778 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml
@@ -3,12 +3,17 @@
   id: MercenaryIDCard
   name: mercenary ID card
   components:
+  - type: PresetIdCard
+    job: Mercenary
   - type: Sprite
+    sprite: _NF/Objects/Misc/id_cards.rsi
     layers:
     - state: default
-    - state: idpassenger
-  - type: PresetIdCard
-    job: Mercenary
+    - state: idmercenary
+  - type: Clothing
+    slots:
+    - idcard
+    sprite: _NF/Objects/Misc/id_cards.rsi
 
 - type: entity
   parent: IDCardStandard
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
index 70b6c661a2c..a11512778f3 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
@@ -2,17 +2,30 @@
   parent: BasePDA
   id: MercenaryPDA
   name: mercenary PDA
-  description: Why isn't it green?
+  description: This PDA smells of war.
   components:
   - type: Pda
     id: MercenaryIDCard
-    state: pda
+    state: pda-mercenary
   - type: PdaBorderColor
     borderColor: "#717059"
     accentVColor: "#A32D26"
+  - type: Sprite
+    sprite: _NF/Objects/Devices/pda.rsi
+    layers:
+    - map: [ "enum.PdaVisualLayers.Base" ]
+    - state: "light_overlay"
+      map: [ "enum.PdaVisualLayers.Flashlight" ]
+      shader: "unshaded"
+      visible: false
+    - state: "id_overlay"
+      map: [ "enum.PdaVisualLayers.IdLight" ]
+      shader: "unshaded"
+      visible: false
   - type: Icon
-    state: pda
-    
+    sprite: _NF/Objects/Devices/pda.rsi
+    state: pda-mercenary
+
 - type: entity
   parent: BasePDA
   id: STCPDA
diff --git a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml
similarity index 94%
rename from Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
rename to Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml
index 8273bef0b30..d132701d415 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/handheld_mass_scanner.yml
@@ -5,7 +5,7 @@
   description: A hand-held mass scanner.
   components:
   - type: Item
-    size: 20
+    size: 10
   - type: Sprite
     sprite: Objects/Tools/handheld_mass_scanner.rsi
     state: icon
@@ -37,4 +37,6 @@
       - key: enum.RadarConsoleUiKey.Key
         type: RadarConsoleBoundUserInterface
   - type: StaticPrice
-    price: 500
+    price: 20
+  - type: VendPrice
+    price: 5000
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml
index 82fa304a941..a3fc2e3416d 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml
@@ -1,3 +1,4 @@
+# Airlocks
 - type: entity
   parent: AirlockCommand
   id: AirlockFrontierLocked
@@ -16,4 +17,22 @@
   - type: AccessReader
     access: [["Frontier"]]
   - type: Wires
-    layoutId: AirlockCommand
\ No newline at end of file
+    layoutId: AirlockCommand
+
+- type: entity
+  parent: AirlockMercenary
+  id: AirlockMercenaryLocked
+  suffix: Mercenary, Locked
+  components:
+  - type: AccessReader
+    access: [["Mercenary"]]
+  - type: Wires
+    layoutId: AirlockMercenary
+
+- type: entity
+  parent: AirlockMercenaryGlass
+  id: AirlockMercenaryGlassLocked
+  suffix: Mercenary, Locked
+  components:
+  - type: AccessReader
+    access: [["Mercenary"]]
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml
new file mode 100644
index 00000000000..04e478a80bf
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -0,0 +1,18 @@
+- type: entity
+  parent: Airlock
+  id: AirlockMercenary
+  suffix: Mercenary
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Doors/Airlocks/Standard/mercenary.rsi
+
+# Glass
+- type: entity
+  parent: AirlockGlass
+  id: AirlockMercenaryGlass
+  suffix: Mercenary
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Doors/Airlocks/Glass/mercenary.rsi
+  - type: PaintableAirlock
+    group: Glass
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
new file mode 100644
index 00000000000..bc090347817
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -0,0 +1,27 @@
+# Mercenary
+- type: entity
+  id: LockerMercenary
+  parent: LockerBaseSecure
+  name: mercenary locker
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: mercenary
+    stateDoorOpen: mercenary_open
+    stateDoorClosed: mercenary_door
+  - type: Sprite
+    sprite: _NF/Structures/Storage/closet.rsi
+    noRot: true
+    layers:
+    - state: generic
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: generic_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.StorageVisualLayers.Lock"]
+      shader: unshaded
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+  - type: AccessReader
+    access: [["Captain"], ["Mercenary"]]
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml
index 4321d5cce1c..ccdbdc72659 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml
@@ -8,11 +8,12 @@
     - !type:OverallPlaytimeRequirement
       time: 10800
   canBeAntag: false
-  icon: "JobIconServiceWorker" 
+  icon: "JobIconSTC" 
   supervisors: job-supervisors-hop
   setPreference: true
   access:
   - Maintenance
+  - External
   - Frontier
 
 - type: startingGear
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml
index 77095085f02..0f75626a01c 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml
@@ -8,26 +8,31 @@
       time: 10800
   startingGear: MercenaryGear
   canBeAntag: true
-  icon: "JobIconSeniorOfficer" 
+  icon: "JobIconMercenary" 
   supervisors: job-supervisors-captain
   setPreference: true
   access:
   - Maintenance
+  - External
+  - Mercenary
 
 - type: startingGear
   id: MercenaryGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitMercenary
-    back: ClothingBackpackMercFilled
-    shoes: ClothingShoesBootsMercFilled
-    mask: ClothingMaskGasMerc
+    back: ClothingBackpackMercenaryFilled
+#    shoes: ClothingShoesBootsMercenaryFilled
+    shoes: ClothingShoesBootsMagMercenaryFilled # Give this only to new spawns
+    mask: ClothingMaskGasMercenary
     eyes: ClothingEyesGlassesMercenary
-    gloves: ClothingHandsMercGlovesCombat
-    head: ClothingHeadHatBeretMerc
-    outerClothing: ClothingOuterVestWebMerc
+    gloves: ClothingHandsMercenaryGlovesCombat
+#    head: ClothingHeadHatBeretMercenary
+    head: ClothingHeadHelmetMercenary
+    outerClothing: ClothingOuterVestWebMercenary
     id: MercenaryPDA
-    ears: ClothingHeadsetGrey
-    belt: ClothingBeltMercWebbing
-  innerClothingSkirt: ClothingUniformJumpsuitMercenary
-  satchel: ClothingBackpackMercFilled
-  duffelbag: ClothingBackpackMercFilled
+    ears: ClothingHeadsetAltMercenary
+    belt: ClothingBeltMercenaryWebbing
+    pocket1: WeaponPistolMk58Nonlethal
+  innerClothingSkirt: ClothingUniformJumpskirtMercenary
+  satchel: ClothingBackpackSatchelMercenaryFilled
+  duffelbag: ClothingBackpackDuffelMercenaryFilled
diff --git a/Resources/Prototypes/_NF/StatusEffects/job.yml b/Resources/Prototypes/_NF/StatusEffects/job.yml
new file mode 100644
index 00000000000..da51ee1509f
--- /dev/null
+++ b/Resources/Prototypes/_NF/StatusEffects/job.yml
@@ -0,0 +1,20 @@
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconMailCarrier
+  icon:
+    sprite: Interface/Misc/job_icons.rsi
+    state: MailCarrier
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconMercenary
+  icon:
+    sprite: _NF/Interface/Misc/job_icons.rsi
+    state: Mercenary
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconSTC
+  icon:
+    sprite: Interface/Misc/job_icons.rsi
+    state: ServiceWorker
diff --git a/Resources/Prototypes/_NF/Wires/layouts.yml b/Resources/Prototypes/_NF/Wires/layouts.yml
new file mode 100644
index 00000000000..c461fe13a8d
--- /dev/null
+++ b/Resources/Prototypes/_NF/Wires/layouts.yml
@@ -0,0 +1,3 @@
+- type: wireLayout
+  parent: Airlock
+  id: AirlockMercenary
diff --git a/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml b/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml
index 3a5de9711df..7f60cf006cd 100644
--- a/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml
+++ b/Resources/Prototypes/_Nyano/Catalog/Fills/Vending/Inventories/repdrobe.yml
@@ -2,16 +2,16 @@
   id: RepDrobeInventory
   startingInventory:
     ClothingUniformJumpsuitReporter: 2
-    ClothingUniformJumpsuitDetective: 2
-    ClothingUniformJumpskirtDetective: 2
+#    ClothingUniformJumpsuitDetective: 2 # Frontier - Detective gear, need to replace this.
+#    ClothingUniformJumpskirtDetective: 2 # Frontier - Detective gear, need to replace this.
     ClothingShoesColorBrown: 2
     ClothingShoesColorBlack: 2
     ClothingShoesColorWhite: 2
-    ClothingOuterVestDetective: 2
+#    ClothingOuterVestDetective: 2 # Frontier - Detective gear, need to replace this.
     ClothingHeadHatFedoraBrown: 2
-    ClothingUniformJumpsuitDetectiveGrey: 2
-    ClothingUniformJumpskirtDetectiveGrey: 2
-    ClothingNeckTieDet: 2
+#    ClothingUniformJumpsuitDetectiveGrey: 2 # Frontier - Detective gear, need to replace this.
+#    ClothingUniformJumpskirtDetectiveGrey: 2 # Frontier - Detective gear, need to replace this.
+#    ClothingNeckTieDet: 2 # Frontier - Detective gear, need to replace this.
     ClothingHeadHatFedoraGrey: 2
     ClothingHandsGlovesColorBlack: 2
     RadioHandheld: 2
diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml
index c37ea4ae61e..a2064f3d3f3 100644
--- a/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml
+++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml
@@ -16,6 +16,8 @@
   - Maintenance
   - Service # Frontier
   - External # Frontier
+  - Mercenary # Frontier
+  - Captain # Frontier
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ]
diff --git a/Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/equipped-EARS.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/alt-equipped-EARS.png
similarity index 100%
rename from Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/equipped-EARS.png
rename to Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/alt-equipped-EARS.png
diff --git a/Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/icon.png b/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/icon_alt.png
similarity index 100%
rename from Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/icon.png
rename to Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/icon_alt.png
diff --git a/Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/meta.json b/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/meta.json
similarity index 85%
rename from Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/meta.json
rename to Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/meta.json
index ee43d990223..7e7e5cc5015 100644
--- a/Resources/Textures/_NF/Clothing/Ears/mercenary.rsi/meta.json
+++ b/Resources/Textures/_NF/Clothing/Ears/Headsets/mercenary.rsi/meta.json
@@ -8,10 +8,10 @@
   },
   "states": [
     {
-      "name": "icon"
+      "name": "icon_alt"
     },
     {
-      "name": "equipped-EARS",
+      "name": "alt-equipped-EARS",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/equipped-OUTERCLOTHING.png
index a70cf7f54e5..680865288a0 100644
Binary files a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/mercenary.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic.png
new file mode 100644
index 00000000000..cd0c0ff2ea1
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_door.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_door.png
new file mode 100644
index 00000000000..26498527779
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/generic_door.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/locked.png
new file mode 100644
index 00000000000..d90218d19e2
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/locked.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json
index 547e191cbbc..e7a90856b44 100644
--- a/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json
@@ -1,20 +1,36 @@
 {
-    "copyright": "Taken from tgstation, mercenary locker is a resprited armory locker by erhardsteinhauer (discord)",
-    "license": "CC-BY-SA-3.0",
-    "size": {
-        "x": 32,
-        "y": 32
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "copyright": "Taken from tgstation, mercenary locker is a resprited armory locker by erhardsteinhauer (discord)",
+  "license": "CC-BY-SA-3.0",
+  "states": [
+    {
+      "name": "generic"
+	},
+	{
+      "name": "generic_door"
+	},
+	{
+      "name": "locked"
+	},
+	{
+      "name": "mercenary"
+	},
+	{
+      "name": "mercenary_door"
+	},
+	{
+      "name": "mercenary_open"
+	},
+    {
+      "name": "unlocked"
     },
-    "states": [
-        {
-            "name": "mercenary"
-        },
-        {
-            "name": "mercenary_door"
-        },
-        {
-            "name": "mercenary_open"
-        }
-    ],
-    "version": 1
+    {
+      "name": "welded"
+    }
+  ]
 }
+
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/unlocked.png
new file mode 100644
index 00000000000..418607bfaf5
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/unlocked.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/closet.rsi/welded.png b/Resources/Textures/_NF/Structures/Storage/closet.rsi/welded.png
new file mode 100644
index 00000000000..5ba5dcc8962
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/closet.rsi/welded.png differ
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 6c2fb582151..908a57fd23d 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -166,4 +166,17 @@ APCBasicEmpImmune: APCBasic
 
 # 2023-11-11
 # No need for a copy paste of the locker
-LockerResearchDirectorShuttleFilled: LockerResearchDirectorFilled
\ No newline at end of file
+LockerResearchDirectorShuttleFilled: LockerResearchDirectorFilled
+
+# 2023-11-29
+# Merc to Mercenary
+ClothingMaskGasMerc: ClothingMaskGasMercenary
+ClothingBackpackMercFilled: ClothingBackpackMercenaryFilled
+ClothingShoesBootsMerc: ClothingShoesBootsMercenary
+ClothingShoesBootsMercFilled: ClothingShoesBootsMercenaryFilled
+ClothingHandsMercGlovesCombat: ClothingHandsMercenaryGlovesCombat
+ClothingHeadHatBeretMerc: ClothingHeadHatBeretMercenary
+ClothingOuterVestWebMerc: ClothingOuterVestWebMercenary
+ClothingBeltMercWebbing: ClothingBeltMercenaryWebbing
+ClothingHeadHelmetMerc: ClothingHeadHelmetMercenary
+ClothingHeadBandMerc: ClothingHeadBandMercenary