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.

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!

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?

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-

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

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

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

Resources/Textures/Objects/Consumable/Drinks/alco-blue.rsi/meta.json

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

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

Resources/Textures/Objects/Consumable/Drinks/alco-green.rsi/meta.json

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

Resources/Textures/Objects/Consumable/Drinks/alco-red.rsi/meta.json

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

Resources/Textures/Objects/Consumable/Drinks/alco-white.rsi/meta.json

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

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

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

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

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

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

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

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

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

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

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

Resources/Textures/Objects/Consumable/Drinks/glue-tube.rsi/meta.json

@@ -10,6 +10,9 @@
         {
             "name": "icon"
         },
+        {
+            "name": "icon_open"
+        },
         {
             "name": "icon-front"
         },

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

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