Rework Drink/Food/FoodContainer entirely (#1009)

Co-authored-by: FL-OZ <anotherscuffed@gmail.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-05-29 15:50:23 -05:00
parent 7222b6d8e2
commit aa26bdfcae
107 changed files with 946 additions and 1099 deletions
--- a/Resources/Prototypes/Entities/Items/Consumables/drinks.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/drinks.yml
--- a/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml
@@ -1,29 +1,42 @@
 - type: entity
-  parent: DrinkBase
+  parent: BaseItem
+  id: DrinkBottleBaseFull
+  abstract: true
+  components:
+  - type: Drink
+    openSounds: bottleOpenSounds
+  - type: Solution
+  - type: Sprite
+    state: icon
+  - type: Icon
+    state: icon
+
+- type: entity
+  parent: DrinkBottleBaseFull
  id: DrinkAbsintheBottleFull
  name: Jailbreaker Verte
  description: One sip of this and you just know you're gonna have a good time.
  components:
-  - type: Drink  
+  - type: Drink
  - type: Sprite
    sprite: Objects/Drinks/absinthebottle.rsi
  - type: Icon
    sprite: Objects/Drinks/absinthebottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkAlcoGreenFull
  name: Emeraldine Melon Liquor
  description: A bottle of 46 proof Emeraldine Melon Liquor. Sweet and light.
  components:
-  - type: Drink    
+  - type: Drink
  - type: Sprite
    sprite: Objects/Drinks/alco-green.rsi
  - type: Icon
    sprite: Objects/Drinks/alco-green.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkAleBottleFull
  name: Magm-Ale
  description: A true dorf's drink of choice.
@@ -33,26 +46,26 @@
    contents:
      reagents:
      - ReagentId: chem.Ale
-        Quantity: 80  
+        Quantity: 80
  - type: Sprite
    sprite: Objects/Drinks/alebottle.rsi
  - type: Icon
    sprite: Objects/Drinks/alebottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkBottleOfNothingFull
  name: Bottle of nothing
  description: A bottle filled with nothing
  components:
-  - type: Drink  
+  - type: Drink
  - type: Sprite
    sprite: Objects/Drinks/bottleofnothing.rsi
  - type: Icon
    sprite: Objects/Drinks/bottleofnothing.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  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.
@@ -62,38 +75,38 @@
    contents:
      reagents:
      - ReagentId: chem.Cognac
-        Quantity: 80  
+        Quantity: 80
  - type: Sprite
    sprite: Objects/Drinks/cognacbottle.rsi
  - type: Icon
    sprite: Objects/Drinks/cognacbottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkGinBottleFull
  name: Griffeater gin bottle
  description: A bottle of high quality gin, produced in the New London Space Station.
  components:
-  - type: Drink   
+  - type: Drink
  - type: Sprite
    sprite: Objects/Drinks/ginbottle.rsi
  - type: Icon
    sprite: Objects/Drinks/ginbottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkGoldschlagerBottleFull
  name: Goldschlager bottle
  description: 100 proof cinnamon schnapps, made for alcoholic teen girls on spring break.
  components:
-  - type: Drink  
+  - type: Drink
  - type: Sprite
    sprite: Objects/Drinks/goldschlagerbottle.rsi
  - type: Icon
    sprite: Objects/Drinks/goldschlagerbottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkKahluaBottleFull
  name: Kahlua bottle
  description: A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK
@@ -103,74 +116,74 @@
    contents:
      reagents:
      - ReagentId: chem.H2O
-        Quantity: 80  
+        Quantity: 80
  - type: Sprite
    sprite: Objects/Drinks/kahluabottle.rsi
  - type: Icon
    sprite: Objects/Drinks/kahluabottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkPatronBottleFull
  name: Wrapp artiste patron bottle
  description: Silver laced tequilla, served in space night clubs across the galaxy.
  components:
-  - type: Drink  
+  - type: Drink
  - type: Sprite
    sprite: Objects/Drinks/patronbottle.rsi
  - type: Icon
    sprite: Objects/Drinks/patronbottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkPoisonWinebottleFull
  name: Warlock's velvet bottle
  description: What a delightful packaging for a surely high quality wine! The vintage must be amazing!
  components:
-  - type: Drink   
+  - type: Drink
  - type: Sprite
    sprite: Objects/Drinks/pwinebottle.rsi
  - type: Icon
    sprite: Objects/Drinks/pwinebottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkRumbottleFull
  name: Captain Pete's cuban spiced rum
  description: This isn't just rum, oh no. It's practically GRIFF in a bottle.
  components:
-  - type: Drink  
+  - type: Drink
  - type: Sprite
    sprite: Objects/Drinks/rumbottle.rsi
  - type: Icon
    sprite: Objects/Drinks/rumbottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkTequilabottleFull
  name: Caccavo guaranteed quality tequila bottle
  description: Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!
  components:
-  - type: Drink   
+  - type: Drink
  - type: Sprite
    sprite: Objects/Drinks/tequillabottle.rsi
  - type: Icon
    sprite: Objects/Drinks/tequillabottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkVermouthBottleFull
  name: Goldeneye vermouth bottle
  description: Sweet, sweet dryness~
  components:
-  - type: Drink    
+  - type: Drink
  - type: Sprite
    sprite: Objects/Drinks/vermouthbottle.rsi
  - type: Icon
    sprite: Objects/Drinks/vermouthbottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkVodkaBottleFull
  name: Vodka bottle
  description: Aah, vodka. Prime choice of drink AND fuel by Russians worldwide.
@@ -187,7 +200,7 @@
    sprite: Objects/Drinks/vodkabottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  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.
@@ -204,7 +217,7 @@
    sprite: Objects/Drinks/whiskeybottle.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkBottleBaseFull
  id: DrinkWineBottleFull
  name: Doublebearded bearded special wine bottle
  description: A faint aura of unease and asspainery surrounds the bottle.
--- a/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml
@@ -1,230 +1,103 @@
 - type: entity
-  parent: DrinkFoodContainerBase
-  name: Base can
-  id: DrinkFoodContainerBaseCan
+  parent: BaseItem
+  id: DrinkCanBaseFull
  abstract: true
  components:
-  - type: Sound
-  - type: DrinkFoodContainer
-    use_sound: /Audio/items/canopen.ogg
-    capacity: 1
-
-# Below are grouped paired as "unopened" and "opened"
- type: entity
-  parent: DrinkFoodContainerBaseCan
-  name: Space cola (unopened)
-  id: DrinkFoodContainerColaCanUnopened
-  components:
-  - type: Sound
-  - type: DrinkFoodContainer
-    prototypes: 
-      DrinkColaCan: 100
-  - type: Sprite
-    sprite: Objects/Drinks/cola.rsi
-  - type: Icon
-    sprite: Objects/Drinks/cola.rsi
-
- type: entity
-  parent: DrinkBase
-  id: DrinkColaCan
-  name: Space cola
-  description: A refreshing beverage.
-  components:
+  - type: Drink
+    openSounds: canOpenSounds
  - type: Solution
    maxVol: 20
    contents:
      reagents:
      - ReagentId: chem.Cola
        Quantity: 20
-  - type: Sprite
-    sprite: Objects/Drinks/cola.rsi
-  - type: Icon
-    sprite: Objects/Drinks/cola.rsi
-
+  - type: Pourable
+    transferAmount: 5

 - type: entity
-  parent: DrinkFoodContainerBaseCan
-  name: Ice tea can (unopened)
-  id: DrinkFoodContainerIceTeaCanUnopened
+  parent: DrinkCanBaseFull
+  id: DrinkColaCan
+  name: Space cola
+  description: A refreshing beverage.
  components:
-  - type: Sound
-  - type: DrinkFoodContainer
-    prototypes: 
-      DrinkIceTeaCan: 100
+  - type: Solution
  - type: Sprite
-    sprite: Objects/Drinks/ice_tea_can.rsi
+    sprite: Objects/Drinks/cola.rsi
  - type: Icon
-    sprite: Objects/Drinks/ice_tea_can.rsi
+    sprite: Objects/Drinks/cola.rsi

 - type: entity
-  parent: DrinkBase
+  parent: DrinkCanBaseFull
  id: DrinkIceTeaCan
  name: Ice tea can
  description: ''
  components:
-  - type: Drink    
  - type: Sprite
    sprite: Objects/Drinks/ice_tea_can.rsi
  - type: Icon
    sprite: Objects/Drinks/ice_tea_can.rsi

-
 - type: entity
-  parent: DrinkFoodContainerBaseCan
-  name: Lemon-lime can (unopened)
-  id: DrinkFoodContainerLemonLimeCanUnopened
-  components:
-  - type: Sound
-  - type: DrinkFoodContainer
-    prototypes: 
-      DrinkLemonLimeCan: 100
-  - type: Sprite
-    sprite: Objects/Drinks/lemon-lime.rsi
-  - type: Icon
-    sprite: Objects/Drinks/lemon-lime.rsi
-
- type: entity
-  parent: DrinkBase
+  parent: DrinkCanBaseFull
  id: DrinkLemonLimeCan
  name: Lemon-lime can
  description: You wanted ORANGE. It gave you Lemon Lime.
  components:
-  - type: Drink    
  - type: Sprite
    sprite: Objects/Drinks/lemon-lime.rsi
  - type: Icon
    sprite: Objects/Drinks/lemon-lime.rsi

-
 - type: entity
-  parent: DrinkFoodContainerBaseCan
-  name: Purple can (unopened)
-  id: DrinkFoodContainerPurpleCanUnopened
-  components:
-  - type: Sound
-  - type: DrinkFoodContainer
-    prototypes: 
-      DrinkPurpleCan: 100
-  - type: Sprite
-    sprite: Objects/Drinks/purple_can.rsi
-  - type: Icon
-    sprite: Objects/Drinks/purple_can.rsi
-
- type: entity
-  parent: DrinkBase
+  parent: DrinkCanBaseFull
  id: DrinkPurpleCan
  name: Purple Can
  description: ''
  components:
-  - type: Drink    
  - type: Sprite
    sprite: Objects/Drinks/purple_can.rsi
  - type: Icon
    sprite: Objects/Drinks/purple_can.rsi

-
 - type: entity
-  parent: DrinkFoodContainerBaseCan
-  name: Space mountain wind can (unopened)
-  id: DrinkFoodContainerSpaceMountainWindCanUnopened
-  components:
-  - type: Sound
-  - type: DrinkFoodContainer
-    prototypes: 
-      DrinkSpaceMountainWindCan: 100
-  - type: Sprite
-    sprite: Objects/Drinks/space_mountain_wind.rsi
-  - type: Icon
-    sprite: Objects/Drinks/space_mountain_wind.rsi
-
- type: entity
-  parent: DrinkBase
+  parent: DrinkCanBaseFull
  id: DrinkSpaceMountainWindCan
  name: Space mountain wind can
  description: Blows right through you like a space wind.
  components:
-  - type: Drink    
  - type: Sprite
    sprite: Objects/Drinks/space_mountain_wind.rsi
  - type: Icon
    sprite: Objects/Drinks/space_mountain_wind.rsi

-
 - type: entity
-  parent: DrinkFoodContainerBaseCan
-  name: Space-up can (unopened)
-  id: DrinkFoodContainerSpaceUpCanUnopened
-  components:
-  - type: Sound
-  - type: DrinkFoodContainer
-    prototypes: 
-      DrinkSpaceUpCan: 100
-  - type: Sprite
-    sprite: Objects/Drinks/space-up.rsi
-  - type: Icon
-    sprite: Objects/Drinks/space-up.rsi
-
- type: entity
-  parent: DrinkBase
+  parent: DrinkCanBaseFull
  id: DrinkSpaceUpCan
  name: Space-up can
  description: Tastes like a hull breach in your mouth.
  components:
-  - type: Drink    
  - type: Sprite
    sprite: Objects/Drinks/space-up.rsi
  - type: Icon
    sprite: Objects/Drinks/space-up.rsi

-
 - type: entity
-  parent: DrinkFoodContainerBaseCan
-  name: Starkist can (unopened)
-  id: DrinkFoodContaineStarkistCanUnopened
-  components:
-  - type: Sound
-  - type: DrinkFoodContainer
-    prototypes: 
-      DrinkStarkistCan: 100
-  - type: Sprite
-    sprite: Objects/Drinks/starkist.rsi
-  - type: Icon
-    sprite: Objects/Drinks/starkist.rsi
-
- type: entity
-  parent: DrinkBase
+  parent: DrinkCanBaseFull
  id: DrinkStarkistCan
  name: Starkist can
  description: The taste of a star in liquid form. And, a bit of tuna...?
  components:
-  - type: Drink    
  - type: Sprite
    sprite: Objects/Drinks/starkist.rsi
  - type: Icon
    sprite: Objects/Drinks/starkist.rsi

-
 - type: entity
-  parent: DrinkFoodContainerBaseCan
-  name: Thirteen loko can (unopened)
-  id: DrinkFoodContaineThirteenLokoCanUnopened
-  components:
-  - type: Sound
-  - type: DrinkFoodContainer
-    prototypes: 
-      DrinkThirteenLokoCan: 100
-  - type: Sprite
-    sprite: Objects/Drinks/thirteen_loko.rsi
-  - type: Icon
-    sprite: Objects/Drinks/thirteen_loko.rsi
-
- type: entity
-  parent: DrinkBase
+  parent: DrinkCanBaseFull
  id: DrinkThirteenLokoCan
  name: Thirteen loko can
  description: The MBO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly.
  components:
-  - type: Drink    
  - type: Sprite
    sprite: Objects/Drinks/thirteen_loko.rsi
  - type: Icon
--- a/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml
@@ -10,7 +10,6 @@
  - type: Pourable
    transferAmount: 5
  - type: Drink
-    despawn_empty: false
  - type: Sound
  - type: Sprite
    state: icon
--- a/Resources/Prototypes/Entities/Items/Consumables/food.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/food.yml
--- a/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml
@@ -1,10 +1,9 @@
 - type: entity
  parent: BaseItem
-  id: DrinkFoodContainerBase
+  id: FoodContainerBase
  abstract: true
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
  - type: Sprite
    state: icon
    netsync: false
@@ -13,435 +12,414 @@

 # Containers
 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Apple cake
-  id: DrinkFoodContainerAppleCake
+  id: FoodContainerAppleCake
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
-    prototypes: 
+  - type: FoodContainer
+    prototypes:
      FoodAppleCakeSlice: 100
-    spawn_on_finish: TrashTray
+    trash: TrashTray
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/apple_cake.rsi
+    sprite: Objects/FoodContainers/apple_cake.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/apple_cake.rsi
+    sprite: Objects/FoodContainers/apple_cake.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Banana bread
-  id: DrinkFoodContainerBananaBread
+  id: FoodContainerBananaBread
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodBananaBreadSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/bananabread.rsi
+    sprite: Objects/FoodContainers/bananabread.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/bananabread.rsi
+    sprite: Objects/FoodContainers/bananabread.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Birthday cake
-  id: DrinkFoodContainerBirthdayCake
+  id: FoodContainerBirthdayCake
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
-    prototypes: 
+  - type: FoodContainer
+    prototypes:
      FoodBirthdayCakeSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/birthdaycake.rsi
+    sprite: Objects/FoodContainers/birthdaycake.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/birthdaycake.rsi
+    sprite: Objects/FoodContainers/birthdaycake.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Brain cake
-  id: DrinkFoodContainerBrainCake
+  id: FoodContainerBrainCake
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodBrainCakeSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/braincake.rsi
+    sprite: Objects/FoodContainers/braincake.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/braincake.rsi
+    sprite: Objects/FoodContainers/braincake.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Bread
-  id: DrinkFoodContainerBread
+  id: FoodContainerBread
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodBreadSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/bread.rsi
+    sprite: Objects/FoodContainers/bread.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/bread.rsi
+    sprite: Objects/FoodContainers/bread.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Carrot cake
-  id: DrinkFoodContainerCarrotCake
+  id: FoodContainerCarrotCake
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodCarrotCakeSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/carrotcake.rsi
+    sprite: Objects/FoodContainers/carrotcake.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/carrotcake.rsi
+    sprite: Objects/FoodContainers/carrotcake.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Cheesecake
-  id: DrinkFoodContainerCheeseCake
+  id: FoodContainerCheeseCake
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodCheeseCakeSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/cheesecake.rsi
+    sprite: Objects/FoodContainers/cheesecake.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/cheesecake.rsi
+    sprite: Objects/FoodContainers/cheesecake.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Cheese wheel
-  id: DrinkFoodContainerCheeseWheel
+  id: FoodContainerCheeseWheel
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodCheeseWedge: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/apple_cake.rsi
+    sprite: Objects/FoodContainers/apple_cake.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/apple_cake.rsi
+    sprite: Objects/FoodContainers/apple_cake.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Chocolate cake
-  id: DrinkFoodContainerChocolateCake
+  id: FoodContainerChocolateCake
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodChocolateCakeSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/chocolatecake.rsi
+    sprite: Objects/FoodContainers/chocolatecake.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/chocolatecake.rsi
+    sprite: Objects/FoodContainers/chocolatecake.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Cream cheese bread
-  id: DrinkFoodContainerCreamCheeseBread
+  id: FoodContainerCreamCheeseBread
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodCreamCheeseBreadSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/creamcheesebread.rsi
+    sprite: Objects/FoodContainers/creamcheesebread.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/creamcheesebread.rsi
+    sprite: Objects/FoodContainers/creamcheesebread.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Donut box
-  id: DrinkFoodContainerDonutBox
+  id: FoodContainerDonutBox
  components:
-  - type: DrinkFoodContainer
+  - type: FoodContainer
    capacity: 6
    prototypes:
      FoodDonut: 70
      FoodFrostedDonut: 30
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/donutbox.rsi
+    sprite: Objects/FoodContainers/donutbox.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/donutbox.rsi
+    sprite: Objects/FoodContainers/donutbox.rsi
  - type: Appearance
    visuals:
-    - type: DrinkFoodContainerVisualizer2D
+    - type: FoodContainerVisualizer2D
      mode: Discrete
      base_state: donutbox
      steps: 7

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Egg box (shut)
-  id: DrinkFoodContainerEggBoxShut
+  id: FoodContainerEggBoxShut
  components:
-  - type: DrinkFoodContainer
+  - type: FoodContainer
    capacity: 1
    prototypes:
-      DrinkFoodContainerEggBox: 100
+      FoodContainerEggBox: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/eggbox_shut.rsi
+    sprite: Objects/FoodContainers/eggbox_shut.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/eggbox_shut.rsi
+    sprite: Objects/FoodContainers/eggbox_shut.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Egg box
-  id: DrinkFoodContainerEggBox
+  id: FoodContainerEggBox
  components:
-  - type: DrinkFoodContainer
+  - type: FoodContainer
    capacity: 12
    prototypes:
      FoodEgg: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/eggbox.rsi
+    sprite: Objects/FoodContainers/eggbox.rsi
    state: eggbox-12
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/eggbox.rsi
+    sprite: Objects/FoodContainers/eggbox.rsi
    state: eggbox-12
  - type: Appearance
    visuals:
-    - type: DrinkFoodContainerVisualizer2D
+    - type: FoodContainerVisualizer2D
      mode: Discrete
      base_state: eggbox
      steps: 13

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Lemon cake
-  id: DrinkFoodContainerLemonCake
+  id: FoodContainerLemonCake
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodLemonCakeSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/lemoncake.rsi
+    sprite: Objects/FoodContainers/lemoncake.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/lemoncake.rsi
+    sprite: Objects/FoodContainers/lemoncake.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Lime cake
-  id: DrinkFoodContainerLimeCake
+  id: FoodContainerLimeCake
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodLimeCakeSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/limecake.rsi
+    sprite: Objects/FoodContainers/limecake.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/limecake.rsi
+    sprite: Objects/FoodContainers/limecake.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Meat bread
-  id: DrinkFoodContainerMeatBread
+  id: FoodContainerMeatBread
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodMeatBreadSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/meatbread.rsi
+    sprite: Objects/FoodContainers/meatbread.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/meatbread.rsi
+    sprite: Objects/FoodContainers/meatbread.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Meat pizza
-  id: DrinkFoodContainerMeatPizza
+  id: FoodContainerMeatPizza
  components:
-  - type: DrinkFoodContainer
+  - type: FoodContainer
    capacity: 6
    prototypes:
      FoodMeatPizzaSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/meatpizza.rsi
+    sprite: Objects/FoodContainers/meatpizza.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/meatpizza.rsi
+    sprite: Objects/FoodContainers/meatpizza.rsi

 # These two will probably get moved one day
 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Monkey cube box
-  id: DrinkFoodContainerMonkeyCubeBox
+  id: FoodContainerMonkeyCubeBox
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
-      DrinkFoodContainerMonkeyCubeWrap: 100
+      FoodContainerMonkeyCubeWrap: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/monkeycubebox.rsi
+    sprite: Objects/FoodContainers/monkeycubebox.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/monkeycubebox.rsi
+    sprite: Objects/FoodContainers/monkeycubebox.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Monkey cube wrap
-  id: DrinkFoodContainerMonkeyCubeWrap
+  id: FoodContainerMonkeyCubeWrap
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodMonkeyCube: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/monkeycubewrap.rsi
+    sprite: Objects/FoodContainers/monkeycubewrap.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/monkeycubewrap.rsi
+    sprite: Objects/FoodContainers/monkeycubewrap.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Mushroom pizza
-  id: DrinkFoodContainerMushroomPizza
+  id: FoodContainerMushroomPizza
  components:
-  - type: DrinkFoodContainer
+  - type: FoodContainer
    capacity: 6
    prototypes:
      FoodMushroomPizzaSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/mushroompizza.rsi
+    sprite: Objects/FoodContainers/mushroompizza.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/mushroompizza.rsi
+    sprite: Objects/FoodContainers/mushroompizza.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Orange cake
-  id: DrinkFoodContainerOrangeCake
+  id: FoodContainerOrangeCake
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodOrangeCakeSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/orangecake.rsi
+    sprite: Objects/FoodContainers/orangecake.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/orangecake.rsi
+    sprite: Objects/FoodContainers/orangecake.rsi

 # TODO: Probably replace it with a stacking thing
 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Pizza box stack
-  id: DrinkFoodContainerPizzaBoxStack
+  id: FoodContainerPizzaBoxStack
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
-      DrinkFoodContainerPizzaBox: 100
+      FoodContainerPizzaBox: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/pizzaboxstack.rsi
+    sprite: Objects/FoodContainers/pizzaboxstack.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/pizzaboxstack.rsi
+    sprite: Objects/FoodContainers/pizzaboxstack.rsi
  - type: Appearance
    visuals:
-    - type: DrinkFoodContainerVisualizer2D
+    - type: FoodContainerVisualizer2D
      mode: Discrete
      base_state: pizzaboxstack
      steps: 5

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Pizza box
-  id: DrinkFoodContainerPizzaBox
+  id: FoodContainerPizzaBox
  components:
-  - type: DrinkFoodContainer
+  - type: FoodContainer
    capacity: 1
    prototypes:
-      DrinkFoodContainerMeatPizza: 25
-      DrinkFoodContainerMargheritaPizza: 25
-      DrinkFoodContainerMushroomPizza: 25
-      DrinkFoodContainerVegetablePizza: 25
+      FoodContainerMeatPizza: 25
+      FoodContainerMargheritaPizza: 25
+      FoodContainerMushroomPizza: 25
+      FoodContainerVegetablePizza: 25
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/pizzabox_open.rsi
+    sprite: Objects/FoodContainers/pizzabox_open.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/pizzabox_open.rsi
+    sprite: Objects/FoodContainers/pizzabox_open.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Margherita pizza
-  id: DrinkFoodContainerMargheritaPizza
+  id: FoodContainerMargheritaPizza
  components:
-  - type: DrinkFoodContainer
+  - type: FoodContainer
    capacity: 6
    prototypes:
      FoodMargheritaPizzaSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/pizzamargherita.rsi
+    sprite: Objects/FoodContainers/pizzamargherita.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/pizzamargherita.rsi
+    sprite: Objects/FoodContainers/pizzamargherita.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Plain cake
-  id: DrinkFoodContainerPlainCake
+  id: FoodContainerPlainCake
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodPlainCakeSlice: 100
-    spawn_on_finish: TrashTray
+    trash: TrashTray
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/plaincake.rsi
+    sprite: Objects/FoodContainers/plaincake.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/plaincake.rsi
+    sprite: Objects/FoodContainers/plaincake.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Pumpkin pie
-  id: DrinkFoodContainerPumpkinPie
+  id: FoodContainerPumpkinPie
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodPumpkinPieSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/pumpkinpie.rsi
+    sprite: Objects/FoodContainers/pumpkinpie.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/pumpkinpie.rsi
+    sprite: Objects/FoodContainers/pumpkinpie.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Tofu bread
-  id: DrinkFoodContainerTofuBread
+  id: FoodContainerTofuBread
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodTofuBreadSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/tofubread.rsi
+    sprite: Objects/FoodContainers/tofubread.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/tofubread.rsi
+    sprite: Objects/FoodContainers/tofubread.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Vegetable pizza
-  id: DrinkFoodContainerVegetablePizza
+  id: FoodContainerVegetablePizza
  components:
-  - type: DrinkFoodContainer
+  - type: FoodContainer
    capacity: 6
    prototypes:
      FoodVegetablePizzaSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/vegetablepizza.rsi
+    sprite: Objects/FoodContainers/vegetablepizza.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/vegetablepizza.rsi
+    sprite: Objects/FoodContainers/vegetablepizza.rsi

 - type: entity
-  parent: DrinkFoodContainerBase
+  parent: FoodContainerBase
  name: Xenomeat bread
-  id: DrinkFoodContainerXenomeatBread
+  id: FoodContainerXenomeatBread
  components:
-  - type: DrinkFoodContainer
-    capacity: 5
+  - type: FoodContainer
    prototypes:
      FoodXenomeatBreadSlice: 100
  - type: Sprite
-    sprite: Objects/DrinkFoodContainers/xenomeatbread.rsi
+    sprite: Objects/FoodContainers/xenomeatbread.rsi
  - type: Icon
-    sprite: Objects/DrinkFoodContainers/xenomeatbread.rsi
+    sprite: Objects/FoodContainers/xenomeatbread.rsi
--- a/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml
@@ -13,7 +13,6 @@
  - type: Pourable
    transferAmount: 5
  - type: Drink
-    despawn_empty: true
  - type: Sprite
    sprite: Objects/Food/flour.rsi
    state: icon
--- a/Resources/Prototypes/Entities/Items/Consumables/trash_drinks.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/trash_drinks.yml
@@ -3,7 +3,7 @@
  name: Base empty bottle
  parent: BaseItem
  abstract: true
-  id: DrinkBottleBase
+  id: DrinkBottleBaseEmpty
  components:
  - type: Sound
  - type: Sprite
@@ -15,12 +15,13 @@
  - type: Pourable
    transferAmount: 5
  - type: Drink
-    despawn_empty: false
+    isOpen: true
+

 # Containers
 - type: entity
  name: Jailbreaker Verte bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleAbsinthe
  components:
  - type: Sprite
@@ -30,7 +31,7 @@

 - type: entity
  name: Alcohol bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleAlcoClear
  components:
  - type: Sprite
@@ -40,7 +41,7 @@

 - type: entity
  name: Ale bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleAle
  components:
  - type: Sprite
@@ -50,7 +51,7 @@

 - type: entity
  name: Beer bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleBeer
  components:
  - type: Sprite
@@ -60,7 +61,7 @@

 - type: entity
  name: Broken bottle
-  parent: DrinkBottleBase  # Can't hold liquids
+  parent: DrinkBottleBaseEmpty  # Can't hold liquids
  id: DrinkBrokenBottle
  components:
  - type: Sprite
@@ -70,7 +71,7 @@

 - type: entity
  name: Cognac bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleCognac
  components:
  - type: Sprite
@@ -80,7 +81,7 @@

 - type: entity
  name: Griffeater gin bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleGin
  components:
  - type: Sprite
@@ -90,7 +91,7 @@

 - type: entity
  name: Goldschlager bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleGoldschlager
  components:
  - type: Sprite
@@ -100,7 +101,7 @@

 - type: entity
  name: Kahlua bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleKahlua
  components:
  - type: Sprite
@@ -110,7 +111,7 @@

 - type: entity
  name: NT Cahors bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleNTCahors
  components:
  - type: Sprite
@@ -120,7 +121,7 @@

 - type: entity
  name: Patron bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottlePatron
  components:
  - type: Sprite
@@ -130,7 +131,7 @@

 - type: entity
  name: Poison wine bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottlePoisonWine
  components:
  - type: Sprite
@@ -140,7 +141,7 @@

 - type: entity
  name: Rum bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleRum
  components:
  - type: Sprite
@@ -150,7 +151,7 @@

 - type: entity
  name: Tequila bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleTequila
  components:
  - type: Sprite
@@ -160,7 +161,7 @@

 - type: entity
  name: Vermouth bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleVermouth
  components:
  - type: Sprite
@@ -170,7 +171,7 @@

 - type: entity
  name: Vodka bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleVodka
  components:
  - type: Sprite
@@ -180,7 +181,7 @@

 - type: entity
  name: Whiskey bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleWhiskey
  components:
  - type: Sprite
@@ -190,7 +191,7 @@

 - type: entity
  name: Wine bottle
-  parent: DrinkBottleBase
+  parent: DrinkBottleBaseEmpty
  id: DrinkBottleWine
  components:
  - type: Sprite