Conflict Fix

space-syndicate · Jun 20, 2024 · 7aa2e49 · 7aa2e49
1 parent 50874df
commit 7aa2e49
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 7 deletions.
diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl
@@ -1,3 +1,3 @@
 loadout-group-inventory = Мой инвентарь
-loadout-group-psychologist-backpack = Рюкзак психолога
+loadout-group-chief-engineer-backpack = Рюкзак старшего инженера
 loadout-group-musician-jumpsuit = Музыкант, комбинезон
diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -65,6 +65,49 @@
   - type: Clothing
     sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
 
+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

diff --git a/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml b/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml
@@ -6,12 +6,12 @@
   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

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -150,7 +150,7 @@
 - type: roleLoadout
   id: JobMusician
   groups:
-  - MusicianBackpack
+  - CommonBackpack
   - MusicianJumpsuit # Corvax-MRP
   - MusicianOuterClothing
   - Glasses