Merge pull request #4573 from Fox-McCloud/mocha

Adds in Cafe Mocha

code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm

@@ -509,6 +509,14 @@
 	result_amount = 2
 	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
 
+/datum/chemical_reaction/cafe_mocha
+	name = "Cafe Mocha"
+	id = "cafe_mocha"
+	result = "cafe_mocha"
+	required_reagents = list("cafe_latte" = 1, "chocolate" = 1)
+	result_amount = 2
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
 /datum/chemical_reaction/acidspit
 	name = "Acid Spit"
 	id = "acidspit"

code/modules/reagents/oldchem/reagents/drink/reagents_drink.dm

@@ -241,6 +241,12 @@
 		M.adjustBruteLoss(-1)
 		return
 
+/datum/reagent/drink/coffee/cafe_latte/cafe_mocha
+	name = "Cafe Mocha"
+	id = "cafe_mocha"
+	description = "The perfect blend of coffe, milk, and chocolate."
+	color = "#673629"
+
 /datum/reagent/drink/tea
 	name = "Tea"
 	id = "tea"

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -459,6 +459,10 @@
 					icon_state = "cafe_latte"
 					name = "Cafe Latte"
 					desc = "A nice, strong and refreshing beverage while you are reading."
+				if("cafe_mocha")
+					icon_state = "cafe_latte"
+					name = "Cafe Mocha"
+					desc = "The perfect blend of coffe, milk, and chocolate."
 				if("acidspit")
 					icon_state = "acidspitglass"
 					name = "Acid Spit"