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 0000000000..e3a9016b83 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..55737abe3d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png new file mode 100644 index 0000000000..f2223b48d7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png new file mode 100644 index 0000000000..8dba518157 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png differ 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 0000000000..25fa4bcb44 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json new file mode 100644 index 0000000000..4d0c4eb7bd --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/78a56e1a22ba1d8d6023ed9bdae55a6de7fe8a39 and modified by emisse, suitskirt version made by BackeTako (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file