From b5a2508ebc1fca9b96416f9feab67dc8b2f45255 Mon Sep 17 00:00:00 2001
From: creamybag <lygadenis@gmail.com>
Date: Mon, 24 Mar 2025 17:15:29 +0300
Subject: [PATCH] Maid Update (#1064)

* MaidUpdate

* fix
---
 .../Entities/Clothing/Shirt/Roles/general.yml |  12 +++++++++++-
 .../_CP14/Entities/Mobs/Species/carcat.yml    |   2 ++
 .../_CP14/Loadouts/Jobs/general.yml           |   6 ++++++
 .../maid_apron.rsi/equipped-CLOAK-carcat.png  | Bin 0 -> 657 bytes
 .../General/maid_apron.rsi/equipped-CLOAK.png | Bin 334 -> 603 bytes
 .../Roles/General/maid_apron.rsi/icon.png     | Bin 258 -> 283 bytes
 .../Roles/General/maid_apron.rsi/meta.json    |  10 +++++++---
 .../Dress/maid_dress.rsi/equipped-SHIRT.png   | Bin 0 -> 1601 bytes
 .../General/Dress/maid_dress.rsi/icon.png     | Bin 0 -> 686 bytes
 .../General/Dress/maid_dress.rsi/meta.json    |  18 ++++++++++++++++++
 10 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK-carcat.png
 create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/equipped-SHIRT.png
 create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/icon.png
 create mode 100644 Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/meta.json

diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml
index 574f33145b..8eb15206b9 100644
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shirt/Roles/general.yml
@@ -280,4 +280,14 @@
   - type: Sprite
     sprite: _CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi
   - type: Clothing
-    sprite: _CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi
\ No newline at end of file
+    sprite: _CP14/Clothing/Shirt/Roles/General/Dress/warrior_garb.rsi
+
+- type: entity
+  parent: CP14ClothingShirtBase
+  id: CP14ClothinShirtMaidDress
+  name: maid's dress
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml
index dff84fe6aa..93e16eb977 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml
@@ -43,6 +43,7 @@
     footstepSoundCollection: null # Silent footstep
   - type: Inventory
     templateId: CP14Carcat # Cant wear shoes
+    speciesId: carcat
     displacements:
       belt:
         sizeMaps:
@@ -113,6 +114,7 @@
     species: CP14Carcat
   - type: Inventory
     templateId: CP14Carcat
+    speciesId: carcat
     displacements:
       belt:
         sizeMaps:
diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
index 832b91fc41..0a8d27bb8a 100644
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
@@ -271,6 +271,7 @@
   loadouts:
   - CP14ClothingShirtCottonBlack
   - CP14ClothingShirtBlackDress
+  - CP14ClothinShirtMaidDress
   - CP14ClothingShirtCottonBlue
   - CP14ClothingShirtCottonBlueCollar
   - CP14ClothingBlueCollarDress
@@ -306,6 +307,11 @@
   equipment:
     shirt: CP14ClothingShirtBlackDress
 
+- type: loadout
+  id: CP14ClothinShirtMaidDress
+  equipment:
+    shirt: CP14ClothinShirtMaidDress
+
 - type: loadout
   id: CP14ClothingShirtCottonBlue
   equipment:
diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK-carcat.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK-carcat.png
new file mode 100644
index 0000000000000000000000000000000000000000..15f7b1526b546295812e5f119162f3ef316ad950
GIT binary patch
literal 657
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>VDk2KaSW-L
z^Y)Hm{w)WQ10SESn!kuUZ2P(N%7m08SHZbIncnd9xNSP}LjQuL=&M<p$!sm@`C^fO
zOxH16?g*IU@{sTMs{i?3Z#eGlu1=3{t5yP900u3pr@7xg%HK8VX=`0YO;+#whaWw6
z_x<la%`Yst^3^ia1KZzyJy>MeUv~Rb(wxw{FYa!e@-#`VRPc8D*3gsHSFft8U0an`
z5^8?S{b}{Yr$-GRe6Chos35dc@p-?(VYv*py>l;fM(91e_^j@7RekaPmtT!TG)rSv
zdaVq<e)iP1^}9b@eYt$E#F331bF}O|r}8|CD7$^>_;pL;ndiP#nDn^t^`H5eA)&c6
zWvkwo{`dElCOZ42Mp|hrJ-<5RY3sh<mFnkz|1DHHb6%};Uy#?y6syagtNv+<6~8_I
zK0YvVm$r&NbJDiL^S}3Y%n5V3FYmZ*Ro)ia`up9_r|Rf``RQ%3MEv8=ZN^J<OFm2q
z5--nH6b-m=Pbx!x@`JbkVF83nub(sT-!|#U9X99gvmbm?_A;c>fVV%6Wxn$?@#EX{
za)Hiy7iL*uxnk~;<p<v0cNQw)OXHl)<`H}Rb7UFc!L>=3E499Gewf=lz0J4m@Zx}9
z%v(3^uKSr0UHR4efKFibY_pDJ&mhrj#hY7C9yXaPv~$kq^jKTQ)ujuMFHSU>d2Y+f
zIzi4w?sweZY<pVxVe*#^(nfoqhP{^CBYsBg?7FrKRw;X*+sya2EI+lS^o><tv}JyF
iC9jkjBis`Q{=e40^rIwUq4kgHAVE)8KbLh*2~7aHC@_Tp

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/equipped-CLOAK.png
index 2e7e5f09ac32476a8b106eddcdf3dbc57b52d3fc..989d0ec0a2c6281251f9fad336275a36d4e22871 100644
GIT binary patch
literal 603
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>U=sCoaSW-L
z^Y)Hm-XjN*V;`SuEWg2)y?ZTtU_j8tWghdn1KgrCqnlb>UUKKm<ycz!^b%`QR=L>i
zA5xQ>Y(#_}l^&6>dGdeqgoFui%#-^im46B|0<8c82a9E&kH~)hyR$WJzt8hd?NhH3
zCb~xMJXh|pt=406&H8gDr<+&Ax@<dIw{&m!7ljwvGY;-=ku1mxf3C+c@8y@PoB#ez
zf0Lcc_T^E;FJ|S-m5+erUW>eB^LvuXDrbwrr%W|I_U2aCrlQPg?{C%Y`nK<AxYdh=
zJo`FMoP9f2y1#AWiL#3y3hX=6x{v(*^;22s=DD=&+$Y8J<II<RDf;~UyGqsXeZ93m
zQ+g)OzHNP7ULtb+n{~1F_V#~!*K9S7{;}&E|EZlKsZamqnqBHnz9@NtEzFU9N#wg}
z{oa!OZ5KZkN?x(``Osr1|F0;4wcKewZ&@^ZqqhLe_egZYc~!emi960!^N(I@(KxYB
z#%mr|-~~_pQbs>T3)d4O=Q-y`zD|^#CAs9Ka;(4aMdP^ayxsQ}r#H08Ty2%iYzVG@
zVE^HS`P$8T&sTWPpKbMv;f&Zxy(cUD^!vUWRqV>zyQ$Y{*|EimCebAijz?a0eRZzw
zr4476>c{<6v%ma&qL+B`=9KgMsv=pJM!s{}vFFF8xSQ|h6tpw-?Q1?4)3opL18w=*
f=WaYO7cWTFcRr#n$oZv+1tjF@>gTe~DWM4fpoS4}

literal 334
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zIXqn)Ln`LH
zy=BPPWFXP@F#fUa3t5Fbr|uq{*f{sJg{76ioVyY`-C}hF7Yp6Kbm@m(XS3ALe@Qcc
zbplOFhzm8p_4N0Z&r4TH*S>DwuDHGKLO1`184pYL`4ss*_nz>^@Xhq|(-ZQVDp{ld
zNR>6@-@d`Day-ZWbN>E){=HZEPE47!=nPPE?3A4;UX^m%bLPI~Kf5S6ZqL?Ld20O*
zt8U8!Z2^OXYf}79Iq941WdD`;$T?4myk}~f)KO*hcddb7Q-9F0`{F8Q>%<LY8`tga
z>NxRnL;1dEG4nb)PL`bA{Epp*`=+4AshTq;=674SyC1mjP`vBgu6;pnFD9`p<pCLA
ZP{KaTd3F0ai9cN+uBWS?%Q~loCII=`k2L@Q

diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/icon.png
index debf4bf168a832ef5d6437577254ed104f3afc59..d937b1002f0037b954197349a534ebff44183752 100644
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}S3O-ELoyoQ
zUbW{sWFW%!A^fA<S=nFx^PHAkIB0G0^1?ww=WlloI%+(+wldk(reXHt>mAKowx}v>
zSs(H6cdkBvoL$Cb0Y;!fKyW}KC{uZ=ne%V^t9)tPKiAqHYf3)xx9she{^zG}{QCR#
zX2e?axe2b3lF|G3pF8+aDx{rf(TqtZ3v;&TS55zXQSnzz<DV&)6>o2PyZZ@P^2V0e
z`&Fizxkj39_uK#MNKr>_jN%D?+eu#1_FqnjCQYinQKvZD>PyH&^{aI|(*AZp+;PAm
YpQAc{kBOw%3XrQjUHx3vIVCg!07dS2d;kCd

literal 258
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dpunnLn2y}
z6C_v{Cy4Yk1sa4ncprcAUsrbW|H<0^8=u~|apcrvW}hP(R<)ljxc>jzoBn^}$;I8l
zyg%687E0_%zQ6JRjVBk6b~5%Xu{w0+&Ll+(of!)k?O@T{UijC@jg8HNV@>SVX$zMr
zP0uKf><H!9eB{cVPxeOj4q$7nzsWW)uPU+AY*^va!Fxhm!(he?N#iXgKL7HQ(#|NX
zU*Is!(#4%o&t2hi3F`?~eqZi|fd*V|2Q?&Ex3DpMc8=dOGuG-d&>sw*u6{1-oD!M<
DqRnQ|

diff --git a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/meta.json
index 0799f0bd2c..d2497148a0 100644
--- a/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/meta.json
+++ b/Resources/Textures/_CP14/Clothing/Cloak/Roles/General/maid_apron.rsi/meta.json
@@ -1,10 +1,10 @@
 {
     "version": 1,
     "license": "CC-BY-SA-4.0",
-    "copyright": "Created by TheShuEd",
+    "copyright": "Created by TheShuEd, modified by creamy",
     "size": {
-        "x": 32,
-        "y": 32
+        "x": 48,
+        "y": 48
     },
     "states": [
         {
@@ -13,6 +13,10 @@
         {
             "name": "equipped-CLOAK",
             "directions": 4
+        },
+        {
+            "name": "equipped-CLOAK-carcat",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/equipped-SHIRT.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/equipped-SHIRT.png
new file mode 100644
index 0000000000000000000000000000000000000000..53b50bab8bdc0da3e59df6655383335b8042ec15
GIT binary patch
literal 1601
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..23fbaf4da1a735f731b19fd6c94214d9756aaf47
GIT binary patch
literal 686
zcmV;f0#W^mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%Xh}ptR9J=Wma%KwKorJ*DV;P33EL%;V-Lod4527^FeMN}l1>^-hk7cRGUcBL
z89Ze3lqv1h(l#x4YFu!jg9l;LDHxMMvZhemScsri9gIXByYi{Dbn&;`o$lTDKD~SI
zNwC5SE3ELJu_j_vESCJqWQ^x|tgk=$?U}o~AHF0>sA>YkXbW*KH7XWMzM>?<_07$9
zBuSdH^E{8u&8OkoaYjNS9!G8Fa(Q1-lE`uj0Nd^%NfMst&DlzlgyW1zrwcRZZ*TjN
zA|eH-Y9e&*x<dfAww{G^)9jPY<^ho96t>;Nb%)4u3RzB}s-q}+03Jnc>Xm9pYMOl}
zlX2)wmQ!T2`EU*}nT#>bKCU~&wtMK6>QVtq@90ab?Qdi<Q$Yv20O4CZ&WIpCOtTL_
z<LVlKfo1W$Tw2O6l&Jys_jNyTq^b$h=>oRh3nP=w=4mz?u{a}h;30O(d(fKBgRrO5
z1r%i%?l+r_IF#`skjv%$#?>{iUcLZ8QIa^$G|}F?`-pz9%d)J0h*%K-xO{)fN$qUm
z^FM*G+FUO0*Uv8q5^@m+mc{YWVXP=bmSF%*(@@of5TU9j&@@fdznB2mz4!G>HS+BN
zHZmFXN)^|=_y4MZe+eN0LHGxjB{Yg&7sRN7Z>_K4d?S-#U|Dlx$LP-3i9q;&AZWQe
z<-MgMML)$L7y-RfrSa+QjFUwOnv!0rVi;`^YVj*Lshx3rbQt!1nBMiTYk>Os1s$U+
zN-N%oPHT04yEv`yMdcVIV8`h4`NQkAZdXi1tiF9(tNQ@kMQuhzkbpoe=PLmG1gyvS
Ue7PZFGynhq07*qoM6N<$f-|r~8vp<R

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/meta.json
new file mode 100644
index 0000000000..7b10adb18c
--- /dev/null
+++ b/Resources/Textures/_CP14/Clothing/Shirt/Roles/General/Dress/maid_dress.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "All right reserved",
+    "copyright": "Created by creamy",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-SHIRT",
+            "directions": 4
+        }
+    ]
+}