Move cafe latte to drinks_cups and add trashonempty (#16285)

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
index f117655bbe0ba72a74d664cb4df579a7d2164f1c..5979ded6d0a5aef71ef9297de77f492371492393 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -33,7 +33,6 @@
       - DrinkBraveBullGlass
       - DrinkCarrotJuice
       - DrinkChocolateGlass
-      - DrinkCafeLatte
       - DrinkCognacGlass
       - DrinkCubaLibreGlass
       - DrinkDeadRumGlass

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 7f9f850fb5fed60307326146b54db6c4e3effea6..acc00844a600047bdc97e78204cae755da74c3b5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -524,23 +524,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/chocolateglass.rsi
 
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkCafeLatte
-  name: cafe latte
-  description: A nice, strong and tasty beverage while you are reading.
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: CafeLatte
-          Quantity: 30
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/cafe_latte.rsi
-
 - type: entity
   parent: DrinkGlassBase
   id: DrinkCoffee

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 806cf30d7107c54f0146fef73ed6e51585586223..fa91eb4fd47811bff0a3881022384ddec1b89ed8 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -207,6 +207,24 @@
   - type: TrashOnEmpty
     solution: drink
 
+- type: entity
+  parent: DrinkBaseCup
+  id: DrinkCafeLatte
+  name: Cafe latte
+  description: A nice, strong and tasty beverage while you are reading.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: CafeLatte
+          Quantity: 20
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/cafe_latte.rsi
+  - type: Appearance
+  - type: TrashOnEmpty
+    solution: drink
+
 - type: entity
   parent: DrinkBaseCup
   id: DrinkTeacup