requested changes

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index 4a5991d7998d565758030b99e1a9c8741709abf4..ff5d7f10f4bfa224d170074020fc184ef48074d9 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -1,7 +1,7 @@
 - type: entity
   abstract: true
   parent: [ DrinkBaseMaterialCardboard, DrinkBase, DrinkBaseOpenable, DrinkVisualsOpenable ]
-  id: DrinkCartonBaseLargeFull # todo rename DrinkCartonBaseFull to match bottles
+  id: DrinkCartonBaseFull
   suffix: Full
   components:
   - type: Openable
@@ -21,8 +21,8 @@
 
 - type: entity
   abstract: true
-  parent: DrinkCartonBaseLargeFull
-  id: DrinkCartonBaseFull # todo rename DrinkCartonSmallBaseFull to match bottles
+  parent: DrinkCartonBaseFull
+  id: DrinkCartonSmallBaseFull
   components:
   - type: SolutionContainerManager
     solutions:
@@ -33,7 +33,7 @@
 
 - type: entity
   abstract: true
-  parent: DrinkCartonBaseLargeFull
+  parent: DrinkCartonBaseFull
   id: DrinkCartonBaseXtraLargeFull
   components:
   - type: SolutionContainerManager
@@ -47,7 +47,7 @@
 # Small carton
 
 - type: entity
-  parent: [DrinkBaseMaterialPlastic, DrinkCartonBaseFull]
+  parent: [DrinkBaseMaterialPlastic, DrinkCartonSmallBaseFull]
   id: DrinkJuiceLimeCarton
   name: lime juice
   description: Sweet-sour goodness.
@@ -62,7 +62,7 @@
     sprite: Objects/Consumable/Drinks/limejuice.rsi
 
 - type: entity
-  parent: DrinkCartonBaseFull
+  parent: DrinkCartonSmallBaseFull
   id: DrinkJuiceOrangeCarton
   name: orange juice
   description: Full of vitamins and deliciousness!
@@ -77,7 +77,7 @@
     sprite: Objects/Consumable/Drinks/orangejuice.rsi
 
 - type: entity
-  parent: DrinkCartonBaseFull
+  parent: DrinkCartonSmallBaseFull
   id: DrinkJuiceTomatoCarton
   name: tomato juice
   description: Well, at least it LOOKS like tomato juice. You can't tell with all that redness.
@@ -92,7 +92,7 @@
     sprite: Objects/Consumable/Drinks/tomatojuice.rsi
 
 - type: entity
-  parent: DrinkCartonBaseFull
+  parent: DrinkCartonSmallBaseFull
   id: DrinkCoconutWaterCarton
   name: coconut water
   description: It's the inside of the coconut that counts.
@@ -107,7 +107,7 @@
     sprite: Objects/Consumable/Drinks/coconutwater.rsi
 
 - type: entity
-  parent: DrinkCartonBaseFull
+  parent: DrinkCartonSmallBaseFull
   id: DrinkCreamCarton
   name: milk cream
   description: It's cream. Made from milk. What else did you think you'd find in there?
@@ -122,7 +122,7 @@
     sprite: Objects/Consumable/Drinks/cream.rsi
 
 - type: entity
-  parent: [DrinkBaseMaterialPlastic, DrinkCartonBaseFull]
+  parent: [DrinkBaseMaterialPlastic, DrinkCartonSmallBaseFull]
   id: DrinkJuiceLemonCarton
   name: lemon juice
   description: First it's sour, then it's still sour.
@@ -137,7 +137,7 @@
     sprite: Objects/Consumable/Drinks/lemonjuice.rsi
 
 - type: entity
-  parent: DrinkCartonBaseFull
+  parent: DrinkCartonSmallBaseFull
   id: DrinkJuicePineappleCarton
   name: pineapple juice
   description: Tastes like a tropical vacation far from space.
@@ -154,7 +154,7 @@
 # Large carton
 
 - type: entity
-  parent: DrinkCartonBaseLargeFull
+  parent: DrinkCartonBaseFull
   id: DrinkMilkCarton
   name: milk
   description: An opaque white liquid produced by the mammary glands of mammals.
@@ -169,7 +169,7 @@
     sprite: Objects/Consumable/Drinks/milk.rsi
 
 - type: entity
-  parent: DrinkCartonBaseLargeFull
+  parent: DrinkCartonBaseFull
   id: DrinkSoyMilkCarton
   name: soy milk
   description: White and nutritious soy goodness!
@@ -184,7 +184,7 @@
     sprite: Objects/Consumable/Drinks/soymilk.rsi
 
 - type: entity
-  parent: DrinkCartonBaseLargeFull
+  parent: 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_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
index a856e91611043cc8d854b27bba5f460ad1c07ebb..c0956fb33af02ba84e8f95534b01278a457ac2d5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
@@ -91,7 +91,7 @@
 
 ## Bases for visuals
 
-# Basic visualizer for an openable entity, usually paired with BaseDrinkOpenable
+# Basic visualizer for an openable entity. Requires DrinkBaseOpenable
 - type: entity
   abstract: true
   id: DrinkVisualsOpenable
@@ -129,7 +129,7 @@
     inHandsMaxFillLevels: 3
     inHandsFillBaseName: -fill-
 
-# Layered visualizer for an entity with fill levels
+# Layered visualizer for an entity with fill levels, and an overlay over the fill levels
 - type: entity
   abstract: true
   parent: DrinkVisualsFill
@@ -157,7 +157,7 @@
     - state: fill-5 # this will need to be different with a different maxFillLevels
       map: ["enum.SolutionContainerLayers.Fill"]
 
-# Visualizer for an openable entity with fill levels
+# Visualizer for an openable entity with fill levels. Requires DrinkBaseOpenable
 - type: entity
   abstract: true
   parent: [DrinkVisualsOpenable, DrinkVisualsFill]
@@ -180,7 +180,7 @@
     examinableWhileClosed: true # If you can see the fill levels it's not opaque
     heldOnly: false
 
-# Visualizer for an openable entity with fill levels, already filled
+# Visualizer for an openable entity with fill levels, already filled. Requires DrinkBaseOpenable
 - type: entity
   abstract: true
   parent: DrinkVisualsAll