another pass

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index ab7d0c1e30bfc21e46dba92cb37f8a5ffb745126..434e4c3f77702a24d37fc0450b768061a274d7dd 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: [ DrinkBase, DrinkBaseMaterialCardboard, DrinkBaseOpenable ]
+  parent: [ DrinkBase, DrinkBaseMaterialCardboard, DrinkBaseOpenable, DrinkVisualsOpenable ]
   id: DrinkCartonBaseLargeFull
   suffix: Full
   components:
@@ -47,7 +47,7 @@
 # Small carton
 
 - type: entity
-  parent: [DrinkVisualsOpenable, DrinkCartonBaseFull]
+  parent: [DrinkBaseMaterialPlastic, DrinkCartonBaseFull]
   id: DrinkJuiceLimeCarton
   name: lime juice
   description: Sweet-sour goodness.
@@ -59,10 +59,10 @@
         - ReagentId: JuiceLime
           Quantity: 50
   - type: Sprite
-    sprite: Objects/Consumable/Drinks/limejuice.rsi # Looks more like plastic than cardboard
+    sprite: Objects/Consumable/Drinks/limejuice.rsi
 
 - type: entity
-  parent: [DrinkVisualsOpenable, DrinkCartonBaseFull]
+  parent: DrinkCartonBaseFull
   id: DrinkJuiceOrangeCarton
   name: orange juice
   description: Full of vitamins and deliciousness!
@@ -77,7 +77,7 @@
     sprite: Objects/Consumable/Drinks/orangejuice.rsi
 
 - type: entity
-  parent: [DrinkVisualsOpenable, DrinkCartonBaseFull]
+  parent: DrinkCartonBaseFull
   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: [DrinkVisualsOpenable, DrinkCartonBaseFull]
+  parent: DrinkCartonBaseFull
   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: [DrinkVisualsOpenable, DrinkCartonBaseFull]
+  parent: DrinkCartonBaseFull
   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: [DrinkVisualsOpenable, DrinkCartonBaseFull]
+  parent: [DrinkBaseMaterialPlastic, DrinkCartonBaseFull]
   id: DrinkJuiceLemonCarton
   name: lemon juice
   description: First it's sour, then it's still sour.
@@ -134,10 +134,10 @@
         - ReagentId: JuiceLemon
           Quantity: 50
   - type: Sprite
-    sprite: Objects/Consumable/Drinks/lemonjuice.rsi # Looks more like plastic than cardboard
+    sprite: Objects/Consumable/Drinks/lemonjuice.rsi
 
 - type: entity
-  parent: [DrinkVisualsOpenable, DrinkCartonBaseFull]
+  parent: DrinkCartonBaseFull
   id: DrinkJuicePineappleCarton
   name: pineapple juice
   description: Tastes like a tropical vacation far from space.
@@ -154,7 +154,7 @@
 # Large carton
 
 - type: entity
-  parent: [DrinkVisualsOpenable, DrinkCartonBaseLargeFull]
+  parent: DrinkCartonBaseLargeFull
   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: [DrinkVisualsOpenable, DrinkCartonBaseLargeFull]
+  parent: DrinkCartonBaseLargeFull
   id: DrinkSoyMilkCarton
   name: soy milk
   description: White and nutritious soy goodness!
@@ -184,7 +184,7 @@
     sprite: Objects/Consumable/Drinks/soymilk.rsi
 
 - type: entity
-  parent: [DrinkVisualsOpenable, DrinkCartonBaseLargeFull]
+  parent: DrinkCartonBaseLargeFull
   id: DrinkOatMilkCarton
   name: oat milk
   description: It's oat milk. Tan and nutritious goodness!
@@ -201,7 +201,7 @@
 # Xtra large
 
 - type: entity
-  parent: [DrinkVisualsOpenable, DrinkCartonBaseXtraLargeFull]
+  parent: [DrinkBaseMaterialPlastic, DrinkCartonBaseXtraLargeFull]
   id: DrinkJuiceLimeCartonXL
   name: lime juice XL
   description: Sweet-sour goodness.
@@ -216,10 +216,10 @@
   - type: Label
     currentLabel: reagent-name-juice-lime
   - type: Sprite
-    sprite: Objects/Consumable/Drinks/limejuice.rsi # Doesn't really look like cardboard...
+    sprite: Objects/Consumable/Drinks/limejuice.rsi
 
 - type: entity
-  parent: [DrinkVisualsOpenable, DrinkCartonBaseXtraLargeFull]
+  parent: DrinkCartonBaseXtraLargeFull
   id: DrinkJuiceOrangeCartonXL
   name: orange juice XL
   description: Full of vitamins and deliciousness!
@@ -237,7 +237,7 @@
     sprite: Objects/Consumable/Drinks/orangejuice.rsi
 
 - type: entity
-  parent: [DrinkVisualsOpenable, DrinkCartonBaseXtraLargeFull]
+  parent: DrinkCartonBaseXtraLargeFull
   id: DrinkCreamCartonXL
   name: milk cream XL
   description: It's cream. Made from milk. What else did you think you'd find in there?

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
index fa0cd1692c26c71c8492de4c77bb7285a298bfe6..7d597ab8c72cf2a16284c7d3fe93b764f3c2df36 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_glass.yml
@@ -384,7 +384,6 @@
     currentLabel: reagent-name-wine
   - type: Sprite
     sprite: Objects/Consumable/Drinks/winebottle.rsi
-  - type: Sealable
   - type: Tag
     tags:
     - Wine
@@ -410,9 +409,9 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/beer.rsi
   - type: Openable
-    closeable: false
+    closeable: false # sprite is just a beer bottle, but this should be removed when there's a more appropriate sprite
   - type: Sealable
-    examineTextUnsealed: drink-component-on-examine-is-unsealed-no-cork # tell the player why it can't close
+    examineTextUnsealed: drink-component-on-examine-is-unsealed-crown-cap # tell the player why it can't close
   - type: Tag
     tags:
     - Beer
@@ -436,9 +435,9 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/alebottle.rsi
   - type: Openable
-    closeable: false
+    closeable: false # sprite is just a beer bottle, but this should be removed when there's a more appropriate sprite
   - type: Sealable
-    examineTextUnsealed: drink-component-on-examine-is-unsealed-no-cork # tell the player why it can't close
+    examineTextUnsealed: drink-component-on-examine-is-unsealed-crown-cap # tell the player why it can't close
 
 
 # Small glass bottles

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_plastic.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_plastic.yml
index b875c03df367bd8345a66e7038c325bfe09c05c8..f55325df85f91572e545e88373cb0bfd4b67fdf4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_plastic.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles_plastic.yml
@@ -23,7 +23,7 @@
     solution: drink
   - type: Tag
     tags:
-    - DrinkBottle
+    - DrinkBottle # Needed to fit in the soda dispenser, needs a better name
 
 - type: entity
   abstract: true
@@ -39,9 +39,6 @@
   - type: Sprite
     state: icon
     sprite: Objects/Consumable/Drinks/waterbottle.rsi # fallback
-  - type: Tag
-    tags:
-    - DrinkBottle
   - type: FitsInDispenser
     solution: drink
 

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index b1867d2600412a98604c73ffdc857dd408cf956d..822809f4f159018ff64703e3d285e4da8eac39d2 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -33,8 +33,8 @@
     sprite: Objects/Consumable/Drinks/mug.rsi
     layers:
       - state: icon-0
-      - map: ["enum.SolutionContainerLayers.Fill"]
-        state: icon-3
+      - state: icon-3
+        map: ["enum.SolutionContainerLayers.Fill"]
         visible: false
   - type: Appearance
   - type: SolutionContainerVisuals
@@ -60,7 +60,7 @@
     price: 125
 
 - type: entity
-  parent: DrinkBaseMug
+  parent: [DrinkBaseCup, DrinkBaseMaterialPorcelain]
   id: DrinkTeacupEmpty
   name: teacup
   description: A plain white porcelain teacup.
@@ -74,6 +74,7 @@
     - state: icon-0
     - map: ["enum.SolutionContainerLayers.Fill"]
       state: icon-4
+  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 4
 
@@ -121,7 +122,7 @@
     - state: icon-1
       map: ["enum.SolutionContainerLayers.Fill"]
       visible: false
-  - type: SolutionContainerVisuals # TODO this doesn't work
+  - type: SolutionContainerVisuals
     maxFillLevels: 1
     fillBaseName: icon-
   - type: Tag
@@ -129,6 +130,7 @@
     - Trash
     - DrinkCup
     - WhitelistChameleon
+  - type: Appearance
   - type: TrashOnSolutionEmpty
     solution: drink
   - type: Clothing
@@ -353,6 +355,7 @@
   - type: TrashOnSolutionEmpty
     solution: drink
 
+# TODO this needs fill levels
 - type: entity
   parent: [DrinkBaseCup, DrinkBaseMaterialPlastic]
   id: DrinkLean

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index bdd83966c66980f68f47d6ffb218980f5d8e924f..3b3ee707fa808d6961c0eb5f056712b9a905eba8 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [DrinkBase, DrinkBaseMaterialPlastic, DrinkBaseOpenable, DrinkVisualsOpenable ]
+  parent: [ DrinkBase, DrinkBaseMaterialPlastic, DrinkBaseOpenable, DrinkVisualsOpenable ]
   id: DrinkSpaceGlue
   name: space glue tube
   description: High performance glue intended for maintenance of extremely complex mechanical equipment. DON'T DRINK!
@@ -34,7 +34,7 @@
     solution: drink
 
 - type: entity
-  parent: [DrinkBase, DrinkBaseMaterialPlastic, DrinkBaseOpenable, DrinkVisualsOpenable ]
+  parent: [ DrinkBase, DrinkBaseMaterialPlastic, DrinkBaseOpenable, DrinkVisualsOpenable ]
   id: DrinkSpaceLube
   name: space lube tube
   description: High performance lubricant intended for maintenance of extremely complex mechanical equipment.