Cherry-picked commit 47fe7d3 from space-wizards/space-station-14/master

Simple-Station · Mar 26, 2024 · 6952053 · 6952053
1 parent 32394b0
commit 6952053
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 33 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -17,7 +17,7 @@
   - type: Sprite
     state: icon
   - type: Item
-    size: Normal
+    size: Small
   - type: MeleeWeapon
     soundNoDamage:
       path: "/Audio/Effects/Fluids/splat.ogg"
@@ -39,6 +39,18 @@
   - type: TrashOnSolutionEmpty
     solution: drink
 
+- type: entity
+  parent: DrinkCartonBaseFull
+  id: DrinkCartonBaseLargeFull
+  abstract: true
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
+  - type: Item
+    size: Normal
+
 - type: entity
   id: DrinkCartonVisualsOpenable
   abstract: true
@@ -116,47 +128,44 @@
     sprite: Objects/Consumable/Drinks/cream.rsi
 
 - type: entity
-  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull]
   id: DrinkMilkCarton
   name: milk
   description: An opaque white liquid produced by the mammary glands of mammals.
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 100
         reagents:
         - ReagentId: Milk
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/milk.rsi
 
 - type: entity
-  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull]
   id: DrinkSoyMilkCarton
   name: soy milk
   description: White and nutritious soy goodness!
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 100
         reagents:
         - ReagentId: MilkSoy
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/soymilk.rsi
 
 - type: entity
-  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
+  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseLargeFull]
   id: DrinkOatMilkCarton
   name: oat milk
   description: It's oat milk. Tan and nutritious goodness!
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 100
         reagents:
         - ReagentId: MilkOat
           Quantity: 100

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
@@ -8,6 +8,8 @@
   components:
   - type: Sprite
     state: icon
+  - type: Item
+    size: Normal
   - type: SolutionContainerManager
     solutions:
       drink:
@@ -72,6 +74,19 @@
       Glass: 100
   - type: SpaceGarbage
 
+- type: entity
+  name: base empty bottle
+  id: DrinkBottleBaseSmallEmpty
+  parent: DrinkBottleBaseEmpty
+  abstract: true
+  components:
+  - type: Item
+    size: Small
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+
 - type: entity
   name: base empty carton
   id: DrinkCartonBaseEmpty
@@ -122,6 +137,19 @@
       Cardboard: 20
   - type: SpaceGarbage
 
+- type: entity
+  name: base empty bottle
+  id: DrinkCartonBaseLargeEmpty
+  parent: DrinkCartonBaseEmpty
+  abstract: true
+  components:
+  - type: Item
+    size: Normal
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
+
 # Containers
 - type: entity
   name: Jailbreaker Verte bottle
@@ -143,28 +171,20 @@
 
 - type: entity
   name: ale bottle
-  parent: DrinkBottleBaseEmpty
+  parent: DrinkBottleBaseSmallEmpty
   id: DrinkBottleAle
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 50
 
 
 - type: entity
   name: beer bottle
-  parent: DrinkBottleBaseEmpty
+  parent: DrinkBottleBaseSmallEmpty
   id: DrinkBottleBeer
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 50
 
 
 - type: entity
@@ -322,37 +342,24 @@
 
 - type: entity
   name: milk carton
-  parent: DrinkCartonBaseEmpty
+  parent: DrinkCartonBaseLargeEmpty
   id: DrinkCartonMilk
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/milk.rsi
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 100
-
 
 - type: entity
   name: soy milk carton
-  parent: DrinkCartonBaseEmpty
+  parent: DrinkCartonBaseLargeEmpty
   id: DrinkCartonSoyMilk
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/soymilk.rsi
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 100
 
 - type: entity
   name: oat milk carton
-  parent: DrinkCartonBaseEmpty
+  parent: DrinkCartonBaseLargeEmpty
   id: DrinkCartonOatMilk
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/oatmilk.rsi
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 100