From 3756d9ce5cfd74c195f451f8f3bb9116afa74f80 Mon Sep 17 00:00:00 2001
From: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Date: Thu, 28 Apr 2022 12:56:21 +0100
Subject: [PATCH] Breakable cups fix (#7805)

* Moves components from one base to another

* reparent water cup to mug from glass

* reparent flasks to not shatter to glass

* remove duplicate component
=
---
 .../Objects/Consumable/Drinks/drinks.yml       | 18 ++++++------------
 .../Objects/Consumable/Drinks/drinks_cups.yml  |  2 +-
 .../Consumable/Drinks/drinks_flasks.yml        | 12 ++++++------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index f0af94d949..6b952d07a2 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -16,6 +16,12 @@
     state: icon
   - type: Spillable
     solution: drink
+  - type: FitsInDispenser
+    solution: drink
+  - type: DrawableSolution
+    solution: drink
+  - type: RefillableSolution
+    solution: drink
   - type: UserInterface
     interfaces:
     - key: enum.TransferAmountUiKey.Key
@@ -57,18 +63,6 @@
     damage:
       types:
         Blunt: 5
-  - type: FitsInDispenser
-    solution: drink
-  - type: DrawableSolution
-    solution: drink
-  - type: RefillableSolution
-    solution: drink
-  - type: SolutionTransfer
-    canChangeTransferAmount: true
-  - type: UserInterface
-    interfaces:
-    - key: enum.TransferAmountUiKey.Key
-      type: TransferAmountBoundUserInterface
 
 # Transformable container - normal glass
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 46894bb7d1..83fb388132 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -206,7 +206,7 @@
     sprite: Objects/Consumable/Drinks/lean.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkBaseCup
   id: DrinkWaterCup
   name: water cup
   description: A paper water cup.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
index 47ec9ff952..b104531003 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkBase
   id: DrinkShinyFlask
   name: shiny flask
   description: A shiny metal flask. It appears to have a Greek symbol inscribed on it.
@@ -9,7 +9,7 @@
     sprite: Objects/Consumable/Drinks/shinyflask.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkBase
   id: DrinkDetFlask
   name: inspector's flask
   description: A metal flask with a leather band and golden badge belonging to the inspector.
@@ -19,7 +19,7 @@
     sprite: Objects/Consumable/Drinks/detflask.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkBase
   id: DrinkFlask
   name: captain's flask
   description: A metal flask belonging to the captain
@@ -29,7 +29,7 @@
     sprite: Objects/Consumable/Drinks/flask.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkBase
   id: DrinkFlaskOld
   name: flask
   description: ''
@@ -39,7 +39,7 @@
     sprite: Objects/Consumable/Drinks/flask_old.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkBase
   id: DrinkLithiumFlask
   name: lithium flask
   description: A flask with a Lithium Atom symbol on it.
@@ -49,7 +49,7 @@
     sprite: Objects/Consumable/Drinks/lithiumflask.rsi
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkBase
   id: DrinkVacuumFlask
   name: vacuum flask
   description: Keeping your drinks at the perfect temperature since 1892.