Rename Assistant to Passenger

Content.Shared/GameTicking/SharedGameTicker.cs

@@ -8,8 +8,8 @@ public abstract class SharedGameTicker : EntitySystem
     {
         // 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 FallbackOverflowJobName = "assistant";
+        public const string FallbackOverflowJob = "Passenger";
+        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
@@ -723,7 +723,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/capformal.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/capformal.rsi
-    
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitCentcomFormal
@@ -733,8 +733,8 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/centcomformal.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/centcomformal.rsi 
-    
+    sprite: Clothing/Uniforms/Jumpsuit/centcomformal.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitHosFormal
@@ -744,8 +744,8 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi 
-     
+    sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitOperative
@@ -756,7 +756,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/operative.rsi
-    
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitAtmos
@@ -767,5 +767,5 @@
     sprite: Clothing/Uniforms/Jumpsuit/atmos.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/atmos.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
-  name: assistant PDA
+  id: PassengerPDA
+  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
-  name: assistant toy
+  id: ToyAssistant # TODO rename but needs map changes
+  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
-  name: assistant ID card
+  id: PassengerIDCard
+  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
@@ -861,7 +861,7 @@
   components:
   - type: Sprite
     state: poster37_legit
-    
+
 #maps
 
 - type: entity
@@ -881,15 +881,15 @@
   components:
   - type: Sprite
     state: deltamap
-    
+
 - type: entity
   parent: PosterBase
   id: PosterMapMarathon
   name: "Marathon Map"
   description: "A map of Marathon Station."
   components:
   - type: Sprite
-    state: marathonmap    
+    state: marathonmap
 
 - type: entity
   parent: PosterBase
@@ -899,15 +899,15 @@
   components:
   - type: Sprite
     state: moosemap
-    
+
 - type: entity
   parent: PosterBase
   id: PosterMapPacked
   name: "Packed Map"
   description: "A map of Packed Station."
   components:
   - type: Sprite
-    state: packedmap  
+    state: packedmap
 
 - type: entity
   parent: PosterBase
@@ -917,22 +917,22 @@
   components:
   - type: Sprite
     state: pillarmap
-    
+
 - type: entity
   parent: PosterBase
   id: PosterMapSaltern
   name: "Saltern Map"
   description: "A map of Saltern Station."
   components:
   - type: Sprite
-    state: salternmap  
-    
+    state: salternmap
+
 - type: entity
   parent: PosterBase
   id: PosterMapSplit
   name: "Split Station Map"
   description: "A map of Split Station."
   components:
   - type: Sprite
-    state: splitmap 
-    
+    state: splitmap
+

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 ]
@@ -34,7 +34,7 @@
     Librarian: [ 1, 1 ]
     Lawyer: [ 2, 2 ]
     Quartermaster: [ 1, 1 ]
-    SalvageSpecialist: [ 3, 3 ] 
+    SalvageSpecialist: [ 3, 3 ]
     Musician: [ 1, 1 ]
     AtmosphericTechnician: [ 3, 3 ]
     TechnicalAssistant: [ 2, 2 ]