From 50874dfd8e818e4042dbb29179e9f5aa1b1b5e31 Mon Sep 17 00:00:00 2001
From: meowstushka <meowstushka@gmail.com>
Date: Mon, 10 Jun 2024 18:12:40 +0300
Subject: [PATCH 1/4] Musician Jumpskirt

---
 .../corvax/preferences/loadout-groups.ftl     |   1 +
 .../entities/clothing/uniforms/jumpskirts.ftl |   2 ++
 .../Entities/Clothing/Uniforms/jumpskirts.yml |  13 ++++++-
 .../Loadouts/Jobs/Civilian/musician.yml       |  18 ++++++++++
 .../Corvax/Loadouts/loadout_groups.yml        |   6 ++++
 .../Prototypes/Loadouts/role_loadouts.yml     |   1 +
 .../Roles/Jobs/Civilian/musician.yml          |   1 -
 .../equipped-INNERCLOTHING-monkey.png         | Bin 0 -> 943 bytes
 .../equipped-INNERCLOTHING-reptilian.png      | Bin 0 -> 1169 bytes
 .../musician.rsi/equipped-INNERCLOTHING.png   | Bin 0 -> 1073 bytes
 .../Uniforms/Jumpskirt/musician.rsi/icon.png  | Bin 0 -> 591 bytes
 .../Jumpskirt/musician.rsi/inhand-left.png    | Bin 0 -> 358 bytes
 .../Jumpskirt/musician.rsi/inhand-right.png   | Bin 0 -> 363 bytes
 .../Uniforms/Jumpskirt/musician.rsi/meta.json |  34 ++++++++++++++++++
 14 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Prototypes/Corvax/Loadouts/Jobs/Civilian/musician.yml
 create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-monkey.png
 create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-reptilian.png
 create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png
 create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png
 create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json

diff --git a/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/corvax/preferences/loadout-groups.ftl
index 01314fe0cbc..c0533a2bd3a 100644
--- 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 = Музыкант, комбинезон
\ No newline at end of file
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
index 397273b9d4e..ab103797063 100644
--- 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 = Роскошное платье, сшитое только из лучших чешуек, идеально подходит для любого концерта в стиле лаунж!
\ 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 bda1c2735de..b768388c006 100644
--- 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
\ No newline at end of file
+    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
\ No newline at end of file
diff --git a/Resources/Prototypes/Corvax/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Corvax/Loadouts/Jobs/Civilian/musician.yml
new file mode 100644
index 00000000000..8cf584a7b8c
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml b/Resources/Prototypes/Corvax/Loadouts/loadout_groups.yml
index 95eab89bf34..a96b999de50 100644
--- 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
\ No newline at end of file
diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
index 941b9e4d4b1..26f735c183a 100644
--- 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
index 607b3226ec8..31ca9c459c6 100644
--- 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/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5a2d8f2c1b22cf7d4f0994afa52626be76d96d9
GIT binary patch
literal 943
zcmV;g15o^lP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&X-PyuRCt{2noUb%R~UewJ2aGO$Te_?gh4}k<<h2PamiH(xG74jtL#eXUit^R
z>9T*oe=xg3#jUIPz~V-@)QPwd(h`z>Sg0r&(vb+x(3~#D6LbcLdu|ei&iiZ*$xY64
z^5&fP!hK&51VIo4K@i?g9Gef9g1QE19&En#y?0$37p0)C&t9AY@K@)jp=ZWh(f}DZ
zXYK#MM*i)>7eu`-=~PBP+j}?^%`dF!py=yrR<RC)=E3GYn?=O+FZvb!`4A2d_lE&D
zl*<*SE&$LrL5LjyfT-7{npG4+7hv#g@8P}qg|$H~4E2M5Q%=<D+Dw;-mHUb*zd|*u
zhU<xXU8?sL(S^M~Rsc-&|NQ$89yK15S01%6<ha`z)WVRhM#DMocKGbUr!4vvu>2Qn
z{oj1~6+bk8VYxIn9KV0^V<La-ty;}0o?pBKASn8JtI^=+C*L_+jfV5_Cq4krFJ4m3
zDgb@+Ov$+F-)^>9F3nvV-|)vKR+LIXU8hqSj=LQIomU<~(dSX)F{|N<bMSl1TqCbM
z-G6n)IP-ux?<N7}l}GxcEdBG|a5Vmmn*-t}W9w}?<1G#H%5zLG04J|Jj=P;}nR!yo
zcuU&&45Rq1|0NUQ)o_Kp@>mU5G@vtXZtUAWrvKXewpazA6x0XlRK^L4J_Y3x6n&?l
zTqh{{PCAuw-n=!98*>z|_=jUUm3iyd7>C#aF!EX$YG9an%vcM<#EY=>U-ORYj~#&K
z!KTxHb>?hDI~0_w`{z9h%EgQu(GHi%Zz6f%($A%z+x82BAP9mW2!bF8f*=TjAp9>#
z^aS<lqvyMR3Onjrtjgm?X!-;$`vJyU3BK*MBr0G=y)FgivcC6}MZYq!V#vENCG+*Y
zrxcV+(%uB?9RRS~+Gn=~(^In)l*?`_k$Yqc%B6KO%SN=5c#gzdw-nU%*VWJ2Znl}8
z&2f0Re{1=m6x4OOT;b&Cl;zSK8_`Z;_eeGT?PeQ)I>*V;DdqC*9EGbt-k;75YlBHi
zbOZp>sSNF-ecDH_U-!?wVFSY?IeT%+Z@<27$T04_@)FONXa~$MtZ5iujoyZv`UA|G
zY_Sf2+2-S{(c8Fh>JPZOHXCdkBqma$ze~4O0PeCzFZ}_6AP9mW2!b$H{sVK)*Qpv8
RBPRd=002ovPDHLkV1l1W&jtVh

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-reptilian.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING-reptilian.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f01b9e6d7c60f49c1f6d6809747e727d4710adc
GIT binary patch
literal 1169
zcmV;C1aA9@P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(OG!jQRCt{2n$K_AW*Eo6*~X?~VUS+g>LIookQbq$3Yiii<(4YTc8PY&KhQ((
zx%AlGcFDc>NvnFzsXs*3OC;3F$cI!cvY;rm5;F5*AdqD_umiFM2?@M!Y}9n`=koAk
z%=dX7-q-fa^8g$Uhr{7;IGq0{3p5{2XSW6bP%)ofIPa=sLE&k1J1u;yz4mn$lWPM2
zh=~%l{x>w@nT(DP2iC;nLL`QzWeorZVI(1)-5RWFI@;d>`}<`-86KI8?!Bba|7uq8
z?fg38r@+H(0r&C`#>DUC9}FI53y7Zr+xhhi&RrKz9{@IP5v*!Dw)5*_cH<Ud(w~|D
zPrT$hC?p6<t}~VdFZj{pK_+36{xnOYKhqK@xelHiFJO`+Hgh?YoM9540DkZ)5wTNx
zg>I(><TkDs^%VWzD}UmCI(5Oa=zo3HL2uoebqmKQM>sw?!YB71tfZFk{>a5IcfR+7
z-!%;U?S29P9REAON-BesZ^`4on(u#Q4g50wpYQ&FVx@}v>6C9-^`|a@LV}>_)cmWi
z5KUm$FrX3<kBfi!!3)s@0N`Wo^+MCBp^zY~anGdh1?^c@{iz9fVwT3ny}pa=9SysN
zfwwOoVb?IQw5*}mcdtB;m8<jtTw9;&cD0yX8>AH7cjCG60zc(8VAd@N(FCfE^4R@3
zXwK`Kb<4M``ZL`IN9pxl2+;)0x`nqdAHl3!6MuoQ7}W=GZT*=agglx~4Y!d*)2U(Q
z$KQr;9t_`~2TiAj*qH=i`0&*`>tcVuJiPidK$U=)C_#=Z==EKAQ&ET}{IT6`Fgd}Z
z@9BDDSy7nuXI=u{gM}s!vwxWl`YAAMeX1ECL}E~h2tb=?&H8XkhD8|qGw%h2NDP~~
z9Ez1H08F%-xg3N@ER?-KSo$+1pkh8-=$&=(wDbnOz6+Iz6YbN|8}!b)fp3Y!)Tegz
zs_cgOU%=<0&*5-591e%W;cz${&KCgF{@JU?0|>PaFb`j-{}w-At=$o&Q2GJp<qK6|
zWKyX*jDCQ5`a(SeMg{k*GN9?xPYQ`qA3UFEp)QT7MD&H_xB``kSk?5gwHP*w$+f|%
zrb8tn<hX)8tL&HQX`xQQq0{k&G+FY;DP=xM@Cu|V5pn2r{DO!#riD5Ig#_`1EV~7j
zh$vR7kQIqqoE2G-P^?s;5)qa?tO*`E9j2ZH>TAHxyH^(+(PRl$gRMBpg579AlO;d#
zcDsQ+tBgH{@1mLk-A)T~T!9dYA(PR4M=ZNF_ZeW>Lv6d!LMEd_h{Pbr73wN6Q-8qH
zvNjgHCQFz04~D^q18Yp%ZnT(t1gI0xbZUs7!k>0_y8)GmbL$WAd{Buv=0p6Htw({n
zRrY*+e$?9SM(E|KpnV9uKVTjN*&`5me?U6B724jwE0YJ=BXA@71H$y-M)U`S>BEid
j5BOYs;BYvcFM|I7<Cj*R7+KN}00000NkvXXu0mjf_B1u&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ddb6e4d30caa65be7670e1279cc1c1b15df52db
GIT binary patch
literal 1073
zcmV-11kU@3P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px&>q$gGRCt{2n!#@xM-+!Yw{@c!u^_ELJs1>&wh=0-5X2FZZ?-JA7ppf*Ip>hO
zFFm?{fbY3mYLu%_Nh6|METL2&4n(*?xRyyI3rf9!v77op4`?S)2r%niCvNAvJVwLr
z@4cs8W|;Rtp-?Ck3WY-P|71qy%dx~p7ob#lJapZ-Ij68R+O0Zo4xS60`N(n?z^etM
z^}mo2kH?ez{#$wEyl2+S!fgYf>qZh{iH+`(k)(M8ip9K0hDAJ{v_4Ade>Sc7=He>8
zckm#Q=FZ~%0r5MF_qz`gX?*Wsb8&UZxyxed1FYTDSu&DrF0KyPwVS#v{fP;%#It6D
zv|lG{HU^Sl1>ZmKWD-W{PqH%lQ@sLNv%!<xQwn;7^;C*%qnCt-Ac7C;8r#`tv|DvZ
ztz9na3Hm#weO6-8A!|qf^Kp~bdsjFtb9#Ql>G=t7&A+%CUEtM;$q%=_7Qyf4a{Ot&
z1>p4WE_b7G&cD>R{y2X1lik2Sr2qZ5-;gO)Scyf2wW~kz6-fJajvEK!SJyM=XE&E4
ztZQs#eip%d=KKJ>Ie0#E+&CcZ*X_nVmA)0UW$o%uOu)lJc3|8&GfCVs*v;j5`OA;&
z=5j3DHt3w0W3RKzIDO#K`cli)d}O&B4JCyWPjXNBF11GCu#9KUPo<h4Sf8Dyf4zs^
z(%ZRc1HHWgAgw?3KA>M1pj@l-l^&s7tB;&_1Fse!=nK&~Gx5y%>71Ej91Ml1HLKG1
zoN6Bc?{{HFuovWqtkZh{xAmo-0MD$Ku&x2dNLx63|46!l8~Ri41U<7})>A1mr3%1E
zyPitnnf1D|6Ld>|ssxk@k7qg;Z60M`&^a>+>)J^BDEorWMceT|L~iO!J321AZvGSe
zRP+@Jg+ifFC=?2XLZMJ7u06I+P^|NLkUxian#=kkbt(+Q)!J<>;7UKhRrxY?U0{@;
z)1~l_;fquPfC0h1a$X4cKZ<TMA6XW`TRvDm$s(PAu&xQ=pf4oGTPydjBnk78<?hzX
zJyDhq`a&WJy&{Pm(g`?fw1kim42bd0>wRf)yX?H)C#-86HCm!1W{qW$PC(kP3!!qY
zPFUB-lqv*6?iNP-35Eh>N)^JoCW^C1jh3yR1nE^^``2efju^oJ<!XJ*RnAhY)-i$s
zk@#A(%3e9oo{f7+Jpt`jop!6vlF@5PD;D$AnpMKOMx~m!A#aaLHBVUAs5Pq;i#^>X
zBPsloLAp`$-}U)^TWeNbFHbq`gX8@HSAml~0*?0w#1b2>?F_9lxsyEt*P=hbO&_jB
re}J1lT)X~&PsIm?LZMJ7{sa62a2Wq&iTa6>00000NkvXXu0mjfl~)KR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..53da76c7aaae4a211a192f3a8c11095dabced651
GIT binary patch
literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%2}wjjR9J=Wlrd`>VHn4MwzY%Dod<_bRZPSd!Qt>?5V{pYI!QObK!)sDI;J0>
zdp<!!R;Q#TAxq#0oZJ!|L=j9t+Frd@Pn$Yihg7Lx&wHWc{g#K9=Y605pXcRyAR;0n
zB0_+oUiXW7-51RT@km6xR4OCI<&}9UE>kL%5j7FYKvA#z2bCR?_pq;5*{bX<iELH&
z{C&Mj@*WN<J3=Pb8kmclu0vJTFkNTK#9aLEyoiY>VJ?}j!>M(Kt!+{>3{2<2#1SmS
zvzo$t^An>VU%=Q6Qx<^7LCK<C_g@yu*u6I6>5%bs$esI>?feEeLzg$X=L_+MW%13u
z17Q5iXFFeF`cymoI=Fckq_Or3s;b7o>2lk>hyh3mm4;=J)f5iTKP<$hgbKiI_aZiM
zx>QvyR0q}?II_*9vo~?ka|Iff#r4OxG%Sma7X`eD8~E;D#6sQr!?Vp-em+xPm^ii0
zcx~)r_u5Dal}^98=u}uj?}0g;eiJ=c;Huq3R#IHGAI_bAQ?wKiath|iN{VzcgWYSB
zPG;~XE>c3p?zPEh%6$Ib7d9ZY2>}Y}6hTpR6AE=eipyj*1t_eHc2CBejYLX@U&T^f
zre+wNw>khTW6dy-;`0Ap#Q-h)B<9UV9GjPT6PK)}tc=IzCEjdA%RUJ`2|^<S!GA0w
d91#&Q=QnV^=No}44;ugg002ovPDHLkV1hj$3IG5A

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000000000000000000000000000000..058c330d586f404f949759dda15cd09847e5a092
GIT binary patch
literal 358
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`s0a9jxM~`N
z%P2WrdULNSW4eiH%EG<7U;clU659DGDBa$^<k_8Fp)s96wJI}?eFsv!B|(0{|B(QL
z?F*$gpu`nV7srr@*0)z1xegiduw3BgY}xhq|Mx0|6R&3VML4!@@p$MlzjQYDx1)_r
zTp9}+<k=b?3#AJ(ls-;cHzQ4uVaKYs%U+#-FP&=mz}LsscUJPGqYS6-<ZUbDR*U4B
z(P8;|XTqdbhV~5;=AYJKNjTSeT8AlO^_<wR8r=*tsvci){;Dy1PJ{T|&rdyV(iJDj
zu!;mYFy3dmu>b9+-&<dA%w+IO<h-!$i|~f6`wprxzWct7;lag}`|M9Hrt~{~VtKAM
vo2jkWyu7J+vhRJjFaDqE|4G~P++hrN-^LWZXvI&U{}?=7{an^LB{Ts5R@j~5

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc8ffb3672199c6723a3a26b44db3c8d3f5626ee
GIT binary patch
literal 363
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`s0a9jxM~`N
z%P2WrdULNSW4eiH%EG<7U;clU659DGDBa$^<k_8Fp)s96wJI}?eFsv!B|(0{|B(QL
z?F*$gpu|m27srr@*0)zLay1+9uwIzL;<Wt#|Gm4fd{vCydU6}P<VKIky_Oo+TEFS@
zdnq)s2<?z`NQ(-&ku$p^)S&ZIl*DHC1!p#KZ?<Ys^v+!?_V7^9tDuV0W(@YBa+@Ar
z5|Y@=J0ZwrV_zm`&&_bhgG}dKzv|qMZ_{YY55A%E)$~{ar}MW8zQnZ>Zv>9z+z-={
zI5#(AQ~A#sLLNZ7>bM1V{u9<`_*U{<o8fEUw;H|&l39Pmd>9MwE^1=EPy{6Y=vHyL
wM1A4u*z!VBAoHSnxj@Fn;0K!@^Eas9oU*O(hJeH}peGqTUHx3vIVCg!0O^OBX8-^I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json b/Resources/Textures/Corvax/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json
new file mode 100644
index 00000000000..d0635a91b4c
--- /dev/null
+++ 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
+    }
+  ]
+}

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 2/4] 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

From 0a959fa47ef18f8dc6a09540abfc4bd4e20dd4f6 Mon Sep 17 00:00:00 2001
From: meowstushka <meowstushka@gmail.com>
Date: Thu, 20 Jun 2024 10:08:01 +0300
Subject: [PATCH 3/4] Fix xd

---
 .../Corvax/Entities/Clothing/Uniforms/jumpskirts.yml           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml
index d334206feb9..95ca43cfb3b 100644
--- a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -64,7 +64,8 @@
     sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
   - type: Clothing
     sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
-
+    
+- type: entity
 parent: ClothingUniformBase
   id: ClothingUniformJumpskirtCapTurtleneck
   name: captain's turtleneck

From ca4a7d07978ab8d50c9c2041de63019b19d1a906 Mon Sep 17 00:00:00 2001
From: meowstushka <meowstushka@gmail.com>
Date: Thu, 20 Jun 2024 10:09:21 +0300
Subject: [PATCH 4/4] And again..

---
 .../Corvax/Entities/Clothing/Uniforms/jumpskirts.yml          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml
index 95ca43cfb3b..57babc72f4e 100644
--- a/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Corvax/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -64,9 +64,9 @@
     sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
   - type: Clothing
     sprite: Corvax/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi
-    
+
 - type: entity
-parent: ClothingUniformBase
+  parent: ClothingUniformBase
   id: ClothingUniformJumpskirtCapTurtleneck
   name: captain's turtleneck
   description: True captain's turtleneck.