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 5e07374d53c..16197ba7df2 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -1686,7 +1686,7 @@
 	taste_description = "creamy chocolate"
 
 	glass_icon_state = "chocolateglass"
-	glass_name = "glass of hot chocolate"
+	glass_name = "cup of hot chocolate"
 	glass_desc = "Made with love! And cocoa beans."
 
 /datum/reagent/drink/sodawater
diff --git a/code/modules/reagents/dispenser/cartridge_presets.dm b/code/modules/reagents/dispenser/cartridge_presets.dm
index bb4dafb4742..d0fa09058d5 100644
--- a/code/modules/reagents/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/dispenser/cartridge_presets.dm
@@ -74,6 +74,7 @@
 	greentea	spawn_reagent = "greentea"
 	chaitea		spawn_reagent = "chaitea"
 	ciderhot	spawn_reagent = "ciderhot"
+	hot_coco	spawn_reagent = "hot_coco"
 
 	// ERT
 	inaprov		spawn_reagent = "inaprovaline"
diff --git a/code/modules/reagents/dispenser/dispenser_presets.dm b/code/modules/reagents/dispenser/dispenser_presets.dm
index 9fe8dbe02d9..1e97c5dda9b 100644
--- a/code/modules/reagents/dispenser/dispenser_presets.dm
+++ b/code/modules/reagents/dispenser/dispenser_presets.dm
@@ -76,6 +76,7 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/water,
 			/obj/item/reagent_containers/chem_disp_cartridge/ice,
 			/obj/item/reagent_containers/chem_disp_cartridge/coffee{temperature_override = 369},
+			/obj/item/reagent_containers/chem_disp_cartridge/hot_coco{temperature_override = 349},			
 			/obj/item/reagent_containers/chem_disp_cartridge/cream,
 			/obj/item/reagent_containers/chem_disp_cartridge/tea{temperature_override = 349},
 			/obj/item/reagent_containers/chem_disp_cartridge/icetea,
@@ -147,6 +148,7 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/sugar,
 			/obj/item/reagent_containers/chem_disp_cartridge/milk,
 			/obj/item/reagent_containers/chem_disp_cartridge/soymilk,
+			/obj/item/reagent_containers/chem_disp_cartridge/hot_coco{temperature_override = 349},
 			/obj/item/reagent_containers/chem_disp_cartridge/water{temperature_override = 373}
 		)
 
diff --git a/html/changelogs/furrycactus - hot chocolate.yml b/html/changelogs/furrycactus - hot chocolate.yml
new file mode 100644
index 00000000000..71e9b3658fb
--- /dev/null
+++ b/html/changelogs/furrycactus - hot chocolate.yml	
@@ -0,0 +1,42 @@
+################################
+# 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: Furrycactus
+
+# 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: 
+  - tweak: "Added Hot Chocolate to the bar coffee machine and to soft drink dispensers."
+  - imageadd: "Replaced the sprite for a glass of hot chocolate with a proper mug sprite."
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index efa295a735a..ae38d8fcd11 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ