Rename Assistant to Passenger (#8007)

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

Content.Shared/GameTicking/SharedGameTicker.cs

@@ -8,8 +8,8 @@ namespace Content.Shared.GameTicking
     {
         // See ideally these would be pulled from the job definition or something.
         // But this is easier, and at least it isn't hardcoded.
-        public const string FallbackOverflowJob = "Assistant";
+        public const string FallbackOverflowJob = "Passenger";
-        public const string FallbackOverflowJobName = "assistant";
+        public const string FallbackOverflowJobName = "passenger";
     }
 
     [Serializable, NetSerializable]

Resources/Locale/en-US/advertisements/vending/cargodrobe.ftl

@@ -1,2 +1,2 @@
-advertisement-cargodrobe-1 = Upgraded Assistant Style! Pick yours today!
+advertisement-cargodrobe-1 = Upgraded Passenger Style! Pick yours today!
 advertisement-cargodrobe-2 = These shorts are comfy and easy to wear, get yours now!

Resources/Locale/en-US/barsign/barsign-component.ftl

@@ -4,7 +4,7 @@ barsign-component-name = bar sign
 
 ## The Harmbaton
 barsign-prototype-name-harmbaton = The Harmbaton
-barsign-prototype-description-harmbaton = A great dining experience for both security members and assistants.
+barsign-prototype-description-harmbaton = A great dining experience for both security members and passengers.
 
 ## The Singulo
 barsign-prototype-name-singulo = The Singulo

Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl

@@ -21,7 +21,7 @@ humanoid-profile-editor-backpack-label = Backpack:
 humanoid-profile-editor-eyes-label = Eye color:
 humanoid-profile-editor-jobs-tab = Jobs
 humanoid-profile-editor-preference-unavailable-stay-in-lobby-button = Stay in lobby if preference unavailable.
-humanoid-profile-editor-preference-unavailable-spawn-as-overflow-button = Be an {$overflowJob} if preference unavailable.
+humanoid-profile-editor-preference-unavailable-spawn-as-overflow-button = Be a {$overflowJob} if preference unavailable.
 humanoid-profile-editor-preference-jumpsuit = Jumpsuit
 humanoid-profile-editor-preference-jumpskirt = Jumpskirt
 humanoid-profile-editor-preference-backpack = Backpack

Resources/Prototypes/Catalog/Fills/Boxes/general.yml

@@ -86,7 +86,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: AssistantPDA
+      - id: PassengerPDA
         amount: 6
   - type: Sprite
     layers:
@@ -106,7 +106,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: AssistantIDCard
+      - id: PassengerIDCard
         amount: 6
   - type: Sprite
     layers:

Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml

@@ -3,9 +3,9 @@
   name: PTech
   spriteName: cart
   startingInventory:
-    AssistantPDA: 5
+    PassengerPDA: 5
     ClearPDA: 5
-    AssistantIDCard: 5
+    PassengerIDCard: 5
     RubberStampApproved: 1
     RubberStampDenied: 1
     Paper: 10

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -245,7 +245,7 @@
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitHoSGrey
   name: head of security's grey jumpsuit
-  description: A grey jumpsuit of Head of Security, which make him look somewhat like an assistant.
+  description: A grey jumpsuit of Head of Security, which make him look somewhat like a passenger.
   components:
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi

Resources/Prototypes/Entities/Markers/Spawners/jobs.yml

@@ -76,16 +76,16 @@
 # Civilian
 
 - type: entity
-  id: SpawnPointAssistant
+  id: SpawnPointAssistant # TODO rename, but requires map changes.
   parent: SpawnPointJobBase
-  name: assistant
+  name: passenger
   components:
   - type: SpawnPoint
-    job_id: Assistant
+    job_id: Passenger
   - type: Sprite
     layers:
       - state: green
-      - state: assistant
+      - state: passenger
 
 - type: entity
   id: SpawnPointTechnicalAssistant

Resources/Prototypes/Entities/Mobs/NPCs/dummy_npcs.yml

@@ -7,6 +7,6 @@
   suffix: AI
   components:
   - type: UtilityAI
-    startingGear: AssistantGear
+    startingGear: PassengerGear
     behaviorSets:
     - PathingDummy

Resources/Prototypes/Entities/Mobs/NPCs/human.yml

@@ -10,7 +10,7 @@
     - Hunger
     - Thirst
     - Idle
-    startingGear: AssistantGear
+    startingGear: PassengerGear
   - type: AiFactionTag
     factions:
     - NanoTrasen

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

@@ -70,12 +70,12 @@
 
 - type: entity
   parent: BasePDA
-  id: AssistantPDA
+  id: PassengerPDA
-  name: assistant PDA
+  name: passenger PDA
   description: Why isn't it gray?
   components:
   - type: PDA
-    id: AssistantIDCard
+    id: PassengerIDCard
 
 - type: entity
   parent: BasePDA
@@ -531,7 +531,7 @@
   parent: BasePDA
   id: SecurityPDA
   name: security PDA
-  description: Red to hide the stains of assistant blood.
+  description: Red to hide the stains of passenger blood.
   components:
   - type: PDA
     id: SecurityIDCard
@@ -543,7 +543,7 @@
     state: pda-security
 
 - type: entity
-  parent: AssistantPDA
+  parent: PassengerPDA
   id: CentcomPDA
   name: centcom PDA
   description: Colored the numbing grey of bureaucracy.
@@ -591,7 +591,7 @@
   description: 99 and 44/100ths percent pure plastic.
   components:
   - type: PDA
-    id: AssistantIDCard
+    id: PassengerIDCard
   - type: Appearance
     visuals:
       - type: PDAVisualizer

Resources/Prototypes/Entities/Objects/Fun/toys.yml

@@ -257,8 +257,8 @@
 
 - type: entity
   parent: BaseItem
-  id: ToyAssistant
+  id: ToyAssistant # TODO rename but needs map changes
-  name: assistant toy
+  name: passenger toy
   description: Grey tide world wide!
   components:
   - type: Sprite

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -22,18 +22,18 @@
 
 - type: entity
   parent: IDCardStandard
-  id: AssistantIDCard
+  id: PassengerIDCard
-  name: assistant ID card
+  name: passenger ID card
   components:
   - type: Sprite
     layers:
     - state: default
-    - state: idassistant
+    - state: idpassenger
   - type: PresetIdCard
-    job: Assistant
+    job: Passenger
 
 - type: entity
-  parent: AssistantIDCard
+  parent: PassengerIDCard
   id: TechnicalAssistantIDCard
   name: technical assistant ID card
   components:
@@ -45,7 +45,7 @@
     - state: idintern-tech
 
 - type: entity
-  parent: AssistantIDCard
+  parent: PassengerIDCard
   id: MedicalInternIDCard
   name: medical intern ID card
   components:
@@ -57,7 +57,7 @@
     - state: idintern-med
 
 - type: entity
-  parent: AssistantIDCard
+  parent: PassengerIDCard
   id: SecurityCadetIDCard
   name: security cadet ID card
   components:
@@ -69,7 +69,7 @@
     - state: idintern-cadet
 
 - type: entity
-  parent: AssistantIDCard
+  parent: PassengerIDCard
   id: ServiceWorkerIDCard
   name: service worker ID card
   components:
@@ -427,7 +427,7 @@
       job: Musician
 
 - type: entity
-  parent: AssistantIDCard
+  parent: PassengerIDCard
   id: AgentIDCard
   suffix: Agent
   components:

Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml

@@ -116,7 +116,7 @@
   parent: PosterBase
   id: PosterContrabandGreyTide
   name: "Grey Tide"
-  description: "A rebellious poster symbolizing assistant solidarity."
+  description: "A rebellious poster symbolizing passenger solidarity."
   components:
   - type: Sprite
     state: poster8_contraband

Resources/Prototypes/Maps/atlas.yml

@@ -9,10 +9,10 @@
   minPlayers: 0
   maxPlayers: 25
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 1, 2 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 2, 2]
     Chef: [ 1, 1 ]

Resources/Prototypes/Maps/bagel.yml

@@ -8,10 +8,10 @@
   mapPath: /Maps/bagel.yml
   minPlayers: 35
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 3, 3 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 2, 2 ]
     Botanist: [ 3, 3]
     Chef: [ 2, 2 ]

Resources/Prototypes/Maps/barratry.yml

@@ -8,10 +8,10 @@
   mapPath: /Maps/barratry.yml
   minPlayers: 40
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 3, 3 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 2, 2 ]
     Botanist: [ 3, 4]
     Chef: [ 2, 2 ]

Resources/Prototypes/Maps/delta.yml

@@ -8,10 +8,10 @@
   mapPath: /Maps/delta.yml
   minPlayers: 60
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 4, 4 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 4, 4]
     Chef: [ 1, 2 ]

Resources/Prototypes/Maps/game.yml

@@ -1,3 +1,44 @@
+- type: gameMap
+  id: saltern
+  mapName: 'Saltern'
+  mapNameTemplate: '{0} Saltern {1}'
+  nameGenerator:
+    !type:NanotrasenNameGenerator
+    prefixCreator: '14'
+  mapPath: /Maps/saltern.yml
+  minPlayers: 0
+  maxPlayers: 29
+  fallback: true
+  overflowJobs:
+    - Passenger
+  availableJobs:
+    CargoTechnician: [ 1, 2 ]
+    Passenger: [ -1, -1 ]
+    Bartender: [ 1, 1 ]
+    Botanist: [ 2, 2 ]
+    Chef: [ 1, 1 ]
+    Clown: [ 1, 1 ]
+    Janitor: [ 1, 1 ]
+    Mime: [ 1, 1 ]
+    Captain: [ 1, 1 ]
+    HeadOfPersonnel: [ 1, 1 ]
+    ChiefEngineer: [ 1, 1 ]
+    StationEngineer: [ 2, 3 ]
+    ChiefMedicalOfficer: [ 1, 1 ]
+    MedicalDoctor: [ 2, 3 ]
+    Chemist: [ 1, 1 ]
+    ResearchDirector: [ 1, 1 ]
+    Scientist: [ 2, 3 ]
+    HeadOfSecurity: [ 1, 1 ]
+    SecurityOfficer: [ 2, 3 ]
+    Chaplain: [ 1, 1 ]
+    Librarian: [ 1, 1 ]
+    Musician: [ 1, 1 ]
+    Lawyer: [ 1, 1 ]
+    SalvageSpecialist: [ 1, 2 ]
+    Quartermaster: [ 1, 1 ]
+    AtmosphericTechnician: [ 1, 2 ]
+
 - type: gameMap
   id: packedstation
   mapName: 'Packedstation'
@@ -14,10 +55,10 @@
       inverted: true
       holidays: [ "Christmas" ]
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 2, 3 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 2, 2 ]
     Chef: [ 1, 1 ]
@@ -52,9 +93,9 @@
   mapPath: /Maps/nss_pillar.yml
   minPlayers: 40
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     CargoTechnician: [ 4, 6 ]
     Bartender: [ 2, 2 ]
     Botanist: [ 2, 4 ]
@@ -94,10 +135,10 @@
   maxPlayers: 15
   votable: false
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 1, 1 ]
-    Assistant: [ 4, 8 ]
+    Passenger: [ 4, 8 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 1, 1 ]
     Chef: [ 1, 1 ]

Resources/Prototypes/Maps/holiday.yml

@@ -11,10 +11,10 @@
     - !type:HolidayMapCondition
       holidays: [ "Christmas" ]
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 2, 3 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 2, 2 ]
     Chef: [ 1, 1 ]

Resources/Prototypes/Maps/marathon.yml

@@ -9,10 +9,10 @@
   minPlayers: 35
   maxPlayers: 70
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 2, 3 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 2, 2 ]
     Botanist: [ 3, 3]
     Chef: [ 2, 2 ]

Resources/Prototypes/Maps/moose.yml

@@ -9,10 +9,10 @@
   minPlayers: 0
   maxPlayers: 35
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 2, 2 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 2, 2]
     Chef: [ 1, 1 ]

Resources/Prototypes/Maps/saltern.yml

@@ -10,10 +10,10 @@
   maxPlayers: 29
   fallback: true
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 2, 2 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 1, 1 ]
     Botanist: [ 2, 2 ]
     Chef: [ 1, 1 ]

Resources/Prototypes/Maps/splitstation.yml

@@ -8,10 +8,10 @@
   mapPath: /Maps/splitstation.yml
   minPlayers: 60
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
     CargoTechnician: [ 3, 6 ]
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
     Bartender: [ 2, 3 ]
     Botanist: [ 3, 6]
     Chef: [ 2, 4 ]

Resources/Prototypes/Maps/test.yml

@@ -5,7 +5,7 @@
   minPlayers: 0
   votable: false
   overflowJobs:
-    - Assistant
+    - Passenger
   availableJobs:
-    Assistant: [ -1, -1 ]
+    Passenger: [ -1, -1 ]
 

Resources/Prototypes/Recipes/Lathes/clothing.yml

@@ -1,7 +1,7 @@
 
 
 - type: latheRecipe
-  id: ClothingUniformJumpsuitColorGrey #Assistant
+  id: ClothingUniformJumpsuitColorGrey # Tide
   icon:
     sprite: Clothing/Uniforms/Jumpsuit/Color/grey.rsi
     state: icon

Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml

@@ -1,21 +1,21 @@
 - type: job
-  id: Assistant
+  id: Passenger
-  name: "assistant"
+  name: "passenger"
-  startingGear: AssistantGear
+  startingGear: PassengerGear
   departments:
   - Civilian
-  icon: "Assistant"
+  icon: "Passenger"
   supervisors: "absolutely everyone"
   access:
   - Maintenance
 
 - type: startingGear
-  id: AssistantGear
+  id: PassengerGear
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorGrey
     back: ClothingBackpackFilled
     shoes: ClothingShoesColorBlack
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorGrey
   satchel: ClothingBackpackSatchelFilled

Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml

@@ -8,7 +8,7 @@
     neck: BedsheetCult
     outerClothing: ClothingOuterArmorCult
     shoes: ClothingShoesCult
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
@@ -22,7 +22,7 @@
     head: ClothingHeadHatHoodCulthood
     outerClothing: ClothingOuterRobesCult
     shoes: ClothingShoesColorRed
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -10,7 +10,7 @@
     gloves: ClothingHandsGlovesIhscombat
     outerClothing: IHSVoidsuit
     shoes: ClothingShoesBootsJack
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
@@ -25,7 +25,7 @@
     head: ClothingHeadHatPirate
     outerClothing: ClothingOuterCoatPirate
     shoes: ClothingShoesBootsWork
-    id: AssistantPDA
+    id: PassengerPDA
     belt: ClothingBeltUtility
   innerclothingskirt: ClothingUniformJumpskirtColorLightBrown
   satchel: ClothingBackpackSatchelEngineering
@@ -41,7 +41,7 @@
     gloves: ClothingHandsGlovesSpaceNinja
     outerClothing: ClothingOuterSuitSpaceninja
     shoes: ClothingShoesSpaceNinja
-    id: AssistantPDA
+    id: PassengerPDA
   innerclothingskirt: ClothingUniformJumpskirtColorBlack
   satchel: ClothingBackpackSatchelFilled
   duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml

@@ -7,7 +7,7 @@
     head: ClothingHeadHatWizard
     outerClothing: ClothingOuterWizard
     shoes: ClothingShoesWizard
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorDarkBlue
   satchel: ClothingBackpackSatchelFilled
@@ -21,7 +21,7 @@
     head: ClothingHeadHatRedwizard
     outerClothing: ClothingOuterWizardRed
     shoes: ClothingShoesWizard
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorRed
   satchel: ClothingBackpackSatchelFilled
@@ -35,7 +35,7 @@
     head: ClothingHeadHatVioletwizard
     outerClothing: ClothingOuterWizardViolet
     shoes: ClothingShoesWizard
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorPurple
   satchel: ClothingBackpackSatchelFilled
@@ -48,7 +48,7 @@
     back: ClothingBackpackFilled
     outerClothing: ClothingOuterHardsuitWizard
     shoes: ClothingShoesWizard
-    id: AssistantPDA
+    id: PassengerPDA
     ears: ClothingHeadsetService
   innerclothingskirt: ClothingUniformJumpskirtColorPurple
   satchel: ClothingBackpackSatchelFilled

Resources/Textures/Interface/Misc/job_icons.rsi/meta.json

@@ -83,7 +83,7 @@
             "name": "ShaftMiner"
         },
         {
-            "name": "Assistant"
+            "name": "Passenger"
         },
         {
             "name": "ChiefEngineer"

Resources/Textures/Markers/jobs.rsi/meta.json

@@ -14,7 +14,7 @@
       "name": "ai"
     },
     {
-      "name": "assistant"
+      "name": "passenger"
     },
     {
       "name": "atmospherics"

Resources/Textures/Objects/Misc/id_cards.rsi/meta.json

@@ -35,7 +35,7 @@
       "name": "gold"
     },
     {
-      "name": "idassistant"
+      "name": "idpassenger"
     },
     {
       "name": "idatmospherictechnician"