Musician's skirt (#29203)

* Sprites&Meta

* Changing prototypes

* Adding to Theater vend

* Sprite_Change

* Sprite_Change

* Prototype_Changes

Is this exactly how it should be?...

* FUCKING FIX

* weh

---------

Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>

diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl
index a107ee24f8404f54cf03e9389fe49c04c74310f9..ef0937c9109cc5bda48032f750f2d3eea61a7181 100644 (file)
--- a/Resources/Locale/en-US/preferences/loadout-groups.ftl
+++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl
@@ -66,6 +66,7 @@ loadout-group-mime-jumpsuit = Mime jumpsuit
 loadout-group-mime-backpack = Mime backpack
 loadout-group-mime-outerclothing = Mime outer clothing
 
+loadout-group-musician-jumpsuit = Musician jumpsuit
 loadout-group-musician-outerclothing = Musician outer clothing
 
 # Cargo

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index 5ef711556b5389e1176a97c3bdf4a489529a5aa8..d105d4cd776e1b520ab73967dad884ca2583d653 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -832,3 +832,14 @@
     sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtMusician
+  name: musician's skirt
+  description: A fancy skirt for the musically inclined. Perfect for any lounge act!
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/musician.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/musician.rsi

diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
index 486ff25d47c7252de00f88a09fcc0d5d008c1e80..eae05d2005d3c4b76b4cf18f95381622ea60abb1 100644 (file)
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
@@ -1,3 +1,22 @@
+# Jumpsuit
+- type: loadout
+  id: MusicianJumpsuit
+  equipment: MusicianJumpsuit
+
+- type: startingGear
+  id: MusicianJumpsuit
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMusician
+
+- type: loadout
+  id: MusicianJumpskirt
+  equipment: MusicianJumpskirt
+
+- type: startingGear
+  id: MusicianJumpskirt
+  equipment:
+    jumpsuit: ClothingUniformJumpskirtMusician
+
 # Outerclothing
 - type: loadout
   id: MusicianWintercoat

diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index cc0aefb69c156818c4426d1ca91e8b169ea058b1..3d4583a063eb242b515088ccae2e328b434aeb24 100644 (file)
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -429,6 +429,13 @@
   loadouts:
   - MimeWintercoat
 
+- type: loadoutGroup
+  id: MusicianJumpsuit
+  name: loadout-group-musician-jumpsuit
+  loadouts:
+  - MusicianJumpsuit
+  - MusicianJumpskirt
+
 - type: loadoutGroup
   id: MusicianOuterClothing
   name: loadout-group-musician-outerclothing

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 0e80113ce3f77bcd92d0a5aa5d5e320591fc9093..5f0ec2b274f70c26ad8809fa8472e6922f1cc90d 100644 (file)
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -137,6 +137,7 @@
 - type: roleLoadout
   id: JobMusician
   groups:
+  - MusicianJumpsuit
   - CommonBackpack
   - MusicianOuterClothing
   - Glasses

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
index 58335ba52dd4599b268290dcc35de04bcde19d6f..5d01cd4938c26527c2520b72601942f08ab156c8 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
@@ -17,7 +17,6 @@
 - type: startingGear
   id: MusicianGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitMusician
     eyes: ClothingEyesGlassesSunglasses
     shoes: ClothingShoesBootsLaceup
     id: MusicianPDA

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..78b2c2e
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png
new file mode 100644 (file)
index 0000000..48c4151
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..5919ab9
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..988fda9
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json
new file mode 100644 (file)
index 0000000..b8ed681
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by github:DreamlyJack(624946166152298517)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}