diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 23df571ff4f..bfec1ec6404 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -133,9 +133,11 @@ vend_id = "coffee" products = list( /obj/item/weapon/reagent_containers/food/drinks/coffee = 25, + /obj/item/weapon/reagent_containers/food/drinks/coffee/pslatte = 15, /obj/item/weapon/reagent_containers/food/drinks/tea = 25, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 25, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 20 + /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 20, + /obj/item/weapon/reagent_containers/food/snacks/donut/psdonut = 10 ) contraband = list( /obj/item/weapon/reagent_containers/food/drinks/ice = 10 diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm index a2405c7c46d..5b70f562071 100644 --- a/code/modules/food/recipes_oven.dm +++ b/code/modules/food/recipes_oven.dm @@ -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 diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index e67305db3f1..495ad2ef27b 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -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() diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 67fd5d6d656..46c97acd8ad 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -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 \ No newline at end of file + 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" + diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 3279baa9883..8bf2cd7db53 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -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 diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index f51867d8969..16db31f359a 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -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." diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 3c96dec5e3c..db8863de56b 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -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) diff --git a/html/changelogs/Kaedwuff - Pumpkin Spice.yml b/html/changelogs/Kaedwuff - Pumpkin Spice.yml new file mode 100644 index 00000000000..29b9cb48b0f --- /dev/null +++ b/html/changelogs/Kaedwuff - Pumpkin Spice.yml @@ -0,0 +1,38 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Kaedwuff + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Pumpkins are now full of pumpkin pulp, instead of generic nutriment! This pulp can be mixed with spices to make a delicious seasoning, which can be put in coffee or mixed with more pulp to make a pie. No longer shall we have to shove a whole pumpkin into the oven to make pie." + - rscadd: "Relatedly, Robust Coffee has released a limited edition Pumpkin Spice Coffee Drink and Donut series for the season!" \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index c366fdc5f3b..9adbb500f8d 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ