From: Tiniest Shark Date: Wed, 3 Sep 2025 19:21:00 +0000 (-0400) Subject: Add inhand sprites to Cartons and Cups, give new inhands to Cans. (#39814) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3aeecd0139c794408a5434091609077b106c53b1;p=space-station-14.git Add inhand sprites to Cartons and Cups, give new inhands to Cans. (#39814) * Added inhand sprites to cans, cartons and cups. * small tweak --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml index 0cd960bed1..1ab7c3180b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml @@ -29,6 +29,8 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: fill + inHandsMaxFillLevels: 3 + inHandsFillBaseName: -fill- - type: GenericVisualizer visuals: enum.OpenableVisuals.Opened: @@ -71,6 +73,8 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: fill + inHandsMaxFillLevels: 3 + inHandsFillBaseName: -fill- - type: GenericVisualizer visuals: enum.OpenableVisuals.Opened: diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/inhand-left.png new file mode 100644 index 0000000000..8bf6755c94 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/inhand-right.png new file mode 100644 index 0000000000..49af4002dc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json index b712e503a1..5a1b399e50 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json @@ -5,13 +5,21 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Github #DrMelon", + "copyright": "Github #DrMelon. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" }, { "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/inhand-left.png new file mode 100644 index 0000000000..50314fb33b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/inhand-right.png new file mode 100644 index 0000000000..4a462785f3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json index c92d6f1b0e..c3942590a6 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/cafe_latte.rsi/meta.json @@ -6,7 +6,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub. Inhands by Tiniest Shark (Github)", "states": [ { @@ -17,6 +17,14 @@ }, { "name": "fill-1" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon.png index ea7735183e..9ef4af5e60 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon_open.png index 04cfae2fc3..a09984dbd3 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/inhand-left.png new file mode 100644 index 0000000000..80d124e334 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/inhand-right.png new file mode 100644 index 0000000000..fcf9eb3943 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/meta.json index 681df63262..ce1ecaa5ab 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/changelingsting.rsi/meta.json @@ -5,17 +5,22 @@ "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 Tiniest Shark (Github)", "states": [ { "name": "icon", "delays": [ [ 10.0, + 0.1, 10.0, + 0.1, 10.0, + 0.1, 10.0, - 10.0 + 0.1, + 10.0, + 0.1 ] ] }, @@ -24,12 +29,125 @@ "delays": [ [ 10.0, + 0.1, + 10.0, + 0.1, 10.0, + 0.1, 10.0, + 0.1, 10.0, - 10.0 + 0.1 ] ] - } - ] -} \ No newline at end of file + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1 + ], + [ + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1 + ], + [ + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1 + ], + [ + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1 + ], + [ + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1 + ], + [ + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1 + ], + [ + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1, + 5.0, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/inhand-left.png new file mode 100644 index 0000000000..609b685ec1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/inhand-right.png new file mode 100644 index 0000000000..24d928ea2a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json index d7f3d6da42..c336b26583 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/coconutwater.rsi/meta.json @@ -5,13 +5,21 @@ "y": 32 }, "license": "CC0-1.0", - "copyright": "Original work by noctis on Discord", + "copyright": "Original work by noctis on Discord. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" }, { "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-left.png index 477a29c3e2..6fc55016b0 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-right.png index 23a82d03f8..b4a47272c5 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/meta.json index 1bebea0aa9..181ce00e88 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/cola.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi, inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/inhand-left.png new file mode 100644 index 0000000000..81e381ec4a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/inhand-right.png new file mode 100644 index 0000000000..9a6a6e17b2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/meta.json index 9e1d9a9075..e65d47fd41 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/cream.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", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" }, { "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-left.png index b831c1087e..d5ff9cf124 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-right.png index 4767d514b1..adac96faed 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/meta.json index 1bebea0aa9..087c100ebf 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/dr_gibb.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-left.png index 365b3aa812..89cb06a092 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-right.png index c929a445b1..d1794343ec 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/meta.json index 1bebea0aa9..087c100ebf 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-left.png index 642fade8f8..b3e7179aa2 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-right.png index 6c8548832a..b4d925a2ff 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json index 1bebea0aa9..087c100ebf 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/fourteen_loko.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..fa5d91c412 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..9cec22fdc8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..5abe7972d8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left.png new file mode 100644 index 0000000000..5048bdd8ad Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..c0f87542b2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..c4640503fd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..9a69f1acd7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right.png new file mode 100644 index 0000000000..db9b96c99b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json index 7319ee8837..afc42a380e 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-NC-SA-4.0", - "copyright": "Created by discord: brainfood#7460 / github: brainfood1183.", + "copyright": "Created by discord: brainfood#7460 / github: brainfood1183. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" @@ -33,6 +33,38 @@ }, { "name": "fill6" + }, + { + "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/golden_cup.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/inhand-left.png new file mode 100644 index 0000000000..7e9f418a50 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/inhand-right.png new file mode 100644 index 0000000000..8fe23e3dcf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/meta.json index db0ac608ed..36a09f430a 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/golden_cup.rsi/meta.json @@ -1 +1,23 @@ -{"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, + "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. Inhands by Tiniest Shark (Github)", + "states": + [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-left.png new file mode 100644 index 0000000000..6df640a3e4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-right.png new file mode 100644 index 0000000000..8ce05ea8ea Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/meta.json index 1b1b3aa259..f5b50d94b3 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/ice_tea_can.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", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" }, { "name": "icon_open" - } + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-left.png index c86f6c325f..21785456ca 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-right.png index b175cde91b..226a769bb9 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/meta.json index 666ec30732..e7c10c09ef 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/lean.rsi/meta.json @@ -1,50 +1,22 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/master/icons/obj/drinks.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/master/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-left.png index aa14f15e1a..17975bea03 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-right.png index 7e1507f80a..dfc03d9786 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/meta.json index 2151beeb21..c0d3bd982f 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime-cranberry.rsi/meta.json @@ -1,25 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi; modified by AugustSun", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi; modified by AugustSun. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-left.png index de164f3b8c..af00bf36e2 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-right.png index a2382a5b61..7fd5dce65b 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/meta.json index 1bebea0aa9..087c100ebf 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/lemon-lime.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..caca4a1e7c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..9cec22fdc8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..5abe7972d8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left.png new file mode 100644 index 0000000000..1d7ebe45fb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..c0f87542b2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..c4640503fd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..9a69f1acd7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right.png new file mode 100644 index 0000000000..8d8933316f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json index 7319ee8837..afc42a380e 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-NC-SA-4.0", - "copyright": "Created by discord: brainfood#7460 / github: brainfood1183.", + "copyright": "Created by discord: brainfood#7460 / github: brainfood1183. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" @@ -33,6 +33,38 @@ }, { "name": "fill6" + }, + { + "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/milk.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/inhand-left.png new file mode 100644 index 0000000000..8e84a8b2cf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/inhand-right.png new file mode 100644 index 0000000000..6dc179cb73 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/meta.json index 9e1d9a9075..e65d47fd41 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/milk.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", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" }, { "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/inhand-left.png new file mode 100644 index 0000000000..23694788ca Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/inhand-right.png new file mode 100644 index 0000000000..a2ffe45a21 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json index 9e1d9a9075..e65d47fd41 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.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", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" }, { "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/inhand-left.png new file mode 100644 index 0000000000..8da8888884 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/inhand-right.png new file mode 100644 index 0000000000..dd65d0066d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json index 9e1d9a9075..e65d47fd41 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.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", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" }, { "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/inhand-left.png new file mode 100644 index 0000000000..0c19129bba Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/inhand-right.png new file mode 100644 index 0000000000..60d661984a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/meta.json index 31a3eae2e6..998efd88d2 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/pineapplejuice.rsi/meta.json @@ -5,13 +5,21 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "GrownSamoyedDog on Github. A variant of orangejuice carton from: https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", + "copyright": "GrownSamoyedDog on Github. A variant of orangejuice carton from: https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" }, { "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-left.png index 69b2348005..079908d808 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-right.png index 71a60e7b0c..3e5edd720f 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/meta.json index 1bebea0aa9..087c100ebf 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/purple_can.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-left.png index 2ed4941501..eb1fade9ba 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-right.png index cb29098114..52b666dad1 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json index d269458e27..db298f17e6 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/pwrgame.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png index 59e3843dc2..a2dc592f4a 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png index 39481d24ee..6d651c750d 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json index 7ded114b0f..94755597f1 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/robustnukie.rsi/meta.json @@ -1,25 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Potato1234x (github) for SS14", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "Made by Potato1234x (github) for SS14. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-left.png index 60f5f88404..dc70a8897b 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-right.png index 8f299e007d..458185df30 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json index 68b9e804a5..37f3b82065 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json @@ -1,25 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi (EDITED BY Plasmaguy#6148 [Discord, liable to change] / jrjr3000 [Steam])", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi (EDITED BY Plasmaguy#6148 [Discord, liable to change] / jrjr3000 [Steam]). Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-left.png index 6b182db296..3759f5cee9 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-right.png index ace1850674..b144fcf523 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json index d269458e27..db298f17e6 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/shamblersjuice.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/70ccd0f2305286a1312425a85365881fac16fcac. Modified by potato1234x (github) for SS14. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-left.png index 2e1c5e06a0..3ccb23f298 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-right.png index 4f2a04fd09..4473d9bfd6 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/meta.json index 1bebea0aa9..087c100ebf 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/sodawater.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png index 3c03c07742..a47e0c1649 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png index 2f68635d90..c47e1dee20 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json index 8bc80009c5..8c03f72257 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/sol_dry.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi, Sol Dry from /tg/.", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "Modified from https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi, Sol Dry from /tg/. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/inhand-left.png new file mode 100644 index 0000000000..16ddaabcea Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/inhand-right.png new file mode 100644 index 0000000000..1e1c7d31b5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/meta.json index 9e1d9a9075..e65d47fd41 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/soymilk.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", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" }, { "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-left.png index 1d68344ef4..f863fa43d0 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-right.png index 88e420e703..f8daea6182 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/meta.json index 1bebea0aa9..087c100ebf 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/space-up.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/inhand-left.png index d1cd7229ee..e42490a3dd 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/inhand-right.png index 5843404b9d..a777932f4c 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/meta.json index 1bebea0aa9..087c100ebf 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/inhand-left.png index 2c4de36e61..9aa2e421ac 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/inhand-right.png index be9651c155..5aaa431dad 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/meta.json index 1bebea0aa9..087c100ebf 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/starkist.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/inhand-left.png new file mode 100644 index 0000000000..61f2fc9590 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/inhand-right.png new file mode 100644 index 0000000000..910124fefa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json index 2666be145a..8f340a2eab 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/teacup.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/teacup.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 Tiniest Shark (Github)", "states": [ { "name": "icon-0" @@ -27,6 +27,14 @@ }, { "name": "icon-vend-green-tea" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/inhand-left.png new file mode 100644 index 0000000000..d391f854e7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/inhand-right.png new file mode 100644 index 0000000000..cec7beb423 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/meta.json index 9e1d9a9075..e65d47fd41 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.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", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" }, { "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/inhand-left.png index 0a48331ebf..ed354cf3fb 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/inhand-left.png and b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/inhand-right.png index cb145ca151..2f2ad70514 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/inhand-right.png and b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/meta.json index d2cf48f286..087c100ebf 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/tonic.rsi/meta.json @@ -1,53 +1,25 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi", - "states": [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi. Inhands by Tiniest Shark (Github)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/inhand-left.png new file mode 100644 index 0000000000..8b7b77afa2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/inhand-right.png new file mode 100644 index 0000000000..ba7c125b36 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json index 7c719f160d..6301d09d7d 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/water_cup.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/water_cup.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", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon-0" }, { "name": "icon-1" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/inhand-left.png new file mode 100644 index 0000000000..a66de5a6aa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/inhand-right.png new file mode 100644 index 0000000000..3b745d9c8b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json index b712e503a1..5a1b399e50 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json @@ -5,13 +5,21 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Github #DrMelon", + "copyright": "Github #DrMelon. Inhands by Tiniest Shark (Github)", "states": [ { "name": "icon" }, { "name": "icon_open" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Misc/6pack.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/6pack.rsi/inhand-left.png new file mode 100644 index 0000000000..5035ce2d81 Binary files /dev/null and b/Resources/Textures/Objects/Misc/6pack.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Misc/6pack.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/6pack.rsi/inhand-right.png new file mode 100644 index 0000000000..ac4b9e1fc5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/6pack.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/6pack.rsi/meta.json b/Resources/Textures/Objects/Misc/6pack.rsi/meta.json index 76280403d4..4c7757a383 100644 --- a/Resources/Textures/Objects/Misc/6pack.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/6pack.rsi/meta.json @@ -1,32 +1,40 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 and modified by Swept", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "6pack1" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432 and modified by Swept. Inhands by Tiniest Shark (Github)", + "size": { + "x": 32, + "y": 32 }, - { - "name": "6pack2" - }, - { - "name": "6pack3" - }, - { - "name": "6pack4" - }, - { - "name": "6pack5" - }, - { - "name": "6pack6" - }, - { - "name": "plastic-thingy" - } - ] + "states": [ + { + "name": "6pack1" + }, + { + "name": "6pack2" + }, + { + "name": "6pack3" + }, + { + "name": "6pack4" + }, + { + "name": "6pack5" + }, + { + "name": "6pack6" + }, + { + "name": "plastic-thingy" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] }