From: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Date: Tue, 8 Oct 2024 23:29:41 +0000 (-0700)
Subject: Add pumpkin pie! (#32623)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=384ff7e8f614e47efdc4eeaf39b3067a614001bd;p=space-station-14.git

Add pumpkin pie! (#32623)

* first commit

* Licence fix

* rosysyntax licence change (permission granted!)

* simplify

* Better wording
---

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
index c9ac483343..b86a4201e8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -23,7 +23,7 @@
         - ReagentId: Vitamin
           Quantity: 5
   - type: Food #All pies here made with a pie tin; unless you're some kind of savage, you're probably not destroying this when you eat or slice the pie!
-    trash: 
+    trash:
     - FoodPlateTin
   - type: SliceableFood
     count: 4
@@ -317,6 +317,43 @@
     - Slice
 # Tastes like pie, meat.
 
+- type: entity
+  name: pumpkin pie
+  parent: FoodPieBase
+  id: FoodPiePumpkin
+  description: Someone should turn this into a latte!
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - pumpkin
+  - type: Sprite
+    layers:
+    - state: tin
+    - state: pumpkin
+  - type: SliceableFood
+    slice: FoodPiePumpkinSlice
+  - type: Tag
+    tags:
+    - Pie
+
+- type: entity
+  name: slice of pumpkin pie
+  parent: FoodPieSliceBase
+  id: FoodPiePumpkinSlice
+  components:
+  - type: FlavorProfile
+    flavors:
+      - sweet
+      - pumpkin
+  - type: Sprite
+    layers:
+    - state: pumpkin-slice
+  - type: Tag
+    tags:
+    - Pie
+    - Slice
+
 - type: entity
   name: xeno pie
   parent: FoodPieBase
diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
index 8dc25c1c72..fa2b657391 100644
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -1062,6 +1062,16 @@
     FoodMeat: 3
     FoodPlateTin: 1
 
+- type: microwaveMealRecipe
+  id: RecipePumpkinPie
+  name: pumpkin pie recipe
+  result: FoodPiePumpkin
+  time: 15
+  solids:
+    FoodDoughPie: 1
+    FoodPumpkin: 1
+    FoodPlateTin: 1
+
 #- type: microwaveMealRecipe
 #  id: RecipePlumpPie
 #  name: plump pie recipe
@@ -1978,4 +1988,4 @@
   solids:
     FoodCroissantRaw: 1
     FoodButterSlice: 1
-    ShardGlass: 1
\ No newline at end of file
+    ShardGlass: 1
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json
index ced8d58373..644424690d 100644
--- a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, mime tart slice and banana cream pie slice from rosysyntax under under CC BY-SA 4.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, the pumpkin and pumpkin slice are made by ss14nekow (Mute Maid), the mime tart slice and banana cream pie slice are made by rosysyntax.",
     "size": {
         "x": 32,
         "y": 32
@@ -95,6 +95,12 @@
         {
             "name": "plump"
         },
+        {
+            "name": "pumpkin"
+        },
+        {
+            "name": "pumpkin-slice"
+        },
         {
             "name": "tin"
         },
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin-slice.png
new file mode 100644
index 0000000000..e462de6b65
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin-slice.png differ
diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin.png b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin.png
new file mode 100644
index 0000000000..f2f1887944
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pie.rsi/pumpkin.png differ