From d41bc627c9884fc5aa81646ae229045c53decb44 Mon Sep 17 00:00:00 2001 From: ItsDzordz Date: Mon, 20 Jan 2025 02:18:29 +0100 Subject: [PATCH 1/3] Added The Classical Maid Dress Added the Dress itself alocated it in auto drobe and jani drobe --- .../VendingMachines/Inventories/janidrobe.yml | 1 + .../VendingMachines/Inventories/theater.yml | 1 + .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 +++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1029 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1524 bytes .../Jumpskirt/ClassicalMaidDress.rsi/icon.png | Bin 0 -> 615 bytes .../ClassicalMaidDress.rsi/inhand-left.png | Bin 0 -> 807 bytes .../ClassicalMaidDress.rsi/inhand-right.png | Bin 0 -> 840 bytes .../ClassicalMaidDress.rsi/meta.json | 30 ++++++++++++++++++ 9 files changed, 43 insertions(+) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index 75de610b60e..86a3096d9b4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -11,6 +11,7 @@ ClothingOuterWinterJani: 2 ClothingNeckScarfStripedPurple: 3 ClothingShoesBootsWinterJani: 2 #Delta V: Add departmental winter boots + ClothingUniformClassicalMaidDress: 2 # Floofstation: a Tider was here and bestowed upon us frills ClothingUniformJumpskirtJanimaid: 2 # Delta V: the maiden outfits no longer require emagging. ClothingUniformJumpskirtJanimaidmini: 1 ClothingHandsJanitorWarmers: 1 # Floofstation diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 6bf690738c4..f975eb17576 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -94,6 +94,7 @@ ClothingUniformJumpskirtPerformer: 2 ClothingShoesBootsPerformer: 2 ClothingNeckCloakMoth: 2 + ClothingUniformClassicalMaidDress: 2 # Floofstation: a Tider was here and bestowed upon us frills ClothingUniformJumpskirtJanimaid: 2 ClothingNeckCloakVoid: 2 ClothingHeadBandRed: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 18266dc4988..82e6c9c81e0 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -839,3 +839,14 @@ sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformClassicalMaidDress + name: Classical Maid Dress + description: A modernised version of the victorian-era maid dress. Streamlined but frilly perfect for a hard working maid. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..3c6722b53f4979b337f3e5682ef532082ca79c15 GIT binary patch literal 1029 zcmV+g1p51lP)Px&zez+vRCr$PTEA6EabCWBz4y$k9=Tf*lKbv?-sgSpF64b@ z)Rd2zDUV-80ipw@T!FX+rrZGW5R6-ZvjsYx&QHv*)oLTc<$cG&$eY{m_cea0R2sq0 z`z~)ymIDyvU@*|@&Ck!L&$e1EO{`cfW{NXO0lMApSo~_Wnkmji1UR}-*FiQvyigF~ z%IcPSvUxpyMey|#=QY-sy(UXo7lE?y={fN5#dju31OWQ>^`;KIQkhdp($+$pKD(O6 zAt?ZX5C=^g~o1k+i7hV0c?B-P%f7h4m})-y z(pPLxAN(i)CmW>xgS*Qk4!C*yr9LEmvf#=A_}J&Te(izl80Qlg-`N3l6~TUa0)QBo zgo^-#PY0bT0)nRlnv2gCfUcUgTc^@fc;o)N^oryXa0woB%-;g$X>Z<6^q!LdX8~*y zU4y52SwD#EHMsaJ0l0)im>&fQAxn}RqXQ(>4Pou*fDp1I$uT-WQr!^Njt&SR zOOhO;10>ZAVeROE5V9o6F*-m}-4ND}4hSJjk{rDpK+O;!menjFN!VWdPr0xKpvn+6 zN}w#x{UdTx0)Yz(wHVYNz~$m40003DP_tRW>>8O=kXh@XBZV3?hy(Q}hzgMPw=|W? zLG*7FM}cD&XwAk95{n}O%K=mx1CZS-fX{qNQ(UJ|c?{2)-67N$z%9?Q1hDJ$W|sy9 zBJBc`1NA6Tr-}~;mH>9Ps5Q;}JgbF`o8`Rulg9KC05(LI$jPM}zcosMxb#6tEqP{> z*881@3LPq(y-y;u1+at1LUy%S$^~Zj(UgIbygqx9w(=E$C4gC?Hp|ohS^yG(y2Ut7 zU<;7dpzuEkV2U6vfPF}ronyXx(dD3|?T5K`R~kLfy^2{50Ek45-X(Y`Y_Px)tVu*cRCr$PnmuR~K@`WwE=33-5FrT!Q-x?CU}0JdK?^GzQB+V6KOicm2}mpq zLYjyg@B<-&ieh7Bp1%n!DS(o%i1F zea!5=*<+e~>}hiQO$DHefF>tUr9hJhKve{*6ws!?=H}+k($bO{8X8K4Ha9o7)7RH$ z+S=Mm2MhTN3kzm=csO1xfV>wDV06aF4=U(WfB-0n0P-jh0|3A6+}mSe zO9(I?I<5Ws`Nwn`2V??}#>*&3iva2U7%!wj@W}^&ef##Cnh)gOba4&Gxm;2t1Gew1Rk8Bb09cU$prfP1w6?Y; zFt@h0%=-FzQUhX@2zeggQ$7G7z2J530P%`6Wu1zVuL2;2Pfd=b0vH{e&ZR^MfRt~G zY-djr{!9Y^u=Q$pFQA2x3qaZ`P!9m~J_;bV;Q)XoIByiF0dQ$S1Y`lA7qlJ-d7t4= z`Sd=n69C`KDA39e0&v40!qNcXyRxIe&3(v_4`J@-*jk_hz``>&dcx*EhFb)24TW%W z>RnQhv|h-H0`3Nx`=N-5je_7-*b3g=*&+M@0fQiDI9_Rdo?_%P%vb#6?_ex9T)ZAz z3{?PJ2>478G~62PRAO8!5(V;MNIHRr`(7n{jeJ!KkgnWgr-h!fudn^s*Vj0H!AcW-dd#!vG0IkqQ{9Og05xrKX&Q%1INwX2>sv@8fy;i2qRRokt zvk~X2BA^kyR;JET5x_Pz6)3X>Uc{&(dZ_`pJ$m-x(T!o(xWB(&Jzo)n7Z(?8!v?)b z_9^hcAVy8j2Vi0Vko`Xz?RIHv4FSfxG6@5(>|JW3Gs8y&L!}a zh})IcJ_-Yv8bI2A0x+5$fkO2FAm#a5@|u5wn1ZDN_*W57Hvs%+h<}Uu+U4jR4-O8h zq2?)s^YimN{9E4Fl8@~V29?DDB`AvHY4R`X{~dtTI}5ZL09w-WY!Dj|Scc@8fqFy$ z4MHSf8D`%C*LhwE?Q%MQV>*ZjL=0P%Go}=n^s>-v?KLyy4m?_cc9$ a-vRq1eNV3a9RL6T07*qoM6N<$f&c(TaHZ)0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..992ee7c43c54afb3ee5bf62db46f60b8f36c4875 GIT binary patch literal 615 zcmV-t0+{`YP)Px%AxT6*R9Hvtl|4v;Q51$xn}di51`-IaH3$v5HUuqAEm2fZ5JAunxd>515x5xr zKoCJeMbXma5;U~x5IEE-2qGwmh=ZH)UN|3@FYb3wRz%=gKD~eMbKiT;y#w^eG4RLw z)CcH0(0AbfIM8afx}{Qy;_ziBW3dah4^C`NzI3Su^Poh|jyGv_<4FD9Nl!cd&1RF5$)sp) z>!8uZq}n|KyGE?14k;WSqW8A~4UZ(KUa!zec1!ia4UX4B&bq#JfDXVmGXM)Q03Xkf z0qEko3nmBj-Af@n9RNUhaER))ieoD$pZgW%WaM_9XFCQ@fQiW!=lmJs`Z7b&X!O%7 zUM`nuVJWTJAX_ zsTe6lPXMMW_*DQdEjZu>psJ=;5htV70k{1SFaeXIyI%vAK^|yv>_2Q z*++G6NL{dA#rn<05NKl%7RHyw`55rEC8G$y4T1k~g9E~RW9s7H2EYRPi>Tl6rt46D zxNN(}8rB?eLm2O2SBFGg3?LQlWt_-?UKWPx%;7LS5RCr$PnlXqIK@^7HbtytRg>Y4>fEEFZt1S+$31}yXO$txA#%nx;!xNPQ z5d>`xJc|^HVrP*?u&}=3AcY61Qb|C&kRsj6zwnmHx|`kEnU#CYnTc&0A=-x7LWU005Aju2mm}z-tN=h!#8yC^UMkW>+$nd^=b#O z(|-{C`TZ-I=ktfxF#s$WuD}9N7kFH`x=G(g?{cB1^;iQCvtSnK{TBe3gdvQ+o>H^f zOy*rI7SzAJ8($+>j3NN09sppNPGC2c(W@OmI)C#3tjqhnAi3IS-M2YWiXb@E08^X; z#;)^VH&h82dN^4yQ1#9CRrK;ecmse6?$ZI#8@@k|PnLGOO|#i7IRUCTs#X997CAXQ zefm!g80;Ysq!HNr-3T^e|CKwSW^cnk)>?`?tB3V{E3VFzF` z&VAGab^tyvvumav?>;Ypuldv|qgQ(oH0_EMU;tbU0l>z#S@ur@u+gg>K+y!3{l1qP zaM>4GYYmXRc*L#_kiLVi@v8$|2}*xn9Uy%NUE@~=xDu59ygESo4!Xv#4sazX{dskO z^c{4KU!((kcB91s@ZF6T1;BSVTHF^R3;=PCwN5VQk)He*FPAZP%-yV2qt;JX_w5&%vE{*@TFPQ2RKWz5oCK07*qoM6N<$f&j`0Yg+&S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9f54140f4c562915231d11a0fb32cf6e420408bf GIT binary patch literal 840 zcmV-O1GoH%P)Px&07*naRCr$PnlXqIK@^7Px)dRuLa<5|&>~=QX)O+H0@?{;lfo0O@ft-qjzi@@ z1VNhv&*BO}v9m}cSXf_ikU}9I{0ncH-OOxehvar==1r6AW_R+x@BMFP z$;*}qd~5|CzhD6DfWQfG2?TBcUIe)WxC8dlk#flG?Oycj=a-mS_OmiUlHNNz55>j#Af;Is3+Y`d0Sat46U&}y&xJa5O+0-ymGR_USm@xth(Um`o6m7VKXNKu%YJD zJ?sFVvS||wJHUpTPxr6`e9ERxEbIUqYChe=4)7_PHnFe+Y^eEk4?Do8Y}&+P>;Ts~ z#-=cg0JzpMHVq!vtpt$m!0KA&Rp}TP3BC{jT#ViuI>yw4N6Xx#16x$oRbIc+0j_n7 zi^4MkKtC(vwdx(?wF8hRbgf@#0%N5E1&m SuK)l507*qoM6N<$f&c)xa&NK# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/meta.json new file mode 100644 index 00000000000..397aa94f25d --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Dzordz#8811", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From b2c8b734d2ff25c3385ca2723abf735fb6c59129 Mon Sep 17 00:00:00 2001 From: ItsDzordz Date: Mon, 20 Jan 2025 18:00:28 +0100 Subject: [PATCH 2/3] Moved The textures as requested new Directory: Resources\Textures\Floof\Clothing\Uniforms --- .../Entities/Clothing/Uniforms/jumpskirts.yml | 4 ++-- .../equipped-INNERCLOTHING-monkey.png | Bin .../equipped-INNERCLOTHING.png | Bin .../Uniforms}/ClassicalMaidDress.rsi/icon.png | Bin .../ClassicalMaidDress.rsi/inhand-left.png | Bin .../ClassicalMaidDress.rsi/inhand-right.png | Bin .../Uniforms}/ClassicalMaidDress.rsi/meta.json | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename Resources/Textures/{Clothing/Uniforms/Jumpskirt => Floof/Clothing/Uniforms}/ClassicalMaidDress.rsi/equipped-INNERCLOTHING-monkey.png (100%) rename Resources/Textures/{Clothing/Uniforms/Jumpskirt => Floof/Clothing/Uniforms}/ClassicalMaidDress.rsi/equipped-INNERCLOTHING.png (100%) rename Resources/Textures/{Clothing/Uniforms/Jumpskirt => Floof/Clothing/Uniforms}/ClassicalMaidDress.rsi/icon.png (100%) rename Resources/Textures/{Clothing/Uniforms/Jumpskirt => Floof/Clothing/Uniforms}/ClassicalMaidDress.rsi/inhand-left.png (100%) rename Resources/Textures/{Clothing/Uniforms/Jumpskirt => Floof/Clothing/Uniforms}/ClassicalMaidDress.rsi/inhand-right.png (100%) rename Resources/Textures/{Clothing/Uniforms/Jumpskirt => Floof/Clothing/Uniforms}/ClassicalMaidDress.rsi/meta.json (100%) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 82e6c9c81e0..aa778234507 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -847,6 +847,6 @@ description: A modernised version of the victorian-era maid dress. Streamlined but frilly perfect for a hard working maid. components: - type: Sprite - sprite: Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi + sprite: Floof/Clothing/Uniforms/ClassicalMaidDress.rsi - type: Clothing - sprite: Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi + sprite: Floof/Clothing/Uniforms/ClassicalMaidDress.rsi diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/icon.png b/Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/icon.png rename to Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/icon.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/inhand-left.png rename to Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/inhand-right.png rename to Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/meta.json b/Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Uniforms/Jumpskirt/ClassicalMaidDress.rsi/meta.json rename to Resources/Textures/Floof/Clothing/Uniforms/ClassicalMaidDress.rsi/meta.json From d4bf0ec7de1efc50041e536c0415cb5d6372a97e Mon Sep 17 00:00:00 2001 From: ItsDzordz Date: Mon, 20 Jan 2025 22:17:47 +0100 Subject: [PATCH 3/3] Moved Directories as requested Found it --- .../Entities/Clothing/Uniforms/jumpskirts.yml | 10 ---------- .../Floof/Entities/Clothing/Uniforms/misc.yml | 12 ++++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index aa778234507..370d9ab80ef 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -840,13 +840,3 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformClassicalMaidDress - name: Classical Maid Dress - description: A modernised version of the victorian-era maid dress. Streamlined but frilly perfect for a hard working maid. - components: - - type: Sprite - sprite: Floof/Clothing/Uniforms/ClassicalMaidDress.rsi - - type: Clothing - sprite: Floof/Clothing/Uniforms/ClassicalMaidDress.rsi diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml index 1ec08bb7508..e2c081cdece 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml @@ -206,3 +206,15 @@ sprite: Floof/Clothing/Uniforms/musiciankingblack.rsi - type: Clothing sprite: Floof/Clothing/Uniforms/musiciankingblack.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformClassicalMaidDress + name: Classical Maid Dress + description: A modernised version of the victorian-era maid dress. Streamlined but frilly perfect for a hard working maid. + components: + - type: Sprite + sprite: Floof/Clothing/Uniforms/ClassicalMaidDress.rsi + - type: Clothing + sprite: Floof/Clothing/Uniforms/ClassicalMaidDress.rsi +