From 4796c92609faadd38f27f4ad5611441bcd8de4e2 Mon Sep 17 00:00:00 2001 From: Tiniest Shark Date: Sat, 20 Sep 2025 14:25:01 -0400 Subject: [PATCH] Inhand Sprites for Clear Glass (#40427) --- .../Consumable/Drinks/drinks_metamorphic.yml | 2 + .../glass_clear.rsi/inhand-left-fill-1.png | Bin 0 -> 169 bytes .../glass_clear.rsi/inhand-left-fill-2.png | Bin 0 -> 185 bytes .../glass_clear.rsi/inhand-left-fill-3.png | Bin 0 -> 191 bytes .../Drinks/glass_clear.rsi/inhand-left.png | Bin 0 -> 310 bytes .../glass_clear.rsi/inhand-right-fill-1.png | Bin 0 -> 171 bytes .../glass_clear.rsi/inhand-right-fill-2.png | Bin 0 -> 188 bytes .../glass_clear.rsi/inhand-right-fill-3.png | Bin 0 -> 198 bytes .../Drinks/glass_clear.rsi/inhand-right.png | Bin 0 -> 326 bytes .../Drinks/glass_clear.rsi/meta.json | 34 ++++++++++++++++- .../Drinks/jar.rsi/inhand-left-fill-1.png | Bin 0 -> 150 bytes .../Drinks/jar.rsi/inhand-left-fill-2.png | Bin 0 -> 189 bytes .../Drinks/jar.rsi/inhand-left-fill-3.png | Bin 0 -> 195 bytes .../Consumable/Drinks/jar.rsi/inhand-left.png | Bin 0 -> 306 bytes .../Drinks/jar.rsi/inhand-right-fill-1.png | Bin 0 -> 149 bytes .../Drinks/jar.rsi/inhand-right-fill-2.png | Bin 0 -> 197 bytes .../Drinks/jar.rsi/inhand-right-fill-3.png | Bin 0 -> 202 bytes .../Drinks/jar.rsi/inhand-right.png | Bin 0 -> 317 bytes .../Consumable/Drinks/jar.rsi/meta.json | 36 +++++++++++++++++- 19 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml index 3b7569022b..d4fe5da5b6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml @@ -31,6 +31,8 @@ metamorphicDefaultSprite: sprite: Objects/Consumable/Drinks/glass_clear.rsi state: icon + inHandsMaxFillLevels: 3 + inHandsFillBaseName: -fill- - type: Tag tags: - DrinkCup # Do these tags diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..aeb5a2ecd4ec32eb9fe7ab25b6ecf28f1eee3496 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|l097lUA^=1u6D) L^>bP0l+XkK&gncm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..567c9b733d6d493387af1d25ecb6ce8521e86a73 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ialK%Ln`LH zy}6P1umcaXgZc-N{r_9|zxus55^Uz!Dc!)jwC^}0P~m~!t6r^Ir9E}-iP|#ucYAj$ zFTTY+W7*b*CtsJ>iUH+;;7{`tpL@ES`0BGyywRxoWAiWb=0>JvXKtn|m8|{h@#LPb erX&MH-39K18~WxYU#Fb~>G5>+b6Mw<&;$Uv;YVWt literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..2e2a6e052ce33043885aea7ab482bcc84cb0a10d GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Dm`5sLn`LH zy}6P1umcaXgY^lK{r_9|zxuturX+B%oO#278!s(@>KfEny;`+Od+OX1e^s2+10BjA z+}mw!bc)I9@TBYWx9I>?0M(Rx>^r%;_aASWi0!ThzKKj~wnoSGA7tL#$h2(DgV`Lh l*>gMZ?ABCeW;h`Ki*YKqzWvHMZ!AGNJzf1=);T3K0RZD8Mlt{Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..de53081bf39f433b6052e3d9f9b4e4ba0a2c9bea GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|K6tt~hE&XX zd&`io$w8p?;lY5&3XS&(7M!i>8$Kviux#D1^bq#~)@hekTy#4eF;T#~cD3Tac-OC+ zB+FKtrvVLMV0aL_IqCk6>Rno^Q+A!Pb=hXL*))K4XZ4jj_dpd{2lHrOvxa?>_!9P7 zhoq%_za0AS_^lk%yaVg`KV)yzdJ!a_8yx-3;{KVt(xG|gx6g>3iUAu6BpUjCrte&T zN~`dDN!XjEteza7vercRwy)V5`kQ0#TQ(s1iE+!-iWOGTzIF{iQ)J%U+8^{r`O7!X z6(?SOT=#X`nMW55T(-naV61s8*>cAnXyO6;3a0%pOT14V-JA%r#naW#Wt~$(695c~ Bg2Dg* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..82e8451ebc4303d0c90e020498785c30778cd3d5 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|QaxQ9Ln`LH zy|t0I!GMRw!NF(Z-}KK66Mt`TP!U?_a4$zD>JKDb9i~3@`>$e^^P$9#0rAHkdkKf9aZ<5@8=229( z-dXNVlEKVB79D4v@$efXNC`v3&aZ2p&A#<;Vm({c)Xl!kKb(?nj{a|$*L*M9T;d~_ hmuB{NX9k7`@qR(K_04xx6+Q-O@^tlcS?83{1OPedM)Lpw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..05538dd6a8bc688be21dd15dd30319c4c893e195 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|8a!PbLn`LH zz2(T)Y{0|f;85%O@Bg6_<-eMk0t+VIo>?ps)|Y>J6Hq0?e3v6~g1;|Yp6f}wv#BX0 zkwLk=`hBEjp7E@UY%#VG55F>kR57g3+dOOjE4I~tj0;>Wf0Z<>-gN5bO2$7<$uUXH rM(lrQ?R_8}eIY9PvON<6!~dte?R@(7J65|Gg0y5c z+3eT;Q%5J8N=4=!;{lq=zz{Pj=ljwnKdtoBy05xz{QPHG=CQ`}6IH@(t)E-PHbidj ziDSKE{GMsk^y`Pty!rC)>AzjQYdzieHQZoKlKv%AD|heB&xDshA7@NDbz$MUiElq` zc`eBZHW*0gaoL{TKJS>=>fURWhLcVFxBX7=_IZ)Huaxnt!Pg13m%9s1o|xR<)u81g z`p(|Q)^AtvfxRDQ9Zz26|2b{jp0B^7#T8bbDXX-qk+^Ggp8sUYo!jy{Kx22kk)Etm UbaJY#5;MpqPgg&ebxsLQ0Dr8E9RL6T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json index 1573c7154e..16bcd31794 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-NC-SA-4.0", - "copyright": "Created by github user moonheart08.", + "copyright": "Created by github user moonheart08. Inhands by TiniestShark (Github)", "states": [ { "name": "icon" @@ -39,6 +39,38 @@ }, { "name": "fill9" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-left-fill-3", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "inhand-right-fill-3", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f758011796e55d361a02139e47063c2e7b4983 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|0z6$DLn`LH zy}6O|fB_GSLptwU``Onzw4GOp9AlEc-*~HjVc1$mph5U`DHIOA~3R_M~(sZ2nn4E;TZ-#({2O@FfPV&mTL zFHVF+hXi~(`v2PokR$`cf$chy3$JVKzBbE9*{i}fPR(>@;BSt^uRrdtvHJaX&J^~H hwM*-(e*=yBaEfuBg|P)o?y`E2Mo(8imvv4FO#t4oNK60# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..64e3e01a3d38c6db830f88a1d2251566e4000b16 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|YCT;XLn`LH zy=BOCL_vh*LXO8v&OQG*kJ_yi+jj2{r{F#2+k)(C_uU5RKT!W{&hzr6pM-Z-E0w4| zW$iIsrM$Rr)q*bv!?neL@<0&xY%<4R+0^aVl&V8CrTgsGu6lCff5TL@og1Y;gm9LB n?-aRE-M|0$)I3QBhCLTp`L=7XygTe~DWM4f+Kos! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6b7e2af913be3de5970cfa854c53e8607a6298b3 GIT binary patch literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|-gvq=hE&XX zd&{1WF;M2n$FIwSc1+&UJbMRI?`sVcr{xaImn=-&t`vB(@0gmB$c+11HTLW?p7_Sa z8S8rjwF80Oh4{Q8&$}nf?$65kzV=?y+K!s^w1uxYCWaI~`J;3{=)mIOX>Lc_Hi#PB zm3_8ujnQZ4yaP`w`Z{<6%UkAbGLcMuX|Yo_F6iBf+DY=iu0hNMk`H9}9*sKcqqp*Q zeBK)EiP0y_D)f_XmHl(yARchc#}FItB**Rj>A3zxyfeyB(Ozz+feF qmoffWd3l=O`@f|Hr7{c*8_uwHEfqVyx9ZeakQz@{KbLh*2~7aNurcTW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..61fd77f4eb52369de323c5d106c9e443ee9d7212 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|>OEZ?Ln`LH zy=BP7tSG=5AiV7h%f0_C&9&ROB6K|4T*{f>H!l4pxOU%Cpkjst3-A4YY6OQDw-sdVsc;kbrMh>2p$CGrL+Hdy7}F@t#b3ezb`8BF54kF?Wg>NtA6jL v4)mO|Q3|?$b1PHoA%UoD?{#7f3^8}OFRavSTy|@tBS^oetDnm{r-UW|n-fe2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..209d0d2e264f8e12c75c12b420aefd9e4a1fce28 GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|zI(bjhE&XX zdrOh;kb_9e!`1}?bJ)8dxx_5A6=b^H;C#VK#WZ0-sEOl5zOI%DlX9lNy)@zfW&PPF zPw%Qc2GkD(CLNpiOxqG6e}41Vk2c+xn(OAioV@L4o0;<@w)my53|F)6S$*nIy-@$H zC!6CAJS(}mlkJu9a`}S&_x`AVT;aQK;@N;uv9wUJlb;Jczl#5~+Ir{RWV`3g5VL_! zpDeI-Pq2ALk6~cd1>+e@T<1K!_j(0T>@(B7R*u`Qy6^Wi1ei0$UjGzV=dj{-qh40! z>Z(1S9ny_pH7Zw6zqOO}Jys{Yx8wQc{d;|x7#I$$w`G_h-R@p