From 98f91498838cd70d37f956e591ff94f5a1d3e365 Mon Sep 17 00:00:00 2001
From: Centronias <me@centronias.com>
Date: Fri, 18 Apr 2025 10:12:37 -0700
Subject: [PATCH] Add inhand sprites for the drink shaker (#36382)

* Add inhand sprites for the drink shaker

* Update Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/meta.json

oop that's not actually their discord name

* Co-Authored-By: Failed <158702813+failed5@users.noreply.github.com>
---
 .../Consumable/Drinks/drinks_special.yml      |   2 ++
 .../Drinks/shaker.rsi/inhand-left.png         | Bin 0 -> 373 bytes
 .../Drinks/shaker.rsi/inhand-right.png        | Bin 0 -> 409 bytes
 .../Consumable/Drinks/shaker.rsi/meta.json    |  23 +++++++++++++++++-
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/inhand-right.png

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index 930cf81757..24e7d1b0e9 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -27,6 +27,8 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shaker.rsi
     state: icon
+  - type: Item
+    sprite: Objects/Consumable/Drinks/shaker.rsi
   - type: UserInterface
     interfaces:
       enum.TransferAmountUiKey.Key:
diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..0973675986a4a994f3d837d34a2bdeea479fd9ef
GIT binary patch
literal 373
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zMLk^{Ln`LH
zy|uBo#XyAR!p+O2547$uGYYZ(nIJXi0-vZwfd@O^i$=aVJK5q()F=7owO?iW%q0=o
z+-cL$0S0%@H%m?{cJo@vc)+5sf8Tq1qvH3oC8q^t#a>@{?N{}S>D+#rrtfX%6mL0W
z8^x&D66SSq*E)uVATHJN`N3X}91G8W_R(&vVs1-pDCXN5R`GtL4!5fCf%tdZa`n^S
z)dpTJTb8+~Mm6l5al6O?yDt}2FU*MSHr%GXDY@tDnHM+P|1xc#QrtGv)HvJndH-1v
zK{(jCve?Gb_TUY^fcW<Ny&K&vav9gy9?Ilqu&8c1ZPWMfJLg{^);VeR2aerPj(Nm(
zXWBMqB_PoM!I(a$&*s{qus&dD@ufz1ruq6ZXaU(AKnwzxf+vG0Pgg&ebxsLQ0Ecvs
AY5)KL

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..69952d23433b8681579e8037ffd77d46a9051769
GIT binary patch
literal 409
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zEj?WvLn`LH
zy|uBo#Xx}d!v5v28?^2)Gfv_z@ZeS1;>^k?6T~oyxvGHu+=_$ZcVC5B8Lr{y+w(i#
zC1K6_#EvuuB`~P6H-FjiUGCgY7KYs0_hv1#v<X=^XU+UejL&0&ycVun_5SqHMRSi@
zPJgxQ*e0FXo4Z&$4DD>nW2d(z?uZfGwa(kn?aXJM2ZrCJHZnwIGdP5XMoeQ>Y_UIL
zGws^1dBK{kg)&FW?Updt-j9Emoxjm^dqhLJ-tI2vPf^*E4b|S(eeCNoJQ?*n<e0DQ
zhiiMj8yr(f_W5*gzHEA^XJlsw9QaKzb<)aAcTn<cuMfU-u0bW+L@e2bgYmP?{c^T%
zeBa_XSuI#Hm(eqfeTtc0{A63%x~WPjf0^ukFSiuRbnCKxXD%w>^LKG^`NFi1!A7n(
nW$Cg2UtoyxrABzB`T8<w0ofct3<8&eCxa+YS3j3^P6<r_cW<7g

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/meta.json
index db0ac608ed..e45363fe68 100644
--- a/Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/shaker.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,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "icon taken from https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi ; inhand sprites made by Failed (Discord: greetings_)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
-- 
2.51.2