From 20a74ca882501d7fd67cd20ab2e4962f9c4a40c3 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Fri, 9 May 2025 21:38:20 -0400 Subject: [PATCH] rename passenger to assistant (#3650) * rename passenger to assistant * update passenger > assistant * update passenger to assistant * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * assistant * move to ent loc * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update headsets.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * Update specific.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * 1984 tourist * Update passenger.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update passenger.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update loadout_groups.yml Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> --------- Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- Resources/Locale/en-US/_DV/job/assistant.ftl | 7 +++++++ .../Locale/en-US/_DV/job/job-description.ftl | 1 + .../en-US/_DV/preferences/loadout-groups.ftl | 2 +- Resources/Locale/en-US/job/job-names.ftl | 3 ++- .../en-US/preferences/loadout-groups.ftl | 14 ++++++++------ Resources/Prototypes/Datasets/ion_storm.yml | 12 ++++-------- .../Entities/Markers/Spawners/jobs.yml | 2 +- .../Roles/Jobs/Civilian/assistant.yml | 4 ++-- .../Objects/Specific/Mail/mail_civilian.yml | 2 +- .../_DV/Loadouts/Jobs/Civilian/passenger.yml | 18 ++++++++++-------- .../Prototypes/_DV/Loadouts/loadout_groups.yml | 4 ++-- 11 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 Resources/Locale/en-US/_DV/job/assistant.ftl diff --git a/Resources/Locale/en-US/_DV/job/assistant.ftl b/Resources/Locale/en-US/_DV/job/assistant.ftl new file mode 100644 index 0000000000..21664d3058 --- /dev/null +++ b/Resources/Locale/en-US/_DV/job/assistant.ftl @@ -0,0 +1,7 @@ +ent-ClothingHeadsetGrey = assistant headset +ent-ClothingHeadsetChameleon = assistant headset +ent-PassengerIDCard = assistant ID card +ent-PassengerPDA = assistant PDA +ent-BoxHeadset = headset box + .desc = A box of spare assistant headsets. +ent-BoxEncryptionKeyPassenger = assistant encryption key box diff --git a/Resources/Locale/en-US/_DV/job/job-description.ftl b/Resources/Locale/en-US/_DV/job/job-description.ftl index b349d94f93..31db58ed4b 100644 --- a/Resources/Locale/en-US/_DV/job/job-description.ftl +++ b/Resources/Locale/en-US/_DV/job/job-description.ftl @@ -9,3 +9,4 @@ job-description-roboticist = Fabricate borgs and other robots, repair and upgrad job-description-cargo-assistant = Learn the basics of the logistics department, deliver crates and take buy orders from the rest of the station. job-description-admin-assistant = Assist command in their day-to-day activities, grab the captain a coffee, answer faxes in the bridge. job-description-mime-delta = Entertain the crew while remaining silent, and engage with light rivalry with the clown. +job-description-assistant = Get your space legs, assist people, ask a Command member to give you a job. diff --git a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl index 8bc3c98f14..c7b210554b 100644 --- a/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/_DV/preferences/loadout-groups.ftl @@ -29,7 +29,7 @@ loadout-group-mime-neck = Mime neck loadout-group-musician-neck = Musician neck -loadout-group-passenger-id-delta = Passenger PDA +loadout-group-passenger-id-delta = Assistant PDA loadout-group-bartender-id-delta = Bartender PDA loadout-group-chef-id-delta = Chef PDA loadout-group-clown-id-delta = Clown PDA diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 62c109545c..60f49324c5 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -34,7 +34,8 @@ job-name-janitor = Janitor job-name-chaplain = Chaplain job-name-botanist = Botanist job-name-bartender = Bartender -job-name-passenger = Passenger +# DeltaV - Changes Passenger to Assistant. job-name-passenger is used in a dozen other places as the default job so we dont want to change that overly much. +job-name-passenger = Assistant job-name-salvagespec = Salvage Specialist job-name-station-ai = Station AI # DeltaV - Hopefully makes LO maintaining easier diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index aeba60a1a1..573711f40e 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -33,12 +33,14 @@ loadout-group-hop-backpack = Head of Personnel backpack loadout-group-hop-outerclothing = Head of Personnel outer clothing # Civilian -loadout-group-passenger-jumpsuit = Passenger jumpsuit -loadout-group-passenger-mask = Passenger mask -loadout-group-passenger-gloves = Passenger gloves -loadout-group-passenger-outerclothing = Passenger outer clothing -loadout-group-passenger-shoes = Passenger shoes -loadout-group-passenger-neck = Passenger neck +# Begin DeltaV Changes - Rename Passenger to Assistant +loadout-group-passenger-jumpsuit = Assistant jumpsuit +loadout-group-passenger-mask = Assistant mask +loadout-group-passenger-gloves = Assistant gloves +loadout-group-passenger-outerclothing = Assistant outer clothing +loadout-group-passenger-shoes = Assistant shoes +loadout-group-passenger-neck = Assistant neck +# End DeltaV Changes loadout-group-bartender-head = Bartender head loadout-group-bartender-jumpsuit = Bartender jumpsuit diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index 7b39aaa2ca..35f67cef64 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -348,13 +348,9 @@ - MUSICIANS - NON-CREW - PARAMEDICS - - PASSENGERS - # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer - - LOGISTICS OFFICERS - # End of modified code - # DeltaV - Epistemics Department - Replace Research Director with Mystagogue - - MYSTAGOGUES - # End of modified code + - ASSISTANTS # DeltaV - Replace passengers with assistants + - LOGISTICS OFFICERS # DeltaV - Replace Quartermaster with Logistics Officer + - MYSTAGOGUES # DeltaV - Replace Research Director with Mystagogue - ROBOTICISTS - RODENTS - SALVAGE SPECIALISTS @@ -507,7 +503,7 @@ - HIT A HOMERUN - HONK - HOST C&C - - IGNORE PASSENGERS + - IGNORE ASSISTANTS # DeltaV - Replace passengers with Assistants - IGNORE THE CAPTAIN - IGNORE THE CLOWN - INFORM THE CREW OF EVERYTHING diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 2340beb0f4..359ccf9efa 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -81,7 +81,7 @@ - type: entity id: SpawnPointPassenger parent: SpawnPointJobBase - name: passenger + name: assistant # DeltaV - rename passenger to assistant components: - type: SpawnPoint job_id: Passenger diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml index d4594520b0..114e27575d 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml @@ -1,7 +1,7 @@ - type: job id: Passenger - name: job-name-passenger - description: job-description-passenger + name: job-name-passenger # DeltaV - This is used everywhere for fallbacks so I didnt want to change it, but it says Assistant now + description: job-description-assistant # DeltaV - Passenger to Assistant playTimeTracker: JobPassenger startingGear: PassengerGear icon: "JobIconPassenger" diff --git a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_civilian.yml b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_civilian.yml index cf0f942e76..e946d10e66 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_civilian.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Specific/Mail/mail_civilian.yml @@ -202,7 +202,7 @@ - type: entity parent: BaseMail id: MailPassengerMoney - suffix: passenger money + suffix: assistant money components: - type: Mail contents: diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml index 3626769961..47b8c71062 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Civilian/passenger.yml @@ -9,20 +9,22 @@ equipment: id: VisitorPDALoadout -- type: loadout - id: TouristPDA - equipment: - id: TouristPDA +# Tourists dont visit evil space stations anymore. +#- type: loadout +# id: TouristPDA +# equipment: +# id: TouristPDA - type: loadout id: OffDutyCrewPDA equipment: id: OffDutyCrewPDA -- type: loadout - id: StudentPDA - equipment: - id: StudentPDA +# Students don't visit evil stations. maybe we can rebrand this to like corporate intern or something +#- type: loadout +# id: StudentPDA +# equipment: +# id: StudentPDA # Jumpsuit # Rose Hoodie w/ Skirt diff --git a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml index b4961db22b..2f6913f4a4 100644 --- a/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_DV/Loadouts/loadout_groups.yml @@ -778,9 +778,9 @@ loadouts: - PassengerPDA - VisitorPDA - - TouristPDA + # - TouristPDA - OffDutyCrewPDA - - StudentPDA + # - StudentPDA - type: loadoutGroup id: BartenderPDADelta