From 99083060df319fba881369052a440f356875fd11 Mon Sep 17 00:00:00 2001
From: Dawid Bla <46636558+DawBla@users.noreply.github.com>
Date: Wed, 10 May 2023 01:53:50 +0200
Subject: [PATCH] Move cafe latte to drinks_cups and add trashonempty (#16285)

---
 .../Random/Food_Drinks/drinks_glass.yml        |  1 -
 .../Objects/Consumable/Drinks/drinks.yml       | 17 -----------------
 .../Objects/Consumable/Drinks/drinks_cups.yml  | 18 ++++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)

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 f117655bbe..5979ded6d0 100644
--- 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 7f9f850fb5..acc00844a6 100644
--- 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 806cf30d71..fa91eb4fd4 100644
--- 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
-- 
2.51.2