Added suitskirt for psychologist (#30709)

* Added jumpskirt

* added locale

* Added spaces in code

* Updated the meta

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index b1fba215d9910310bb0fb5b81c917a5eece6c741..917826886b1614283347af0a1dcb168cf8bd3026 100644 (file)
--- 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 6ad8cc05058a92ed41179b2c1bf360a9ea38715a..18eae39f03b860c2334cbc8d18709377e22a4f54 100644 (file)
--- 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 (file)
index 0000000..bc4bae3
--- /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 1df741b3c768e34e688dd3abf05a929ec4b9eb56..f3a1b616951c61566f5e65bf24e32aad7a249df1 100644 (file)
--- 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 c204f87c93bf60b0c38c183fb02867106497057c..878c14dc70a04c46d3cd09e863b91b166f57cf1c 100644 (file)
--- 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 5414430bf54187d303c6d0db9402f0bab326fdad..57b8e3984228a99bdcebfda9abf8191e374912e5 100644 (file)
--- 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 (file)
index 0000000..e3a9016
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 (file)
index 0000000..55737ab
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 (file)
index 0000000..f2223b4
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 (file)
index 0000000..8dba518
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 (file)
index 0000000..25fa4bc
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 (file)
index 0000000..4d0c4eb
--- /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