From: Tayrtahn Date: Sun, 4 Feb 2024 20:13:47 +0000 (-0500) Subject: Add open/closed/fill states and sprites (#24600) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=41cf3e559973f89eb48d1e24099716f54a1bc87c;p=space-station-14.git Add open/closed/fill states and sprites (#24600) This adds visual differences to the sprites of many of the game's drinks when they are opened, as well as visual fill levels for most see-through drink containers. Condiment packets are visibly torn open in the corner when opened. Glue, lube, and condiment bottles are visibly opened too. I also noticed that the soda bottles were all completely opaque, so I fixed that while I was at it. Oh, and I updated the wine bottle sprite to say 14 instead of 13, 'cause yeah. As a result of the way fill levels take on the color of the contained liquid, many of the drinks have changed slightly in appearance. This can be adjusted in the future by modifying the colors of the reagents, but seems outside the scope of this already large PR. This also means that if you refill the bottles with a different liquid, they'll take on the new color appropriately. --- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml index 345611bd87..cab95b0803 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -36,7 +36,23 @@ solution: drink - type: entity - parent: DrinkCartonBaseFull + id: DrinkCartonVisualsOpenable + abstract: true + components: + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon"} + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + +- type: entity + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] id: DrinkJuiceLimeCarton name: lime juice description: Sweet-sour goodness. @@ -51,7 +67,7 @@ sprite: Objects/Consumable/Drinks/limejuice.rsi - type: entity - parent: DrinkCartonBaseFull + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] id: DrinkJuiceOrangeCarton name: orange juice description: Full of vitamins and deliciousness! @@ -66,7 +82,7 @@ sprite: Objects/Consumable/Drinks/orangejuice.rsi - type: entity - parent: DrinkCartonBaseFull + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] id: DrinkJuiceTomatoCarton name: tomato juice description: Well, at least it LOOKS like tomato juice. You can't tell with all that redness. @@ -81,7 +97,7 @@ sprite: Objects/Consumable/Drinks/tomatojuice.rsi - type: entity - parent: DrinkCartonBaseFull + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] id: DrinkCreamCarton name: milk cream description: It's cream. Made from milk. What else did you think you'd find in there? @@ -96,7 +112,7 @@ sprite: Objects/Consumable/Drinks/cream.rsi - type: entity - parent: DrinkCartonBaseFull + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] id: DrinkMilkCarton name: milk description: An opaque white liquid produced by the mammary glands of mammals. @@ -112,7 +128,7 @@ sprite: Objects/Consumable/Drinks/milk.rsi - type: entity - parent: DrinkCartonBaseFull + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] id: DrinkSoyMilkCarton name: soy milk description: White and nutritious soy goodness! @@ -128,7 +144,7 @@ sprite: Objects/Consumable/Drinks/soymilk.rsi - type: entity - parent: DrinkCartonBaseFull + parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull] id: DrinkOatMilkCarton name: oat milk description: It's oat milk. Tan and nutritious goodness! diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 2c156d5828..b0b2c2729f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -79,7 +79,46 @@ Glass: 100 - type: entity - parent: DrinkBottleGlassBaseFull + id: DrinkBottleVisualsOpenable + abstract: true + components: + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon"} + - type: Sprite + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + +- type: entity + id: DrinkBottleVisualsAll + abstract: true + components: + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon_empty"} + - type: Sprite + sprite: Objects/Consumable/Drinks/alco-bottle.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: fill-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: fill- + +- type: entity + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkAbsintheBottleFull name: Jailbreaker Verte description: One sip of this and you just know you're gonna have a good time. @@ -94,7 +133,7 @@ sprite: Objects/Consumable/Drinks/absinthebottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkBlueCuracaoBottleFull name: Miss Blue Curacao description: A fruity, exceptionally azure drink. Does not allow the imbiber to use the fifth magic. @@ -106,10 +145,19 @@ - ReagentId: BlueCuracao Quantity: 100 - type: Sprite - sprite: Objects/Consumable/Drinks/alco-blue.rsi + sprite: Objects/Consumable/Drinks/alco-bottle.rsi + layers: + - state: icon_blue + map: ["enum.OpenableVisuals.Layer"] + - state: fill-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: SolutionContainerVisuals + maxFillLevels: 6 + fillBaseName: fill- - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull] id: DrinkBottleOfNothingFull name: bottle of nothing description: A bottle filled with nothing. @@ -124,7 +172,7 @@ sprite: Objects/Consumable/Drinks/bottleofnothing.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull] id: DrinkChampagneBottleFull name: champagne bottle description: Only people devoid of imagination can't find an excuse for champagne. @@ -139,7 +187,7 @@ sprite: Objects/Consumable/Drinks/champagnebottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkCognacBottleFull name: cognac bottle description: A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time. @@ -156,7 +204,7 @@ sprite: Objects/Consumable/Drinks/cognacbottle.rsi - type: entity - parent: DrinkBottlePlasticBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkColaBottleFull name: space cola bottle description: Cola. In space. @@ -172,9 +220,8 @@ - type: Sprite sprite: Objects/Consumable/Drinks/colabottle.rsi - - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkGrenadineBottleFull name: briar rose grenadine syrup bottle description: Sweet and tangy, a bar syrup used to add color or flavor to drinks. @@ -190,9 +237,11 @@ opened: true - type: Sprite sprite: Objects/Consumable/Drinks/grenadinebottle.rsi + - type: SolutionContainerVisuals + maxFillLevels: 6 - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkGinBottleFull name: Griffeater gin description: A bottle of high quality gin, produced in the New London Space Station. @@ -209,7 +258,7 @@ sprite: Objects/Consumable/Drinks/ginbottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkGildlagerBottleFull name: gildlager bottle description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break. @@ -224,7 +273,7 @@ sprite: Objects/Consumable/Drinks/gildlagerbottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull] id: DrinkCoffeeLiqueurBottleFull name: coffee liqueur bottle description: The great taste of coffee with none of the benifits. @@ -241,7 +290,7 @@ sprite: Objects/Consumable/Drinks/coffeeliqueurbottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkMelonLiquorBottleFull name: emeraldine melon liquor description: A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light. @@ -253,10 +302,19 @@ - ReagentId: MelonLiquor Quantity: 100 - type: Sprite - sprite: Objects/Consumable/Drinks/alco-green.rsi + sprite: Objects/Consumable/Drinks/alco-bottle.rsi + layers: + - state: icon_green + map: ["enum.OpenableVisuals.Layer"] + - state: fill-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: SolutionContainerVisuals + maxFillLevels: 6 + fillBaseName: fill- - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkPatronBottleFull name: wrapp artiste patron bottle description: Silver laced tequilla, served in space night clubs across the galaxy. @@ -271,7 +329,7 @@ sprite: Objects/Consumable/Drinks/patronbottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull] id: DrinkPoisonWinebottleFull name: warlock's velvet bottle description: What a delightful packaging for a surely high quality wine! The vintage must be amazing! @@ -286,7 +344,7 @@ sprite: Objects/Consumable/Drinks/pwinebottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkRumBottleFull name: captain pete's Cuban spiced rum description: This isn't just rum, oh no. It's practically GRIFF in a bottle. @@ -303,7 +361,7 @@ sprite: Objects/Consumable/Drinks/rumbottle.rsi - type: entity - parent: DrinkBottlePlasticBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkSpaceMountainWindBottleFull name: space mountain wind bottle description: Blows right through you like a space wind. @@ -321,7 +379,7 @@ sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi - type: entity - parent: DrinkBottlePlasticBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkSpaceUpBottleFull name: space-up bottle description: Tastes like a hull breach in your mouth. @@ -339,7 +397,7 @@ sprite: Objects/Consumable/Drinks/space-up_bottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkTequilaBottleFull name: caccavo guaranteed quality tequila bottle description: Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients! @@ -356,7 +414,7 @@ sprite: Objects/Consumable/Drinks/tequillabottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkVermouthBottleFull name: goldeneye vermouth bottle description: Sweet, sweet dryness! @@ -373,7 +431,7 @@ sprite: Objects/Consumable/Drinks/vermouthbottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkVodkaBottleFull name: vodka bottle description: Aah, vodka. Prime choice of drink AND fuel by Russians worldwide. @@ -390,7 +448,7 @@ sprite: Objects/Consumable/Drinks/vodkabottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkWhiskeyBottleFull name: uncle git's special reserve description: A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES. @@ -407,7 +465,7 @@ sprite: Objects/Consumable/Drinks/whiskeybottle.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull] id: DrinkWineBottleFull name: doublebearded bearded special wine bottle description: A faint aura of unease and asspainery surrounds the bottle. @@ -426,7 +484,7 @@ # Small Bottles - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkBeerBottleFull name: beer # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e description: An alcoholic beverage made from malted grains, hops, yeast, and water. @@ -444,7 +502,7 @@ sprite: Objects/Consumable/Drinks/beer.rsi - type: entity - parent: DrinkBottleGlassBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull] id: DrinkBeerGrowler # Needs to be renamed DrinkBeerBottleFull name: Beer Growler # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e description: An alcoholic beverage made from malted grains, hops, yeast, and water. XL growler bottle. @@ -463,7 +521,7 @@ - type: entity - parent: DrinkBottlePlasticBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkAleBottleFull name: Magm-Ale description: A true dorf's drink of choice. @@ -482,7 +540,7 @@ sprite: Objects/Consumable/Drinks/alebottle.rsi - type: entity - parent: DrinkBottlePlasticBaseFull + parent: [DrinkBottleVisualsAll, DrinkBottlePlasticBaseFull] id: DrinkAleBottleFullGrowler name: Magm-Ale Growler description: A true dorf's drink of choice. XL growler bottle. @@ -500,7 +558,7 @@ sprite: Objects/Consumable/Drinks/alebottle.rsi - type: entity - parent: DrinkBottlePlasticBaseFull + parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull] id: DrinkWaterBottleFull name: water bottle description: Simple clean water of unknown origin. You think that maybe you dont want to know it. @@ -519,6 +577,7 @@ sprite: Objects/Consumable/Drinks/waterbottle.rsi layers: - state: icon + map: ["enum.OpenableVisuals.Layer"] - state: icon-1 map: ["enum.SolutionContainerLayers.Fill"] visible: false @@ -564,7 +623,7 @@ # Cartons, TODO: this needs to be moved elsewhere eventually, since cartons shouldnt smash into glass shards - type: entity - parent: DrinkBottlePlasticBaseFull + parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull] id: DrinkJuiceLimeCartonXL name: lime juice XL description: Sweet-sour goodness. @@ -583,7 +642,7 @@ sprite: Objects/Consumable/Drinks/limejuice.rsi - type: entity - parent: DrinkBottlePlasticBaseFull + parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull] id: DrinkJuiceOrangeCartonXL name: orange juice XL description: Full of vitamins and deliciousness! @@ -602,7 +661,7 @@ sprite: Objects/Consumable/Drinks/orangejuice.rsi - type: entity - parent: DrinkBottlePlasticBaseFull + parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull] id: DrinkCreamCartonXL name: Milk Cream XL description: It's cream. Made from milk. What else did you think you'd find in there? diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml index 359e4262cd..2fd2331f91 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml @@ -11,7 +11,7 @@ sprite: Objects/Consumable/Drinks/glue-tube.rsi layers: - state: icon - map: [ "enum.SolutionContainerLayers.Base" ] + map: ["enum.OpenableVisuals.Layer"] - state: fill1 map: [ "enum.SolutionContainerLayers.Fill" ] visible: false @@ -29,6 +29,12 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: fill + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon"} - type: Tag tags: - DrinkSpaceGlue @@ -48,7 +54,7 @@ sprite: Objects/Consumable/Drinks/lube-tube.rsi layers: - state: icon - map: [ "enum.SolutionContainerLayers.Base" ] + map: ["enum.OpenableVisuals.Layer"] - state: fill1 map: [ "enum.SolutionContainerLayers.Fill" ] visible: false @@ -65,6 +71,12 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: fill + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon"} - type: Lube - type: TrashOnSolutionEmpty solution: drink @@ -134,5 +146,21 @@ - type: RandomFillSolution solution: drink weightedRandomId: RandomFillMopwata + - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon_empty"} - type: Sprite sprite: Objects/Consumable/Drinks/mopwata.rsi + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] + - state: fill-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: fill- diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml index 5ae992319a..197e7ea982 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml @@ -49,7 +49,19 @@ - type: SolutionTransfer maxTransferAmount: 10 - type: Sprite - state: packet-empty + layers: + - state: packet-trans-2 + map: ["enum.SolutionContainerLayers.Fill"] + visible: true + - state: packet-layer + map: ["enum.OpenableVisuals.Layer"] + - state: packet-label + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "packet-layer-open"} + False: {state: "packet-layer"} - type: Icon state: packet-empty - type: PhysicalComposition @@ -77,7 +89,9 @@ - state: packet-trans-2 map: ["enum.SolutionContainerLayers.Fill"] visible: true - - state: packet-astrotame + - state: packet-layer + map: ["enum.OpenableVisuals.Layer"] + - state: packet-label-a - type: Icon state: packet-astrotame - type: Appearance @@ -98,12 +112,6 @@ reagents: - ReagentId: BbqSauce Quantity: 10 - - type: Sprite - layers: - - state: packet-trans-2 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - state: packet-layer - type: Icon state: packet-bbq - type: Appearance @@ -124,12 +132,6 @@ reagents: - ReagentId: Cornoil Quantity: 10 - - type: Sprite - layers: - - state: packet-trans-2 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - state: packet-layer - type: Icon state: packet-cornoil - type: Appearance @@ -150,12 +152,6 @@ reagents: - ReagentId: Frostoil Quantity: 10 - - type: Sprite - layers: - - state: packet-trans-2 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - state: packet-layer - type: Icon state: packet-frostoil - type: Appearance @@ -176,12 +172,6 @@ reagents: - ReagentId: HorseradishSauce Quantity: 10 - - type: Sprite - layers: - - state: packet-solid-2 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - state: packet-layer - type: Icon state: packet-greygoo - type: Appearance @@ -202,12 +192,6 @@ reagents: - ReagentId: Hotsauce Quantity: 10 - - type: Sprite - layers: - - state: packet-trans-2 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - state: packet-layer - type: Icon state: packet-hotsauce - type: Appearance @@ -228,11 +212,6 @@ - ReagentId: Ketchup Quantity: 10 - type: Sprite - layers: - - state: packet-solid-2 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - state: packet-layer - type: Icon state: packet-ketchup - type: Appearance @@ -252,12 +231,6 @@ reagents: - ReagentId: Mustard Quantity: 10 - - type: Sprite - layers: - - state: packet-solid-2 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - state: packet-layer - type: Icon state: packet-mustard - type: Appearance @@ -277,12 +250,6 @@ reagents: - ReagentId: Blackpepper Quantity: 10 - - type: Sprite - layers: - - state: packet-solid-2 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - state: packet-layer - type: Icon state: packet-pepper - type: Appearance @@ -308,6 +275,7 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: true - state: packet-layer + map: ["enum.OpenableVisuals.Layer"] - state: packet-label color: black - type: Icon @@ -329,12 +297,6 @@ reagents: - ReagentId: Soysauce Quantity: 10 - - type: Sprite - layers: - - state: packet-solid-2 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - state: packet-layer - type: Icon state: packet-soysauce - type: Appearance @@ -354,12 +316,6 @@ reagents: - ReagentId: Sugar Quantity: 10 - - type: Sprite - layers: - - state: packet-solid-2 - map: ["enum.SolutionContainerLayers.Fill"] - visible: true - - state: packet-layer - type: Icon state: packet-sugar - type: Appearance @@ -399,6 +355,12 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: bottle-alpha- + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "bottle-open"} + False: {state: "bottle-empty"} - type: PhysicalComposition materialComposition: Glass: 50 @@ -418,6 +380,7 @@ - type: Sprite layers: - state: bottle-empty + map: ["enum.OpenableVisuals.Layer"] - state: label-c - state: bottle-alpha-6 map: ["enum.SolutionContainerLayers.Fill"] @@ -443,6 +406,7 @@ - type: Sprite layers: - state: bottle-empty + map: ["enum.OpenableVisuals.Layer"] - state: label-e - state: bottle-alpha-6 map: ["enum.SolutionContainerLayers.Fill"] @@ -468,6 +432,7 @@ - type: Sprite layers: - state: bottle-empty + map: ["enum.OpenableVisuals.Layer"] - state: label-v - state: bottle-alpha-6 map: ["enum.SolutionContainerLayers.Fill"] @@ -490,6 +455,7 @@ - type: Sprite layers: - state: bottle-empty + map: ["enum.OpenableVisuals.Layer"] - state: label-h - state: bottle-alpha-6 map: ["enum.SolutionContainerLayers.Fill"] @@ -515,6 +481,7 @@ - type: Sprite layers: - state: bottle-empty + map: ["enum.OpenableVisuals.Layer"] - state: label-k - state: bottle-alpha-6 map: ["enum.SolutionContainerLayers.Fill"] @@ -540,6 +507,7 @@ - type: Sprite layers: - state: bottle-empty + map: ["enum.OpenableVisuals.Layer"] - state: label-b - state: bottle-alpha-6 map: ["enum.SolutionContainerLayers.Fill"] diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 80e177542e..480db86441 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1213,7 +1213,16 @@ - type: Sprite sprite: Objects/Fun/glue.rsi state: icon + layers: + - state: icon + map: ["enum.OpenableVisuals.Layer"] - type: Appearance + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon_open"} + False: {state: "icon"} - type: Glue consumptionUnit: 10 - type: Item diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-1.png new file mode 100644 index 0000000000..e9d7a95189 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-2.png new file mode 100644 index 0000000000..745b1b6087 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-3.png new file mode 100644 index 0000000000..7b1add8aba Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-4.png new file mode 100644 index 0000000000..102c82b37c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-5.png new file mode 100644 index 0000000000..019f5e700a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_empty.png new file mode 100644 index 0000000000..ecdaec3e51 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_open.png new file mode 100644 index 0000000000..55f7440f97 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/icon_open.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 e8a2f8c21d..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/absinthebottle.rsi/meta.json @@ -9,6 +9,27 @@ "states": [ { "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alco-blue.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/alco-blue.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"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 diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-1.png new file mode 100644 index 0000000000..bbb021eb2e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-2.png new file mode 100644 index 0000000000..b9d6261226 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-3.png new file mode 100644 index 0000000000..9800a56db3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-4.png new file mode 100644 index 0000000000..34088c12e0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-5.png new file mode 100644 index 0000000000..bbbff3ac08 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-6.png new file mode 100644 index 0000000000..f2b760876e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/fill-6.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-blue.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_blue.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/alco-blue.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_blue.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_empty.png new file mode 100644 index 0000000000..851126deae Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-green.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_green.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/alco-green.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_green.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_open.png new file mode 100644 index 0000000000..b336e18eb1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-red.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_red.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/alco-red.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_red.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-white.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_white.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Drinks/alco-white.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/icon_white.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json new file mode 100644 index 0000000000..f60e29d82f --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/alco-bottle.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "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_blue" + }, + { + "name": "icon_green" + }, + { + "name": "icon_red" + }, + { + "name": "icon_white" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + }, + { + "name": "fill-6" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alco-green.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/alco-green.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"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 diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alco-red.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/alco-red.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"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 diff --git a/Resources/Textures/Objects/Consumable/Drinks/alco-white.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/alco-white.rsi/meta.json deleted file mode 100644 index db0ac608ed..0000000000 --- a/Resources/Textures/Objects/Consumable/Drinks/alco-white.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"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 diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-1.png new file mode 100644 index 0000000000..1f619fbaa5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-2.png new file mode 100644 index 0000000000..8822751720 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-3.png new file mode 100644 index 0000000000..6d10fc3f83 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-4.png new file mode 100644 index 0000000000..aa9bafc579 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-5.png new file mode 100644 index 0000000000..6cf2364cfd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon.png index b7a9513892..08afa947be 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_empty.png new file mode 100644 index 0000000000..435165699c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_open.png new file mode 100644 index 0000000000..b187507165 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/alebottle.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-1.png new file mode 100644 index 0000000000..ad1e2bcd42 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-2.png new file mode 100644 index 0000000000..427623e18d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-3.png new file mode 100644 index 0000000000..cfdd56ce4d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-4.png new file mode 100644 index 0000000000..914871c0c4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-5.png new file mode 100644 index 0000000000..af50ba4ddd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/icon_empty.png new file mode 100644 index 0000000000..e21b03404b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/icon_open.png new file mode 100644 index 0000000000..104b034512 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/beer.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/icon_open.png new file mode 100644 index 0000000000..7796e65b73 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/icon_open.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 db0ac608ed..9e1d9a9075 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/bottleofnothing.rsi/meta.json @@ -1 +1,17 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/icon_open.png new file mode 100644 index 0000000000..24af278a24 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/icon_open.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 26120dfca2..e00674b301 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/champagnebottle.rsi/meta.json @@ -1 +1,17 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "drawn by givazaa", "states": [{"name": "icon"}]} +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "drawn by givazaa", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/icon_open.png new file mode 100644 index 0000000000..551294d38a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/icon_open.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 db0ac608ed..9e1d9a9075 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/coffeeliqueurbottle.rsi/meta.json @@ -1 +1,17 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-1.png new file mode 100644 index 0000000000..c06c1991f4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-2.png new file mode 100644 index 0000000000..2e40321ad0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-3.png new file mode 100644 index 0000000000..c3fbdaa6bf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-4.png new file mode 100644 index 0000000000..8740f00aab Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-5.png new file mode 100644 index 0000000000..fa851ae0f3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/icon_empty.png new file mode 100644 index 0000000000..506b9adb05 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/icon_open.png new file mode 100644 index 0000000000..04603ddf48 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/cognacbottle.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-1.png new file mode 100644 index 0000000000..6fbbd2f8bb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-2.png new file mode 100644 index 0000000000..aea5ea2c09 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-3.png new file mode 100644 index 0000000000..1f20702592 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-4.png new file mode 100644 index 0000000000..42fd7dc5d4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-5.png new file mode 100644 index 0000000000..945ebf7b49 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/icon_empty.png new file mode 100644 index 0000000000..1559e7e97a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/icon_open.png new file mode 100644 index 0000000000..1865d81106 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/colabottle.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/icon_open.png new file mode 100644 index 0000000000..8ded82d6b1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/meta.json index db0ac608ed..9e1d9a9075 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/cream.rsi/meta.json @@ -1 +1,17 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-1.png new file mode 100644 index 0000000000..aa09b488ec Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-2.png new file mode 100644 index 0000000000..db67a5a930 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-3.png new file mode 100644 index 0000000000..5179f6e95c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-4.png new file mode 100644 index 0000000000..9c3b596b30 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-5.png new file mode 100644 index 0000000000..ede911766f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/icon_empty.png new file mode 100644 index 0000000000..cbe035e903 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/icon_open.png new file mode 100644 index 0000000000..4608bf002b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/gildlagerbottle.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-1.png new file mode 100644 index 0000000000..830daf63e9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-2.png new file mode 100644 index 0000000000..6e51f6f0b2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-3.png new file mode 100644 index 0000000000..7cf0630577 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-4.png new file mode 100644 index 0000000000..2d44a181a6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-5.png new file mode 100644 index 0000000000..60b0e59005 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/icon_empty.png new file mode 100644 index 0000000000..f830bdc9b2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/icon_open.png new file mode 100644 index 0000000000..3edd21f8b5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/ginbottle.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon_open.png new file mode 100644 index 0000000000..451a3eed0a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json index 734e9e1e64..7319ee8837 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "icon_open" + }, { "name": "icon-front" }, diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-1.png new file mode 100644 index 0000000000..09ad1e1b40 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-2.png new file mode 100644 index 0000000000..d793961320 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-3.png new file mode 100644 index 0000000000..0b279477ac Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-4.png new file mode 100644 index 0000000000..0b279477ac Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-5.png new file mode 100644 index 0000000000..334740168c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-6.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-6.png new file mode 100644 index 0000000000..666cfd1e13 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/fill-6.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/icon_empty.png new file mode 100644 index 0000000000..e1a454f85b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/icon_open.png new file mode 100644 index 0000000000..cf55ed3dc2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/icon_open.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 db0ac608ed..6542150423 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/grenadinebottle.rsi/meta.json @@ -1 +1,38 @@ -{"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", + "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": "fill-6" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/icon_open.png new file mode 100644 index 0000000000..c35813f198 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/icon_open.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 db0ac608ed..9e1d9a9075 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/limejuice.rsi/meta.json @@ -1 +1,17 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon_open.png new file mode 100644 index 0000000000..4ec59c6cf3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json index 734e9e1e64..7319ee8837 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/lube-tube.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "icon_open" + }, { "name": "icon-front" }, diff --git a/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/icon_open.png new file mode 100644 index 0000000000..cb98017627 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/meta.json index db0ac608ed..9e1d9a9075 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/milk.rsi/meta.json @@ -1 +1,17 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-1.png new file mode 100644 index 0000000000..22eb0ee04b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-2.png new file mode 100644 index 0000000000..976b08102c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-3.png new file mode 100644 index 0000000000..976b08102c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-4.png new file mode 100644 index 0000000000..637cd877a5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-5.png new file mode 100644 index 0000000000..593115fb64 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon_empty.png new file mode 100644 index 0000000000..332019fd28 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon_open.png new file mode 100644 index 0000000000..677c9b74dd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/icon_open.png new file mode 100644 index 0000000000..5cf240ff02 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json index db0ac608ed..9e1d9a9075 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json @@ -1 +1,17 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon.png index 360b1a1463..59bfce31f9 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon_open.png new file mode 100644 index 0000000000..9714670804 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json index db0ac608ed..9e1d9a9075 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/orangejuice.rsi/meta.json @@ -1 +1,17 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-1.png new file mode 100644 index 0000000000..8fdc92f22b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-2.png new file mode 100644 index 0000000000..77f01452d0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-3.png new file mode 100644 index 0000000000..58f72cf2d3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-4.png new file mode 100644 index 0000000000..627b5410e2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-5.png new file mode 100644 index 0000000000..33a96802d6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/icon_empty.png new file mode 100644 index 0000000000..9dc2e2ffa8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/icon_open.png new file mode 100644 index 0000000000..e137b231dd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/patronbottle.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/icon_open.png new file mode 100644 index 0000000000..46ad7af156 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/icon_open.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 db0ac608ed..9e1d9a9075 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/pwinebottle.rsi/meta.json @@ -1 +1,17 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-1.png new file mode 100644 index 0000000000..edb576e223 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-2.png new file mode 100644 index 0000000000..0926cb5d2d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-3.png new file mode 100644 index 0000000000..0926cb5d2d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-4.png new file mode 100644 index 0000000000..7bf2a28aca Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-5.png new file mode 100644 index 0000000000..6d4f19e9ff Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/icon_empty.png new file mode 100644 index 0000000000..2dd73a7cb5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/icon_open.png new file mode 100644 index 0000000000..27221c4c66 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/rumbottle.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/icon.png index 307ff9a9d0..168410f331 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/icon_open.png new file mode 100644 index 0000000000..188d07f1d5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/meta.json index db0ac608ed..9e1d9a9075 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/soymilk.rsi/meta.json @@ -1 +1,17 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-1.png new file mode 100644 index 0000000000..6fbbd2f8bb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-2.png new file mode 100644 index 0000000000..aea5ea2c09 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-3.png new file mode 100644 index 0000000000..1f20702592 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-4.png new file mode 100644 index 0000000000..42fd7dc5d4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-5.png new file mode 100644 index 0000000000..945ebf7b49 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/icon_empty.png new file mode 100644 index 0000000000..69a0fd07c8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/icon_open.png new file mode 100644 index 0000000000..f9e2861df0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space-up_bottle.rsi/icon_open.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 db0ac608ed..960293f615 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 @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-1.png new file mode 100644 index 0000000000..6fbbd2f8bb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-2.png new file mode 100644 index 0000000000..aea5ea2c09 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-3.png new file mode 100644 index 0000000000..1f20702592 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-4.png new file mode 100644 index 0000000000..42fd7dc5d4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-5.png new file mode 100644 index 0000000000..945ebf7b49 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/icon_empty.png new file mode 100644 index 0000000000..18e42a0f4d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/icon_open.png new file mode 100644 index 0000000000..d74fc8721a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi/icon_open.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 db0ac608ed..960293f615 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 @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-1.png new file mode 100644 index 0000000000..204e885505 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-2.png new file mode 100644 index 0000000000..fa2fa7a1eb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-3.png new file mode 100644 index 0000000000..b72059d765 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-4.png new file mode 100644 index 0000000000..f3d24cd95a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-5.png new file mode 100644 index 0000000000..0e0cf52bda Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/icon_empty.png new file mode 100644 index 0000000000..c8e014cc46 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/icon_open.png new file mode 100644 index 0000000000..f6bbfd2e8f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/tequillabottle.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/icon_open.png new file mode 100644 index 0000000000..fbf113292b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/meta.json index db0ac608ed..9e1d9a9075 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/tomatojuice.rsi/meta.json @@ -1 +1,17 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-1.png new file mode 100644 index 0000000000..be5efc55d8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-2.png new file mode 100644 index 0000000000..32eadfa1ce Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-3.png new file mode 100644 index 0000000000..d4b964e7cd Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-4.png new file mode 100644 index 0000000000..ae4d881c47 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-5.png new file mode 100644 index 0000000000..ab82bb4b65 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/icon_empty.png new file mode 100644 index 0000000000..3983b282db Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/icon_open.png new file mode 100644 index 0000000000..25787f9279 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/vermouthbottle.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-1.png new file mode 100644 index 0000000000..345d88ca77 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-2.png new file mode 100644 index 0000000000..051e61b2d5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-3.png new file mode 100644 index 0000000000..051e61b2d5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-4.png new file mode 100644 index 0000000000..6ff8e90bf3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-5.png new file mode 100644 index 0000000000..fec5c1b2fc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/icon_empty.png new file mode 100644 index 0000000000..1c7c3765e9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/icon_open.png new file mode 100644 index 0000000000..cec7bd047b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/vodkabottle.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_open.png new file mode 100644 index 0000000000..e38ba30650 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/icon_open.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 0922ee1d1a..763da96dcb 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi/meta.json @@ -11,6 +11,9 @@ { "name": "icon" }, + { + "name": "icon_open" + }, { "name": "icon-1" }, diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-1.png new file mode 100644 index 0000000000..d5b0ad0b40 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-2.png new file mode 100644 index 0000000000..ff0a6c45d7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-3.png new file mode 100644 index 0000000000..ff0a6c45d7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-4.png new file mode 100644 index 0000000000..cc97fb30d6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-5.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-5.png new file mode 100644 index 0000000000..44a006bcc1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/fill-5.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/icon_empty.png new file mode 100644 index 0000000000..196022ee1a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/icon_open.png new file mode 100644 index 0000000000..31d51b2266 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/icon_open.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 db0ac608ed..960293f615 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/whiskeybottle.rsi/meta.json @@ -1 +1,35 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/icon.png index 8929546cb5..e527e5598a 100644 Binary files a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/icon_open.png new file mode 100644 index 0000000000..399e934cd7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/icon_open.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 db0ac608ed..9e1d9a9075 100644 --- a/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Drinks/winebottle.rsi/meta.json @@ -1 +1,17 @@ -{"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", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-open.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-open.png new file mode 100644 index 0000000000..e4348aebba Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/bottle-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json index bcba1b89ba..a2398a2fa5 100644 --- a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/meta.json @@ -16,6 +16,9 @@ { "name": "bottle-empty" }, + { + "name": "bottle-open" + }, { "name": "bottle-enzyme" }, @@ -118,9 +121,15 @@ { "name": "packet-layer" }, + { + "name": "packet-layer-open" + }, { "name": "packet-label" }, + { + "name": "packet-label-a" + }, { "name": "packet-trans-1" }, diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-label-a.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-label-a.png new file mode 100644 index 0000000000..1e2fd3afe4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-label-a.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer-open.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer-open.png new file mode 100644 index 0000000000..773cff7960 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer-open.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer.png b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer.png index 91fda9c706..7b971fa227 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer.png and b/Resources/Textures/Objects/Consumable/Food/condiments.rsi/packet-layer.png differ diff --git a/Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/icon.png b/Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/icon.png index e249a5ce90..c0eafca108 100644 Binary files a/Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/icon.png and b/Resources/Textures/Objects/Consumable/TrashDrinks/whiskeybottle_empty.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Fun/glue.rsi/icon_open.png b/Resources/Textures/Objects/Fun/glue.rsi/icon_open.png new file mode 100644 index 0000000000..cc2039df90 Binary files /dev/null and b/Resources/Textures/Objects/Fun/glue.rsi/icon_open.png differ diff --git a/Resources/Textures/Objects/Fun/glue.rsi/meta.json b/Resources/Textures/Objects/Fun/glue.rsi/meta.json index d2ae18500a..55fc6227cd 100644 --- a/Resources/Textures/Objects/Fun/glue.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/glue.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "icon_open" + }, { "name": "inhand-left", "directions": 4