Hot Coffee Fixes (#5696)

* Makes coffee hot

code/modules/mob/living/carbon/taste.dm

@@ -6,7 +6,6 @@
 		var/text_output = temp.generate_taste_message(src)
 		if(text_output != last_taste_text || last_taste_time + 100 < world.time) //We dont want to spam the same message over and over again at the person. Give it a bit of a buffer.
 			to_chat(src, "<span class='notice'>You can taste [text_output]</span>")//no taste means there are too many tastes and not enough flavor.
-
 			last_taste_time = world.time
 			last_taste_text = text_output
 	return from.trans_to_holder(target,amount,multiplier,copy) //complete transfer
@@ -61,7 +60,6 @@ calculate text size per text.
 				out += "[intensity_desc] [taste_desc]"
 
 	var/temp_text = ""
-
 	switch(get_temperature())
 		if(-INFINITY to T0C - 50)
 			temp_text = "lethally freezing"
@@ -77,15 +75,13 @@ calculate text size per text.
 			temp_text = "lukewarm"
 		if(T0C + 25 to T0C + 40)
 			temp_text = "warm"
-		if(T0C + 40 to T0C + 70)
+		if(T0C + 40 to T0C + 100)
 			temp_text = "hot"
-		if(T0C + 70 to T0C + 90)
+		if(T0C + 100 to T0C + 120)
 			temp_text = "scolding hot"
-		if(T0C + 90 to T0C + 120)
-			temp_text = "burning hot"
-		if(T0C + 120 to T0C + 150)
+		if(T0C + 120 to T0C + 200)
 			temp_text = "molten hot"
-		if(T0C + 150 to INFINITY)
+		if(T0C + 200 to INFINITY)
 			temp_text = "lethally hot"
 
 	return "[temp_text] [english_list(out, "something indescribable")]."

code/modules/reagents/dispenser/cartridge.dm

@@ -14,12 +14,20 @@
 	var/spawn_reagent = null
 	var/label = ""
 
-/obj/item/weapon/reagent_containers/chem_disp_cartridge/Initialize()
+	var/temperature_override = 0 //A non-zero value with set the temperature of the reagents inside to this value, in kelvin.
+
+
+/obj/item/weapon/reagent_containers/chem_disp_cartridge/Initialize(mapload,temperature_override)
 	. = ..()
+	if(temperature_override)
+		src.temperature_override = temperature_override
 	if(spawn_reagent)
-		reagents.add_reagent(spawn_reagent, volume)
+		reagents.add_reagent(spawn_reagent, volume, temperature = src.temperature_override)
 		var/datum/reagent/R = SSchemistry.chemical_reagents[spawn_reagent]
-		setLabel(R.name)
+		if(label)
+			setLabel(label)
+		else
+			setLabel(R.name)
 
 /obj/item/weapon/reagent_containers/chem_disp_cartridge/examine(mob/user)
 	..()

code/modules/reagents/dispenser/dispenser_presets.dm

@@ -68,9 +68,9 @@
 	spawn_cartridges = list(
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/water,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/ice,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee{temperature_override = 369},
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/cream,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/tea,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/tea{temperature_override = 349},
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/icetea,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/cola,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/smw,
@@ -128,12 +128,13 @@
 
 /obj/machinery/chemical_dispenser/coffeemaster/full
 	spawn_cartridges = list(
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/espresso,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/coffee{temperature_override = 369},
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/espresso{temperature_override = 369},
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/cream,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/sugar,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/milk,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/soymilk
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/soymilk,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/water{temperature_override = 373}
 		)
 
 /obj/machinery/chemical_dispenser/coffee
@@ -145,5 +146,5 @@
 
 /obj/machinery/chemical_dispenser/coffee/full
 	spawn_cartridges = list(
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/espresso
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/espresso{temperature_override = 369.15}
 		)

html/changelogs/burgerbb-coffee.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: BurgerBB
+
+# 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: "Coffee in coffee dispensers now spawn hot."