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 11e48f830eefe2c218472d3ece122215346625f3..d7108ab99557db98972fb36ca380f94c79965cfa 100644 (file)
--- 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 1c90e719792c13d94069881f18630056396bb685..e053d2f36be8d15b687cefbee92578081beb6da5 100644 (file)
--- 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 1007c6da568175d2d6486041147900f65c430386..bc603113c529b88f9d3fe198e44180cc6076e577 100644 (file)
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 c163ac636a02acb630939475b5129298bc3077d0..f2d1db2fcaa773c3e9b8141c72f446a771975338 100644 (file)
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 8576cfb892f1c9dd6579582bcb6136a0ff48de13..98329059763f350428b9162e911f8d97640dfbae 100644 (file)
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 2a29854fdfd8d9787d209070954a2dc89c254656..aea3e39d5cf1ae5a49025e0bbde695d30b582fd9 100644 (file)
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 a9ef04b87faaf4515b624a0ddbe38dc4ad96ced2..bee31343e1e138c841242aa141870eb8bfbeda72 100644 (file)
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 f171ca56078e708776bd05e35e3ba3ecd9809a00..d9ab2f5b00fd67f2eee75761a68d5a1fd8f72513 100644 (file)
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 c998f643f498c7680c00a2ae9fe0b3f66f53048d..bdf5be8d8687b8e77c87b42b0ce0c4e7f0ce1f92 100644 (file)
Binary files a/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/pitcher.rsi/icon.png differ