From: Tiniest Shark Date: Sat, 24 May 2025 17:32:27 +0000 (-0400) Subject: Inhands for bartender tools and mugs. (#37771) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=214338caa633dad8dcf9017b78281d766523410a;p=space-station-14.git 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 c8c5c70d5f..89e70beded 100644 --- 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 373430c255..418d2c9d2d 100644 --- 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 efd594ccdd..2ebc20e365 100644 --- 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 af3bd9a93f..a7e3bf18cf 100644 --- 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 index 0000000000..89bf1799d4 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 index 0000000000..edb6fc2f87 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 db0ac608ed..ffcf3da666 100644 --- 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 index 0000000000..2d97239eb2 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 index 0000000000..4d1fc8757a 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 a4039a1dd1..2c665ef007 100644 --- 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 index 0000000000..e55862aa35 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 index 0000000000..8d2361bbe6 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 index 0000000000..699236160a 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 index 0000000000..0ed241c688 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 b42841a32d..6b42e9b9f7 100644 --- 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 index 0000000000..ab31ff6a04 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 index 0000000000..283b9e75ed 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 f55a85dc26..fcedd37c42 100644 --- 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 index 0000000000..ded27898e9 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 index 0000000000..f9f43687f9 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 f55a85dc26..fcedd37c42 100644 --- 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 index 0000000000..59a7824c78 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 index 0000000000..f33751eed4 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 ceb7ea2651..ec2769b3b9 100644 --- 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 index 0000000000..18e7891b56 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 index 0000000000..7333f04e70 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 21ea2b2106..052ebf11aa 100644 --- 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 index 0000000000..75e52d93f4 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 index 0000000000..78c3651271 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 21ea2b2106..052ebf11aa 100644 --- 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 index 0000000000..d45650eb5b 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 index 0000000000..7fc471293f 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 21ea2b2106..052ebf11aa 100644 --- 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 index 0000000000..972df383dd 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 index 0000000000..af27fd3485 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 index 0000000000..39360e1cfd 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 b733d745fe..c46dd0db14 100644 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 index 0000000000..9ffaa7c21b 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 index 0000000000..d628d47fbb 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 f605d28ff7..d7e6f34541 100644 --- 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 index 0000000000..b8b4c81598 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 index 0000000000..01bf1e17d9 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 21ea2b2106..052ebf11aa 100644 --- 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 index 0000000000..9cda7f0ce5 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 index 0000000000..563187cdd0 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 21ea2b2106..052ebf11aa 100644 --- 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 index 0000000000..2fd0c6bb36 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 index 0000000000..b6f127f2e5 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 21ea2b2106..052ebf11aa 100644 --- 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 index 0000000000..1d41798e58 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 index 0000000000..1b4ee5e0b5 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 21ea2b2106..052ebf11aa 100644 --- 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 index 0000000000..f8b8787652 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 index 0000000000..33e5a613cc 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 21ea2b2106..052ebf11aa 100644 --- 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 index 0000000000..044f1f5807 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 index 0000000000..aa06a4b040 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 21ea2b2106..052ebf11aa 100644 --- 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 index 0000000000..4a1125cab1 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 index 0000000000..9e2af908c1 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 21ea2b2106..052ebf11aa 100644 --- 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 index 0000000000..bba2ddd197 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 index 0000000000..6094b8b76f 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 index 0000000000..0e7ae7e5eb 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 index 0000000000..a9f0394fa6 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 index 0000000000..6068875bcf 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 index 0000000000..7f463495a5 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 b7a6eeee38..fd648b79cf 100644 --- 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 index 0000000000..fd0d15cdcd 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 index 0000000000..efbb80be0c 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 index 0000000000..e62f65f14e 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 index 0000000000..29b2aaa7f6 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 389f1b8b96..cf438684de 100644 --- 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 index 0000000000..6e44346548 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 index 0000000000..721992a2f4 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 db0ac608ed..b45677f986 100644 --- 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 + } + ] +}