Inhand Sprites for Clear Glass (#40427)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
index 3b7569022b9e034d30ce303a34dcb700ead25736..d4fe5da5b6dfce8a480afdf135215fb9c60e82b3 100644 (file)
--- 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 (file)
index 0000000..aeb5a2e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-1.png differ

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 (file)
index 0000000..567c9b7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-2.png differ

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 (file)
index 0000000..2e2a6e0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left-fill-3.png differ

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 (file)
index 0000000..de53081
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-left.png differ

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 (file)
index 0000000..82e8451
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-1.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-2.png
new file mode 100644 (file)
index 0000000..24b51ea
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-2.png differ

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 (file)
index 0000000..05538dd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right-fill-3.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..ef34c72
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glass_clear.rsi/inhand-right.png differ

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 1573c7154ea20cfaa99dfec06618cf760a84811d..16bcd3179403eabf1c5a9606eb3bace1e13ab003 100644 (file)
--- 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 (file)
index 0000000..e3f7580
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-1.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-2.png
new file mode 100644 (file)
index 0000000..b7f41fa
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-2.png differ

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 (file)
index 0000000..64e3e01
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left-fill-3.png differ

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 (file)
index 0000000..6b7e2af
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-1.png
new file mode 100644 (file)
index 0000000..a14469a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-1.png differ

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 (file)
index 0000000..61fd77f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-2.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-3.png
new file mode 100644 (file)
index 0000000..41d6498
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right-fill-3.png differ

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 (file)
index 0000000..209d0d2
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
index ed109341de520eab85d5253d23150b1815c2805b..f7db09b523760736b070c0411325f4927cb7f2a5 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/jar.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/jar.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 transparencies by IProduceWidgets",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi transparencies by IProduceWidgets. 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
         }
     ]
-}
\ No newline at end of file
+}