From: themias <89101928+themias@users.noreply.github.com>
Date: Sat, 17 Aug 2024 14:09:42 +0000 (-0400)
Subject: Add croissant recipe (#30825)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ef3de3936452095ceccd8af73b30e1c49901f782;p=space-station-14.git

Add croissant recipe (#30825)

* Add croissant recipe

* comma

* fix description

* fix merge error
---

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
index 784bfe2cd5..42a7141684 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -603,3 +603,27 @@
             Quantity: 1
           - ReagentId: Vitamin
             Quantity: 1
+
+- type: entity
+  name: croissant
+  parent: FoodBakedBase
+  id: FoodBakedCroissant
+  description: Buttery, flaky goodness.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - bread
+      - butter
+  - type: Sprite
+    state: croissant
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 7
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
+        - ReagentId: Butter
+          Quantity: 2
+        - ReagentId: Vitamin
+          Quantity: 1
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 2579410689..6fb75711de 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -452,6 +452,9 @@
   - type: Construction
     graph: Pizza
     node: flat
+  - type: SliceableFood
+    count: 3
+    slice: FoodCroissantRaw
 
 - type: entity
   name: pizza bread
@@ -782,3 +785,22 @@
         name: food-sequence-content-cocoa
       taco: 
         name: food-sequence-content-cocoa
+
+- type: entity
+  name: raw croissant
+  parent: FoodBakingBase
+  id: FoodCroissantRaw
+  description: Buttery, flaky goodness waiting to happen.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - dough
+  - type: Sprite
+    state: croissant-raw
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 4
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 3
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 70c4f5523b..287f15ad0f 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1829,4 +1829,13 @@
   result: FoodTacoShell
   time: 5
   solids:
-    FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe
\ No newline at end of file
+    FoodDoughTortillaFlat: 1 # one third of a standard bread dough recipe
+
+- type: microwaveMealRecipe
+  id: RecipeCroissant
+  name: croissant recipe
+  result: FoodBakedCroissant
+  time: 5
+  solids:
+    FoodCroissantRaw: 1
+    FoodButterSlice: 1
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/croissant.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/croissant.png
new file mode 100644
index 0000000000..3922f8bdde
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/croissant.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
index 7f887863aa..56d8c81f10 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58",
+  "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
   "size": {
     "x": 32,
     "y": 32
@@ -123,6 +123,9 @@
     },
     {
       "name": "chevrechaud"
+    },
+    {
+      "name": "croissant"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw.png
new file mode 100644
index 0000000000..be8a1e2a8f
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/croissant-raw.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
index 8e73375235..6132ff89da 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, butter-slice taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
+  "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 and croissant-raw taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955",
   "size": {
     "x": 32,
     "y": 32
@@ -114,6 +114,9 @@
     },
     {
       "name": "butter-slice"
+    },
+    {
+      "name": "croissant-raw"
     }
   ]
 }