Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo

Merged master into branch

Resources/Textures/Objects/Consumable/Drinks/absintheglass.rsi/meta.json

@@ -26,9 +26,6 @@
         },
         {
             "name": "fill-4"
-        },
-        {
-            "name": "fill-5"
         }
     ]
 }

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"}]}
+{
+    "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
+        }
+    ]
+}

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
         }
     ]
 }

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
         }
     ]
 }

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
+        }
     ]
   }

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
+        }
     ]
   }

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"}]}
+{
+    "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
+        }
+    ]
+}

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
         }
     ]
-}
+}

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
         }
     ]
-}
+}

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
         }
     ]
-}
+}

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
         }
     ]
-}
+}

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
         }
     ]
-}
+}

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
         }
     ]
-}
+}

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
         }
     ]
-}
+}

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
         }
     ]
-}
+}

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
         }
     ]
-}
+}

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
         }
     ]
-}
+}

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
         }
     ]
-}
+}

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
+      }
   ]
 }

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
         }
     ]
 }

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"}]}
+{
+    "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
+        }
+    ]
+}