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 00000000000..fae856a2e10 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-psychiatrist.png differ diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-socialworker.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-socialworker.png new file mode 100644 index 00000000000..0aac9742b61 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-socialworker.png differ 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 00000000000..9de90f1914a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-therapist.png differ