Inhands for bartender tools and mugs. (#37771)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index c8c5c70d5f44992db5807ff2d0d21869b4e7c00d..89e70bededa5c84e56fa6add4a9af62af1157edf 100644 (file)
--- 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 373430c255aab795764fb167222bc07754e8440b..418d2c9d2dca54e1c28674ea932ec684ed6d6c0d 100644 (file)
--- 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 efd594ccdd08345bbb108e98e0ee964889b3d12f..2ebc20e36570ff378ac20303884dad4a60c9f8d7 100644 (file)
--- 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 af3bd9a93fbd59ff3516c2c38df82978c6aee720..a7e3bf18cff4234d2aaf7079fd3b73fee8b29963 100644 (file)
--- 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 (file)
index 0000000..89bf179
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/inhand-left.png differ

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/barflask.rsi/meta.json
index db0ac608ed068f887d184f45e9acd83fba0a3976..ffcf3da666bf52dbc202b194e4e11ff77ffb93d2 100644 (file)
--- 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 (file)
index 0000000..2d97239
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/inhand-left.png differ

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json
index a4039a1dd1d96680f5fb9a25ced72101ce447496..2c665ef007decbee07c3c2af3a1e64b5ed2a2ee5 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/generic_jug.rsi/meta.json
@@ -5,13 +5,21 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon_open modified from icon by Prole0 (GitHub)",
+    "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon_open modified from icon by Prole0 (GitHub), inhands by TiniestShark (github)",
     "states": [
         {
             "name": "icon"
         },
         {
             "name": "icon_open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
         }
     ]
 }

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

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

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

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

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

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/icebucket.rsi/meta.json
index f55a85dc2659cfb30bc372044bb3e78e67b27636..fcedd37c4253bc3642c7933ef9b41bb5025feeb1 100644 (file)
--- 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 (file)
index 0000000..ded2789
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/inhand-left.png differ

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/meta.json
index f55a85dc2659cfb30bc372044bb3e78e67b27636..fcedd37c4253bc3642c7933ef9b41bb5025feeb1 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/jigger.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/jigger.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/mreflask.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..59a7824
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/inhand-left.png differ

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json
index ceb7ea2651998a786a675328b857b763be06eb32..ec2769b3b9d74714458b933411b81327fc087f29 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mreflask.rsi/meta.json
@@ -1 +1,22 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Created by EmoGarbage", "states": [{"name": "icon"}]}
\ No newline at end of file
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by EmoGarbage, inhands by TiniestShark (github)",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}

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

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug.rsi/meta.json
index 21ea2b2106449dd4aad531fccf9b326a3b722d60..052ebf11aabdeb83d9f02f5b46e3d96782fb7de3 100644 (file)
--- 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 (file)
index 0000000..75e52d9
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_black.rsi/inhand-left.png differ

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

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 21ea2b2106449dd4aad531fccf9b326a3b722d60..052ebf11aabdeb83d9f02f5b46e3d96782fb7de3 100644 (file)
--- 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 (file)
index 0000000..d45650e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_blue.rsi/inhand-left.png differ

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

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 21ea2b2106449dd4aad531fccf9b326a3b722d60..052ebf11aabdeb83d9f02f5b46e3d96782fb7de3 100644 (file)
--- 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 (file)
index 0000000..972df38
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-0.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-1.png
new file mode 100644 (file)
index 0000000..af27fd3
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-1.png differ

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 (file)
index 0000000..39360e1
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-2.png differ

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 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png differ

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

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
index f605d28ff705c1bf00fe099ab8b140c1cb041622..d7e6f34541a2875d3c5b8d0e530841de7400a448 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
@@ -5,10 +5,27 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "https://github.com/unitystation/unitystation/blob/221bbcc50edf4e63dc71ac6fd5152664a6b6745a/UnityProject/Assets/Textures/items/drinks/mug_gromit.png | Created By https://github.com/ksivte",
+    "copyright": "https://github.com/unitystation/unitystation/blob/221bbcc50edf4e63dc71ac6fd5152664a6b6745a/UnityProject/Assets/Textures/items/drinks/mug_gromit.png | Created By https://github.com/ksivte, inhands and modification by TiniestShark (github)",
     "states": [
+        {
+            "name": "icon-0"
+        },
+        {
+            "name": "icon-1"
+        },
+        {
+            "name": "icon-2"
+        },
         {
             "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_green.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..b8b4c81
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/inhand-left.png differ

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json
index 21ea2b2106449dd4aad531fccf9b326a3b722d60..052ebf11aabdeb83d9f02f5b46e3d96782fb7de3 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_green.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_green.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_heart.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..9cda7f0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/inhand-left.png differ

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json
index 21ea2b2106449dd4aad531fccf9b326a3b722d60..052ebf11aabdeb83d9f02f5b46e3d96782fb7de3 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_heart.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_heart.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_metal.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..2fd0c6b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_metal.rsi/inhand-left.png differ

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

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 21ea2b2106449dd4aad531fccf9b326a3b722d60..052ebf11aabdeb83d9f02f5b46e3d96782fb7de3 100644 (file)
--- 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 (file)
index 0000000..1d41798
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/inhand-left.png differ

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json
index 21ea2b2106449dd4aad531fccf9b326a3b722d60..052ebf11aabdeb83d9f02f5b46e3d96782fb7de3 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_moebius.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_one.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..f8b8787
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_one.rsi/inhand-left.png differ

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

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 21ea2b2106449dd4aad531fccf9b326a3b722d60..052ebf11aabdeb83d9f02f5b46e3d96782fb7de3 100644 (file)
--- 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 (file)
index 0000000..044f1f5
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/inhand-left.png differ

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json
index 21ea2b2106449dd4aad531fccf9b326a3b722d60..052ebf11aabdeb83d9f02f5b46e3d96782fb7de3 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_rainbow.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_red.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..4a1125c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mug_red.rsi/inhand-left.png differ

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

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 21ea2b2106449dd4aad531fccf9b326a3b722d60..052ebf11aabdeb83d9f02f5b46e3d96782fb7de3 100644 (file)
--- 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 (file)
index 0000000..bba2ddd
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/inhand-left-fill-1.png differ

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

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

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

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

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/meta.json
index b7a6eeee38b7dfcb55c633b754c888904e0fd6b4..fd648b79cf222be3bc5ffcf1731bdb083158fef5 100644 (file)
--- 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 (file)
index 0000000..fd0d15c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/inhand-left-fill-1.png differ

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

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

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shotglass.rsi/meta.json
index 389f1b8b96eae27c44ba706df82fe121c0cbc255..cf438684de6d73f60ab62560fee16a71226810e8 100644 (file)
--- 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 (file)
index 0000000..6e44346
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/inhand-left.png differ

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

diff --git a/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vacuumflask.rsi/meta.json
index db0ac608ed068f887d184f45e9acd83fba0a3976..b45677f9866ad997ae45e07c354e4dbe6e8d8898 100644 (file)
--- 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
+        }
+    ]
+}