Musician Jumpskirt

space-syndicate · Jun 10, 2024 · 50874df · 50874df
1 parent 192cd66
commit 50874df
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 2 deletions.
diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl
@@ -1,2 +1,3 @@
 loadout-group-inventory = Мой инвентарь
 loadout-group-psychologist-backpack = Рюкзак психолога
+loadout-group-musician-jumpsuit = Музыкант, комбинезон
diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/clothing/uniforms/jumpskirts.ftl
@@ -10,3 +10,5 @@ ent-ClothingUniformJumpskirtPsychologist = юбка-костюм психоло
     .desc = Я не теряю вещи. Я кладу вещи в места, которые потом ускользают от меня.
 ent-ClothingUniformJumpskirtSchool = школьная юбка
     .desc = Стильная и удобная школьная юбка.
+ent-ClothingUniformJumpskirtMusician = платье из карпокожи
+    .desc = Роскошное платье, сшитое только из лучших чешуек, идеально подходит для любого концерта в стиле лаунж!
diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -63,4 +63,15 @@
   - type: Sprite
     sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
   - type: Clothing
-    sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
+    sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtMusician
+  name: carpskin skirt # Corvax-Resprite
+  description: An luxurious skirt made with only the finest scales, perfect for any lounge act! # Corvax-Resprite
+  components:
+  - type: Sprite
+    sprite: Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi
+  - type: Clothing
+    sprite: Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi
diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Civilian/musician.yml
@@ -0,0 +1,18 @@
+# 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
diff --git a/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml b/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml
@@ -13,3 +13,9 @@
   - PsychologistSatchel
   - PsychologistDuffel
 
+- type: loadoutGroup
+  id: MusicianJumpsuit
+  name: loadout-group-musician-jumpsuit
+  loadouts:
+  - MusicianJumpsuit
+  - MusicianJumpskirt
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -151,6 +151,7 @@
   id: JobMusician
   groups:
   - MusicianBackpack
+  - MusicianJumpsuit # Corvax-MRP
   - MusicianOuterClothing
   - Glasses
   - Trinkets

diff --git 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/...rvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-monkey.png b/...rvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-monkey.png
diff --git a/...x/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-reptilian.png b/...x/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-reptilian.png
diff --git a/...ures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png b/...ures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png
diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png
diff --git a/...urces/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png b/...urces/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png
diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by: meowstushka; Discord: meowstushka; (UwU)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}