From 9bc1fabdb39ce802e22d06b0c44bfab6dab40b53 Mon Sep 17 00:00:00 2001 From: TakoDragon <69509841+BackeTako@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:51:54 +0200 Subject: [PATCH] Added suitskirt for psychologist (#30709) * Added jumpskirt * added locale * Added spaces in code * Updated the meta --- .../en-US/preferences/loadout-groups.ftl | 2 ++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 +++++++ .../Loadouts/Jobs/Wildcards/psychologist.yml | 10 ++++++ .../Prototypes/Loadouts/loadout_groups.yml | 7 ++++ .../Prototypes/Loadouts/role_loadouts.yml | 1 + .../Roles/Jobs/Wildcards/psychologist.yml | 1 - .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 946 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1084 bytes .../Jumpskirt/psychologist.rsi/icon.png | Bin 0 -> 424 bytes .../psychologist.rsi/inhand-left.png | Bin 0 -> 518 bytes .../psychologist.rsi/inhand-right.png | Bin 0 -> 553 bytes .../Jumpskirt/psychologist.rsi/meta.json | 30 ++++++++++++++++++ 12 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index b1fba215d9..917826886b 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -194,5 +194,7 @@ loadout-group-paramedic-shoes = Paramedic shoes # Wildcards loadout-group-reporter-jumpsuit = Reporter jumpsuit +loadout-group-psychologist-jumpsuit = Psychologist jumpsuit + loadout-group-boxer-jumpsuit = Boxer jumpsuit loadout-group-boxer-gloves = Boxer gloves diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 6ad8cc0505..18eae39f03 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -843,3 +843,14 @@ sprite: Clothing/Uniforms/Jumpskirt/musician.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/musician.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtPsychologist + name: psychologist suitskirt + description: I don't lose things. I place things in locations which later elude me. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/psychologist.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/psychologist.rsi diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml new file mode 100644 index 0000000000..bc4bae3858 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml @@ -0,0 +1,10 @@ +# Jumpsuit +- type: loadout + id: PsychologistJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitPsychologist + +- type: loadout + id: PsychologistJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtPsychologist diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 1df741b3c7..f3a1b61695 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1226,6 +1226,13 @@ - ReporterJumpsuit - JournalistJumpsuit +- type: loadoutGroup + id: PsychologistJumpsuit + name: loadout-group-psychologist-jumpsuit + loadouts: + - PsychologistJumpsuit + - PsychologistJumpskirt + - type: loadoutGroup id: BoxerJumpsuit name: loadout-group-boxer-jumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index c204f87c93..878c14dc70 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -489,6 +489,7 @@ id: JobPsychologist groups: - GroupTankHarness + - PsychologistJumpsuit - MedicalBackpack - Glasses - Survival diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 5414430bf5..57b8e39842 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -15,7 +15,6 @@ - type: startingGear id: PsychologistGear equipment: - jumpsuit: ClothingUniformJumpsuitPsychologist shoes: ClothingShoesLeather id: PsychologistPDA ears: ClothingHeadsetMedical diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..e3a9016b83ea4b2a7d9ae2b863affc44e8c07350 GIT binary patch literal 946 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 IM6N<$f?rSYOaK4? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..25fa4bcb44c50955ca2fa472ade0177bbb9f825e GIT binary patch literal 553 zcmV+^0@nSBP)Px$<4Ht8RCt{2+A)rTKokbxe>R)Ym<*MaYwImMgO{+^bBtSAcnQzo5$voCZi$s9 z7TWl>8lr&0CvX$_r2C99@{Y;45Rv-hy@*J5vj@v=BF*MN zM4aL+I>u+V;d?p-01SsieD!*{0YBR<7K;S{U_2hzIiIJv#9QR!)c~5l3SN~E~-rPhKf?a|@QmTX>9Y zgNUHt?@N*-h@uGHZWn{W0L$ePyWI}9eZ5|*rV~&{yoCt}!?1K^+wb?SNx&=d-n|8) zD8l)Cwu2FdApjr<0whV&_~maYrJ%KbI^NtOc-=7wf}4HW?``u;ymwEd*81*cbvPW_ zar&?L7B3MI5fKp)5m93vz9|ur^c9(J72{fn$a^ZVzOV`KsbcKvVP(kjtzzurVRg7I z@BZJZQhD690_)RlP$>bvRg7Jft^uwUSf3^jl>82`e5)9{s2uI1(v#Jeim{7Ik3q|q rim?mlKS}vkF)rhD%2