emberfall-14 · Monotheonist · Dec 26, 2024 · Dec 26, 2024 · Dec 26, 2024 · Dec 26, 2024
diff --git a/Resources/Locale/en-US/devices/device-network.ftl b/Resources/Locale/en-US/devices/device-network.ftl
@@ -33,7 +33,7 @@ device-address-prefix-freezer = FZR-
 device-address-prefix-volume-pump = VPP-
 device-address-prefix-smes = SMS-
 
-#PDAs and terminals
+# PDAs and terminals
 device-address-prefix-console = CLS-
 device-address-prefix-fire-alarm = FIR-
 device-address-prefix-air-alarm = AIR-
@@ -42,7 +42,7 @@ device-address-prefix-sensor-monitor = MON-
 
 device-address-examine-message = The device's address is {$address}.
 
-#Device net ID names
+# Device net ID names
 device-net-id-private = Private
 device-net-id-wired = Wired
 device-net-id-wireless = Wireless

diff --git a/Resources/Locale/en-US/emberfall/job/job-description.ftl b/Resources/Locale/en-US/emberfall/job/job-description.ftl
@@ -0,0 +1,3 @@
+# Job descriptions. Keep it alphabetical, gang.
+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.
diff --git a/Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl
@@ -0,0 +1,76 @@
+# 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-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-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-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-RubberStampDetective = inspector's rubber stamp
+# 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.
diff --git a/Resources/Locale/en-US/emberfall/job/job-names.ftl b/Resources/Locale/en-US/emberfall/job/job-names.ftl
@@ -0,0 +1,11 @@
+# Emberfall custom job locale - overwrites upstream files. Make it at least SLIGHTLY alphabetical please.
+job-name-commanding-officer = Commanding Officer 
+job-name-executive-officer = Executive Officer
+job-name-inspector = Inspector
+job-name-pharmacist = Pharmacist
+
+# Role timers - same thing as I said earlier.
+JobCommandingOfficer = Commanding Officer
+JobExecutiveOfficer = Executive Officer
+JobInspector = Inspector
+JobPharmacist = Pharmacist
diff --git a/Resources/Locale/en-US/emberfall/job/job-supervisors.ftl b/Resources/Locale/en-US/emberfall/job/job-supervisors.ftl
@@ -0,0 +1,5 @@
+# Job Supervisors. Keep it alphabetical, gang.
+job-supervisors-commanding-officer = the Commanding Officer
+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
diff --git a/Resources/Locale/en-US/emberfall/paper/stamp-component.ftl b/Resources/Locale/en-US/emberfall/paper/stamp-component.ftl
@@ -0,0 +1,5 @@
+# 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-inspector = Inspector
+# Pharmacists don't have a stamp.
diff --git a/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl b/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl
@@ -0,0 +1,7 @@
+# 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-inspector = Inspector 
+id-card-access-level-pharmacy = Pharmacy
diff --git a/Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl b/Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl
@@ -1,4 +1,4 @@
-#When an admin adds a game rule
+# When an admin adds a game rule
 add-gamerule-admin = Game rule({$rule}) added - {$admin}
 list-gamerule-admin-header = | Time       | Rule added
 list-gamerule-admin-no-rules = No game rules have been added.

diff --git a/Resources/Locale/en-US/revenant/revenant.ftl b/Resources/Locale/en-US/revenant/revenant.ftl
@@ -16,7 +16,7 @@ revenant-soul-yield-low = {CAPITALIZE(THE($target))} has a below average soul.
 revenant-soul-begin-harvest = {CAPITALIZE(THE($target))} suddenly rises slightly into the air, {POSS-ADJ($target)} skin turning an ashy gray.
 revenant-soul-finish-harvest = {CAPITALIZE(THE($target))} slumps onto the ground!
 
-#UI
+# UI
 revenant-user-interface-title = Ability Shop
 revenant-user-interface-essence-amount = [color=plum]{$amount}[/color] Stolen Essence
 

diff --git a/Resources/Locale/en-US/weapons/melee/melee.ftl b/Resources/Locale/en-US/weapons/melee/melee.ftl
@@ -3,5 +3,5 @@ melee-inject-failed-hardsuit = Your {$weapon} cannot inject through hardsuits!
 melee-balloon-pop = {CAPITALIZE(THE($balloon))} popped!
 
 
-#BatteryComponent
+# BatteryComponent
 melee-battery-examine = It has enough charge for [color={$color}]{$count}[/color] hits.
@@ -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

@@ -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

@@ -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

@@ -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

@@ -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