From 7aa2e4964a3864327a22ff28ceee95f535577153 Mon Sep 17 00:00:00 2001
From: meowstushka <meowstushka@gmail.com>
Date: Thu, 20 Jun 2024 10:05:22 +0300
Subject: [PATCH] Conflict Fix

---
 .../corvax/preferences/loadout-groups.ftl     |  2 +-
 .../Entities/Clothing/Uniforms/jumpskirts.yml | 43 +++++++++++++++++++
 .../Corvax/Loadouts/loadout_groups.yml        | 10 ++---
 .../Prototypes/Loadouts/role_loadouts.yml     |  2 +-
 4 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl
index c0533a2bd3a..81709bdf01d 100644
--- 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 = Музыкант, комбинезон
\ No newline at end of file
diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml
index b768388c006..d334206feb9 100644
--- 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
index a96b999de50..8793822a3c2 100644
--- 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
index 26f735c183a..ac8ad687268 100644
--- 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