From 214338caa633dad8dcf9017b78281d766523410a Mon Sep 17 00:00:00 2001 From: Tiniest Shark Date: Sat, 24 May 2025 13:32:27 -0400 Subject: [PATCH] Inhands for bartender tools and mugs. (#37771) --- .../Objects/Consumable/Drinks/drinks.yml | 2 + .../Objects/Consumable/Drinks/drinks_cups.yml | 3 +- .../Consumable/Drinks/drinks_flasks.yml | 3 + .../Consumable/Drinks/drinks_special.yml | 2 + .../Drinks/barflask.rsi/inhand-left.png | Bin 0 -> 416 bytes .../Drinks/barflask.rsi/inhand-right.png | Bin 0 -> 423 bytes .../Consumable/Drinks/barflask.rsi/meta.json | 23 +++- .../Drinks/generic_jug.rsi/inhand-left.png | Bin 0 -> 517 bytes .../Drinks/generic_jug.rsi/inhand-right.png | Bin 0 -> 495 bytes .../Drinks/generic_jug.rsi/meta.json | 10 +- .../inhand-left-fill-1.png | Bin 0 -> 186 bytes .../glass_coupe_shape.rsi/inhand-left.png | Bin 0 -> 327 bytes .../inhand-right-fill-1.png | Bin 0 -> 193 bytes .../glass_coupe_shape.rsi/inhand-right.png | Bin 0 -> 337 bytes .../Drinks/glass_coupe_shape.rsi/meta.json | 16 +++ .../Drinks/icebucket.rsi/inhand-left.png | Bin 0 -> 530 bytes .../Drinks/icebucket.rsi/inhand-right.png | Bin 0 -> 523 bytes .../Consumable/Drinks/icebucket.rsi/meta.json | 16 ++- .../Drinks/jigger.rsi/inhand-left.png | Bin 0 -> 294 bytes .../Drinks/jigger.rsi/inhand-right.png | Bin 0 -> 310 bytes .../Consumable/Drinks/jigger.rsi/meta.json | 16 ++- .../Drinks/mreflask.rsi/inhand-left.png | Bin 0 -> 485 bytes .../Drinks/mreflask.rsi/inhand-right.png | Bin 0 -> 512 bytes .../Consumable/Drinks/mreflask.rsi/meta.json | 23 +++- .../Consumable/Drinks/mug.rsi/inhand-left.png | Bin 0 -> 328 bytes .../Drinks/mug.rsi/inhand-right.png | Bin 0 -> 321 bytes .../Consumable/Drinks/mug.rsi/meta.json | 12 +- .../Drinks/mug_black.rsi/inhand-left.png | Bin 0 -> 281 bytes .../Drinks/mug_black.rsi/inhand-right.png | Bin 0 -> 278 bytes .../Consumable/Drinks/mug_black.rsi/meta.json | 12 +- .../Drinks/mug_blue.rsi/inhand-left.png | Bin 0 -> 326 bytes .../Drinks/mug_blue.rsi/inhand-right.png | Bin 0 -> 328 bytes .../Consumable/Drinks/mug_blue.rsi/meta.json | 12 +- .../Consumable/Drinks/mug_dog.rsi/icon-0.png | Bin 0 -> 368 bytes .../Consumable/Drinks/mug_dog.rsi/icon-1.png | Bin 0 -> 511 bytes .../Consumable/Drinks/mug_dog.rsi/icon-2.png | Bin 0 -> 545 bytes .../Consumable/Drinks/mug_dog.rsi/icon-3.png | Bin 465 -> 543 bytes .../Drinks/mug_dog.rsi/inhand-left.png | Bin 0 -> 323 bytes .../Drinks/mug_dog.rsi/inhand-right.png | Bin 0 -> 308 bytes .../Consumable/Drinks/mug_dog.rsi/meta.json | 21 +++- .../Drinks/mug_green.rsi/inhand-left.png | Bin 0 -> 326 bytes .../Drinks/mug_green.rsi/inhand-right.png | Bin 0 -> 318 bytes .../Consumable/Drinks/mug_green.rsi/meta.json | 12 +- .../Drinks/mug_heart.rsi/inhand-left.png | Bin 0 -> 369 bytes .../Drinks/mug_heart.rsi/inhand-right.png | Bin 0 -> 364 bytes .../Consumable/Drinks/mug_heart.rsi/meta.json | 12 +- .../Drinks/mug_metal.rsi/inhand-left.png | Bin 0 -> 308 bytes .../Drinks/mug_metal.rsi/inhand-right.png | Bin 0 -> 319 bytes .../Consumable/Drinks/mug_metal.rsi/meta.json | 12 +- .../Drinks/mug_moebius.rsi/inhand-left.png | Bin 0 -> 348 bytes .../Drinks/mug_moebius.rsi/inhand-right.png | Bin 0 -> 362 bytes .../Drinks/mug_moebius.rsi/meta.json | 12 +- .../Drinks/mug_one.rsi/inhand-left.png | Bin 0 -> 342 bytes .../Drinks/mug_one.rsi/inhand-right.png | Bin 0 -> 343 bytes .../Consumable/Drinks/mug_one.rsi/meta.json | 12 +- .../Drinks/mug_rainbow.rsi/inhand-left.png | Bin 0 -> 326 bytes .../Drinks/mug_rainbow.rsi/inhand-right.png | Bin 0 -> 329 bytes .../Drinks/mug_rainbow.rsi/meta.json | 12 +- .../Drinks/mug_red.rsi/inhand-left.png | Bin 0 -> 301 bytes .../Drinks/mug_red.rsi/inhand-right.png | Bin 0 -> 298 bytes .../Consumable/Drinks/mug_red.rsi/meta.json | 12 +- .../Drinks/pitcher.rsi/inhand-left-fill-1.png | Bin 0 -> 137 bytes .../Drinks/pitcher.rsi/inhand-left-fill-2.png | Bin 0 -> 150 bytes .../Drinks/pitcher.rsi/inhand-left.png | Bin 0 -> 417 bytes .../pitcher.rsi/inhand-right-fill-1.png | Bin 0 -> 137 bytes .../pitcher.rsi/inhand-right-fill-2.png | Bin 0 -> 153 bytes .../Drinks/pitcher.rsi/inhand-right.png | Bin 0 -> 436 bytes .../Consumable/Drinks/pitcher.rsi/meta.json | 104 +++++++++++------- .../shotglass.rsi/inhand-left-fill-1.png | Bin 0 -> 152 bytes .../Drinks/shotglass.rsi/inhand-left.png | Bin 0 -> 241 bytes .../shotglass.rsi/inhand-right-fill-1.png | Bin 0 -> 157 bytes .../Drinks/shotglass.rsi/inhand-right.png | Bin 0 -> 246 bytes .../Consumable/Drinks/shotglass.rsi/meta.json | 18 ++- .../Drinks/vacuumflask.rsi/inhand-left.png | Bin 0 -> 412 bytes .../Drinks/vacuumflask.rsi/inhand-right.png | Bin 0 -> 407 bytes .../Drinks/vacuumflask.rsi/meta.json | 25 ++++- 76 files changed, 325 insertions(+), 77 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-0.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-left-fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-right-fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index c8c5c70d5f..89e70beded 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -138,6 +138,8 @@ - type: SolutionContainerVisuals maxFillLevels: 5 fillBaseName: fill + inHandsMaxFillLevels: 1 + inHandsFillBaseName: -fill- - type: entity parent: DrinkGlass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 373430c255..418d2c9d2d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -116,14 +116,13 @@ sprite: Objects/Consumable/Drinks/mug_green.rsi - type: entity - parent: DrinkBaseCup #this one doesn't have the proper layers in the rsi + parent: DrinkBaseMug id: DrinkMugDog name: funny dog mug description: It looks like a cartoon beagle. components: - type: Sprite sprite: Objects/Consumable/Drinks/mug_dog.rsi - state: icon-3 - type: entity parent: DrinkBaseMug diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index efd594ccdd..2ebc20e365 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -113,6 +113,7 @@ sprite: Objects/Consumable/Drinks/pitcher.rsi layers: - state: icon + map: ["enum.SolutionContainerLayers.Base"] - state: fill-6 map: ["enum.SolutionContainerLayers.Fill"] visible: false @@ -120,3 +121,5 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: fill- + inHandsMaxFillLevels: 2 + inHandsFillBaseName: -fill- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index af3bd9a93f..a7e3bf18cf 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -70,6 +70,8 @@ - type: SolutionContainerVisuals maxFillLevels: 2 fillBaseName: fill + inHandsMaxFillLevels: 1 + inHandsFillBaseName: -fill- - type: entity parent: DrinkGlassBase diff --git a/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..89bf1799d4cc11ca70f2730720204fcc9186f1ac GIT binary patch literal 416 zcmV;R0bl-!P)Px$T1iAfRCt{2+ObLlK@^4IqgbYy+7On!LYlB7jmS2VbRlmb7PeX`Mzqo=3F#6W zK`TWB(SX=kXd&7uTc#WfiD(ei>>Xp^{~qAX?%COC?nnRt0000Wi(Ltx{Z86h&HV?N~&9nIFQOMaa?ViJo4b zmCNPioKw5qHvLk={18kEkfgz2U={VJ`DO)3;Y$d?q=3ar)gtEG{C>Y5bR7Ty00000 z0001tV_NPCn9tio-xU}t<_rG*@gZ}r>2Oqfo8_;pE-Q*6EhJ0YZ*7|9j}#p2;zTBK z9Q!0me6!i~&N*+tx2(SjwZ)9X&%djJ3cOx!EC>3Hsv)3pHr0000< KMNUMnLSTXk@3^)A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..edb6fc2f872c01ade772de0f0061b6b0d3a48024 GIT binary patch literal 423 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z6FprVLn`LH zy|vNnaDWKggZRQTMHkO*X}M(nBB)7EDRRkOuX_$MF|SiLx)xq=FANrEUZ*5tEh5e? zd&JgT;c+2XMoZE9o#tUb_WykH?D>S*Ph}c9AV4hhr|-|#Jlod35Q&{5!_81~NN=8; z93zAKWaG8zuftNVp54AG*ktb6i=4YTnivj$%$!l|q^BpsdXGO_}>l z?;f%_Uq5|CTIMXNtJ&rZKjeK+Y&x?d?zKDvL+<{@ZTAm6`^8qaeOqty)zq7x1(Co- zCB5%LYtH=`?kgLoCz#0SYO|U|`CKrZd$zD(N52Bc2I034i)=QPZn6Dd zzWvj$PdZ9UuFg4uUMH{bWtp8Wu2sv(U@&XW;mfefsLz*{kgjdbRUb{gwZIsmwtM2#THvd#M)7^qdNr4Geh(Pgg&e IbxsLQ0RNq|jsO4v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json index db0ac608ed..ffcf3da666 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json @@ -1 +1,22 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2d97239eb2e9c807be6a817dcd14ad13dfc6262a GIT binary patch literal 517 zcmV+g0{Z=lP)Px$zez+vRCt{2+C6H+KoAAsmypJ=trrXi<67tnDpf7$6uOEp;Zqn=x%358xN>O_ zq&EvvV>X2|LH;R1b~cXSeO0PqcKy}?&j3V3L_|bH6t8XD@a!I*qHWvIG)<7dpWV+- zy=WAvs_N>%o6Sb0E&#Z)470@o)9Dne)k>|dc#SPkRaLOo!a0X5%V4dAD@*kRc<;4K z0s!7(3!J+S0I=Whqnml;)c2SHFvcXQADsY^=lOS&@7t|`G~5_jE|;k5I_ha9yMW<5U!H|_eT{^vKLME(8)K3#O-TLN zeFXIcJeudH7?%$d7PF6#Px$sYygZRCt{2+P`YUFc1dtFQuc_2s(w#!E45ho(z5pzeHXoPZ8*p(PYZv!4D7u zhJv$|fU^{JQtSSsC)-j?_$N$b&v-eV@VwjoyT=Df&?JtH)*6e&0!flUYyBf3V{y4$oURuo zpdGv{O8~%I(>N^@ic$&y@Or(9t`{Z1mXcBmQ51FETM*tVV6)jw+7&QXwgRLcy994W zTK<501&9-nWtnLQmp)^mDW#kaNR)upYGrJ2VB8h3-|qncd7g_t)8cQrO@bv|fQX2Q zh=_=Yh=_>pMaWk9=-Tq3W(KONGDT6C_L@WL_20hlnSl^937rEbacrJuGfbyb%;$3) z4hPhAJ=iAGG&NdlESF0hk4Lx+J-Bdcj{e5i%z%yMyBqB^Akk)eF7FJCD7i2HU c0;PB4G4uVfIGcNVa|uYbr>mdKI;Vst052*(>Hq)$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8d2361bbe6a641e8b7ce3e1ca21a77ad309cd09a GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z89iMbLn`LH zy=9np$U&s#A>&gKOO7j=4_GYSqPTuDWL_%bRC%Er?6A9|_y+^W&cY+!vlRj>uXP>$ zKUMEu)%|th)5=tUW-=W3Jkz3kYU!@K_P=A!Ek9>?C+-fbz1ZeX71K#(yBF`?6Fco{ z=AExfk7NW_zg0Z5^zSLFyLa@f<${@uDqfxJ4~kTOowf7z-!yxcZY|gH%%jsxqjLG@ zFoH}5fiLN2**)rwnf}{KE2N%bU-NzW8ga>W25oy8dzXZlUu2g_?9quX*=v6^;P!pl zV-izk5_!H%{j6ut{=58EY?SEL0^b+63x3xhn9!wl^!wJSDz$s}_g3iv4Q~F;SY=!C TLsS1m7|0$^S3j3^P6d)z_?mO-D=VM?cxF( lbH)Bo{>u_+!@zLB@h*c|lcm8sEtypy#h$KyF6*2UngB4`MJoUR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0ed241c688fb575ae9ce3b2836968b941c49df5f GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zxjkJRLn`LH zy=BOC$Ux-S$M8ZS{|An5UM<>TUBP*sud1PnvHv1-2j5)nd5hU!Tv+;`I8fl?D$`E4 z|NGbSF6rMR!1UJzXeI;0fAtm8F*%zKf8AXnvhB^($8o#!HfWtnu#)t6|7FjucUK&J z{cNwEy;CO2_H@;()vwmxz3nk&$u4utg{jq-xgSW+pY^o=sM_aeAF8)rYj01OvLs4$ z>6z>QbPmOLPYTHt16u(k%&$IU-gorre!I&*TW-}Hu$|B0cc$&HgNurpP5xrmA0Y*Y z-25J{UAL3V@5tf}UrS$#+;0;8!D?2-l|PqJuUYtW>9Wv3uPIC1_TT&=SD?4#?%NYZ gGF651fhHelRc^_xWc^>iC<0`er>mdKI;Vst00se*M*si- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json index b42841a32d..6b42e9b9f7 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/glass_coupe_shape.rsi/meta.json @@ -27,6 +27,22 @@ }, { "name": "fill5" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ab31ff6a04c8bfe239a93af86214d0db0859f40d GIT binary patch literal 530 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z&v?2xhE&XX zduwgqAqNrG2Zz&ySvc8P`TUJEc>2U2FlxCeREnrb1s-JnqL{Tx&_X6+!iva^FViCH z4walMnSS=Ch+;wdv!GdO-x-u(;E>5&zq|SG7lv);i&@I4e{+ZX>~EGA_FL@PdMz^h z?&9+yYY%@prx%e|W+IhnBgfpp++gA>y|A<<+ot&zL-tzZV+;&kiyQ()#Mv$6`W;Iz znWW~4GwftsewlOjS+?eb496sV)PxxhWNmfYefQXA-W}oUY+1}vYsIYQ@|EqDZ8+b| zd?3f{ca?0AI@_yyEl;8AufJY+TXr$W?6kLh<-FwGcawI;*loSH*Xr=Y33dDx$>KV5 z&!<1B{Fnafj_^{(_QQ>F>c`gePmtaaw_f`9-+!-a=b!!`HuqzE+%ksTVEln~*BFsB@=em{{YgEVTpT+T9ES?TfEPiO=F(u}Mu} zn(G470}{ehI6oXcr4(@dvEodI_%%9AYZ({97=P>jYY8(PnfW?3@|wq_BZk+O`n4yY z|CGGOJDWjUINzjf8hb(!%C6xR%% Lu6{1-oD!M<0lC|0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..283b9e75edac47271dfd6f34fb143ed10fb32465 GIT binary patch literal 523 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zk9xW|hE&XX zdrPtJkb?-@gZaFiO)Sk?eEvonKC$`-7`5CK3S(G%S3F>lVG8a&@Gy#dQ&w0`#)8yc zbKgvnH2c5Y!|KfM-xtiI)1!{565r#G$H_MyfudH3C_zd!EVnmycp=N9)>d%k`9e}{hmGk@Cb z4j8DbDAahJm3QFw?EK=jr+4K)&dOWhdv|}8rThXQ^Fe5Av}v^Yfva~K*5yr73Hz3R zmm$2EdDpIOTk;xK?_`XPjgH#yUMRErWJ;3)N7nQAv2t@>y*l^2So^EgbLNtmv%DpN z*LN_kd&VaB`qrShi&TGoW3oKmW_WQ=)MsU}r}*Fm@R{UHx3v IIVCg!05m)2)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/meta.json index f55a85dc26..fcedd37c42 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/meta.json @@ -1,14 +1,22 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Dezzzix; Discord: dezzzix", + "copyright": "Made by Dezzzix; Discord: dezzzix, inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - } + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ded27898e94ddbe322bddd9f08505bf0e3965845 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|9(cMqhE&XX zdutC~LP$ph5M zP+&XPYQvOEarZyloc??@Pjca7i&LAtG~a$b;dFnANkVLR=DbY{=Re`?;JCfbch<_h z7rS>`6+})ucjngTzgs&t?0YX7c)Z}dneXJ1w7a&c|ISW2*ATVZwMFIh-P;B{(@Htg zdK*I4hRSk+>;i!T+vTwn0xBGm0K1j=NTZWW-Nt2E&-t7(Idb;|#taD0e0s!XPek%X~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f9f43687f9ee7a6d9fbafea731f0e4036a6f2380 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|K6tt~hE&XX zd+Q)?vjLAoU~nndvjqP0f`)9)2JFrSr)BImxKwFgKV~w4?W;ZK!GnjwoOaw$0%~Mv z_<#8+lM_c~{k-Rv()H&2{ueCz!mk(35^%bu@4qLT@mi_w>Q$SRrKiO*7*Ec<-Nm)) z?TI$qV#d>(N|Ywu`~Ga^%rCX|_qan%eJ?+;3)T$?EnmB?-k~S(%$wg`T0vJ$c$zEB z&s4MIsUG|BS_otz7~BfJ@^z)DO<}5Bc>agUQHO=YpK8W6K+>(<9YHx4Wh=FeI#P4dRN*UU@>-^{Je9 zOO0N8MOEE_8l%IHY8x%;1b_ds+kbtwm)p9|w+%m2)I_(2D=}MG?mcw(t#aPF_krup zRh71%u|L)NgsI^~7;n>q>+-wqzwef1p07XC6XGy1Ipwxv8MDp*Pl*y%_r-5qpS4?P zf0ofPi-gj-ci)yVG8D>muY1fsdzq%yTt7|ENppX5ByB%Dd&{)|uY*zA^K@g63A|*_ z>3X~)WTj8+&qY0(PZtB-dCB`gRJV!m!mV!i)Vh8!n2BDL{1JKV#Oeu*S6=&SEDcy2 zcCjj(u|o9hbeT0j7@8Cc-j+pMmF0#Wi;!*nSkZIv!RePx$x=BPqRCt{2+Pz8xK@lm z2q^~g2omxLf*_3s-D_j`{gLAw*KRDMre*>)9&3)D* zmFC=lAZX!e{}d<3XINR?USy_Rf}n-jQ{B0~=2GPQ{+BGLf_EQ;f~om*v0JT9*=jA=yop( zA9y+~Nc?0lIL9IvCl}2`{#Pte_EU%A|fK9PhJ6>HlxNZUozVO0000f6~3^iiSIf?sex(=H}Rx=`+>Mb%Up{c4C0w zv^|Z2|Ltd}9W{Sq_<5GO5YS)-h6A%Zf3bz6Uc6i9{V3$|%SGkeRNii1{jMNK#dGq{ zODdO5H*lOx+j(idylSDAXPW){wAjsSXNo+S${OGBx2&}MXjAZ1*Ya4q?;ob}g3SXF zdl)}g?zTQ({&U9L=pP&SWc$S)&3?8ewcOcp4EHxhuKO0V z+V=0ui=MyNKe*5S9CyB64v}%5N`qwMF zg^>XgE?v8lj~@2isAaFgqvZK%)}ALj8A8KuvffxPe$K|k_nDscnZvzPcA9~W1Q8F~ zy|(Y4fAaR@&v!r9yD!dgh+7!eEBvuw(do+7r!yBHE=;$pJek0_D zcb{0lGN-;_y;J;w&G!_!_g-8xO|9tr^Z63TRlfYQ4>)#A6KL*}9ZcsV9Db~AIXxX@ Nji;-h%Q~loCIDLlhV=jd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json index 21ea2b2106..052ebf11aa 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { "name": "icon-0" @@ -18,6 +18,14 @@ }, { "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..75e52d93f440b4291513b4ad90e3ae66027ef662 GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|E_=E-hE&XX zd&{t|#ek>vp?P$q)08he&iv(fmaNj7(6@4eQd;?Ji=YdC=1*yRB)I0mv57!kK(O!3 zYSROE&;K?yzPv5>?9EA2f~>qXCoP#%?2-0XT`46tT=%q+@#G~N`qyt>_a;M;wPMpl z?g>G^ejIIk{ODU-0+FKxu6Th6Bob Y7*i+PF4+>gF&<>Tr>mdKI;Vst07FT64gdfE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..78c365127125f741d68042c0d453821edd556081 GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|E_k{)hE&XX zd&`io$w8p?;qr|$xG%h)R{j5QKoN)2rn|R1l0+U$xViq>-@?SCzj?OK*&Y_4HU@?d z>3s91dugt{R`tC`g6;bE`BRGXCZ(jk`u#7n*4_Vw43N3YPjhLg>%Pe|Jtt*+IL>&rhqWxi{~>wqG{$G_GE$IUbssv($PY zuZYV2@o4FSZ$I>T{A@Pe{>iXD)cwK5HvuiD4YSO@KXh_h|DQQpW)2er!+|E_q#~=c Tr3UBOL56y|`njxgN@xNAnpkn^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json index 21ea2b2106..052ebf11aa 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { "name": "icon-0" @@ -18,6 +18,14 @@ }, { "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d45650eb5b7d4b56d0475c06aef20c67b3df1706 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z89ZGaLn`LH zy=B;S$U)@TNBvE2+-65;vAhZHs^EM-;o7Oo5lg@F#W{(2S36z^k}lnTjO_qrii3Iy`(ceyY$MRoQ(Z(Gg9tLPq?PLrjpSq`+J+!-+!8x z?@Hb;vDNBRJV|m@f T64vba4zkVD)z4*}Q$iB}f}V+I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7fc471293f312db375f1b7b87ea572f6559bd9ee GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%znLJ$_Ln`LH zy|ppxP=Ls>kNOKUZmIT(GToG2`a`IeJzRbMv6ENJKd8D`rHM1W&6s9Z`oSv0A>)Ad z&Q8U@{}sGF?9SOX>OA)VnhON~d(uB&sMu##Iql!h`D@a`-kWEd#7cQ`9rBRx{yzKb zPqT%t0RnEX`0tx^s9#;RCQ!g_Qc7vX$xV#0*KV@)JkNe?Q(_W3>rs*1JCE7f%n&ny zq}+|eVaI^CGJ1_tsNGu3=9oI>QmjE U%s%%-7lN$wboFyt=akR{0Jpk}!2kdN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json index 21ea2b2106..052ebf11aa 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { "name": "icon-0" @@ -18,6 +18,14 @@ }, { "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-0.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-0.png new file mode 100644 index 0000000000000000000000000000000000000000..972df383ddbcf4b98689499d0b048b66f72149eb GIT binary patch literal 368 zcmV-$0gwKPP)Px$DoI2^R9J=Wl)Xv=K@^40U1TF+Q7}z9g+-r0QmA0riNibYO!m0ZJXZvg=2vs>)#@6KS+3;=j0!8%n;M#H83WHf|M6@Oj8cj#2nREW{D z^*aGi&mw&C1voiU7)(n6fFg^zv2$$oC0`YP)~RBV#U#nPTaqlYm^xMLcLLS|n%-+; zLWl^S?r$LCK}1kw@yl76Uoz+(HtxQ$2L{v9uh$QE=V+~O!(R(g<`-{c#H6^9fcL!C z5c!#pZ3Yp$n+KSS55R-R3i)J=uoqdG&c*|)`DDB_32lly91e%$Pp|+XN^-*R`?B2t O0000EX>4Tx04R}tkv&MmKpe$iQ>A`X94sQDkfAzR5ET(zq>4qbP}&NuI+$Gg1x*@~ z6c9#=a_C-#2duZ zo0iUbpE$tsl0tk=JZ8`Zi66NxyZpvE=di#t14c4FPaGf?b4@HaG0Ph&@f2}TQ8mgJ zQZ6f;w>YcCGOOQ{ztEr2RuWvNIfMw75Je0kWRy`r5f(zUYNVKm(|)*xf6(#A$R(4j z07i}ll%PU#{NR7^yIV6mIpHSx!$A9sZGVgazFnYJvF-0;+pe7e-e=%SYxql5VCIwb zN<#}C0lnM6#dSlI_khbCVBkrY49StaG=*#yct4|WN&|hjK-ZevTYVp=4?vQ-TD}1e z4uR1eWv{n*cSmz?|DLJ$_XEt4a?3u!SIqzb05nNNK~z|U?ai?X03Z+q!N>ml6a=+| zw*e!K9%iDA?jiu7s=Y?;HS%|-J)O^P{=4-*DVvc&)Z002ovPDHLkV1hf- B+Zq4> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-2.png new file mode 100644 index 0000000000000000000000000000000000000000..39360e1cfd88a02b69899c9f30dfc4c076fc76d9 GIT binary patch literal 545 zcmV++0^a?JP)EX>4Tx04R}tkv&MmKpe$iQ>A`X94sQDkfAzR5ET(zq>4qbP}&NuI+$Gg1x*@~ z6c9#=a_C-#2duZ zo0iUbpE$tsl0tk=JZ8`Zi66NxyZpvE=di#t14c4FPaGf?b4@HaG0Ph&@f2}TQ8mgJ zQZ6f;w>YcCGOOQ{ztEr2RuWvNIfMw75Je0kWRy`r5f(zUYNVKm(|)*xf6(#A$R(4j z07i}ll%PU#{NR7^yIV6mIpHSx!$A9sZGVgazFnYJvF-0;+pe7e-e=%SYxql5VCIwb zN<#}C0lnM6#dSlI_khbCVBkrY49StaG=*#yct4|WN&|hjK-ZevTYVp=4?vQ-TD}1e z4uR1eWv{n*cSmz?|DLJ$_XEt4a?3u!SIqzb09HvvK~z|U?ana@fItjH(TRHkK@qm{ z{-?4MM8OkCENm=noJ#P&E`do#0s#D7IH7f!@;>*&Xx*_2?Ax4*kfL0RJfuvuUA0Oy jZv#({+~)uQ0H1II&o2yxx-kjl00000NkvXXu0mjf|7h!o literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png index b733d745feb456812a9d73845683e13f26b7ca57..c46dd0db14ac2ae95f74858fdb8c151a1ea055cb 100644 GIT binary patch delta 517 zcmV+g0{Z>Y1D^ztB!7l!LqkwWLqi~Na&Km7Y-IodD3N`UJxIeq9K~N#rG8W#EFz+i zp*mR*6%kydibb$c+6t{Ym|Xe=O&XFE7e~Rh;NZt%)xpJCR|i)?5c~jfadlF3krMxx z6k5c3aNLh~_a1le0HIoBs@XOUsG4QOBVjR>UKM?>=tMudF@K9;iJ5vdv6w{5@pTUm zU++RZtM$1*M~{**8Q>9#=a_C-#2duZo0iUbpE$tsl0tk=JZ8`Zi66NxyZpvE=di#t z14c4FPaGf?b4@HaG0Ph&@f2}TQ8mgJQZ6f;w>YcCGOOQ{ztEr2RuWvNIfMw75Je0k zWRy`r5f(zUYJa4dh|_+!g@4fT$H*m4qx>~*g4i16Q9A&S!cz$4s&6n4okp=*yMP0h#mXf?gp0*uxiz^~iw-A_FL0D#}fvYQSF=&GO100000NkvXX Hu0mjfcvI~h delta 439 zcmV;o0Z9Iz1knSKB!8GmL_t(o!|jzlYZOrwhM#k1GP{P^ab=@+AtZ*a5{O{12!d6J zg}p2q@IP2YAr?aL4+Lx#rnHw->6C3P6f|2XNZ2s!X68DZ{kqpCLP{rO1@S)h`FMFb zAK-8}9RE8~G~uARQxcK)h^hl%O=_*3Us!$GJC6XrXo9i!d4CjMSt(cMKs*Ne+w^hT z-US{{+<{heXTR)^*R*bXmMKIOcHE;9T_Ya_Z*Ht^ZBEnyYt5Z*=ezWK9qe!QA`FK) z)7AQ;MlE~*oWzNa{ z;Q$~`ba3GgoE8m0$bRfmy1YmbEuatg5fQ94tvJy^k>-VG0QfjILvwa{L=?stM#G<< z&$EVw1kB&sx|!+j?n&MyYkweXH|ggc(lmLyczgT)UobgDo;UR*>m00Q-PY+Pw5cfd h&^;B0!{PX6`2}^ykFNr2l4t+`002ovPDHLkV1oWw$}Io@ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9ffaa7c21b333e2d5a649c68e025c8987648fd72 GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|{(8DNhE&XX zduu=6!2prt9}nL-IKT0z%ESuB)z>FT>}_S=(7kgpyP>Czle0K?vryK{B3&)>q=S|& zHTIs9mmPk8XU@XYe>;H&0l@>yzgZ8$x-Y(c8O}W2W#Q#h{);X=HQr)$wSv9)W!f{B zC)-%MC8K8UTjb_Z)}^|lT(#4wcSrl0P4}Y?luQ@<^u5Hm`p4hc$v-2sPxbxh-!La} zDlf!fklB_0YWLlj{PAt4-LXx^AB4Nl@>k||?sy}zTIO2TMlDv(`K9R&yL%RfrR;cq z|GBxf^Hj^#M^BjEvORe&`(&T@P5Es>dRLcRlG-yTe;b3gST`#J!w+w9!woy?=R5c{ PgRJp%^>bP0l+XkKyJd?P literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d628d47fbb85a91636a9e55e8eafc584f8e3fa9e GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|-g&w>hE&XX zdutwd3Q0boe5tTzT%BF*Wx_ zTG0o;lPT+No7U^!5@&fIb@%@zwj95s3vBfHA|HR<7nvXa&3W~GhTkvEe$C;97z`vG zVuR%mewn|2s$Q3H{blzTS{at#%g!!dBC+Rn4s(>K%Djzwel?r>4Sqd&__b{5=cgJc x?Ov2@lXz3!b@l6VE=7V<;-p!s85^a(ADjB@0>jM1Qw!%Gd%!BRr?FaEe40^HkR;!2 z&X#I-zaRgZO_^#h+4`-oRA&Sl&A@PH<`MG+t4{y>6gMk9YTw#Dn^iOKo%!|dg4d*L z-Mya6ULRCSF_K+fp*!W-OqH3s_s&|SM;mJ%nBW@UP-(pT*U?46S5xcvIqg#pF#{V1 zA_~~gJb(Mn=DujswtU4C?xCeOmsc*k=)LUAPfz*x^VL{)m@0fdTl=N*hrQ3THO|vmnV9EKY94atMa#{|J8ZbHcnomz-2mLH||>a zch0j-O&THJm#_Y}A$-j#bFM`JllG|TSL!)T4J~5?YBc7T^+}p8`|P3HsTgUnks#tj zzt{Ht^H1J>{Q2(Z|J`mE8}>M@l~Vt8c;2PMp2uSsmCT>vA7>Q7@bXhi)Z75a-7C)) zWeff^ocfmkL+A_Mifh&>4}VGS++AF(ws8CZMk6ynMg|6jTA;p0`@8O}l>LYmeqJRK7%#RP;d*j6xZZZVj=NN0hHLCK~DuW2zslP1_) z`J}l*XXmugfcq0;p8j8=$d7;$IglrzPuFHdQ`s5H5HQ)`Xunw-guXYB5& zc>25M34TAk@PzZ49OI?s3#|;_cTD94+W;bB7(Ull*Upc>e){gdCE2eJ988%Aw6k

+PZp3=iUeFlnsIoN(sBhYXP2 Mp00i_>zopr029cbn*aa+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..563187cdd0103f48090413aedf2cdc121c5863a6 GIT binary patch literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z)jVAsLn`LH zy=Cin*g)dg$K@;78K$Krtvn*Q$spy;p(COaRqXNy++R#n4PJlX##LK}pd}@VnbYey z%8VnK1eZjWI;s4#*Ytj}r!Ltw@}4^r(0m4lAL(w-b#7f>YA;i6|IWX-_}b^%tT|sN zl@!}veEYX}*FUNBzfPazZ%>W)vdb|s={|99T~gP4mC#7RyCL)aCca+Gmk>97(vs!h zeV>^9<+OeG+UT$NEsNKOr|zjxa(>4PwgPO8bMx%??77DKo*37AKKAC`VmeF9V&l19 zx$WAakqc*TJ{cd^CDZ@^nX37$JGL2fXNx@Dw{nwG)iZhJlZ+*zb2uzp3_ia<hE&XX zduwBFi-AbX!<(xQ3NZ?)?%;A_Ut;2H?Z?T{sc}$MK~Ujhv%b~ITThte%DaE;XFB$6 zvdr1ZK>a`<_pH=R;n5573vP`SFx}J(Hd)BR1(OjA`De~7Qj*s_F zTP|O`ZKRjXY_vx|UPUS$11(FXK&;0(j z>HPa$ez~`^Zkv6r&99rr`nhb!o6mELKi!+1dR(G7@<^1(GWq!a{nhcuEMAu}Zzwy- z5ahMK_I{~Mdyv=kfB&O(0wR8Or}8i`G`Rm@o2cmjyhhuh7i5K}tDnm{r-UW|BPoFL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b6f127f2e5d83adeae7fa8a213fefcf1a6e96608 GIT binary patch literal 319 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|etNn%hE&XX zduwBEi-E+^kL7`G4n>VeIOa87VqH5uac;Jz#>yECl`JY;-fte5Ec93sEW>zF_UHes zicR|uo&Bx?G=hPlq5j#l&l8LF&VJVM%$ns^8k-#{R{4JOzyIFXZmD>NhOT`7TmJm_ zX~Mf$C6hx$TGwp-?N_Ok+@q2j8+S_Pz|`0>hI2bhDpqVY+nPK3SfP#GABEe}V1vQL zgYMaRjaIf16ud}dU#_7y36_Ub;!4o_D< Jmvv4FO#qFcgT(*< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json index 21ea2b2106..052ebf11aa 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { "name": "icon-0" @@ -18,6 +18,14 @@ }, { "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1d41798e58e4e53216ba185c7bf76f4daa24f35e GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z#XMacLn`LH zy|pmwaDd3MkL!aQXF1+mA|R|Wv9^2PL6^mg)K)EuiniU)K0|VflTYZ%HLF+5)-PAenM$;$ryub}qGyGYOSnG7e;bOwe8=XidxiA28K^?lNl!2H?I@76_RfN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1b4ee5e0b5da2d0fa213b08cc66ccb4c60c0c8a9 GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zRXklBLn`LH zy|ppxP=Ls>kLNEbJ_!2Y%OdV5Q`^1Ik$vtQD+|k)7mnWC%YR|10;~AK0GYcoyF?rX z6r*KMX*wzIReZj!@n8J})hBZ2Y@Mfl_5@l01pj?>pDd0`pR)AjzuUi$W(k%2GcS#9 z_L(&4iJQOvcl&SUqCr=ncwsGF(d6IC$;SiJ=YK3L*H1{ISs(H6;qwXC5_TIdDRJ;scpA2|H*X{R1>GypIqVv=zp5z&%yLlZ6+OXd<|?qJ zw{Wwuz=i*fQlkDD7gkj&GXhO!U^sJTkx9afStXVEdv9e0Up;zrQpu~^CUy0mljNLD zPM*0N+0vt!#S{4YYS^SRadzje+A>5dkEJl2w|_5YXukK$TJLoy8NQvKtMW47s#syV zU+wHYo6hpYPF{BUvt-;&uni#M0MCr?Z!71||NP>c?wx4%yj4|(CB9Z|E7<>rK9|p5 zuXgh~*QHAbXI*)Gz2fW7>8B-@-eEKN`t$O;2GQ54Jll(B)~^eDZf_qof6}~N%PQnw k#{Zj<_fbLzXs*s*rs9)f8{L+j;RD&@>FVdQ&MBb@07giZ8vp1WL_)V<3Uq<2TH#6>KA~`V!nb%xxm>`z?UwrXyy}5Ai=c}orr>mdKI;Vst0KmGFwg3PC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json index 21ea2b2106..052ebf11aa 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { "name": "icon-0" @@ -18,6 +18,14 @@ }, { "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..044f1f5807e7034b17d39f648dc6c1ff118e971d GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z89ZGaLn`LH zy=BOC$U&g>VP{j5CiCqZ9Md$ne-gTP;FfV@H21W72eisJY>f1n+0fL}%F%t}gr7m< zf9nIul4aW~m6?D>GB7mU*ZDMe+VY_D?NjBhd*8KQey@7#sqgn*-?Ow`H$83U#)+;c zO5QEeP@8oAn37UZXlU9*>GZvu*UscgI8kNKaQgWd-%kvBXU%rUHedM~JL{X`Y=JZD z_Mdpond5X~*0)4SZm=aFLLu*nvOKbM~yxve_Ldmu`kx#IiJ(%R{_O;0SnIqMzIkzH{MUd;W$|Kock&@i^QoJkL3 UtirfeCxFcMboFyt=akR{02teh#{d8T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..aa06a4b040eab0334783b9198101eeecd435619c GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%znLS+`Ln`LH zy|ppxP=Ls>kHWfKoO7AV3k7A2@130ffp<==T6((T;`|3w$_om2PH^p55#YBxX`!yI z;;}6c|Ia@B^l?G{wD%oAV}am-_WQkgb1v5yUjAFQ?xx=5%uUzU71yfApDB4fr|P}$ zPqu0OU5h$gTqad$WLi!7c*OMNja4dgT_UUYBV S4}oJSnPsqi;nCa4beN=7Ra%De6%pZ#zQefR7GFn<$w0p zpcmJlOnml9i4kZB1H+dy3MLEmp3a+pwkWfd>3ifMfsw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9e2af908c1ec995f3b9e1e83cdedf59126413c5a GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|o_M-AhE&XX zd&`ll$wB1UNBxtovjt+7Trl0$D*i!AZb^1YW1mPw_kvjNg_(&?Q!cjX3;+J_km4er z?{@rbwGhw*28ILkXa2YoqEeLlwWhZCOZ7hgN*#62OpUeQ-+$(=X)5G;PZcrtAV;#Thv}RX~P&y85}Sb4q9e0BekQ3IG5A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json index 21ea2b2106..052ebf11aa 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", "states": [ { "name": "icon-0" @@ -18,6 +18,14 @@ }, { "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..bba2ddd1970ee93e7e2ef0b5faf6b8823260db1f GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|oIPC}Ln`LH zy=BPDU?{+R@I!j0*gHLuN#RTK(|)CH$YunpVPMeTGFPSevdYYD;k;lz1H*^;`t=7m d`575L9AZnkET?*>G1v?w<>~6@vd$@?2>^GlCglJC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..6094b8b76f1557ba00d497d214dee6536975fc45 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|0z6$DLn`LH zy|r7g!GOob@%#O!rG+yy86^&XxOrC8W92;wpdto_4K9-^pWk`BWv=^lPovv)kHLaK q;?KdU_5Z?6Skiwr*qX2~9N?1nxv#T!-fxaLkP1&%KbLh*2~7Y*g)$-l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0e7ae7e5eba419bf8bd87ea7d22680f920090a60 GIT binary patch literal 417 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zqdi?5Ln`LH zy=9wsL_vV{!S=u?E2-TN*-VNV*Bz3rWr%NZ-eK5l&F3)7BB-vcSGZ&1x7w*oQ;$hB z$Gl(7y z#`B+QN|whurU+dtwXIqFet-JXkZ#SpS5p`n5^kI2+`hKw+4{IBv+wr~M^&#n7RCL( zcCln_crD|c;+qna_kQP4Oo$E7Sew{$vj0_&VPy7RdGU(({MlJ6_Az|6sh{&zfXU@a z$leZxmVoN0a#L%j-_AalOIGE{|Bvs!@W%La>2JN$MHTDsUl9<5gTRgJJ~4)Wd7~yD z@Mt+tW6-P1_Y2caZ!;=QI$r4F#i_Y;m9>K=>(Y?GcMm+me>Q0UDx1!)5oqju!Pjnq zOE-^W`OgL+Q)8C9Pno^0oDnFQ%D-cizM$Ym;VS0Uf|o5#^7uS}Vb0*`>gTe~DWM4f DPkO51 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..a9f0394fa6bf94424fc3baacc631bc3da1eb2f94 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|oIPC}Ln`LH zy>*b6K~aFo;rIJVdOzNpF8r93rqy7+h83uUfk9>Fwqon!e7Wi;g=4`23=9vZ1^@o- dEzipEpx!QwNlx`;TnIZz%G1@)Wt~$(69C7BCyW39 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..6068875bcf00b78f2097a855a0f94e03c54f20a1 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|f<0XvLn`LH zy>*cHfB^@y!~6ZJ(H|CDhxATzD;I94oW%lE!@w{}CDe3x`j11aZC7RO`rXB_t2)n8 v4J^aJaC^;~dG&$W>tEf^{}srMxATc{_$JZw?ynLB51RO{crC@SD2S`}e!P+3%8GsJ5A_)1 zy8|`1-r1e?VRPmz0jC2NeZNH+817Y9ygxnXT}t)FJ?nKPk`vb2J`GqJnVs0VdRkKdBUW>|Dn|ynl;nsus%eMAii?Vob(5Jj=RnxU!?lP-I6_g6j>CRvO$NIsX z<_?wXVZs+m?|yo!J^Q@<@nY?tVfm+1B-&2z`@3I+TM!NcmpT7awojh7;7X6vChI>d zw&f;sFh>9V9zJDG;E8(yE=iY7I209H3NlzVmM)m$_3dl_q)^5Km77_Xrip~jUVQ$> ztNqV43>QzB+Ti}{{rY#&S#A#}aKQxUHthXZ-6v$sbyL!I_5XAG>;wfbzO-YU8gy=9 U!43uvU^Fmzy85}Sb4q9e0C_FF^8f$< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/meta.json index b7a6eeee38..fd648b79cf 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/meta.json @@ -1,50 +1,74 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/d23125a1b04ef77c00da9e7aa7110835672077bb", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/d23125a1b04ef77c00da9e7aa7110835672077bb, inhands by TiniestShark (github)", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "icon-1" - }, - { - "name": "icon-2" - }, - { - "name": "icon-3" - }, - { - "name": "icon-4" - }, - { - "name": "icon-5" - }, - { - "name": "icon-6" - }, - { - "name": "fill-1" - }, - { - "name": "fill-2" - }, - { - "name": "fill-3" - }, - { - "name": "fill-4" - }, - { - "name": "fill-5" - }, - { - "name": "fill-6" - } + { + "name": "icon" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "icon-4" + }, + { + "name": "icon-5" + }, + { + "name": "icon-6" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + }, + { + "name": "fill-6" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..fd0d15cdcd56f6dce1b0a01ad84bad0c22213d1b GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|f;?RuLn`LH zz3Iq%z<`IvarGa=V*xRIow1s)cp7T&d{+XhVR+yXde!&ta_bp0@1DG<2ND5--OJX! s;e7kO;z)V;H(%%ei0r@BK+%NT+zD&<4S_Ezi*srNS*KJk? z>Sg%nGg)$*bpPeY`{MP}@6VGKoG4Xh8$au8*2G&^PTlEv!sg;KXA^UG@#Wn1!*8b- zF@p3kJn&!QAEWJlQ}hz|8kto4+r7tM7T!ClS-H@^XVYdW+w&UFBJXeYfR%NWOLDs;`4hZAIqr>mdKI;Vst0DTc!kpKVy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e62f65f14ee6657288fd340b62cbeae813fa5951 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|!aZFaLn`LH zy|s|{fB}!|!4<#HOY}ebbm{2kHZYGdW*-^EnD%|GYRIWI*;Qhxtd=Ja@N0aL1T=W7hk>`ts*ZjRR6L og--3#-c%BMS#wtf1H+9q<~EY1LgjXbb3tZ!y85}Sb4q9e07SZEIsgCw literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json index 389f1b8b96..cf438684de 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, modified heavily by github user moonheart08.", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, modified heavily by github user moonheart08, inhands by TiniestShark (github).", "states": [ { "name": "icon" @@ -18,6 +18,22 @@ }, { "name": "fill2" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6e44346548ae0b2e86d822396df5d9f9eaa4bc9b GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z!#rIaLn`LH zy=B;S$U%bj!ShYWB{s}7nxO0>KEq9?xY1;>`v<0%$y2>=bjYPto%B4Wr4+sH{duk5 z`?6NKS49t zf4nz+f8D&JOQ&>w-`65=>W`H{tALN!-?TQ~!wk=5&OJBQHC`HGHk)@&vD$j^uhI+* zx8F{a&79?}|DeQbqq1-DOIC&hCca`D)iPM`a&3&q zA750GVz^+!`|Y=F*>2fg>#8+RFJU;4cflZeYED?g)ddeF7pH7yV)(s~WpPRsdax!1@SVU4!R39)j{@jy2m|V+!-Z$9^7~Bk=u6{1-oD!MB`n;jl8x`4s|3x}UB+4o+TVM!(z!-`d>GVjXP?3kyq)MZ+#;^vs?0*CZYC-oYJ zaU`BUCmb7l9mx1>v;F?C*2>3m<>bw+*p zb%te`pZJQ|=Ff=(iss&~nLg)`>GI1A*Gg?gp7{rOMJ~OvbUwp@+9DxAIGFq3lWY5h zr#<3 zj9F~wpMRb^vyLmdKI;Vst0Jw9lqyPW_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json index db0ac608ed..b45677f986 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json @@ -1 +1,24 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file +{ + "version": 1, + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, inhands by TiniestShark (github)", + "license": "CC-BY-SA-3.0", + "size": + { + "x": 32, + "y": 32 + }, + "states": + [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2