Musician Jumpskirt

Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl

@@ -1,2 +1,3 @@
 loadout-group-inventory = Мой инвентарь
-loadout-group-psychologist-backpack = Рюкзак психолога
+loadout-group-chief-engineer-backpack = Рюкзак старшего инженера
+loadout-group-musician-jumpsuit = Музыкант, комбинезон

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 = Роскошное платье, сшитое только из лучших чешуек, идеально подходит для любого концерта в стиле лаунж!

Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -63,4 +63,59 @@
   - 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: ClothingUniformBase
+  id: ClothingUniformJumpskirtCapTurtleneck
+  name: captain's turtleneck
+  description: True captain's turtleneck.
+  components:
+    - type: Sprite
+      sprite: Corvax/Clothing/Uniforms/Jumpskirt/cap_turtleneck.rsi
+    - type: Clothing
+      sprite: Corvax/Clothing/Uniforms/Jumpskirt/cap_turtleneck.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtHoPTurtleneck
+  name: head's of personal turtleneck
+  description: Turtleneck of papers god.
+  components:
+    - type: Sprite
+      sprite: Corvax/Clothing/Uniforms/Jumpskirt/hop_turtleneck.rsi
+    - type: Clothing
+      sprite: Corvax/Clothing/Uniforms/Jumpskirt/hop_turtleneck.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtHoSBlack
+  name: head's of security black skirt
+  description: Main villain's skirt.
+  components:
+    - type: Sprite
+      sprite: Corvax/Clothing/Uniforms/Jumpskirt/hos_black.rsi
+    - type: Clothing
+      sprite: Corvax/Clothing/Uniforms/Jumpskirt/hos_black.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtRDFormal
+  name: research director's formal skirt
+  description: Evil genius skirt.
+  components:
+    - type: Sprite
+      sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_formal.rsi
+    - type: Clothing
+      sprite: Corvax/Clothing/Uniforms/Jumpskirt/rd_formal.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

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

Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml

@@ -6,10 +6,16 @@
   loadouts: []
 
 - type: loadoutGroup
-  id: PsychologistBackpack
-  name: loadout-group-psychologist-backpack
+  id: ChiefEngineerBackpack
+  name: loadout-group-chief-engineer-backpack
   loadouts:
-  - PsychologistBackpack
-  - PsychologistSatchel
-  - PsychologistDuffel
+  - ChiefEngineerBackpack
+  - ChiefEngineerSatchel
+  - ChiefEngineerDuffel
 
+- type: loadoutGroup
+  id: MusicianJumpsuit
+  name: loadout-group-musician-jumpsuit
+  loadouts:
+  - MusicianJumpsuit
+  - MusicianJumpskirt

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -150,7 +150,8 @@
 - type: roleLoadout
   id: JobMusician
   groups:
-  - MusicianBackpack
+  - CommonBackpack
+  - MusicianJumpsuit # Corvax-MRP
   - MusicianOuterClothing
   - Glasses
   - Trinkets

Resources/Prototypes/Roles/Jobs/Civilian/musician.yml

@@ -17,7 +17,6 @@
 - type: startingGear
   id: MusicianGear
   equipment:
-    jumpsuit: ClothingUniformJumpsuitMusician
     eyes: ClothingEyesGlassesSunglasses
     shoes: ClothingShoesBootsLaceup
     id: MusicianPDA

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
+    }
+  ]
+}