Psychologist Loadout Improvements (#2459)

* Add new sprites for alternative psychologist PDAs * Add localizations for alternative psychologist job names * Add localizations for additional psychologist loadout groups * Expand psychologist loadout options Adds three new alternative job title PDAs: - Psychiatrist - Therapist (req. 4hrs psych) - Social Worker (req. 4hrs service) Adds head, outer clothing, scarf, and shoe loadout groups to the psychologist. Adds a blue folder to the psychologist's starting equipment. * Restore erroneous whitespace I hate YAML. This whitespace should not exist, but removing it would cause merge conflicts or something equally stupid. Signed-off-by: Michelle Szinger <[email protected]> * Restore erroneous trailing whitespace I hate YAML. This whitespace should not exist, but its removal would lead to merge conflicts or diff messiness or other such nonsense, so. Signed-off-by: Michelle Szinger <[email protected]> * Remove erroneously restored erroneous whitespace This one is actually my bad. Apologies. Signed-off-by: Michelle Szinger <[email protected]> * De-dent erroneously indented lines I hate YAML. Not even sure how this particular mistake happened, but I hate YAML. Note to self: stop using Rider for YAML changes. --------- Signed-off-by: Michelle Szinger <[email protected]>
DeltaV-Station · Dec 20, 2024 · 2b70bee · 2b70bee
1 parent e5bbbb1
commit 2b70bee
Show file tree

Hide file tree

Showing 12 changed files with 200 additions and 3 deletions.
diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl
@@ -55,6 +55,10 @@ job-alt-title-fool = Fool
 
 job-alt-title-hygiene-technician = Hygiene Technician
 
+job-alt-title-psychiatrist = Psychiatrist
+job-alt-title-social-worker = Social Worker
+job-alt-title-therapist = Therapist
+
 # Role timers
 JobMedicalBorg = Medical Cyborg
 JobCourier = Courier

diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl
@@ -62,6 +62,11 @@ loadout-group-medical-doctor-neck = Medical Doctor neck
 
 loadout-group-medical-intern-id-delta = Medical Intern PDA
 
+loadout-group-psychologist-head = Psychologist head
+loadout-group-psychologist-outerclothing = Psychologist outer clothing
+loadout-group-psychologist-shoes = Psychologist shoes
+loadout-group-psychologist-id-delta = Psychologist PDA
+
 # Miscellaneous
 loadout-group-scarfs = Scarf
 

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -310,6 +310,38 @@
     id: ClinicianIDCard
     state: pda-phys # - aPDA Sprite Rework
 
+# Psychologist
+
+- type: entity
+  parent: PsychologistPDA
+  id: PsychiatristPDA
+  name: psychiatrist PDA
+  description: Sterile-smelling and neutrally colored.
+  components:
+  - type: Pda
+    id: PsychiatristIDCard
+    state: pda-psychiatrist
+
+- type: entity
+  parent: PsychologistPDA
+  id: TherapistPDA
+  name: therapist PDA
+  description: Covered in a rubberized case in a reassuring shade of brown.
+  components:
+  - type: Pda
+    id: TherapistIDCard
+    state: pda-therapist
+
+- type: entity
+  parent: PsychologistPDA
+  id: SocialWorkerPDA
+  name: social worker PDA
+  description: Dented and scratched. It's been well-used.
+  components:
+  - type: Pda
+    id: SocialWorkerIDCard
+    state: pda-socialworker
+
 # Atmospherics Technician
 
 - type: entity

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml
@@ -150,6 +150,32 @@
   - type: IdCard
     jobTitle: job-alt-title-clinician
 
+# Psychologist
+
+- type: entity
+  parent: PsychologistIDCard
+  id: PsychiatristIDCard
+  name: psychiatrist ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-psychiatrist
+
+- type: entity
+  parent: PsychologistIDCard
+  id: TherapistIDCard
+  name: therapist ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-therapist
+
+- type: entity
+  parent: PsychologistIDCard
+  id: SocialWorkerIDCard
+  name: social worker ID card
+  components:
+  - type: IdCard
+    jobTitle: job-alt-title-social-worker
+
 # Atmospheric Technician
 
 - type: entity

diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/psychologist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/psychologist.yml
@@ -0,0 +1,74 @@
+# PDA
+- type: loadout
+  id: PsychologistPDA
+  equipment:
+    id: PsychologistPDA
+
+- type: loadout
+  id: PsychiatristPDA
+  equipment:
+    id: PsychiatristPDA
+
+- type: loadout
+  id: TherapistPDA
+  equipment:
+    id: TherapistPDA
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobPsychologist
+      time: 14400 # 4 hours psychologist
+
+- type: loadout
+  id: SocialWorkerPDA
+  equipment:
+    id: SocialWorkerPDA
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:DepartmentTimeRequirement
+      department: Civilian
+      time: 14400 # 4 hours service
+
+# Head
+- type: loadout
+  id: PsychologistFrenchBeret
+  equipment:
+    head: ClothingHeadHatBeretFrench
+
+- type: loadout
+  id: PsychologistGreyFlatcap
+  equipment:
+    head: ClothingHeadHatGreyFlatcap
+
+- type: loadout
+  id: PsychologistBrownFlatcap
+  equipment:
+    head: ClothingHeadHatBrownFlatcap
+
+# OuterClothing
+- type: loadout
+  id: PsychologistMedicalWinterCoat
+  equipment:
+    outerClothing: ClothingOuterWinterMed
+
+- type: loadout
+  id: PsychologistWinterCoat
+  equipment:
+    outerClothing: ClothingOuterWinterCoat
+
+- type: loadout
+  id: PsychologistWinterCoatPlaid
+  equipment:
+    outerClothing: ClothingOuterWinterCoatPlaid
+
+- type: loadout
+  id: PsychologistCoatBomber
+  equipment:
+    outerClothing: ClothingOuterCoatBomber
+
+- type: loadout
+  id: PsychologistSweater
+  equipment:
+    outerClothing: ClothingOuterCoatHyenhSweater
diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
@@ -211,6 +211,38 @@
   - SecurityFirearmSpeedLoaderSpecialRubber
   - SecurityFirearmSpeedLoaderSpecial
 
+# Medical
+## Psychologist
+- type: loadoutGroup
+  id: PsychologistHead
+  name: loadout-group-psychologist-head
+  minLimit: 0
+  loadouts:
+  - MedicalBeret
+  - PsychologistFrenchBeret
+  - PsychologistGreyFlatcap
+  - PsychologistBrownFlatcap
+
+- type: loadoutGroup
+  id: PsychologistOuterClothing
+  name: loadout-group-psychologist-outerclothing
+  minLimit: 0
+  loadouts:
+  - PsychologistMedicalWinterCoat
+  - PsychologistWinterCoat
+  - PsychologistWinterCoatPlaid
+  - PsychologistCoatBomber
+  - PsychologistSweater
+
+- type: loadoutGroup
+  id: PsychologistShoes
+  name: loadout-group-psychologist-shoes
+  loadouts:
+  - LeatherShoes
+  - LaceupShoes
+  - MedicalWinterBoots
+  - WinterBoots
+
 # Justice
 ## Chief Justice
 - type: loadoutGroup
@@ -446,6 +478,15 @@
   - JanitorPDA
   - HygieneTechnicianPDA
 
+- type: loadoutGroup
+  id: PsychologistPDADelta
+  name: loadout-group-psychologist-id-delta
+  loadouts:
+  - PsychologistPDA
+  - PsychiatristPDA
+  - TherapistPDA
+  - SocialWorkerPDA
+
 # Misc
 - type: loadoutGroup
   id: Scarfs

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -547,6 +547,11 @@
   - MedicalBackpack
   - Glasses
   - SurvivalMedical # DeltaV, replaces Survival
+  - PsychologistPDADelta # DeltaV
+  - PsychologistHead # DeltaV
+  - Scarfs # DeltaV
+  - PsychologistOuterClothing # DeltaV
+  - PsychologistShoes # DeltaV
   - Trinkets
   - GroupSpeciesBreathTool
 

diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
@@ -22,9 +22,10 @@
 - type: startingGear
   id: PsychologistGear
   equipment:
-    shoes: ClothingShoesLeather
-    id: PsychologistPDA
+    #shoes: ClothingShoesLeather # DeltaV: Multiple shoe options in loadout.
+    #id: PsychologistPDA # DeltaV: Multiple PDA options in loadout.
     ears: ClothingHeadsetMedical
   storage:
     back:
     - RubberStampPsychologist
+    - BoxFolderBlue # DeltaV
diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician version by Radezolid", 
+    "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician version by Radezolid, added Psychiatrist, Therapist, and Social Worker versions by alterae <[email protected]>",
     "size": {
         "x": 32,
         "y": 32
@@ -104,6 +104,9 @@
         {
             "name": "pda-paramedic"
         },
+        {
+            "name": "pda-psychiatrist"
+        },
         {
             "name": "pda-mime"
         },
@@ -128,6 +131,9 @@
         {
             "name": "pda-security"
         },
+        {
+            "name": "pda-socialworker"
+        },
         {
             "name": "pda-brigmedic"
         },
@@ -137,6 +143,9 @@
         {
             "name": "pda-syndi-agent"
         },
+        {
+            "name": "pda-therapist"
+        },
         {
             "name": "pda-centcom"
         },

diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-psychiatrist.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-psychiatrist.png
diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-socialworker.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-socialworker.png
diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-therapist.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-therapist.png