new-frontiers-14 · Cheackraze · Dec 11, 2023 · Nov 29, 2023 · Nov 29, 2023 · Nov 29, 2023
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -41,14 +41,15 @@ public sealed partial class IdCardConsoleComponent : Component
         "Command",
         "Engineering",
         "External",
-        "Frontier",
+        "Frontier", // Frontier
         "HeadOfPersonnel",
         "HeadOfSecurity",
         "Hydroponics",
         "Janitor",
         "Kitchen",
         "Maintenance",
         "Medical",
+        "Mercenary", // Frontier
         "Quartermaster",
         "Research",
         "ResearchDirector",

diff --git a/Resources/Locale/en-US/_NF/nf-jobs.ftl → .../Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/nf-jobs.ftl → .../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. 
+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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -8,14 +8,15 @@
   - ChiefMedicalOfficer
   - HeadOfSecurity
   - ResearchDirector
-  - Frontier
+  - Frontier # Frontier
   - Command
   - Security
   - Detective
   - Armory
   - Brig
   - Engineering
   - Medical
+  - Mercenary # Frontier
   - Quartermaster
   - Salvage
   - Cargo

diff --git a/Resources/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml
@@ -26,10 +26,12 @@
   - Armory
   - Brig
   - Detective
+  - Mercenary # Frontier
 
 - type: accessGroup
   id: Armory
   tags:
   - Security
   - Armory
   - Brig
+  - Mercenary # Frontier
diff --git 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
@@ -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
@@ -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
@@ -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