Mirror 26430: Reduces size of smaller cartons and fix size discrepanc…

…ies with empty containers (#447)

## Mirror of PR #26430: [Reduces size of smaller cartons and fix size
discrepancies with empty
containers](space-wizards/space-station-14#26430)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `47fe7d3cc664d59bacc2036e5678adad47622e3d`

PR opened by <img
src="https://avatars.githubusercontent.com/u/107660393?v=4"
width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a>
at 2024-03-25 16:06:33 UTC - merged at 2024-03-26 04:04:42 UTC

---

PR changed 2 files with 49 additions and 33 deletions.

The PR had the following labels:
- No C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> - Reduces the item size of drink cartons with `maxVol: 50` to `small`
> - Fixes discrepancies between full alcohol bottles and empty
> - Makes empty cartons consistent with full as well 
> 
> ## Why / Balance
> Keeps it consistent with other drink containers. 
> 
> ## Technical details 
> n/a
> 
> ## Media
> Before:
>
![image](https://github.com/space-wizards/space-station-14/assets/107660393/f232b56c-c4d1-480f-ae29-a11dc2f2c47c)
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes in-game, **or** this PR does not require an in-game showcase
> 
> ## Breaking changes
> n/a
> 
> **Changelog**
> n/a


</details>

Co-authored-by: SimpleStation14 <Unknown>

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

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