From cf67baee7d4dbff1d99f1f730b7415fd28c6e848 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Mon, 23 May 2022 05:19:23 -0600 Subject: [PATCH] Maid outfit for janidrobe (#8071) Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../VendingMachines/Inventories/janidrobe.yml | 2 ++ .../VendingMachines/Inventories/theater.yml | 2 ++ .../Entities/Clothing/Shoes/specific.yml | 20 +++++++++++++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 12 ++++++++ .../Specific/bling.rsi/equipped-FEET.png | Bin 0 -> 520 bytes .../Shoes/Specific/bling.rsi/icon.png | Bin 0 -> 274 bytes .../Shoes/Specific/bling.rsi/inhand-left.png | Bin 0 -> 303 bytes .../Shoes/Specific/bling.rsi/inhand-right.png | Bin 0 -> 307 bytes .../Shoes/Specific/bling.rsi/meta.json | 27 ++++++++++++++++++ .../janimaid.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1210 bytes .../Uniforms/Jumpskirt/janimaid.rsi/icon.png | Bin 0 -> 506 bytes .../Jumpskirt/janimaid.rsi/inhand-left.png | Bin 0 -> 617 bytes .../Jumpskirt/janimaid.rsi/inhand-right.png | Bin 0 -> 622 bytes .../Uniforms/Jumpskirt/janimaid.rsi/meta.json | 26 +++++++++++++++++ 14 files changed, 89 insertions(+) create mode 100644 Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Clothing/Shoes/Specific/bling.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Shoes/Specific/bling.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Shoes/Specific/bling.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml index e523b6e430..85fac386af 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml @@ -15,3 +15,5 @@ ClothingBeltJanitor: 2 ClothingHeadsetService: 2 ClothingOuterWinterJani: 2 + emaggedInventory: + ClothingUniformJumpskirtJanimaid: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 3be0c226fc..4cb7dd5f44 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -26,3 +26,5 @@ Gohei: 2 ClothingHeadPaperSack: 2 ClothingHeadPaperSackSmile: 2 + emaggedInventory: + ClothingShoesBling: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index dd1bd0b44b..147bd3dc02 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -23,6 +23,26 @@ footstepSoundCollection: collection: footstep_clown +- type: entity + parent: ClothingShoesBase + id: ClothingShoesBling + name: bling clown shoes + description: Made of refined bananium and shined with the pulp of a fresh banana peel. These make a flashy statement. + components: + - type: Sprite + sprite: Clothing/Shoes/Specific/bling.rsi + - type: Clothing + sprite: Clothing/Shoes/Specific/bling.rsi + - type: FootstepModifier + footstepSoundCollection: + collection: footstep_clown + - type: PointLight + netsync: false + enabled: true + radius: 3 + energy: 2 + color: "#FFD800" + - type: entity parent: ClothingShoesBase id: ClothingShoesCult diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 0dd42c7342..11a3843ab6 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -541,3 +541,15 @@ sprite: Clothing/Uniforms/Jumpskirt/atmosf.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/atmosf.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtJanimaid + name: janitorial maid uniform + description: For professionals, not the posers. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi + diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..c715df8fa049c40421a1c73a2372815816437b68 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnO zPZ!6KiaBp*ZOm&n5OK|4+7tVWaq5j*wzAqkme+aw^6lKUY5Llr`i0e59iBM`Y}UCF z?`(rwz8Ji>u}qXVp)Si5kqCuxgqms~kf%erUj^Y!@) zD(1vYpMOVKAUSV;!^)k;rtL?>;+mh-GtV*oxou*AbKeXV&Ua_sKlS}O@$gjtgH+#r z6$Z!m^4>Q6xoB0j;oO!ZPo~e7eo9-XH*Ou}_ydPbE7QyNELrk>Ud^kzMwU9p Yof)T99i3K&0i%||)78&qol`;+0Dzd>_W%F@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..05a48d15a67f33198e06456696f070ed56d31b14 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0sxv z#WAE}&fCk5e9a01tQRsLZTg<^J!f{2I{%}&S-Vo>{VoU1Jvh<9b#mL;`Mre=KlL50 zvtoc6!N9@v!C$4|-QP=8%Q-d(7Oj_+dM2WM)U|=@zo?1I``U%!vkdEsO%`dlOmEh^ z^D(RRuC!T#cFVpd)jxtZ=Qq?PPk)&Bv8gCLC#~bLaPWp!SySu9MoD+diwY{rPX!^x?_b;kNl~KK6%!xAV6~UKk?fW9xd!l^A}DHU;S&T51T>8z1ul=U(9*yww`KZ~p1^?LauF8rB_?b5pD>i(RJzexwDCq$pT z+WT&vuGR8@@;2vJ&iamE3qiyh*DEy+K4CW*Hv=id&CDnH70SvKUNZhsww~~X!730W r^5FIP=S!z}FK(4mb7NpQP_>8Q^o%5vi_22agG}&r^>bP0l+XkKTkn33 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a4587cd38e7a18d5c09a6f882cf943a95ad84ed1 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|-g>$?hE&XX zd&`!u$w1=R$M%-&85>@n%X;D`bHv(HCiQr4i}sGk3p%(me`-uT_CH@yGxzfa{$=4z zK)nnMKa3k+rp9V)^V<;oPOmT8`BOWyl|0Ym%^Md^Gcv9JVY*{`apX&hT&uG$XEb=v znrvSqf9LwfHA}*8fBU)ToX?vJcmA9e&0wFO^m2~(@8f#{bzZ7%WzU%!URU&Qfu6|p zsd~2VN7SZH`TI-V!hHX47qFEe;((SUw~9}V{=AHqZ+id4{bxjoANc-=Q~EK}k2o8{ zBNMbARDW!lSjuQuW_NO_%d46d>AU$D7!*9qUmi^MSW)rV7G#L0tDnm{r-UW|AM=1k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json new file mode 100644 index 0000000000..56e6395348 --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json @@ -0,0 +1,27 @@ + +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..fa7398710a243e43c14809c2ba9826270891a4ed GIT binary patch literal 1210 zcmV;r1V#IaP)Px(bV)=(RCt{2nonrkRvgE_UB)J67``|lQp|Q)=EM+ihzu!%kx|-%OOB<3uH9%L z3=E;6;2z>b3~N|uNil@LdI^QKIrI?LLrdrwj0NnF!a(+-TxLXqpd!XIF$i*aJA@}B z*@^X@Z8fFu148IM>wSOk_x@V%2M7cLfj}S-2n1~@6bdAvq==?z#F?&X8c8TAQYaM2 zN$;Lj{SR5hz0cur7`0lh>37Lw@*JxnEcy@fFI@T$@-MjceK{bZqzC{=l7uIZ@8jC_ zSqu#;NKaove&r>~r6Qg@z7NZ?U|ALtN{YNLKJS_nTIoC4DsFJ=xBXEX8uBYIk)FPUa5xMAuq+FUOX~oDa;b=JI3b~=$e3~w0Py3~*N`O1)#8-f z>C3Pz3(LR!0pQpve)K=^Ye>0Nv@0jeG5}yMbJg{{xU`OPspz*zCbo(jw(}Q%`regC zpCw7cR&j%=+*2JuTi-PI0l-zcSS$uvmJy4^>@=Ehn)?_UR_w0J3vK;Mr3?VBuHR_< zXI~VWU#XNard;%;@2dxxZ}#o(lv`MXuIsLRUDuIYSOWmOE( z3@ksK0RSvNoPl8&uq=y9zpVpk>oXh8`JNZr`n`JZ)K!3Y66@9q(5jrprFGnynY4QW zZGAdFvFbA!s;VjhfM_(@lt+g}JRa}*9)O~08le-eVHl8Q*}l`X!NEZ$ec!790DSjD zrlb5$xpsXPH>Ywi3>KQD;hT2lEh^&E!$7R$Xb; zY8A7YJeL7Hc)NTcL%<1j0=&UOX0s#E==Q`BC zfA4O9L@V+uuWTpWPG1H992^|*7RLnD^H!b*E(e(A9(H%OVVZlGpSxinm3hNudO=@b zpM4aj>pHTzRqXC;y}2JBfGlXsnxXIbe5Z z8vs!G_n)pB!vnQ}+QbUe9PrV{pWxZkpItL-sZ*$uP6t8>U^l-nipS$|(LKA}-pQkKx`*cVGu~c1!af`h#gFkXot6^BTmU9xF%~*M zI}kP&W9PIH!Zb@kJZ+30O9?{x2-xMtB~Y_UNTpH&fOC#qyRJL-KZ&?c042=?klpwD zy#NB3beqj)#mM4eNQ&{QyP&iK{r4W2h(LAw0amq$bUGdQyWKAA#-o_axMXrmCG~s& z*}bk*zncl5dXty=PU|7My|Kj@-hR2}u>eKnaxI;ddH}~KRsivnUsvn%Um$Mw=HzDk zz7NAN0w32D{W`Cp7QnP*(PgC#P_>$9*cBuaiNNN0p0NK3Ko}ytUR25e@`dA^XFXk% wuceIp6@YMZ3G$s!R|_4%qQzDQuu4S$AAl0Sv8f|WAOHXW07*qoM6N<$g5KcT;Q#;t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a35a5e9d2b1fbae70d58f39e6a68710c5c75fb08 GIT binary patch literal 617 zcmV-v0+#)WP)Px%BS}O-RCt{2*|BTeKo|w^=g{FsF9{q0?*dOA{4ZoNbPR>2&`enhg%I$PC0Pog z5Xh3LONLT3nU+BQgfk?Qli*e0B?99?gSX2hwQ?*u_I;Ie@P3my+fTA|{xE(35fKp) z5fKp)5v{@)V_WTx4a3j^Kp2L0I2>AIjC~7vMK)XmTJ4TC##p5keqMb?@A?tO7~8vk z#D~2@D5bIwvyQw)YOVnvKc83tIQse?N-0bx6I@*0;LE`d>h(IN(<#o*djNo|AII78 zYPI=?UL~(6>ouHr002DP_p_4%faC5i06=Svv-2Jv?)z)aE8}zlTJ4UF;}HO4Clv$% zwAKiMAh#aJBkb*;TA=ujt(xb;c?ZN#qwMkNw_myEqA1F}F8y#-<}LEh<;{2fKiRD; z8%nq4ckS<8zpO0pHJpcFYA_gB0BAHCx%DWD&}=rBK8|!=5s@JX0H5}|ORZO(S489j zwAvlJxwZXbJxLO5Zf%!t=PL5bIL&~0k|cT4d9y@*38s$^yBE3V#^dqa*HxLfh}bYm zPiS`Q#!sW%bYE9q5wW1u?45BvS?N3?A|fIpA|fJhNwvpfe~VW|x;^&p@1p literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1c3b595e908d50645cd9e148c1619a6837b90e9d GIT binary patch literal 622 zcmV-!0+IcRP)Px%C`m*?RCt{2*)eO|Kp4jHze@&hXB2l~TIyY(=W(eU=~SbbDGUr9IE%+w~U)H}@!| z^x)>6S4Ss!o|jzgscy!`ws{-*f!A+8X@HL(Uf_8iv)PQxt6#i-_nc<4$zrkK{9*vW z_1Dt|K%=p8nt#SNZ$9hF3IMpf9VUMQIPJd#!1sO5F9zJ*4xi?3D%vJ*W&%3ho{r;5 za#DaG2=INMAP6$!aXjJZ_^j5);4$*9tbq7ol5C%S{+`(vMN#Is<;Cl?ZQi}~k3Yko z$pf;k$o*D7QqR(rW#q?GEpJw7^%{*v8lcr`WyYf@qTO!SSM^F%&0AOm0p1+65s`HgDmZ;BxzshSKZ~ci)-kqW z^ts5jjxz;f@Q7N=^VE-e30SZH%iz^7c761SM07*qo IM6N<$f(YFuPyhe` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json new file mode 100644 index 0000000000..4322840a3f --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from tg at commit https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}