From 57c6e503d1fb571db0f79c7e9c65edd1acdd7153 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sat, 16 Dec 2023 14:20:39 +1100 Subject: [PATCH] Crayon boxes get white crayons (#22553) --- .../Entities/Objects/Fun/crayons.yml | 7 ++++++- .../Objects/Fun/crayons.rsi/black_box.png | Bin 113 -> 1082 bytes .../Objects/Fun/crayons.rsi/blue_box.png | Bin 118 -> 1092 bytes .../Textures/Objects/Fun/crayons.rsi/box.png | Bin 299 -> 1280 bytes .../Objects/Fun/crayons.rsi/green_box.png | Bin 122 -> 1090 bytes .../Textures/Objects/Fun/crayons.rsi/meta.json | 5 ++++- .../Objects/Fun/crayons.rsi/orange_box.png | Bin 123 -> 1095 bytes .../Objects/Fun/crayons.rsi/purple_box.png | Bin 119 -> 1089 bytes .../Objects/Fun/crayons.rsi/red_box.png | Bin 113 -> 1080 bytes .../Objects/Fun/crayons.rsi/white_box.png | Bin 0 -> 1088 bytes .../Objects/Fun/crayons.rsi/yellow_box.png | Bin 122 -> 1089 bytes 11 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/crayons.rsi/white_box.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml index e693f9b7c4..cb755b161a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml @@ -236,7 +236,7 @@ state: box - type: Storage grid: - - 0,0,6,0 + - 0,0,7,0 maxItemSize: Tiny - type: Item sprite: Objects/Fun/crayons.rsi @@ -251,6 +251,7 @@ - id: CrayonBlue - id: CrayonPurple - id: CrayonBlack + - id: CrayonWhite - type: ItemMapper mapLayers: black_box: @@ -281,4 +282,8 @@ whitelist: tags: - CrayonYellow + white_box: + whitelist: + tags: + - CrayonWhite - type: Appearance diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/black_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/black_box.png index aa9cc97a01768cf33820814b7e12349fb98b4d79..c4b4d9cfdc412ff8ab1bba491f3b8e02ad7821fa 100644 GIT binary patch literal 1082 zcmZ`&&ui0A98Yc0ty<|#5WyG~L`hznm9d62thKcZ*imYQ?zE-JYZsO#F?l6%7dP>s z=Uv2$M?r9)2M^*!)T@Ypfj8N~n}=-|eJ`nPTDk}C*Y|xt-yfgv`#x)|)-vgfX^NsU z%1Wh)cbd$((|Gl^xBuWR;WcYzYX94%1AI9T+e)`yr*7i&9G+zSxVMMbd1qzKqo^A% z$V^-iue_tEq-(U=s9nD+YIdJfb-M$(pznkzDG>3o50Od-ebe&9pvZ(8B0du_VCYZ< zZ55ezy+Pl$T}Ur-JjXL~nx<*V)w^P|a%Tv~w<5ENkRt-%`#$F{aJJh6xk8};cmW6k zi#1s9p@r0dwY;m5k^goo(9>MQL56M7#ID-02dKy}#L;L(aq8O0k27%1(2K4CXu>|U zkOy*H4$Q(KqdSh!@`iL^VgPx;Fn%UXagdhBOjQFM&oDn6s22M5kPc!BK;Zc$mKRu| z07m)Y@FiUnk%3GY5;w{xWUyqSNh#4M6qp8KRy0+sS7ZWKhh24GB1XnZJ0@K3*ntEh zy-9o|oir&J=+`*=4D|qFNJJONXIpZ5bc?WxO5uP*tC(2|CDQJiiM!- zxcGlX9*6!;)|j?6c7ES7kSq)hOo?NtSbfBji+tPNYK66k6M3T2&`?Bb?3YF@5EcOU zfSi`VsGsEY;fKpRxXEftrPONA|Nj0qL(%7wpPtGK!QbndThC8b%P)`5{(8NX$}Urh zRQ9m7@#@i={Ktc9Uyt?@?|WyEFYRRU!!ot|U^n>%rJnr!e0)UuR;jL5_RAZO{{cTd BL|y;@ delta 83 zcmV-Z0IdJI2yu`kO*lzJK~#90?asjs03ZxP(Z)M7bpIvM6?%}EnE%cMr~&{0AKR1A pO09SIC>J|m`|SZqscHZK?mDu71cX_00%HIG002ovPDHLkV1lE=Ah-Yk diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/blue_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/blue_box.png index 2e974939cf72a3cba92da5cff65eb2ccac5dd2e6..519accac21b9555da650e9ff8109caf33d944c3b 100644 GIT binary patch literal 1092 zcmZ`&J#5oJ6n3FN8>vhPPz9=Mgo=>tb4*k^qO1XBk_Mp#%tf`yfV1xCccz`&ht5+_Pey1VD+_r0I*-Fs4BUzy3x<`{;V z(O0zwxmmiWPLea+-Th6jiLkL!VGciC_(48SLql)ZYRpw4PmxX6mz&SXIUTHSgbZ`# zfbNNN^86cyIgXsBfsNXlZ229*wEY$oqD~N_lt?CG2V#?rI<6PWQHhH!WFk{F;Mmv% z@02*BR%fd|g6yIo3L>ZGSe8|g-Ig2L^%PFNO58Tafeb*e*Asfz1RrgIe6d&rq68#~ zCl-8o-@|6ad*P+T$$vi@3@zjY*zrA<`ZZgA7neAW2I{XQPuuFp3A)IQqu3UJF6=-L zhafNH!8jat+Jg+eFr|YK1Lz+D6UV~z09ysZ)N(}fN$VqtT5;SE+aO~ABvD-AMTwV+ zpkE(JU$HG2JJ^LWas7H?2ForU)>3;)f$LCaW!Ln!N?gR-ux)l-%&Da4z=d~Pex!iJ zZWy0vhutb*Oa=znTPbd0U|=rF42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#TcPZ#8*#wX=h*yuylq3VZ-q8e+XkHrNxAb(p$ z2Bj9~=ahm%-p zsC~FqpqquTJTxz}#Lft60Gcq8E~NOeax5w-&o9aj0mlV$K;l#cH3$-@NU0Q(1;7yi z%ma2@Hu~`VWXJVmmwW>-<*Ex1X~M6iRgxQSwT23$sGKPBj8$iAtNtw^F{Qy|C&Q}$KcCj}+>klgbUJ3jY1PJA z^XpkxF=Q=cX*jdy_3Aj7u(ccG&uKbZolC-t?}V``!~-7N*FwD?-JL# zQ7Wt`rBcYgUTcxe0-b}+*9E*(W@=pY;oa-fdf={j{E2Pe{!CLY|9^bN{{rIzrxh_A z^)`=8=5lcE31rY>cDVV$Tfb#mNW-PC0>1(_>O{nydTJYTx85Lkr<!U`p!Vqkou_O0&q?B;h&rx zwC~{xq&{l0^nio{Gf&;1$z>63l^F5zaRHEoBC7yIR9yfpAAc9^&$$BMAx5X&Qb-Ae z&+ZF0&JP3t;F>R#m+!5+ut!>8ZjF@%WElQssshqq;E|Wg!&lai1Y8q1n&R{9g765k ziv5OVz$%$G^~7rEJ0J#N?_Nz`4PpT6%LK$=c^=%G@OD70^g0~2XYsYK(P%XN diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/green_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/green_box.png index e6165cfa8c7b72be1381a09699948e26e738b455..8b5818a09f0e26cb04a651352051321941b897c2 100644 GIT binary patch literal 1090 zcmZ`&J#W)M7s^?j0E6KQMG=N3hZ%Vu3r`BzBaZbRT~GJnzSI_r7gxZ!Q*!1%_c3^)0PQ zc9zchi)0Otj?Tz76*f25nUil`Tc|6THflp5>iRKDiDYu@LTs{8*Y!d_034#w_ zc-V}1FT9aB`R_-Ap%pkjc96$Xzh)ctaE0S&py5dJw5?$rzZbZ16x#yOg1qG+#Xe4mDX03SdE-@bO#B;n8?Ul#~FGZ`yP3iaEy2wQ1(}*{t#B>8JO!fA!k7cCxvXVKZ_ol`r|BcL3 rzF4wdWBji7Z^4xgup$kRjs!-AdmC6IY)>wq!TBfSo0_keytbyl!D>5|URM=S4k; zUR4CWdJr!=2zu}j5CjqNpjR&*ynFDb?5Utr>Ge3n@;Z=lDFKb5BX$Sh%{Y7x#Stq&(^#&JVrfeZi$Jb#tt1y(47 zVSPA#$udP`BL~L94eN;&tU74iO7KJi$0o{(j^XZ9n25Dt*XTQlk#W(!18;Y{NCF9N zoS#_7-AZ6e1`?@T+|pp^IentMEUcEKSdB63=nfKwK9!NRPBNOi9`f*;3T#t#5e)nQ zzpo@>8t-Vtq_0u%wre9LJ`$cS)-IHPeq1@DeLmN|Hbz^Xq3*w%4cH&wOQea_+NN@_w*BBgsaitW delta 93 zcmX@kQ9VH=+{x3$F{ENna)Jcw;slYNra%KOw}S!9-p(`r2Vb^P3o?~h=@oRj?vm^R r#jhy|vIUQ4@`TEQ)M$V;@K`V~0GQ9X?7BLgH1fWY&MEHAJ^ z0SxQI=}U$#A`@9KByLzw$Y9Ar<62@*D6mYztY~TWR*?x<1GcoTg%}wZ?OO0*(+MOH z*^T2P?YLVBOvykZb&DHy=sQ-IFfR)W^HRvhn0C~I2%%0zB(;->TH8Smep8;QD>j0j z>*4nmMU3N}Y%%F;6#TwzB3XzXOsEs6M1RDRhkA~;(+GQ!B=SU~*il4k;*~}t5H22ebi1r-5-R)J)fe!-AaEwc=jPj##dRXmJgRUAO8bel}Pgd delta 89 zcmV-f0H*)J2zQVqQ$9&VK~#90?a;9a03Z-U(O~Tw4(f1rPT(B&=L~^^1NpBGAw&WI v0Kb_%!pXPn0pqUhO3zX816#!p007{6yYC3sHs3LIvqK-8;Vhli8VxgCSt(Qu?pI$ zF1eT91&!vf7z2o&zjbVtR!ARmXje#G(7uc~E(*V$h4s=ln zDqICj!Xc|WjL;2JIxsPSykHnV5vKacSinpzM>w7|KOCqL`wfu^G73Q8`Rgn%utF6K z^26avrXeB=*)S$+V*KiC7bM^`4Cw87J-A@NUP8B#`Kh z;uGnpSqV&tKq7gI8!Z@mc8@SG3yTX<%*KdxSc3$iO+;j+giAt%Vgw)J0O0PX>~ zD1kvg$;F@VF74qaTUM2NTPqxWeNmw3*_ne+hreH~J+Hi-a}Jb4o%^u)BwxO%0Pp(_EL1oB{PX0V)hKBepQP;0F n$Q7C=sIgAD{P08tdxLlmQzGk@fJibP0l+XkKcsw6E diff --git a/Resources/Textures/Objects/Fun/crayons.rsi/white_box.png b/Resources/Textures/Objects/Fun/crayons.rsi/white_box.png new file mode 100644 index 0000000000000000000000000000000000000000..69e1795b6924338edcbf2551c36ec45c6c2b40f5 GIT binary patch literal 1088 zcmZ`&PiWIn98OiF4OHAkK?Gy;Fooo0aZDT1ux{-Te9E(12ze3!olb}ET;pB831)J+91uhx ziX298!CeRGA?E~_VkiIo6k%ZamWM3YVTfP7?zT~$Wl5mHi1Rd!K^(8`+ffwL0MLdl z=%4`1@H1c%4_S?2hEC9z0}BJlA50S_(o_!_vskH8i1X>!hZ8lTxB)Uj0suroxWNe` zC+5JQKAgU68WOUQ4I|+O^+XC5Y&2>mcp`yq5oIM?cba)N&;x%f@_mZ3Tb z`ks&9R~)e)?`XuhuVL_Y$3lwOcQ9s7uoCwp6@1ij{q0(G7fB(H1oa)oq9$Hx+yc=B z;2uzD84UVKp?|-=(8WzwR*Qw2mihMaZH5xki#K~`zQ0*L@TNXz{fE`*FS|=WOO-U! zrH-YUA1}L4?)>Gh3%%ySW#z-KE3dvjn_u7mb2v3mrB0jSrC$aj$2jauq~xcX)QHTlm^L}sAFGRtA5G8D5fk3 zAtYv)SQr>!>Hr&4B}N27(3Opau_^--aA%vuiPDqq;osl)Kfb&FX`{X|S6C=83^S)~ zR-0sJ>72Pp*685i7ulww=Ef>>_<8Xs`M8X9ty`-xH_3U1Ogg@9KO^gGu-T3n=Ee&; zr>?@{TZTCo+ASUHwJm7+u3%Vx2MMtoBrG|GzzEwC&rhgKIht9LRw`BJz&i~|Tjzuy=7OM)Nnf>OC$2BHKci6;m? zy6<5l=Dp~8>g2zlDvHd|4zTTeEcI)2{2o>~js_ZxG*8PM#0h$#lSHvhfE?r^4@aOR zl)xk&w!6a&y(p7|2m|OJLK7#_v;dpSM5*!5w<`M03=bo#fuUzmBFAs zlD=%25Zl;6iEx8@5(O&`9<@?DmB6v7vd}TSU4@Hz3w4d2gE^HH9XRM-$B$)@;zs$Y zb=0j4CS)Mfx?#JCBH!szKrP5% z&`)aN_xo!PNt4yJYNe&mnmh9sUKPcK>EW_gIuD!A|7?H!zV&0?dVTVE(LMfl`uEC* oqbElvZRhy((;IDwCZ{h&hIv`J^p2gr{eZTwwqCCuuI@bg2QAx1g#Z8m delta 92 zcmX@eQ8hs&%+b@uF{ENna)Jcw;slYNra%KOw}Sz!vYKB1S0?fa@05CLGB4n8-KT^9 r{dt(BnU1G#3_Sb~tVjc-;{hW>Lnr&@@7%h#7=Xaj)z4*}Q$iB}K*u5_ -- 2.51.2