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!ia0y~yU~m9o4mJh`hE z*sOCU-q{AVd@*=$%g5%r$y~vm$)S&>L57pTQi!2Qh2e<@!-bCgzqw+%-uv3iKl`)#ZFctLx$2=AV)_2P zSIpe)mz)p2TALgz+{m)}ihLc5f2&q;ps2t+)PH6n{Xs>cmXO)F&|ov3B8JPtq3KF1d1|mUYk4 z=j-zqRLqH)KL3ueKyu#xhLt;wP1}!%#Wg>vXP#sFbKArK=e`*#obS%Mf9m^n;^C?O z2dTdMDh!VA<-KkCbJ415!?`U-o=l%D|3+Nn)?xm%Z`?Y{@dpl>R;HKjS+eB&yqZ^a djVyJHJ2OtJIy$WkV_;xl@O1TaS?83{1OR}T-1h(g 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!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9F5M?jcysy3fA z0|UbmPZ!6KiaBpDJMuLv2(Vtre6;C%#`m1rMe6*I=4S0mjrY48H22^{2iM7MXXp18 zHvH6gw9blQfC2~82Y;1Y0f4QP&2p|Dq-;?`s!^&oZnlHd&k44ofy`glX=O&!0^)3 z#WAE}&f8m#Tulxl$3E)6kZRn0>%7?~Ke;8=qPoTT)(5q>Y>FVdQ&MBb@09)^VjsO4v 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!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&!0^`7 z#WAE}&f8nId`$)t$3C{VWY5^}@?6#vKba%eo-(P&dt0=3JYLYjmHAU+;<5kviki8f zFYqr5XJP<>AI6O@Q)4x@`E3Y(r`H$l{HdMUN}lKO=8X%d8JX7qFx|1eIP#@LuGQI> zGa9^SO}4L*zjJ-#nkC`4zx~{E&gadAJAclKX0XpsdO64Y_whY}Ixp3>vgb?ROoKQE)@o8CWh{}~bD2fjbzlzzN)gN0XmNMFv*_~YK@~UP<`fff31_jUZmj{zQR#ZH;1)1XM>gTe~DWM4f DAM=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 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z*6Gr z;uumf=j|;2jN4%{$M?q`Q%jTBXQ2>urY!Q=5rKjZ9?j;7fw!8y`<6DZyPKiF!?SSV z1Gz`eJlPQ$o`x+4syJJ>T7D6@=Is4KqKEa(ghLMB7R98wG%Zj%W^Bk&RAJqsu5z>U z>%3gkrSF-YUf8~_t$+XhU(|bc4i=_H2L%BRmRwB{E|rB#I+kS~nYk`g%2Pu#NJHd= z=lgk~fB7Si>^=XmKw@ju+Lz@gQ$ES8R@C{$|4BavMC|xlYpJks2?vA6q!#u5_m6LV zjpX6g_VAB)s(Y$>YN^sZn|=JJHzh=h33+wx(X)F$OE~JK^-Zn3g4f&s20D38T$sqp zP>`M`G)aY#A#1DDCvE+S^Y*nASnx1x(Bba(e$CKOw6Y`5LUG}e6Elhg89qF|a(#lz z$*Yg1+5X5DG- z+`nE+c^KBMyPxqVJziv1{K_eY%VNGPeZQK0M*g?A@1{gYG_QNTt|s>S#OMfShCOeh*%gKj+u9)Pn{*I`(rI8FcLDG$u-H(CPNxzm_@UwXyWspYz0T{n}gg{z_;= zxzOutTo+c&Il8p;&dixxsu^=@t?W0xGL~GmN{g`}!{pW!_jXqsx%a>18Wv?rEfijt zC@~@R=Dy2Y4jyz=tG&OPfuZKR^RmT%{C1YrikUAjGT>p}*=lui3>yp(@Y@$&QH`uu;>VqfmQ>Au6fzB~H< z_j*SCICU1+#ewNw`RtzsW}JNzxHc>{^Jp`qamoYprh z&#~BQ;=B26XTOiZ?E_x~743{1^=eEx89e;!n=?$f4ja6A{7U+MUt&$op5^jtX6EK6 zU#*X3=<7d{8rin)^@;U+m>B+ieQtGSfBpNs1{dv5+Us-F@A$>DG04csd=NX%a`kiA zJa#?y8PDX(%C{xXs-7`_ccT2%%EPHuj`8vHYekm5w%W8a^v%1R$KCqwf}L~H_4!c1dZ*9DFgzK`*hl|JO zKe%~$eynlM$`G!cpV>#t9-2?LU3^k|?`HSQCQclUpI2Rf-4b_?;aJ?w2Uot_I-JFP zSsESIzI#8L+5dZbnZuHLhQ%kfTe|kHO)gq)wsrZ{ znTggr%$z3vV{CDnZzd@u61VrfT|cY1yhEnRs}s+{W+$;WEs0vIG&}n3i;6vqdjl2+ zmLKI}X*JecIQbN_%<;$PB4pJakFW>SK6oP0_+82F!I~Qi0vz{h|FH`>t`>cB;C&|p P0|SGntDnm{r-UW|qTw!) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/janimaid.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4c978dd8a1f8d80c40c0a9932aebcbfb9dc17fc4 GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9F5M?jcysy3fA z0|Vn4PZ!6KiaBqmZuE8v6gg(U@ZdvU{(}xo;Tz{jeeuuWWD?I@u~3s;al!*#KRtdY z4wu>g*JNy|`&$3Lo z`~CM`2BsM$v(Kg-J@F{fqwC|U-3zub|NSmEqr;)}H)Gh=juI=`AG`1By*ajc#_1g? zMc%4kYZz|sT^F){Hs^w>$mSZ7dvMXwFt!a|t_<=GLi;zaRQ3VIEQ6=3 KpUXO@geCyq;M(B; 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 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z@+Ty z;uumf=k3jn*|!}eSU)_!@X$@4Q-<+9lfT>_{S?Czp4Md-d?LA81wKqtjpSM=aAML* z@3tV5nbREpwHT{Rp8O#6fhyBu$L8&)RkjxCSbnRWTKu7IvgK|6O(p*f>KFuJVC^A^ zN4@PcJr=Q4q%N-3{rxY&V-mM_*Bxo!>#VVK z6aVJEJ+4{n80GEfM=)6Y`X%S3>7ynb6Lasu>4SW)zFIB2tao+PLIJMyLaS8kRe4~l!bB2 zHI62Q?Q+MJ-@Kh4wctnJ+F8#JRk9!PU;O6d%kA+ypD)rlwO8+NLFhBxPv@SVE&pqO zbFGfF*Y;=SZ{Nr6U!(KhbWVFhmVrbBLxzde&aWC>7jn#|+x3;i2~JexV3_}HxA)rc zx#2EPn6})K-Mw?`-y~a4p`5(j>3Pq!KAo~S+fX@4rSfv+W|un7W&QlS#dkhG_W0wS z>!CBZcib@W^v@`JeawIHos#(QIKhnzuDqFBXdC&`MhOb?J+~fDs_zbW-DUgj-TS4f zw;#Kn-B@nTFd?`9Xm#WNm#NizW^X+f^}7CA@!P_eVjuF@J+>c@d)sjJ*5jgkya%U* zRKK|!uAq8VuDX&@<#zJ=v;#Kl-fk?ncGzY6t&GEK>+ySW4I;Ob-OtasIX5>#bX^7m P0|SGntDnm{r-UW|J3$>p 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 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z@*{n z;uumf=j~0y?As0!$3E`&X6ua;5@3AK9huLq@28> z>a01-$9sYNL!P%!R4PO(IuBHQc<|OL(qmJ~{ga+gwcqDY^5693g~eWuy$US?P8^C5 zf+4``rQi1DhYhYUBuc#cSg~em(5`nmuB)EaPLqF8QXQqa)b{-2+h4`m%)e_a{qo@1 zyl{8*ih0vx-mJ_!c5GXv^v}lY`SzI&{qk`SD&;oc>^Z$Ueoy`PIcb|uCT)E1CyC*} z*Xx(r92RdZnpJ4t!em?I4Ng-?Z0_9#a#oR?Ra|h^_JXw zd%yJCAD(}bdDFTRf5Ys9&R?3E`s8@9ZhlziSE*h%sRdWFQjaaxSadh1-tsi?h=(be+skh8l#x_vU<-fcerSyUV}Oa+|YSX{R{ zrsieey?p02!)=LQcAnVUw~=?TD8swb9^c$K4A-rWZR-hZ$d*l(mbP|YSK5;s8L9=+ z($lT5mdKI;Vst00`YBPyhe` 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 + } + ] +}