Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add pumpkin pie! #32623

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 11 additions & 1 deletion Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -1978,4 +1988,4 @@
solids:
FoodCroissantRaw: 1
FoodButterSlice: 1
ShardGlass: 1
ShardGlass: 1
Original file line number Diff line number Diff line change
@@ -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, mime tart slice and banana cream pie slice from rosysyntax under under CC BY-SA 4.0, the pumpkin and pumpkin slice are made by ss14nekow (Mute Maid) and are under CC BY-SA 4.0",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -95,6 +95,12 @@
{
"name": "plump"
},
{
"name": "pumpkin"
},
{
"name": "pumpkin-slice"
},
{
"name": "tin"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading