From 1d58e5d1e2e339d6d8064cbee2e563cc707c25c0 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Thu, 26 Dec 2024 14:46:59 -0400 Subject: [PATCH 01/18] Get the four jobs converted through locale at the most base level --- .../Locale/en-US/emberfall/job/job-description.ftl | 3 +++ Resources/Locale/en-US/emberfall/job/job-names.ftl | 11 +++++++++++ .../Locale/en-US/emberfall/job/job-supervisors.ftl | 5 +++++ Resources/Prototypes/Roles/Jobs/Command/captain.yml | 4 ++-- .../Roles/Jobs/Command/head_of_personnel.yml | 8 ++++---- Resources/Prototypes/Roles/Jobs/Medical/chemist.yml | 4 ++-- 6 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 Resources/Locale/en-US/emberfall/job/job-description.ftl create mode 100644 Resources/Locale/en-US/emberfall/job/job-names.ftl create mode 100644 Resources/Locale/en-US/emberfall/job/job-supervisors.ftl diff --git a/Resources/Locale/en-US/emberfall/job/job-description.ftl b/Resources/Locale/en-US/emberfall/job/job-description.ftl new file mode 100644 index 00000000000..51dd481e56e --- /dev/null +++ b/Resources/Locale/en-US/emberfall/job/job-description.ftl @@ -0,0 +1,3 @@ +# Job descriptions. Keep it alphabetical, gang. +job-description-executiveofficer = 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-names.ftl b/Resources/Locale/en-US/emberfall/job/job-names.ftl new file mode 100644 index 00000000000..dce831f422b --- /dev/null +++ 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-commandingofficer = Commanding Officer +job-name-executiveofficer = 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 new file mode 100644 index 00000000000..da1be06c16e --- /dev/null +++ b/Resources/Locale/en-US/emberfall/job/job-supervisors.ftl @@ -0,0 +1,5 @@ +# Job Supervisors. Keep it alphabetical, gang. +job-supervisors-commandingofficer = the Commanding Officer +job-supervisors-executiveofficer = 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/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index a22d334c941..d928f21d136 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -1,8 +1,8 @@ - type: job id: Captain - name: job-name-captain + name: job-name-commandingofficer # Emberfall: Captain -> CO description: job-description-captain - playTimeTracker: JobCaptain + playTimeTracker: JobCommandingOfficer # Emberfall: Captain -> CO requirements: - !type:DepartmentTimeRequirement department: Engineering diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index f457cfbc496..fd121cecd03 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/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-executiveofficer # Begin Emberfall: HoP -> XO + description: job-description-executiveofficer + 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 diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index dec2b6273eb..8d807c96562 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -1,8 +1,8 @@ - type: job id: Chemist - name: job-name-chemist + name: job-name-pharmacist # Emberfall: Chemist -> Pharmacist description: job-description-chemist - playTimeTracker: JobChemist + playTimeTracker: JobPharmacist # Emberfall: Chemist -> Pharmacist requirements: - !type:DepartmentTimeRequirement department: Medical From b45beae19b35f634640b7f4d1c0518c06185866d Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Thu, 26 Dec 2024 15:15:08 -0400 Subject: [PATCH 02/18] Guess what, a bunch of comments are making Fluent shit itself. Milon remove this it's not important but it's just QOL. --- Resources/Locale/en-US/devices/device-network.ftl | 4 ++-- .../Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl | 2 +- Resources/Locale/en-US/revenant/revenant.ftl | 2 +- Resources/Locale/en-US/weapons/melee/melee.ftl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/devices/device-network.ftl b/Resources/Locale/en-US/devices/device-network.ftl index 9ae101a1e89..dd473866dca 100644 --- 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/game-ticking/game-rules/gamerule-admin.ftl b/Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl index 3b31fe46630..c7a7affa08c 100644 --- 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 index f4ea6d79ff3..1d6bae7b343 100644 --- 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 index 871d142504f..d3318ea2449 100644 --- 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. From 908096609dee1d7521e4939a160ba9dae2744659 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Thu, 26 Dec 2024 15:22:18 -0400 Subject: [PATCH 03/18] makes these, remind me to fill later --- Resources/Locale/en-US/emberfall/paper/stamp-component.ftl | 1 + Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl | 1 + 2 files changed, 2 insertions(+) create mode 100644 Resources/Locale/en-US/emberfall/paper/stamp-component.ftl create mode 100644 Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl diff --git a/Resources/Locale/en-US/emberfall/paper/stamp-component.ftl b/Resources/Locale/en-US/emberfall/paper/stamp-component.ftl new file mode 100644 index 00000000000..d9ab2821236 --- /dev/null +++ b/Resources/Locale/en-US/emberfall/paper/stamp-component.ftl @@ -0,0 +1 @@ +# Stamp Names for Emberfall Jobs \ No newline at end of file diff --git a/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl b/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl new file mode 100644 index 00000000000..c407274ceca --- /dev/null +++ b/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl @@ -0,0 +1 @@ +# Accesses for Emberfall Jobs \ No newline at end of file From fb321179d0aa0f45e75a06f49e2b1fdc6a702946 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Thu, 26 Dec 2024 17:58:01 -0400 Subject: [PATCH 04/18] Filling it up and fixing my typo --- Resources/Locale/en-US/emberfall/job/job-description.ftl | 2 +- Resources/Locale/en-US/emberfall/job/job-names.ftl | 4 ++-- Resources/Locale/en-US/emberfall/job/job-supervisors.ftl | 4 ++-- Resources/Locale/en-US/emberfall/paper/stamp-component.ftl | 4 +++- .../Locale/en-US/emberfall/prototypes/access/accesses.ftl | 6 +++++- Resources/Prototypes/Roles/Jobs/Command/captain.yml | 2 +- .../Prototypes/Roles/Jobs/Command/head_of_personnel.yml | 4 ++-- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Resources/Locale/en-US/emberfall/job/job-description.ftl b/Resources/Locale/en-US/emberfall/job/job-description.ftl index 51dd481e56e..2cf393aa351 100644 --- a/Resources/Locale/en-US/emberfall/job/job-description.ftl +++ b/Resources/Locale/en-US/emberfall/job/job-description.ftl @@ -1,3 +1,3 @@ # Job descriptions. Keep it alphabetical, gang. -job-description-executiveofficer = Be the second in command to the CO. Take charge when they go missing. +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-names.ftl b/Resources/Locale/en-US/emberfall/job/job-names.ftl index dce831f422b..b1539c7478d 100644 --- a/Resources/Locale/en-US/emberfall/job/job-names.ftl +++ b/Resources/Locale/en-US/emberfall/job/job-names.ftl @@ -1,6 +1,6 @@ # Emberfall custom job locale - overwrites upstream files. Make it at least SLIGHTLY alphabetical please. -job-name-commandingofficer = Commanding Officer -job-name-executiveofficer = Executive Officer +job-name-commanding-officer = Commanding Officer +job-name-executive-officer = Executive Officer job-name-inspector = Inspector job-name-pharmacist = Pharmacist diff --git a/Resources/Locale/en-US/emberfall/job/job-supervisors.ftl b/Resources/Locale/en-US/emberfall/job/job-supervisors.ftl index da1be06c16e..1b5d70d514f 100644 --- a/Resources/Locale/en-US/emberfall/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/emberfall/job/job-supervisors.ftl @@ -1,5 +1,5 @@ # Job Supervisors. Keep it alphabetical, gang. -job-supervisors-commandingofficer = the Commanding Officer -job-supervisors-executiveofficer = the Executive Officer +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 index d9ab2821236..844d31707e8 100644 --- a/Resources/Locale/en-US/emberfall/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/emberfall/paper/stamp-component.ftl @@ -1 +1,3 @@ -# Stamp Names for Emberfall Jobs \ No newline at end of file +# Stamp Names for Emberfall Jobs +stamp-component-stamped-name-commanding-officer = Commanding Officer +stamp-component-stamped-name-executive-officer = Executive Officer diff --git a/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl b/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl index c407274ceca..91341579083 100644 --- a/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl @@ -1 +1,5 @@ -# Accesses for Emberfall Jobs \ No newline at end of file +# Accesses for Emberfall Jobs + +# Command +id-card-access-level-commanding-officer = Commanding Officer +id-card-access-level-executive-officer = Executive Officer diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index d928f21d136..41a14e929e0 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -1,6 +1,6 @@ - type: job id: Captain - name: job-name-commandingofficer # Emberfall: Captain -> CO + name: job-name-commanding-officer # Emberfall: Captain -> CO description: job-description-captain playTimeTracker: JobCommandingOfficer # Emberfall: Captain -> CO requirements: diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index fd121cecd03..292cd5c5eac 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -1,7 +1,7 @@ - type: job id: HeadOfPersonnel - name: job-name-executiveofficer # Begin Emberfall: HoP -> XO - description: job-description-executiveofficer + name: job-name-executive-officer # Begin Emberfall: HoP -> XO + description: job-description-executive-officer playTimeTracker: JobExecutiveOfficer # End Emberfall: HoP -> XO requirements: - !type:DepartmentTimeRequirement From 14e77fec51f6e49f6b11ad1fe39c8cf95a090141 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sat, 28 Dec 2024 17:26:04 -0400 Subject: [PATCH 05/18] Job Item Overrides --- .../emberfall/job/job-item-overrides.ftl | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl diff --git a/Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl new file mode 100644 index 00000000000..1de1506dc01 --- /dev/null +++ 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 "chem" and what is actually the pharmacist. What the fuck am I doing, help. From 3d9638537502d7bba5b2d1358780f8a286d9163a Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sat, 28 Dec 2024 17:45:32 -0400 Subject: [PATCH 06/18] I forgot Inspector Gadget --- Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl | 2 +- Resources/Locale/en-US/emberfall/paper/stamp-component.ftl | 2 ++ .../Locale/en-US/emberfall/prototypes/access/accesses.ftl | 2 ++ Resources/Prototypes/Access/security.yml | 2 +- Resources/Prototypes/Roles/Jobs/Security/detective.yml | 4 ++-- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl index 1de1506dc01..993717cba32 100644 --- a/Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl +++ b/Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl @@ -73,4 +73,4 @@ ent-RubberStampDetective = inspector's rubber stamp # Pharmacist ent-ClothingUniformJumpsuitChemistry = pharmacist's jumpsuit ent-ClothingUniformJumpskirtChemistry = pharmacist's jumpskirt -# TODO: Figure out what items can vaguely be "chem" and what is actually the pharmacist. What the fuck am I doing, help. +# 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/paper/stamp-component.ftl b/Resources/Locale/en-US/emberfall/paper/stamp-component.ftl index 844d31707e8..ddacdd2dcf7 100644 --- a/Resources/Locale/en-US/emberfall/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/emberfall/paper/stamp-component.ftl @@ -1,3 +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 index 91341579083..c0020b4c0e7 100644 --- a/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl @@ -3,3 +3,5 @@ # 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/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml index cfe94dd78af..9f0d4028126 100644 --- a/Resources/Prototypes/Access/security.yml +++ b/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 diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index d6bc23f9ff4..f1c1de21f5c 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/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 From 61e682f90ad1d7999d02efec12ed18a8fb1d0ffa Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sat, 28 Dec 2024 18:01:11 -0400 Subject: [PATCH 07/18] FUCK --- Resources/Prototypes/Roles/Jobs/Medical/chemist.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 8d807c96562..294fffb9be6 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -1,8 +1,8 @@ - type: job id: Chemist - name: job-name-pharmacist # Emberfall: Chemist -> Pharmacist - description: job-description-chemist - playTimeTracker: JobPharmacist # Emberfall: Chemist -> Pharmacist + name: job-name-pharmacist # Start Emberfall: Chemist -> Pharmacist + description: job-description-pharmacist + playTimeTracker: JobPharmacist # End Emberfall: Chemist -> Pharmacist requirements: - !type:DepartmentTimeRequirement department: Medical From 0db5c541e0969e064d455c5f9cd103019b174432 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sat, 28 Dec 2024 18:18:35 -0400 Subject: [PATCH 08/18] The Playtime Trackers that Time Forgot --- .../_Emberfall/Roles/play_time_trackers.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Resources/Prototypes/_Emberfall/Roles/play_time_trackers.yml diff --git a/Resources/Prototypes/_Emberfall/Roles/play_time_trackers.yml b/Resources/Prototypes/_Emberfall/Roles/play_time_trackers.yml new file mode 100644 index 00000000000..175b1283706 --- /dev/null +++ b/Resources/Prototypes/_Emberfall/Roles/play_time_trackers.yml @@ -0,0 +1,13 @@ +# Emberfall Roles Playtime Trackers +# Please keep this alphabetical, gang. +- type: playTimeTracker + id: JobCommandingOfficer + +- type: playTimeTracker + id: JobExecutiveOfficer + +- type: playTimeTracker + id: JobInspector + +- type: playTimeTracker + id: JobPharmacist From 213e95fc6e6b06e29fb446d222830b27698a44da Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sat, 28 Dec 2024 18:20:34 -0400 Subject: [PATCH 09/18] Revert "Guess what, a bunch of comments are making Fluent shit itself. Milon remove this it's not important but it's just QOL." This reverts commit b45beae19b35f634640b7f4d1c0518c06185866d. --- Resources/Locale/en-US/devices/device-network.ftl | 4 ++-- .../Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl | 2 +- Resources/Locale/en-US/revenant/revenant.ftl | 2 +- Resources/Locale/en-US/weapons/melee/melee.ftl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/devices/device-network.ftl b/Resources/Locale/en-US/devices/device-network.ftl index dd473866dca..9ae101a1e89 100644 --- 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/game-ticking/game-rules/gamerule-admin.ftl b/Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl index c7a7affa08c..3b31fe46630 100644 --- 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 index 1d6bae7b343..f4ea6d79ff3 100644 --- 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 index d3318ea2449..871d142504f 100644 --- 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. From abbcadff6a7821a1205aafc380164e77c8a6bd2f Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sat, 28 Dec 2024 19:31:38 -0400 Subject: [PATCH 10/18] Making some progress. --- .../job/job-description.ftl | 0 .../job/job-item-overrides.ftl | 35 +++++++++++++++++++ .../job/job-names.ftl | 0 .../job/job-supervisors.ftl | 0 .../paper/stamp-component.ftl | 0 .../prototypes/access/accesses.ftl | 0 6 files changed, 35 insertions(+) rename Resources/Locale/en-US/{emberfall => _emberfall}/job/job-description.ftl (100%) rename Resources/Locale/en-US/{emberfall => _emberfall}/job/job-item-overrides.ftl (79%) rename Resources/Locale/en-US/{emberfall => _emberfall}/job/job-names.ftl (100%) rename Resources/Locale/en-US/{emberfall => _emberfall}/job/job-supervisors.ftl (100%) rename Resources/Locale/en-US/{emberfall => _emberfall}/paper/stamp-component.ftl (100%) rename Resources/Locale/en-US/{emberfall => _emberfall}/prototypes/access/accesses.ftl (100%) diff --git a/Resources/Locale/en-US/emberfall/job/job-description.ftl b/Resources/Locale/en-US/_emberfall/job/job-description.ftl similarity index 100% rename from Resources/Locale/en-US/emberfall/job/job-description.ftl rename to Resources/Locale/en-US/_emberfall/job/job-description.ftl diff --git a/Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl similarity index 79% rename from Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl rename to Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl index 993717cba32..a648d1eca22 100644 --- a/Resources/Locale/en-US/emberfall/job/job-item-overrides.ftl +++ b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl @@ -24,6 +24,7 @@ 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 = @@ -35,12 +36,25 @@ 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 = + .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 +ent-DefaultStationBeaconCaptainsQuarters = + .suffix = CO's Quarters +ent-LockableButtonCaptain = + .suffix = CO +ent-AirlockCaptainLocked = + .suffix = CO, Locked +ent-AirlockCaptainGlassLocked = + .suffix = CO, Locked # 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. @@ -60,6 +74,8 @@ 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 +ent-DefaultStationBeaconHOPOffice = + .suffix = XO's office # 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.) @@ -67,7 +83,26 @@ ent-LockerHeadOfPersonnel = executive officer's locker # 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. +ent-DoorElectronicsDetective= + .suffix = Inspector, Locked +ent-WindoorSecureDetectiveLocked = + .suffix = Inspector, Locked +ent-AirlockDetectiveLocked = + .suffix = Inspector, Locked +ent-AirlockDetectiveGlassLocked = + .suffix = Inspector, Locked +ent-WindoorSecureDetectiveLocked = + .suffix = Inspector, Locked +ent-DefaultStationBeaconDetectiveRoom = + .suffix = Inspector's Room # 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 diff --git a/Resources/Locale/en-US/emberfall/job/job-names.ftl b/Resources/Locale/en-US/_emberfall/job/job-names.ftl similarity index 100% rename from Resources/Locale/en-US/emberfall/job/job-names.ftl rename to Resources/Locale/en-US/_emberfall/job/job-names.ftl diff --git a/Resources/Locale/en-US/emberfall/job/job-supervisors.ftl b/Resources/Locale/en-US/_emberfall/job/job-supervisors.ftl similarity index 100% rename from Resources/Locale/en-US/emberfall/job/job-supervisors.ftl rename to Resources/Locale/en-US/_emberfall/job/job-supervisors.ftl diff --git a/Resources/Locale/en-US/emberfall/paper/stamp-component.ftl b/Resources/Locale/en-US/_emberfall/paper/stamp-component.ftl similarity index 100% rename from Resources/Locale/en-US/emberfall/paper/stamp-component.ftl rename to Resources/Locale/en-US/_emberfall/paper/stamp-component.ftl diff --git a/Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl b/Resources/Locale/en-US/_emberfall/prototypes/access/accesses.ftl similarity index 100% rename from Resources/Locale/en-US/emberfall/prototypes/access/accesses.ftl rename to Resources/Locale/en-US/_emberfall/prototypes/access/accesses.ftl From 7ff49e2555bea39c894326e9b5cbbc274a99c7df Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sat, 28 Dec 2024 19:43:40 -0400 Subject: [PATCH 11/18] I forgot a space. --- Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl index a648d1eca22..e06304338bf 100644 --- a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl +++ b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl @@ -38,7 +38,7 @@ 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 = +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 @@ -91,7 +91,7 @@ ent-LockerDetective = inspector's cabinet ent-DetectivePDA = inspector PDA ent-WeaponRevolverInspector = Investigator .desc = A inspector's best friend. Uses .45 magnum ammo. -ent-DoorElectronicsDetective= +ent-DoorElectronicsDetective = .suffix = Inspector, Locked ent-WindoorSecureDetectiveLocked = .suffix = Inspector, Locked From 8b6b4d3d0d4d90ba3d06aeef4ad4ae15d26287b9 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sun, 29 Dec 2024 01:03:30 -0400 Subject: [PATCH 12/18] I have to do this, otherwise the linter shits itself and fucking dies --- Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl index e06304338bf..def4822c3ad 100644 --- a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl +++ b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl @@ -93,7 +93,7 @@ ent-WeaponRevolverInspector = Investigator .desc = A inspector's best friend. Uses .45 magnum ammo. ent-DoorElectronicsDetective = .suffix = Inspector, Locked -ent-WindoorSecureDetectiveLocked = +ent-WindoorSecureDetectiveLocked = secure windoor .suffix = Inspector, Locked ent-AirlockDetectiveLocked = .suffix = Inspector, Locked From 66141dd8ff52becf822570ce058d095d1b682602 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sun, 29 Dec 2024 01:07:56 -0400 Subject: [PATCH 13/18] OKAY FUCK THE wINDOOR ACTUALLY! FUCK YOU!! FUCK YOU !! FUCK YOU!! --- Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl index def4822c3ad..0a0563ec5c6 100644 --- a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl +++ b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl @@ -93,8 +93,6 @@ ent-WeaponRevolverInspector = Investigator .desc = A inspector's best friend. Uses .45 magnum ammo. ent-DoorElectronicsDetective = .suffix = Inspector, Locked -ent-WindoorSecureDetectiveLocked = secure windoor - .suffix = Inspector, Locked ent-AirlockDetectiveLocked = .suffix = Inspector, Locked ent-AirlockDetectiveGlassLocked = From c41ed4203efcf904b9fb4090b8db3f186fa0b146 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sun, 29 Dec 2024 01:23:15 -0400 Subject: [PATCH 14/18] Endless CBT --- .../Locale/en-US/_emberfall/job/job-item-overrides.ftl | 6 ------ .../Entities/Structures/Doors/Airlocks/access.yml | 6 +++--- .../Entities/Structures/Doors/Windoors/windoor.yml | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl index 0a0563ec5c6..09ffdbe1102 100644 --- a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl +++ b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl @@ -93,12 +93,6 @@ ent-WeaponRevolverInspector = Investigator .desc = A inspector's best friend. Uses .45 magnum ammo. ent-DoorElectronicsDetective = .suffix = Inspector, Locked -ent-AirlockDetectiveLocked = - .suffix = Inspector, Locked -ent-AirlockDetectiveGlassLocked = - .suffix = Inspector, Locked -ent-WindoorSecureDetectiveLocked = - .suffix = Inspector, Locked ent-DefaultStationBeaconDetectiveRoom = .suffix = Inspector's Room # 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 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index f6889cbce0a..dfe8e795aa1 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -378,7 +378,7 @@ - type: entity parent: AirlockSecurity id: AirlockDetectiveLocked - suffix: Detective, Locked + suffix: Inspector, Locked # Emberfall: Detective -> Inspector components: - type: ContainerFill containers: @@ -762,7 +762,7 @@ - type: entity parent: AirlockSecurityGlass id: AirlockDetectiveGlassLocked - suffix: Detective, Locked + suffix: Inspector, Locked # Emberfall: Detective -> Inspector components: - type: ContainerFill containers: @@ -1041,7 +1041,7 @@ - type: entity parent: AirlockMaintSecLocked id: AirlockMaintDetectiveLocked - suffix: Detective, Locked + suffix: Inspector, Locked # Emberfall: Detective -> Inspector components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index db0fc13b977..9e12ed1082f 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/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: From 213a58b49e274152d70ce87c9560110ecb6152fd Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sun, 29 Dec 2024 01:30:36 -0400 Subject: [PATCH 15/18] More endless CBT --- .../Locale/en-US/_emberfall/job/job-item-overrides.ftl | 4 ---- .../Entities/Structures/Doors/Airlocks/access.yml | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl index 09ffdbe1102..c2a7a36ee21 100644 --- a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl +++ b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl @@ -51,10 +51,6 @@ ent-DefaultStationBeaconCaptainsQuarters = .suffix = CO's Quarters ent-LockableButtonCaptain = .suffix = CO -ent-AirlockCaptainLocked = - .suffix = CO, Locked -ent-AirlockCaptainGlassLocked = - .suffix = CO, Locked # 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. diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index dfe8e795aa1..2310c7fb789 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -306,7 +306,7 @@ - type: entity parent: AirlockCommand id: AirlockCaptainLocked - suffix: Captain, Locked + suffix: CO, Locked # Emberfall: Captain -> CO components: - type: ContainerFill containers: @@ -690,7 +690,7 @@ - type: entity parent: AirlockCommandGlass id: AirlockCaptainGlassLocked - suffix: Captain, Locked + suffix: CO, Locked #Emberfall: Captain -> CO components: - type: ContainerFill containers: @@ -1059,7 +1059,7 @@ - type: entity parent: AirlockMaintCommandLocked id: AirlockMaintCaptainLocked - suffix: Captain, Locked + suffix: CO, Locked # Emberfall: Captain -> CO components: - type: ContainerFill containers: @@ -1252,7 +1252,7 @@ - type: entity parent: HighSecDoor id: HighSecCaptainLocked - suffix: Captain, Locked + suffix: CO, Locked # Emberfall: Captain -> CO components: - type: ContainerFill containers: From 4ca2c0c31ffae1116a875bcfeb026e8ec5838943 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sun, 29 Dec 2024 02:18:17 -0400 Subject: [PATCH 16/18] Moving the beacons, too, because those shit themselves --- .../en-US/_emberfall/job/job-item-overrides.ftl | 6 ------ .../_emberfall/navmap-beacons/station-beacons.ftl | 4 ++++ .../Entities/Objects/Devices/station_beacon.yml | 12 ++++++------ 3 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 Resources/Locale/en-US/_emberfall/navmap-beacons/station-beacons.ftl diff --git a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl index c2a7a36ee21..f707f4e0103 100644 --- a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl +++ b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl @@ -47,8 +47,6 @@ 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 -ent-DefaultStationBeaconCaptainsQuarters = - .suffix = CO's Quarters ent-LockableButtonCaptain = .suffix = CO # TODO: Add missing items found during testing to this list. @@ -70,8 +68,6 @@ 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 -ent-DefaultStationBeaconHOPOffice = - .suffix = XO's office # 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.) @@ -89,8 +85,6 @@ ent-WeaponRevolverInspector = Investigator .desc = A inspector's best friend. Uses .45 magnum ammo. ent-DoorElectronicsDetective = .suffix = Inspector, Locked -ent-DefaultStationBeaconDetectiveRoom = - .suffix = Inspector's Room # 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 diff --git a/Resources/Locale/en-US/_emberfall/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/_emberfall/navmap-beacons/station-beacons.ftl new file mode 100644 index 00000000000..a745837f019 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index 5552a973f10..7a607e9e0eb 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml +++ b/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 @@ -213,10 +213,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 From c5744c9f393a2045186470dd89059550ccaf3e82 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sun, 29 Dec 2024 02:25:57 -0400 Subject: [PATCH 17/18] FML!! --- .../Locale/en-US/_emberfall/job/job-item-overrides.ftl | 2 -- .../Prototypes/Entities/Structures/Wallmounts/switch.yml | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl index f707f4e0103..7885f687f8a 100644 --- a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl +++ b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl @@ -47,8 +47,6 @@ 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 -ent-LockableButtonCaptain = - .suffix = CO # 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. diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml index 19233ba69a5..70d8c6f10cf 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml @@ -256,7 +256,7 @@ - type: entity id: LockableButtonCaptain - suffix: Captain + suffix: CO # Emberfall: Captain -> CO parent: LockableButton components: - type: AccessReader @@ -264,7 +264,7 @@ - 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 From 146d4a5f2b58714e2979ac416b512b586c110383 Mon Sep 17 00:00:00 2001 From: Monotheonist <182929384+Monotheonist@users.noreply.github.com> Date: Sun, 29 Dec 2024 02:34:10 -0400 Subject: [PATCH 18/18] yeah fuck the door electronics too --- Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl index 7885f687f8a..0eecc6e49f4 100644 --- a/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl +++ b/Resources/Locale/en-US/_emberfall/job/job-item-overrides.ftl @@ -81,8 +81,6 @@ ent-LockerDetective = inspector's cabinet ent-DetectivePDA = inspector PDA ent-WeaponRevolverInspector = Investigator .desc = A inspector's best friend. Uses .45 magnum ammo. -ent-DoorElectronicsDetective = - .suffix = Inspector, Locked # 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