]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Add inhand sprites for the drink shaker (#36382)
authorCentronias <me@centronias.com>
Fri, 18 Apr 2025 17:12:37 +0000 (10:12 -0700)
committerGitHub <noreply@github.com>
Fri, 18 Apr 2025 17:12:37 +0000 (10:12 -0700)
* 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>

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/meta.json

index 930cf8175762af5a451c598a43db82becbaf6d53..24e7d1b0e91fd823fe3d994188abdd9b25631cfa 100644 (file)
@@ -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 (file)
index 0000000..0973675
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/inhand-left.png differ
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 (file)
index 0000000..69952d2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/inhand-right.png differ
index db0ac608ed068f887d184f45e9acd83fba0a3976..e45363fe688f3cde269101b80c5a39681f2e5be4 100644 (file)
@@ -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
+        }
+    ]
+}