From 7efea6f319ed04d15391d5fda139d2ad4ad889c1 Mon Sep 17 00:00:00 2001
From: cheesePizza2 <34486300+cheesePizza2@users.noreply.github.com>
Date: Fri, 19 Nov 2021 20:03:42 -0500
Subject: [PATCH] Drinks move and Shaker minor edit (#5381)

* drink move 1

shitcode time

* remove leftover comments

i forgor to do this last comment

* remove leftover comments

i forgor to do this last commit

* shaker modifying

fuck now it crashes, screw it ill fix it later

* i forgot a hyphen

i am so fucking stupid i am so fucking stupid i am so fucking stupid i am so fucking stupid i am so fucking stupid i am so fucking stupid i am so fucking stupid i am so fucking stupid i am so fucking stupid i am so fucking stupid
---
 .../Entities/Objects/Consumable/drinks.yml    | 125 +-----------------
 .../Objects/Consumable/drinks_flasks.yml      |  59 +++++++++
 .../Objects/Consumable/drinks_special.yml     |  78 +++++++++++
 3 files changed, 138 insertions(+), 124 deletions(-)
 create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/drinks_flasks.yml
 create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/drinks_special.yml

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
index 4f56eddb95..fb69720392 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -1,4 +1,4 @@
-# TODO: Find remaining cans and move to drinks_cans
+# TODO: Find remaining cans and move to drinks_cans
 # TODO: Find empty containers (e.g. mug, pitcher) and move to their own yml
 - type: entity
   parent: BaseItem
@@ -2000,129 +2000,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/wineglass.rsi
 
-# TODO: Move to containers
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkShaker
-  name: shaker
-  description: ''
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/shaker.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkShinyFlask
-  name: shiny flask
-  description: A shiny metal flask. It appears to have a Greek symbol inscribed on it.
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/shinyflask.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkShotGlass
-  name: shot glass
-  description: ''
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/shotglass.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkCarafe
-  name: pitcher
-  description: A handled glass pitcher.
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/carafe.rsi
-    state: icon-10
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkDetFlask
-  name: inspector's flask
-  description: A metal flask with a leather band and golden badge belonging to the inspector.
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/detflask.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkFlask
-  name: captain's flask
-  description: A metal flask belonging to the captain
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/flask.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkFlaskOld
-  name: flask
-  description: ''
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/flask_old.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkJar
-  name: jar
-  description: The hipster's cup
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/jar.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkJarMetroid
-  name: jar metroid
-  description: ''
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/jar_metroid.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkJarWhat
-  name: jar of something
-  description: You can't really tell what this is.
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/jar_what.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkLithiumFlask
-  name: lithium flask
-  description: A flask with a Lithium Atom symbol on it.
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/lithiumflask.rsi
-
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkVacuumFlask
-  name: vacuum flask
-  description: Keeping your drinks at the perfect temperature since 1892.
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/vacuumflask.rsi
-
 # TODO: MOVE
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_flasks.yml
new file mode 100644
index 0000000000..47ec9ff952
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_flasks.yml
@@ -0,0 +1,59 @@
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkShinyFlask
+  name: shiny flask
+  description: A shiny metal flask. It appears to have a Greek symbol inscribed on it.
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/shinyflask.rsi
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkDetFlask
+  name: inspector's flask
+  description: A metal flask with a leather band and golden badge belonging to the inspector.
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/detflask.rsi
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkFlask
+  name: captain's flask
+  description: A metal flask belonging to the captain
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/flask.rsi
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkFlaskOld
+  name: flask
+  description: ''
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/flask_old.rsi
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkLithiumFlask
+  name: lithium flask
+  description: A flask with a Lithium Atom symbol on it.
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/lithiumflask.rsi
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkVacuumFlask
+  name: vacuum flask
+  description: Keeping your drinks at the perfect temperature since 1892.
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/vacuumflask.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_special.yml
new file mode 100644
index 0000000000..5c0e729c81
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_special.yml
@@ -0,0 +1,78 @@
+- type: entity
+  parent: BaseItem
+  id: DrinkShaker
+  name: shaker
+  description: ''
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
+  - type: Drink
+    isOpen: true
+  - type: FitsInDispenser
+    solution: drink
+  - type: DrawableSolution
+    solution: drink
+  - type: RefillableSolution
+    solution: drink
+  - type: SolutionTransfer
+    canChangeTransferAmount: true
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/shaker.rsi
+    state: icon
+  - type: UserInterface
+    interfaces:
+    - key: enum.TransferAmountUiKey.Key
+      type: TransferAmountBoundUserInterface
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkShotGlass
+  name: shot glass
+  description: ''
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/shotglass.rsi
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkCarafe
+  name: pitcher
+  description: A handled glass pitcher.
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/carafe.rsi
+    state: icon-10
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkJar
+  name: jar
+  description: The hipster's cup
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/jar.rsi
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkJarMetroid
+  name: jar metroid
+  description: ''
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/jar_metroid.rsi
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkJarWhat
+  name: jar of something
+  description: You can't really tell what this is.
+  components:
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/jar_what.rsi