The highly dreaded roles rename [INCOMPLETE]

Resources/Locale/en-US/_emberfall/job/job-description.ftl

@@ -1 +1,4 @@
+# Job descriptions. Keep it alphabetical, gang.
 job-description-css = Manage the service sector of the station, fire the clown for not being funny enough.
+job-description-executive-officer = Be the second in command to the CO. Take charge when they go missing.
+job-description-pharmacist = Synthesize medications, fulfill prescriptions, and prepare various chemicals for use by the medical team.

Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl

@@ -0,0 +1,89 @@
+# Rename all the changed jobs's items to their actual names with this one weird trick. Check it out.
+# This governs the name for items rather than changing them in the actual yaml.
+# The item order is, bedsheet (if applicable) and wearable items first, then more tactile items like the PDA and hardsuit.
+
+# Commanding Officer
+ent-BedsheetCaptain = CO's bedsheet
+    .desc = It has a Solus Concord symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern Commanding Officers.
+ent-ClothingBackpackCaptain = commanding officer's backpack
+    .desc = It's a special backpack made exclusively for Solus Concord's commanding officers.
+ent-ClothingBackpackDuffelCaptain = commanding officer's duffel bag
+    .desc = A large duffel bag for holding commanding goods.
+ent-ClothingBackpackSatchelCaptain = commanding officer's satchel
+    .desc = An exclusive satchel for Solus Concord's commanding officers.
+ent-ClothingHeadHatCaptain = commanding officer's hardhat
+    .desc = A crown fit for the overseer of a space station.
+ent-ClothingHeadHatCapcap = commanding officer cap
+    .desc = A grand, stylish cap fit for a commanding officer.
+ent-ClothingUniformJumpsuitCaptain = commanding officer's jumpsuit
+    .desc = It's a navy-blue jumpsuit with some gold markings denoting the rank of "CO," whatever that means.
+ent-ClothingUniformJumpskirtCaptain = commanding officer's jumpskirt
+    .desc = It's a navy-blue jumpskirt with some gold markings denoting the rank of "CO," whatever that means.
+ent-ClothingUniformJumpsuitCapFormal = commanding officer's formal suit
+ent-ClothingUniformJumpskirtCapFormalDress = commanding officer's formal dress
+ent-ClothingOuterWinterCap = commanding officer's winter coat
+ent-ClothingOuterArmorCaptainCarapace = commanding officer's carapace
+ent-ClothingNeckCloakCap = commanding officer's cloak
+ent-ClothingNeckCloakCapFormal = commanding officer's formal cloak
+ent-ClothingNeckMantleCap = commanding officer's mantle
+    .desc = A comfortable and chique mantle befitting of only the most experienced CO.
+ent-ClothingMaskGasCaptain =
+    .desc = Solus Concord cut corners and repainted an engineer's gas mask, but don't tell anyone.
+ent-ClothingHeadHatHoodWinterCaptain = commanding officer's winter coat hood
+    .desc = An expensive and tailored hood, to keep the CO's head warm.
+ent-ClothingHandsGlovesCaptain = commanding officer gloves
+ent-CaptainPDA = commanding officer PDA
+ent-RubberStampCaptain = commanding officer's rubber stamp
+ent-PenCap = CO's fountain pen
+    .desc = A luxurious fountain pen for the Commanding Officer.
+ent-DrinkFlask = commanding officer's flask
+    .desc = A metal flask belonging to the commanding officer.
+ent-MobFoxRenault = Renault
+    .desc = The commanding officer's trustworthy fox.
+ent-CaptainSabre = A ceremonial weapon belonging to the commanding officer of the station.
+ent-ClothingHeadHelmetHardsuitCap = commanding officer's hardsuit helmet
+    .desc = Special hardsuit helmet, fitted to the Commanding Officer of the station.
+ent-ClothingOuterHardsuitCap = commanding officer's armored spacesuit
+    .desc = A formal armored spacesuit, made for the station's commanding officer.
+ent-JetpackCaptain = commanding officer's jetpack
+ent-LockerCaptain = commanding officer's locker
+# TODO: Add missing items found during testing to this list. 
+# The goal: don't let there be a mention of captain unless it's in the context of like, pirates or something else.
+
+# Executive Officer (Former HoP)
+ent-BedsheetHOP = XO's bedsheet
+    .desc = It's decorated with a key emblem. For those rare moments when you can rest and cuddle with your dog without someone screaming for you over the radio.
+ent-ClothingUniformJumpsuitHoP = executive officer's jumpsuit
+ent-ClothingUniformJumpskirtHoP = executive officer's jumpskirt
+ent-ClothingHeadHatHopcap = executive officer's cap
+    .desc = A grand, stylish executive officer's cap.
+# What the fuck is the XO's color scheme? Find out later.
+ent-ClothingNeckCloakHop = executive officer's cloak
+    .desc = A colored cloak with colored shoulders and gold buttons, proving you are the gatekeeper to any airlock on the station.
+ent-ClothingNeckMantleHOP = executive officer's mantle
+    .desc = A good executive officer knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half.
+ent-ClothingOuterWinterHoP = executive officer's winter coat
+ent-ClothingHeadHatHoodWinterHOP = executive officer's winter coat hood
+ent-RubberStampHop = executive officer's rubber stamp
+ent-LockerHeadOfPersonnel = executive officer's locker
+# TODO: Add missing items found during testing to this list.
+# The goal: Most of the XO's stuff will be resprited so they're not just a HoP reskin.
+# CSS (Chief Service Supervisor) actually does the intended of the HoP (by managing Service.)
+
+# Inspector (Inspector Gadget)
+ent-ClothingNeckTieDet = inspector's tie
+ent-ClothingOuterVestDetective = inspector's vest
+ent-ClothingOuterCoatDetective = inspector trenchcoat
+ent-RubberStampDetective = inspector's rubber stamp
+ent-VendingMachineDetDrobe = InspectDrobe
+    .desc = A machine for all your detective needs, as long as you need clothes.
+ent-LockerDetective = inspector's cabinet
+ent-DetectivePDA = inspector PDA
+ent-WeaponRevolverInspector = Investigator
+    .desc = A inspector's best friend. Uses .45 magnum ammo.
+# TODO: I actually have no idea if the det has that many items that actually mention the det - there's more items that mention PIs
+
+# Pharmacist
+ent-ClothingUniformJumpsuitChemistry = pharmacist's jumpsuit
+ent-ClothingUniformJumpskirtChemistry = pharmacist's jumpskirt
+# TODO: Figure out what items can vaguely be "chemistry" and what is actually the pharmacy. What the fuck am I doing, help.

Resources/Locale/en-US/_emberfall/job/job-names.ftl

@@ -1,10 +1,18 @@
+# Emberfall custom job locale - overwrites upstream files. Make it at least SLIGHTLY alphabetical please.
 # keep these sorted or i'll kill you
-
+job-name-commanding-officer = Commanding Officer 
 job-name-css = Chief Service Supervisor
+job-name-executive-officer = Executive Officer
 job-name-senior-engineer = Senior Engineer
 job-name-senior-officer = Senior Officer
+job-name-inspector = Inspector
 job-name-senior-physician = Senior Physician
+job-name-pharmacist = Pharmacist
 job-name-senior-researcher = Senior Researcher
 
 # Role timers
+JobCommandingOfficer = Commanding Officer
 JobChiefServiceSupervisor = Chief Service Supervisor
+JobExecutiveOfficer = Executive Officer
+JobInspector = Inspector
+JobPharmacist = Pharmacist

Resources/Locale/en-US/_emberfall/job/job-supervisors.ftl

@@ -1 +1,6 @@
-job-supervsiors-css = the chief service supervisor
+# Job Supervisors. Keep it alphabetical, gang.
+job-supervisors-commanding-officer = the Commanding Officer
+job-supervsiors-css = the Chief Service Supervisor
+job-supervisors-executive-officer = the Executive Officer
+job-supervisors-engineering-emberfall = Station Engineers, Senior Engineers, and the Chief Engineer
+job-supervisors-medicine-emberfall = Medical Doctors, Paramedics, Pharmacists, and the Chief Medical Officer

Resources/Locale/en-US/_emberfall/navmap-beacons/station-beacons.ftl

@@ -0,0 +1,4 @@
+# Emberfall Station Beacons (Yippee)
+station-beacon-commanding-officer = Commanding Officer
+station-beacon-executive-officer = Executive Officer
+station-beacon-inspector = Inspector

Resources/Locale/en-US/_emberfall/paper/stamp-component.ftl

@@ -1 +1,6 @@
+# Stamp Names for Emberfall Jobs
+stamp-component-stamped-name-commanding-officer = Commanding Officer
+stamp-component-stamped-name-executive-officer = Executive Officer
 stamp-component-stamped-name-css = Chief Service Supervisor
+stamp-component-stamped-name-inspector = Inspector
+# Pharmacists don't have a stamp, I think...

Resources/Locale/en-US/_emberfall/prototypes/access/accesses.ftl

@@ -1 +1,8 @@
+# Accesses for Emberfall Jobs
+
+# Command
+id-card-access-level-commanding-officer = Commanding Officer
+id-card-access-level-executive-officer = Executive Officer
 id-card-access-level-css = Chief Service Supervisor
+id-card-access-level-inspector = Inspector 
+id-card-access-level-pharmacy = Pharmacy

Resources/Prototypes/Access/security.yml

@@ -16,7 +16,7 @@
 
 - type: accessLevel
   id: Detective
-  name: id-card-access-level-detective
+  name: id-card-access-level-inspector # Emberfall: Detective -> Inspector
 
 - type: accessGroup
   id: Security

Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml

@@ -148,18 +148,18 @@
 - type: entity
   parent: DefaultStationBeaconCommand
   id: DefaultStationBeaconCaptainsQuarters
-  suffix: Captain's Quarters
+  suffix: CO's Quarters # Emberfall: Captain -> CO
   components:
   - type: NavMapBeacon
-    defaultText: station-beacon-captain
+    defaultText: station-beacon-commanding-officer # Emberfall: Captain -> CO
 
 - type: entity
   parent: DefaultStationBeaconCommand
   id: DefaultStationBeaconHOPOffice
-  suffix: HOP's Office
+  suffix: XO's Office # Emberfall: HOP -> XO
   components:
   - type: NavMapBeacon
-    defaultText: station-beacon-hop
+    defaultText: station-beacon-executive-officer # Emberfall: HOP -> XO
 
 - type: entity
   parent: DefaultStationBeacon
@@ -221,10 +221,10 @@
 - type: entity
   parent: DefaultStationBeaconSecurity
   id: DefaultStationBeaconDetectiveRoom
-  suffix: Detective's Room
+  suffix: Inspector's Room # Emberfall: Detective -> Inspector
   components:
   - type: NavMapBeacon
-    defaultText: station-beacon-detective
+    defaultText: station-beacon-inspector # Emberfall: Detective -> Inspector
 
 - type: entity
   parent: DefaultStationBeaconSecurity

Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

@@ -315,7 +315,7 @@
 - type: entity
   parent: AirlockCommand
   id: AirlockCaptainLocked
-  suffix: Captain, Locked
+  suffix: CO, Locked # Emberfall: Captain -> CO
   components:
   - type: ContainerFill
     containers:
@@ -387,7 +387,7 @@
 - type: entity
   parent: AirlockSecurity
   id: AirlockDetectiveLocked
-  suffix: Detective, Locked
+  suffix: Inspector, Locked # Emberfall: Detective -> Inspector
   components:
   - type: ContainerFill
     containers:
@@ -709,7 +709,7 @@
 - type: entity
   parent: AirlockCommandGlass
   id: AirlockCaptainGlassLocked
-  suffix: Captain, Locked
+  suffix: CO, Locked #Emberfall: Captain -> CO
   components:
   - type: ContainerFill
     containers:
@@ -781,7 +781,7 @@
 - type: entity
   parent: AirlockSecurityGlass
   id: AirlockDetectiveGlassLocked
-  suffix: Detective, Locked
+  suffix: Inspector, Locked # Emberfall: Detective -> Inspector
   components:
   - type: ContainerFill
     containers:
@@ -1078,7 +1078,7 @@
 - type: entity
   parent: AirlockMaintSecLocked
   id: AirlockMaintDetectiveLocked
-  suffix: Detective, Locked
+  suffix: Inspector, Locked # Emberfall: Detective -> Inspector
   components:
   - type: ContainerFill
     containers:
@@ -1096,7 +1096,7 @@
 - type: entity
   parent: AirlockMaintCommandLocked
   id: AirlockMaintCaptainLocked
-  suffix: Captain, Locked
+  suffix: CO, Locked # Emberfall: Captain -> CO
   components:
   - type: ContainerFill
     containers:
@@ -1289,7 +1289,7 @@
 - type: entity
   parent: HighSecDoor
   id: HighSecCaptainLocked
-  suffix: Captain, Locked
+  suffix: CO, Locked # Emberfall: Captain -> CO
   components:
   - type: ContainerFill
     containers:

Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml

@@ -308,7 +308,7 @@
 - type: entity
   parent: WindoorSecureSecurityLocked
   id: WindoorSecureDetectiveLocked
-  suffix: Detective, Locked
+  suffix: Inspector, Locked # Emberfall: Detective -> Inspector
   components:
   - type: ContainerFill
     containers:

Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml

@@ -256,15 +256,15 @@
 
 - type: entity
   id: LockableButtonCaptain
-  suffix: Captain
+  suffix: CO # Emberfall: Captain -> CO
   parent: LockableButton
   components:
   - type: AccessReader
     access: [["Captain"]]
 
 - type: entity
   id: LockableButtonHeadOfPersonnel
-  suffix: HeadOfPersonnel
+  suffix: ExecutiveOfficer # Emberfall: HOP -> XO
   parent: LockableButton
   components:
   - type: AccessReader
@@ -328,7 +328,7 @@
 
 - type: entity
   id: LockableButtonDetective
-  suffix: Detective
+  suffix: Inspector # Emberfall: Detective -> Inspector
   parent: LockableButton
   components:
   - type: AccessReader

Resources/Prototypes/Roles/Jobs/Command/captain.yml

@@ -1,8 +1,8 @@
 - type: job
   id: Captain
-  name: job-name-captain
+  name: job-name-commanding-officer # Emberfall: Captain -> CO
   description: job-description-captain
-  playTimeTracker: JobCaptain
+  playTimeTracker: JobCommandingOfficer # Emberfall: Captain -> CO
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering

Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml

@@ -1,8 +1,8 @@
 - type: job
   id: HeadOfPersonnel
-  name: job-name-hop
-  description: job-description-hop
-  playTimeTracker: JobHeadOfPersonnel
+  name: job-name-executive-officer # Begin Emberfall: HoP -> XO
+  description: job-description-executive-officer 
+  playTimeTracker: JobExecutiveOfficer # End Emberfall: HoP -> XO
   requirements:
     - !type:DepartmentTimeRequirement
       department: Engineering
@@ -19,7 +19,7 @@
   weight: 20
   startingGear: HoPGear
   icon: "JobIconHeadOfPersonnel"
-  supervisors: job-supervisors-captain
+  supervisors: job-supervisors-commandingofficer
   canBeAntag: false
   access:
   - Command

Resources/Prototypes/Roles/Jobs/Medical/chemist.yml

@@ -1,8 +1,8 @@
 - type: job
   id: Chemist
-  name: job-name-chemist
-  description: job-description-chemist
-  playTimeTracker: JobChemist
+  name: job-name-pharmacist # Start Emberfall: Chemist -> Pharmacist
+  description: job-description-pharmacist
+  playTimeTracker: JobPharmacist # End Emberfall: Chemist -> Pharmacist
   requirements:
     - !type:DepartmentTimeRequirement
       department: Medical

Resources/Prototypes/Roles/Jobs/Security/detective.yml

@@ -1,8 +1,8 @@
 - type: job
   id: Detective
-  name: job-name-detective
+  name: job-name-inspector # Emberfall: Detective -> Inspector
   description: job-description-detective
-  playTimeTracker: JobDetective
+  playTimeTracker: JobInspector # Emberfall: Detective -> Inspector
   requirements:
     - !type:DepartmentTimeRequirement
       department: Security

Resources/Prototypes/_Emberfall/Roles/play_time_trackers.yml

@@ -1,5 +1,22 @@
+# Emberfall Roles Playtime Trackers
+# Please keep this alphabetical, gang.
+- type: playTimeTracker
+  id: JobCommandingOfficer
+
 - type: playTimeTracker
   id: JobChiefServiceSupervisor
 
+- type: playTimeTracker
+  id: JobExecutiveOfficer
+
+- type: playTimeTracker
+  id: JobInspector
+
+- type: playTimeTracker # no its not ever used, but needs to exist
+  id: JobSeniorEngineer
+
+- type: playTimeTracker
+  id: JobPharmacist
+
 - type: playTimeTracker # no its not ever used, but needs to exist
   id: JobSeniorEngineer