From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com>
Date: Mon, 19 Aug 2024 03:01:26 +0000 (-0700)
Subject: Added a pitcher for the chef to use in serving beverages (#31105)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=529e4b767c4c0f807db233712bdb938e961bfbbf;p=space-station-14.git

Added a pitcher for the chef to use in serving beverages (#31105)

* changed weird red pixel on pitcher sprite

* added pitcher prototype

* added pitcher to dinnervend

* realized I need to change the other icon sprites too :P
---

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
index 11e48f830e..d7108ab995 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
@@ -15,6 +15,7 @@
     DrinkGlass: 5
     Beaker: 5
     LargeBeaker: 5
+    Pitcher: 2
     DrinkMug: 5
     DrinkMugBlack: 2
     DrinkMugBlue: 2
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
index 1c90e71979..e053d2f36b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -98,3 +98,25 @@
   components:
   - type: Sprite
     sprite: Objects/Consumable/Drinks/vacuumflask.rsi
+
+- type: entity
+  parent: FlaskBase
+  id: Pitcher
+  name: Metal Pitcher
+  description: A stainless steel insulated pitcher. Everyone's best friend in the morning.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 60
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/pitcher.rsi
+    layers:
+      - state: icon
+      - state: fill-6
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: fill-
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-1.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-1.png
index 1007c6da56..bc603113c5 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-1.png and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-2.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-2.png
index c163ac636a..f2d1db2fca 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-2.png and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-3.png
index 8576cfb892..9832905976 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-3.png and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-4.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-4.png
index 2a29854fdf..aea3e39d5c 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-4.png and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-4.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-5.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-5.png
index a9ef04b87f..bee31343e1 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-5.png and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-5.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-6.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-6.png
index f171ca5607..d9ab2f5b00 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-6.png and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon-6.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon.png
index c998f643f4..bdf5be8d86 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon.png differ