From 8ebe105458c4b9ea48e958992d698e5c6f88ddd6 Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:32:42 -0400
Subject: [PATCH] Add butter slices (#30789)

---
 .../VendingMachines/Inventories/chefvend.yml  |   2 +-
 .../Objects/Consumable/Food/ingredients.yml   |  29 ++++++++++++++++++
 .../Recipes/Cooking/meal_recipes.yml          |  10 +++---
 .../Food/ingredients.rsi/butter-slice.png     | Bin 0 -> 146 bytes
 .../Consumable/Food/ingredients.rsi/meta.json |   5 ++-
 5 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
index 1d1c9f8cd3..1ccda0e273 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -17,7 +17,7 @@
     FoodContainerEgg: 1
     DrinkMilkCarton: 2
     DrinkSoyMilkCarton: 1
-    FoodButter: 4
+    FoodButter: 3
     FoodCheese: 1
     FoodMeat: 6
     
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 102703f2a5..a81ed55545 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -505,6 +505,35 @@
         density: 10
         mask:
         - ItemMask
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 18
+        reagents:
+        - ReagentId: Butter
+          Quantity: 15
+  - type: SliceableFood
+    count: 3
+    slice: FoodButterSlice
+
+- type: entity
+  name: butter slice
+  parent: FoodBakingBase
+  id: FoodButterSlice
+  description: A pat of delicious, golden, fatty goodness.
+  components:
+  - type: Sprite
+    state: butter-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 6
+        reagents:
+        - ReagentId: Butter
+          Quantity: 5
+  - type: Tag
+    tags:
+    - Slice
 
 - type: entity
   name: stick of cannabis butter
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index fff0e7db9f..1aace5896e 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -457,7 +457,7 @@
   time: 5
   solids:
     FoodBreadPlainSlice: 1
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeFrenchToast
@@ -478,7 +478,7 @@
   solids:
     FoodBreadPlainSlice: 1
     FoodGarlic: 1
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeJellyToast
@@ -1218,7 +1218,7 @@
     Flour: 5
     Sugar: 5
   solids:
-    FoodButter: 1
+    FoodButterSlice: 1
     FoodSnackChocolateBar: 1
 
 - type: microwaveMealRecipe
@@ -1230,7 +1230,7 @@
     Flour: 5
     Sugar: 10
   solids:
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeRaisinCookie
@@ -1252,7 +1252,7 @@
     Oats: 5
     Sugar: 5
   solids:
-    FoodButter: 1
+    FoodButterSlice: 1
 
 - type: microwaveMealRecipe
   id: RecipeChocolateChipPancake
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png
new file mode 100644
index 0000000000000000000000000000000000000000..81b73772a7318579c56567281dd9a11720d2251c
GIT binary patch
literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0MfW#kT*C7W}{2{Qr#a
zv-~&zfI^HVL4Lsu4$p3+0Xc@AE{-7@6O$7p7#jiw=IU!SC@s*?=vdTp(<3n8CS&B0
p8y+`VT^kNc^qxP^b4*^0fgyScbC&kf4NO4I44$rjF6*2UngD=UFWmqD

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
index b4317b0c76..8e73375235 100644
--- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny,",
+  "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
   "size": {
     "x": 32,
     "y": 32
@@ -111,6 +111,9 @@
     },
     {
       "name": "tortilladough-slice"
+    },
+    {
+      "name": "butter-slice"
     }
   ]
 }
-- 
2.52.0