From 2b70beec0c9844252f4200ddddab38f480347eac Mon Sep 17 00:00:00 2001 From: Michelle Szinger Date: Fri, 20 Dec 2024 11:49:04 -0700 Subject: [PATCH] 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 * 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 * Remove erroneously restored erroneous whitespace This one is actually my bad. Apologies. Signed-off-by: Michelle Szinger * 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 --- .../Locale/en-US/deltav/job/job-names.ftl | 4 + .../deltav/preferences/loadout-groups.ftl | 5 ++ .../DeltaV/Entities/Objects/Devices/pda.yml | 32 ++++++++ .../Objects/Misc/identification_cards.yml | 26 ++++++ .../Loadouts/Jobs/Medical/psychologist.yml | 74 ++++++++++++++++++ .../DeltaV/Loadouts/loadout_groups.yml | 41 ++++++++++ .../Prototypes/Loadouts/role_loadouts.yml | 5 ++ .../Roles/Jobs/Wildcards/psychologist.yml | 5 +- .../DeltaV/Objects/Devices/pda.rsi/meta.json | 11 ++- .../Devices/pda.rsi/pda-psychiatrist.png | Bin 0 -> 460 bytes .../Devices/pda.rsi/pda-socialworker.png | Bin 0 -> 730 bytes .../Objects/Devices/pda.rsi/pda-therapist.png | Bin 0 -> 508 bytes 12 files changed, 200 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/psychologist.yml create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-psychiatrist.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-socialworker.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-therapist.png diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index e08645c5ea6..90307cc2d61 100644 --- 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 index 9d0b06d8804..f761cd45830 100644 --- 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 index 8b4478d804c..a9ddeb881da 100644 --- 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 index 8c93b96d4e6..47449201b6a 100644 --- 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 new file mode 100644 index 00000000000..c7e252151ca --- /dev/null +++ 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 index 8b5b827e09a..2bf3ae86d50 100644 --- 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 index eb569b70225..c16fd986b07 100644 --- 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 index 4e69c4a3c87..00e991a2094 100644 --- 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 index d0ac0bee150..51105a4c6de 100644 --- 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 ", "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 new file mode 100644 index 0000000000000000000000000000000000000000..fae856a2e1069a6f551f28169ee152a4dd40d3de GIT binary patch literal 460 zcmV;-0WPx$hDk(0R9J=W*Re{&Kpe;MZ^fw)F-uU8Zh=B;eG4gZcgqtvck(GZ^a=V5Rw&Ny zt+f=2OXwi!P%%=$B@WV3;@#zvOSrAUO<7$_5Av?eS9Azc-R^AV2Q zqTT7{?i`?Ud`hTT6)TtJ0L$eP$8B+PbIBQS1iS+a;I%g-oR4wbmhz~I5-=I`X?p%o zC%qwKMUl6~3&5}A?hZ+mLbhg`V!QeJ{MfctTeEM3f8;l(Y(;$l0000Px%lu1NER9J=WmoZP zm9zL(T@A-`BjfFz1}hb_p9YZ%AcMdA@DqSqt;YHJIlk`$AcO$Gwr%`Ruj97whxV(r zCp5l%PmOUW3*eV;h2vJMMWIl@G)(|3Yw)byZeyBes;yEYK)>Jb%lt+)3SrxJEU45d zM3S#efM&DF;c++d4^ar;_hU1+ZTr$nsFVm$uh%ECs7F^qDk&Y;0${k!mQ0ZeAp=;J zb+a{qB5zWbWidZLuPn@K0pyVoB9;zK(llV{r5ea=M0phi z0YMOi%}Po(qgw}%YPDJrsfAmwfh^_8e=dONEJ~%4(xKcLNqr(o$`nW^LI`@jp3_WF~P6Bt%{wB=@L>=lSYc%BEt73g$2 zS2}jb0wCp^Fwe28Nnpe; z&mDK*++&whcOQULcc1CX!_eN|I?4pN($y?Y{_@(T-+J8voa$=!7c)B%MkdAr>i_@% M07*qoM6N<$f@o_^VE_OC literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-therapist.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-therapist.png new file mode 100644 index 0000000000000000000000000000000000000000..9de90f1914adc750c25ffecfb497bf91366673d5 GIT binary patch literal 508 zcmVPx$wn;=mR9J=W*F8(aKp4RBzb}iGhyfKUrHGhPC^#sHqq}4J8R}XP9Q*=0)^Fek zaHylRiwITPp%jA-H7Hb}Vx&cvIP?YD<}OK-bkS!??w;hiU)sBHf&cjHF(pf;5{lhB zUtO9LUN^IMG}6~F$^d+qi#(W?a2#QxH+Vj)$&3J8Yp23o=|l$*B4%ZU^I47K^Ctk( z=`^iY3(K+qXf~SwB$G+3%Y(tTW%b)ReTU-Jt#FKK*T?HdtyUuzi=ikA0II42P_Nff z6h+u}3rB!$+qTnxJ}yEwe;fhTYE^iHUxZsY0y3G5banVaj0Nx#UJ;Q2!a@WBctJ!C za6?Q4AVW+HFfJlgfDm9%Oy;Nr#TQMBG8^N41{o3{PNxgAg6B+W#)n9fu8#Mp>Tk;w=;^}TD}1N z0!n9lZ4~ZE01Ln;U;