From: lzk228 <124214523+lzk228@users.noreply.github.com>
Date: Mon, 24 Apr 2023 02:27:28 +0000 (+0300)
Subject: [tweak] More drinks in Solar's Best Hot Drinks (#15701)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=7227e4f1d9ffd28a1961c335bfb9d25eb6bc22cb;p=space-station-14.git

[tweak] More drinks in Solar's Best Hot Drinks (#15701)

* coffee

* desc

* 10 -> 5
---

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
index ff2f344856..acb15b217c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
@@ -1,5 +1,9 @@
 - type: vendingMachineInventory
   id: HotDrinksMachineInventory
   startingInventory:
-    DrinkHotCoffee: 10
-    DrinkTeacup: 10
+    DrinkHotCoffee: 5
+    DrinkCafeLatte: 5
+    DrinkTeacup: 5
+    DrinkGreenTea: 5
+  emaggedInventory:
+    DrinkNothing: 2
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index c91593bfc2..7b7309e304 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -207,6 +207,31 @@
   - type: TrashOnEmpty
     solution: drink
 
+- type: entity
+  parent: DrinkBaseCup
+  id: DrinkCafeLatte
+  name: Cafe latte
+  description: Light coffee-creamy drink. It has latte art on it.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: CafeLatte
+          Quantity: 20
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/hot_coffee.rsi
+    layers:
+      - state: icon-0
+      - map: ["enum.SolutionContainerLayers.Fill"]
+        state: icon-4
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+    fillBaseName: icon-
+  - type: TrashOnEmpty
+    solution: drink
+
 - type: entity
   parent: DrinkBaseCup
   id: DrinkTeacup
@@ -232,6 +257,56 @@
   - type: TrashOnEmpty
     solution: drink
 
+- type: entity
+  parent: DrinkBaseCup
+  id: DrinkGreenTea
+  name: Green tea
+  description: A plain white porcelain teacup.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: GreenTea
+          Quantity: 20
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/teacup.rsi
+    layers:
+      - state: icon-0
+      - map: ["enum.SolutionContainerLayers.Fill"]
+        state: icon-4
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+    fillBaseName: icon-
+  - type: TrashOnEmpty
+    solution: drink
+
+- type: entity
+  parent: DrinkBaseCup
+  id: DrinkNothing
+  name: Nothing
+  description: Is that cup empty?
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Nothing
+          Quantity: 20
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/hot_coffee.rsi
+    layers:
+      - state: icon-0
+      - map: ["enum.SolutionContainerLayers.Fill"]
+        state: icon-4
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+    fillBaseName: icon-
+  - type: TrashOnEmpty
+    solution: drink
+
 - type: entity
   parent: DrinkBaseCup
   id: DrinkLean