diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 8674c35fbdc..6f14ba119d8 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -136,16 +136,18 @@ /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/psdonut = 10 + /obj/item/weapon/reagent_containers/food/snacks/donut/normal/psdonut = 10 ) contraband = list( /obj/item/weapon/reagent_containers/food/drinks/ice = 10 ) prices = list( /obj/item/weapon/reagent_containers/food/drinks/coffee = 20, + /obj/item/weapon/reagent_containers/food/drinks/coffee/pslatte = 25, /obj/item/weapon/reagent_containers/food/drinks/tea = 20, /obj/item/weapon/reagent_containers/food/drinks/h_chocolate = 22, - /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6 + /obj/item/weapon/reagent_containers/food/snacks/donut/normal = 6, + /obj/item/weapon/reagent_containers/food/snacks/donut/normal/psdonut = 10 ) cooling_temperature = T0C + 57 //Optimal coffee temperature heating_temperature = T0C + 100 //ULTRA HOT COFFEE diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 71d94f59cc4..15b159bcfe3 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -602,7 +602,7 @@ nutriment_amt = 3 bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/donut/psdonut +/obj/item/weapon/reagent_containers/food/snacks/donut/normal/psdonut name = "pumpkin spice donut" desc = "A limited edition seasonal pastry." icon_state = "donut_ps" diff --git a/html/changelogs/Kaedwuff - Pumpkinfixes.yml b/html/changelogs/Kaedwuff - Pumpkinfixes.yml new file mode 100644 index 00000000000..15af2cb6264 --- /dev/null +++ b/html/changelogs/Kaedwuff - Pumpkinfixes.yml @@ -0,0 +1,37 @@ +################################ +# 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: + - bugfix: "The promotional pumpkin spice items have been properly priced, and the donut no longer exists in a state of quantum flux yall." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index ce8523beb92..3d96e68bb9b 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ