From: Tiniest Shark Date: Sat, 12 Jul 2025 14:28:22 +0000 (-0400) Subject: Bottle Drink Inhands (#38937) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=88ebad06ea579880061d0b98f999380d54993bef;p=space-station-14.git Bottle Drink Inhands (#38937) * there is now bottles of booze in your hands * Messed up the vermouth inhand fills slightly. * oh whoops that's redundant --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 11da44f898..c2ac4c606f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -215,6 +215,8 @@ - type: SolutionContainerVisuals maxFillLevels: 5 fillBaseName: fill- + inHandsMaxFillLevels: 3 + inHandsFillBaseName: -fill- # Large Glass Bottles @@ -719,9 +721,6 @@ Quantity: 30 - type: Sprite sprite: Objects/Consumable/Drinks/waterbottle.rsi - - type: SolutionContainerVisuals - inHandsMaxFillLevels: 2 - inHandsFillBaseName: -fill- - type: Label currentLabel: reagent-name-water - type: Sealable diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml index ed2324811e..22ff617809 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml @@ -168,3 +168,5 @@ - type: SolutionContainerVisuals maxFillLevels: 5 fillBaseName: fill- + inHandsMaxFillLevels: 3 + inHandsFillBaseName: -fill- diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..d5adc6d762 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..9d1cc8a7d6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..16bf2bcd0f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left.png new file mode 100644 index 0000000000..68538310bc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..f7f8d2d39f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..3b65c3ed77 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..dbce673fd5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right.png new file mode 100644 index 0000000000..7342070518 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/alco-bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..b735287a2a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..1b387d5ac3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..001a801d6c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left.png new file mode 100644 index 0000000000..54f662b064 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..2da1e578c4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..4532858488 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..979bbf08cc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right.png new file mode 100644 index 0000000000..d226ded556 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json index f60e29d82f..52cb1050a0 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.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_blue" @@ -42,6 +42,38 @@ }, { "name": "fill-6" + }, + { + "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/alebottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..8a5e842eda Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..af2da8354c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..48af47360e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left.png new file mode 100644 index 0000000000..b58d2cfb36 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..e37dd673c5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..71e4bdaf53 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..88fd5618c3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right.png new file mode 100644 index 0000000000..743a93bf1e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json index 960293f615..df07a51fcd 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/alebottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/beer.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..d340491de3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..ba8c8fbc03 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..b0020cc3d7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left.png new file mode 100644 index 0000000000..98fe987443 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..b89d65f8f2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..2b437b14ac Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..9df8de24dc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right.png new file mode 100644 index 0000000000..19b919e34e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/beer.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/bottleofnothing.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-left.png new file mode 100644 index 0000000000..a51ae97131 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-right.png new file mode 100644 index 0000000000..efbffb69c6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json index 9e1d9a9075..30b3bf2a33 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.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 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/champagnebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-left.png new file mode 100644 index 0000000000..0010e197f2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-right.png new file mode 100644 index 0000000000..ec574e53b3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json index e00674b301..94e9eb6ce1 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json @@ -5,13 +5,21 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "drawn by givazaa", + "copyright": "drawn by givazaa, 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/coffeeliqueurbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-left.png new file mode 100644 index 0000000000..119a8f7d2b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-right.png new file mode 100644 index 0000000000..bf8d6438f0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json index 9e1d9a9075..009176d023 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.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 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/cognacbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..66efbe97e1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..612222a36c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..a4cf0262b7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left.png new file mode 100644 index 0000000000..9ebf7d4752 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..b68edb9380 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..de29daf81b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..c6d68f63d9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right.png new file mode 100644 index 0000000000..08f49bec69 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json index 960293f615..df07a51fcd 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/colabottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..6d3b968beb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..3a7e751075 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..7beda89048 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left.png new file mode 100644 index 0000000000..62fb7cdc68 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..22eff7e402 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..b0f11f1af1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..b671320b52 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right.png new file mode 100644 index 0000000000..359a48f529 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/colabottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/gildlagerbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..6b7c6a3da5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..1b407be265 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..3ab3631870 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left.png new file mode 100644 index 0000000000..d045f4f0e7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..65ddfbc981 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..bb4733c7a2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..20caef3032 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right.png new file mode 100644 index 0000000000..80938404de Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/ginbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..39198a73cc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..591c709b9a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..9dc112eb67 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left.png new file mode 100644 index 0000000000..cf1096a1f2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..4fa6e2865e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..a2451e16d2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..2eca06d4f6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right.png new file mode 100644 index 0000000000..8eb0c20905 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/grenadinebottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..a13202b5d3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..a1dddcb94b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..b9ac2b6520 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left.png new file mode 100644 index 0000000000..570467eb19 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..0dd980a922 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..751ebf5d3c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..0db4d2d19a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right.png new file mode 100644 index 0000000000..c4f1689a53 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json index 6542150423..ba81b5b27c 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.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" @@ -33,6 +33,38 @@ }, { "name": "fill-6" + }, + { + "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/lemonjuice.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-left.png new file mode 100644 index 0000000000..13c94563bf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-right.png new file mode 100644 index 0000000000..01c9102950 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json index 9e1d9a9075..009176d023 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/lemonjuice.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 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/limejuice.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-left.png new file mode 100644 index 0000000000..43e01b3e20 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-right.png new file mode 100644 index 0000000000..67d745ffc0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json index 9e1d9a9075..30b3bf2a33 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/limejuice.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 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/mopwata.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..4565a7752a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..41325e50ea Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..454e3ab2a4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left.png new file mode 100644 index 0000000000..166532f8dc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..a4f87ad9c7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..a2b417f33a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..b283819d3c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right.png new file mode 100644 index 0000000000..a82d43f7e9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json index 960293f615..df07a51fcd 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mopwata.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/ntcahors.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..311ddd4623 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..d9b930ed7e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..1dc501183f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left.png new file mode 100644 index 0000000000..8d04eec7ef Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..3be2b0e899 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..49076b5575 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..70fc4e4470 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right.png new file mode 100644 index 0000000000..642f55425a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json index db0ac608ed..e91afea62f 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/ntcahors.rsi/meta.json @@ -1 +1,46 @@ -{"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 TiniestShark (github)", + "states": [ + { + "name": "icon" + }, + { + "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/patronbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..b07e28d83c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..5923f3c50b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..41b5cc1114 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left.png new file mode 100644 index 0000000000..4ac4286c10 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..c8a9d8d8c8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..c8674e5a48 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..693c9ebadc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right.png new file mode 100644 index 0000000000..d953ec3ea2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/pwinebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-left.png new file mode 100644 index 0000000000..544d2cba51 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-right.png new file mode 100644 index 0000000000..cd772b1eec Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json index 9e1d9a9075..30b3bf2a33 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.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 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/rumbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..c0fe79484c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..49119e5062 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..c8b4499d38 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left.png new file mode 100644 index 0000000000..c746d8b8df Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..97ee9a42d9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..4880ea306f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..4b4fc4e156 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right.png new file mode 100644 index 0000000000..ae8839ebcd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/sakebottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png index 53b96d67d5..0e943e4a95 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png index 57273615e3..d8feb0b718 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-left.png new file mode 100644 index 0000000000..556d05732c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-right.png new file mode 100644 index 0000000000..13185481d1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json index 6009794429..a56728bea4 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/sakebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/sakebottle.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, recolored by PursuitinAshes (Github)", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, recolored by PursuitinAshes (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/sodawater-bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..6d3b968beb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..3a7e751075 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..fdb53126e6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left.png new file mode 100644 index 0000000000..280a655f4d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..22eff7e402 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..b0f11f1af1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..b671320b52 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right.png new file mode 100644 index 0000000000..689017b3c3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json index 1190465440..cd7a1c9027 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/sodawater-bottle.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "modified from space-up_bottle.rsi and inspired by sodawater.rsi by Prole0 (GitHub)", + "copyright": "modified from space-up_bottle.rsi and inspired by sodawater.rsi by Prole0 (GitHub), inhands by TiniestShark (github)", "states": [ { "name": "icon" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/space-up_bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..6d3b968beb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..3a7e751075 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..7beda89048 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left.png new file mode 100644 index 0000000000..3db9a0ad5f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..22eff7e402 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..b0f11f1af1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..b671320b52 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right.png new file mode 100644 index 0000000000..f9eab876ee Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/space_mountain_wind_bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..6d3b968beb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..3a7e751075 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..7beda89048 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left.png new file mode 100644 index 0000000000..20909cf84f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..22eff7e402 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..b0f11f1af1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..b671320b52 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right.png new file mode 100644 index 0000000000..dcf45ca0e7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/tequillabottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..8a621112a0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..d616002a2e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..0decf903e2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left.png new file mode 100644 index 0000000000..75c584bd40 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..464ad3d2db Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..cd072f633b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..5c62139438 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right.png new file mode 100644 index 0000000000..b4f0b8a8b3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/tonic-bottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..6d3b968beb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..3a7e751075 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..7beda89048 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left.png new file mode 100644 index 0000000000..efc8153c22 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..22eff7e402 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..b0f11f1af1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..b671320b52 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right.png new file mode 100644 index 0000000000..8cf79b3ec9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json index 7ef37142c7..334f81ac7a 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/tonic-bottle.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "modified from space-up_bottle.rsi and inspired by tonic.rsi by Prole0 (GitHub)", + "copyright": "modified from space-up_bottle.rsi and inspired by tonic.rsi by Prole0 (GitHub), inhands by TiniestShark (github)", "states": [ { "name": "icon" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/vermouthbottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..7e6e085352 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..97697d35af Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..39bdcdfcef Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left.png new file mode 100644 index 0000000000..608531cdf9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..6501196aa3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..d2f1580d39 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..33f6bd5f27 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right.png new file mode 100644 index 0000000000..b047e2e9d6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/vodkabottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..12db433acf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..314f03cb92 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..9f5836fe51 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left.png new file mode 100644 index 0000000000..c4ad1c2f17 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..95e370f259 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..53a26bb314 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..6e72c95475 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right.png new file mode 100644 index 0000000000..d07fc07cb5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/waterbottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png index 154c205bf1..b8361f4ba0 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..154c205bf1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png index 1530ff913f..a33a30d34f 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png index 66a831d2cc..f2df5c7da8 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..66a831d2cc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json index e09aa519fc..0f46f67641 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json @@ -1,61 +1,67 @@ { - "version": 1, - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon, icon_empty, & icon_open modified from waterbottle.rsi by Prole0 (GitHub)", - "license": "CC-BY-SA-3.0", - "size": - { - "x": 32, - "y": 32 - }, - "states": - [ - { - "name": "icon" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "icon_open" - }, - { - "name": "icon_empty" - }, - { - "name": "fill-1" - }, - { - "name": "fill-2" - }, - { - "name": "fill-3" - }, - { - "name": "fill-4" - }, - { - "name": "fill-5" - }, - { - "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 - } - ] + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi, icon, icon_empty, & icon_open modified from waterbottle.rsi by Prole0 (GitHub)", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + }, + { + "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/whiskeybottle.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..3310861154 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..7386b6d5ef Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-3.png new file mode 100644 index 0000000000..2604e46518 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left.png new file mode 100644 index 0000000000..7ac7b2ab67 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..c1c61b23a8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..882c4b9eed Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-3.png new file mode 100644 index 0000000000..b7a8874beb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right.png new file mode 100644 index 0000000000..d9a2349f97 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json index 960293f615..e139633197 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.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" @@ -30,6 +30,38 @@ }, { "name": "fill-5" + }, + { + "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/winebottle.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-left.png new file mode 100644 index 0000000000..739fe12581 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-right.png new file mode 100644 index 0000000000..aed75df962 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json index 9e1d9a9075..30b3bf2a33 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/winebottle.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 TiniestShark (github)", "states": [ { "name": "icon" }, { "name": "icon_open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] }