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 01f57f48e37..272bee384fb 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2426,7 +2426,7 @@ glass_icon_state = "NTellahotchocolate" glass_name = "glass of NTella hot chocolate" - glass_desc = "A very chocolatey drink for the days so rough, so cold, or so celebratory that a regular hot hcocolate just won't cut it. It has marshmallows!" + glass_desc = "A very chocolatey drink for the days so rough, so cold, or so celebratory that a regular hot chocolate just won't cut it. It has marshmallows!" glass_center_of_mass = list("x"=16, "y"=7) /singleton/reagent/drink/toothpaste diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 0d548e047b5..0c0a049fdaf 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3031,8 +3031,8 @@ name = "NTella hot chocolate" id = "NTellahotchocolate" result = /singleton/reagent/drink/NTellahotchocolate - required_reagents = list(/singleton/reagent/drink/milk = 2, /singleton/reagent/nutriment/choconutspread = 2, /singleton/reagent/drink/milk/cream = 2) - result_amount = 6 + required_reagents = list(/singleton/reagent/drink/milk = 1, /singleton/reagent/nutriment/choconutspread = 1, /singleton/reagent/drink/milk/cream = 1) + result_amount = 3 /datum/chemical_reaction/drink/drink/mimosa name = "Mimosa" diff --git a/html/changelogs/tomixcomics-PR-18000.yml b/html/changelogs/tomixcomics-PR-18000.yml new file mode 100644 index 00000000000..6198e6481b4 --- /dev/null +++ b/html/changelogs/tomixcomics-PR-18000.yml @@ -0,0 +1,43 @@ +################################ +# 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 +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Tomixcomics + +# 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: "Made missing sprites for some food and drinks display correctly." + - tweak: "Repharsed the recipe for NTella chocolate milk to be 1u+1u+1u = 3u instead of 2u+2u+2u=6u." + - spellcheck: "Changed the word 'hcocolate' to 'chocolate'" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 96370abf0a5..55d5f0f5c09 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/item/reagent_containers/food/pastries.dmi b/icons/obj/item/reagent_containers/food/pastries.dmi index eef90e535bb..7c6028f1a75 100644 Binary files a/icons/obj/item/reagent_containers/food/pastries.dmi and b/icons/obj/item/reagent_containers/food/pastries.dmi differ