Pumpkin Spice! (#5408)

Makes pumpkins have 'pumpkin pulp' inside of them (a child of nutriment), which can be used with space spice to make pumpkin spice.

This can be used for several drinks, along with the new pumpkin pie recipe, that no longer requires a whole pumpkin be shoved in the oven.

Additionally, added a temporary limited edition seasonal drink and donuts to the vending machines. It's Autumnlicious™!
This commit is contained in:
Kaedwuff
2018-10-27 21:25:41 +02:00
committed by Werner
parent 5c972f5305
commit 7a44ce7e44
9 changed files with 129 additions and 5 deletions
+1 -2
View File
@@ -205,8 +205,7 @@
/datum/recipe/pumpkinpie
appliance = OVEN
fruit = list("pumpkin" = 1)
reagents = list("milk" = 5, "sugar" = 5, "egg" = 3, "flour" = 10)
reagents = list("milk" = 5, "sugar" = 5, "egg" = 3, "flour" = 10, "pumpkinpulp"= 5, "pumpkinspice"= 2)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie
reagent_mix = RECIPE_REAGENT_REPLACE //We dont want raw egg in the result
+1 -1
View File
@@ -983,7 +983,7 @@
name = "pumpkin"
seed_name = "pumpkin"
display_name = "pumpkin vine"
chems = list("nutriment" = list(1,6))
chems = list("pumpkinpulp" = list(5,6))
kitchen_tag = "pumpkin"
/datum/seed/pumpkin/setup_traits()
@@ -1178,6 +1178,39 @@
glass_desc = "Espresso with hot milk and chocolate."
glass_center_of_mass = list("x"=15, "y"=9)
/datum/reagent/drink/coffee/icecoffee/psfrappe
name = "Pumpkin Spice Frappe"
id = "psfrappe"
description = "A seasonal treat popular around the autumn times."
color = "#9C6B19"
taste_description = "autumn bliss and coffee"
glass_icon_state = "frappe_psl"
glass_name = "glass of pumpkin spice frappe"
glass_desc = "A seasonal treat popular around the autumn times."
/datum/reagent/drink/coffee/pslatte
name = "Pumpkin Spice Latte"
id = "pslatte"
description = "A seasonal drink favored in autumn."
color = "#9C6B19"
taste_description = "hot creamy coffee and autumn bliss"
glass_icon_state = "psl_cheap"
glass_name = "cup of pumpkin spice latte"
glass_desc = "A hot cup of pumpkin spiced coffee. Autumn really is the best season!"
/datum/reagent/drink/coffee/sadpslatte
name = "Processed Pumpkin Latte"
id = "sadpslatte"
description = "A processed drink vaguely reminicent of autumn bliss."
color = "#9C6B19"
taste_description = "a disappointing approximation of autumn bliss"
glass_icon_state = "psl_cheap"
glass_name = "cup of cheap pumpkin latte"
glass_desc = "Maybe you should just go ask the barista for something more authentic..."
/datum/reagent/drink/hot_coco
name = "Hot Chocolate"
id = "hot_coco"
@@ -3792,4 +3825,19 @@
if(alien != IS_DIONA)
M.druggy = max(M.druggy, 30)
M.dizziness += 5
M.drowsyness = 0
M.drowsyness = 0
/datum/reagent/nutriment/pumpkinpulp
name = "Pumpkin Pulp"
id = "pumpkinpulp"
description = "The gooey insides of a slain pumpkin"
color = "#f9ab28"
taste_description = "gooey pumpkin"
/datum/reagent/spacespice/pumpkinspice
name = "Pumpkin Spice"
id = "pumpkinspice"
description = "A delicious seasonal flavoring."
color = "#AE771C"
taste_description = "autumn bliss"
@@ -2803,6 +2803,27 @@
required_reagents = list("blood" = 2, "sarezhiwine" = 3)
result_amount = 5
/datum/chemical_reaction/pumpkinspice
name = "Pumpkin Spice"
id = "pumpkinspce"
result = "pumpkinspice"
required_reagents = list("spacespice" = 8, "pumpkinpulp" = 2)
result_amount = 10
/datum/chemical_reaction/psfrappe
name = "Pumpkin Spice Frappe"
id = "psfrappe"
result = "psfrappe"
required_reagents = list("icecoffee" = 6, "pumpkinspice" = 2, "cream" = 2)
result_amount = 10
/datum/chemical_reaction/pslatte
name = "Pumpkin Spice Latte"
id = "pslatte"
result = "pslatte"
required_reagents = list("coffee" = 6, "pumpkinspice" = 2, "cream" = 2)
result_amount = 10
//transmutation
/datum/chemical_reaction/transmutation_silver
@@ -133,6 +133,15 @@
. = ..()
reagents.add_reagent("coffee", 30)
/obj/item/weapon/reagent_containers/food/drinks/coffee/pslatte
name = "Seasonal Pumpkin Spice Latte"
desc = "A limited edition pumpkin spice coffee drink!"
icon_state = "psl_vended"
center_of_mass = list("x"=15, "y"=10)
Initialize()
. = ..()
reagents.add_reagent("sadpslatte", 30)
/obj/item/weapon/reagent_containers/food/drinks/tea
name = "Duke purple tea"
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
@@ -602,6 +602,13 @@
nutriment_amt = 3
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/donut/psdonut
name = "pumpkin spice donut"
desc = "A limited edition seasonal pastry."
icon_state = "donut_ps"
center_of_mass = list("x"=13, "y"=16)
nutriment_desc = list("pumpkin spice" = 1, "donut" = 2)
/obj/item/weapon/reagent_containers/food/snacks/donut/normal/Initialize()
. = ..()
reagents.add_reagent("sprinkles", 1)