Adds choccy milk and milkshake

code/game/objects/items/reagent_containers/food/condiment.dm

@@ -13,6 +13,7 @@
 	possible_transfer_amounts = list(1,5,10)
 	center_of_mass = "x=16;y=6"
 	volume = 50
+	var/static_container_icon = FALSE //do I change my icon when a different reagent is inside me? Right now, yes.
 
 /obj/item/reagent_container/food/condiment/attack(mob/M, mob/user)
 	if(!reagents?.total_volume)
@@ -83,7 +84,7 @@
 		to_chat(user, SPAN_NOTICE(" You transfer [trans] units of the condiment to [target]."))
 
 /obj/item/reagent_container/food/condiment/on_reagent_change()
-	if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "hotsauce_cholula" || icon_state == "hotsauce_franks" || icon_state == "hotsauce_sriracha" || icon_state == "hotsauce_tabasco" || icon_state == "coldsauce_cole")
+	if(static_container_icon) //Noooo, don't turn me into a marketable enzyme/condiment bottle, I have my own icon and description!
 		return
 	if(length(reagents.reagent_list) > 0)
 		switch(reagents.get_master_reagent_id())
@@ -156,10 +157,25 @@
 	. = ..()
 	reagents.add_reagent("sugar", 50)
 
+/obj/item/reagent_container/food/condiment/chocolate_syrup
+	name = "\improper Chocolate Syrup bottle"
+	desc = "A bottle of Weyland-Yutani brand chocolate syrup for adding chocolate flavor to space treats, or for sipping directly from the nozzle like a little kid."
+	icon_state = "chocolate_syrup"
+	static_container_icon = TRUE //Yes, I do have my own sprite.
+	possible_transfer_amounts = list(1,5,10,15,20,60) //the thought of marines having fisticuffs because somebody drank all the chocolate syrup is beyond hilarious.
+	amount_per_transfer_from_this = 5
+	volume = 60
+
+/obj/item/reagent_container/food/condiment/chocolate_syrup/Initialize()
+	. = ..()
+	reagents.add_reagent("chocolatesyrup", 60)
+	AddElement(/datum/element/corp_label/wy)
+
 /obj/item/reagent_container/food/condiment/saltshaker //Separate from above since it's a small shaker rather then
 	name = "Salt Shaker" // a large one.
 	desc = "Salt. From space oceans, presumably."
 	icon_state = "saltshakersmall"
+	static_container_icon = TRUE
 	possible_transfer_amounts = list(1,20) //for clown turning the lid off
 	amount_per_transfer_from_this = 1
 	volume = 20
@@ -172,6 +188,7 @@
 	name = "Pepper Mill"
 	desc = "Often used to flavor food or make people sneeze."
 	icon_state = "peppermillsmall"
+	static_container_icon = TRUE
 	possible_transfer_amounts = list(1,20) //for clown turning the lid off
 	amount_per_transfer_from_this = 1
 	volume = 20
@@ -183,6 +200,7 @@
 /obj/item/reagent_container/food/condiment/hotsauce
 	icon = 'icons/obj/items/food/condiments.dmi'
 	name = "hotsauce parent object"
+	static_container_icon = TRUE
 	possible_transfer_amounts = list(1,5,60) //60 allows marines to chug the bottle in one go.
 	volume = 60
 
@@ -245,6 +263,7 @@
 	name = "Cole's Cold bottle"
 	desc = "A bottle of cold sauce locally produced in Shivas Snowball. You probably shouldn't drink this on its own."
 	icon_state = "coldsauce_cole"
+	static_container_icon = TRUE
 
 /obj/item/reagent_container/food/condiment/coldsauce/Initialize()
 	. = ..()

code/game/objects/items/reagent_containers/food/drinks/drinkingglass.dm

@@ -50,10 +50,15 @@
 				name = "Glass of cream"
 				desc = "Ewwww..."
 				center_of_mass = "x=16;y=10"
-			if("chocolate")
+			if("chocolatesyrup")
 				icon_state  = "chocolateglass"
-				name = "Glass of chocolate"
-				desc = "Tasty."
+				name = "Glass of chocolate syrup"
+				desc = "So indulgent!"
+				center_of_mass = "x=16;y=10"
+			if("chocolate_milk")
+				icon_state  = "chocomilk_glass"
+				name = "Chocolate Milk"
+				desc = "A childhood classic that makes even the most hardened marines smile."
 				center_of_mass = "x=16;y=10"
 			if("lemonjuice")
 				icon_state  = "lemonglass"
@@ -564,6 +569,11 @@
 				name = "Milkshake"
 				desc = "Glorious brainfreezing mixture."
 				center_of_mass = "x=16;y=7"
+			if("chocolate_milkshake")
+				icon_state = "chocolate_milkshake"
+				name = "Chocolate Milkshake"
+				desc = "Glorious brainfreezing mixture in classic chocolate flavor."
+				center_of_mass = "x=16;y=7"
 			if("lemonade")
 				icon_state = "lemonadeglass"
 				name = "Lemonade"

code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

@@ -28,6 +28,7 @@
 	for(var/i = 0, i < 6, i++)
 		new /obj/item/reagent_container/food/snacks/flour(src)
 	new /obj/item/reagent_container/food/condiment/sugar(src)
+	new /obj/item/reagent_container/food/condiment/chocolate_syrup(src)
 	for(var/i = 0, i < 3, i++)
 		new /obj/item/reagent_container/food/snacks/meat/monkey(src)
 
@@ -129,7 +130,8 @@
 		new /obj/item/reagent_container/food/condiment/sugar(src)
 	for(var/i = 0, i < 6, i++)
 		new /obj/item/reagent_container/food/snacks/flour(src)
-	new /obj/item/reagent_container/food/condiment/enzyme(src)
+		new /obj/item/reagent_container/food/condiment/enzyme(src)
+		new /obj/item/reagent_container/food/condiment/chocolate_syrup(src)
 
 /obj/structure/closet/secure_closet/freezer/industry
 	name = "Industry Freezer"

code/game/objects/structures/crates_lockers/closets/secure/kitchen.dm

@@ -62,6 +62,7 @@
 		new /obj/item/reagent_container/food/snacks/flour(src)
 	for(var/i in 1 to 2)
 		new /obj/item/reagent_container/food/condiment/sugar(src)
+		new /obj/item/reagent_container/food/condiment/chocolate_syrup(src)
 
 //grocery
 

code/modules/reagents/chemistry_machinery/chem_dispenser.dm

@@ -341,6 +341,7 @@
 		"grapejuice",
 		"lemonjuice",
 		"banana",
+		"chocolatesyrup",
 	)
 	hacked_reagents = list(
 		"milk",

code/modules/reagents/chemistry_machinery/reagent_grinder.dm

@@ -30,7 +30,7 @@
 		/obj/item/reagent_container/food/snacks/grown/ricestalk = list("rice" = -5),
 		/obj/item/reagent_container/food/snacks/grown/cherries = list("cherryjelly" = 0),
 		/obj/item/reagent_container/food/snacks/grown/plastellium = list("plasticide" = 5),
-
+		/obj/item/reagent_container/food/snacks/chocolatebar = list("chocolatesyrup" = 0),
 
 		//All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
 		/obj/item/reagent_container/pill = list(),
@@ -53,7 +53,6 @@
 		/obj/item/reagent_container/food/snacks/watermelonslice = list("watermelonjuice" = 0),
 		/obj/item/reagent_container/food/snacks/grown/grapes = list("grapejuice" = 0),
 		/obj/item/reagent_container/food/snacks/grown/poisonberries = list("poisonberryjuice" = 0),
-
 	)
 
 

code/modules/reagents/chemistry_reactions/food_drink.dm

@@ -801,13 +801,27 @@
 	required_reagents = list("orangejuice" = 2, "cola" = 1)
 	result_amount = 2
 
+/datum/chemical_reaction/chocolate_milk
+	name = "Chocolate Milk"
+	id = "chocolate_milk"
+	result = "chocolate_milk"
+	required_reagents = list("chocolatesyrup" = 1, "milk" = 4)
+	result_amount = 5
+
 /datum/chemical_reaction/milkshake
 	name = "Milkshake"
 	id = "milkshake"
 	result = "milkshake"
 	required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2)
 	result_amount = 5
 
+/datum/chemical_reaction/milkshake/chocolate
+	name = "Chocolate Milkshake"
+	id = "chocolate_milkshake"
+	result = "chocolate_milkshake"
+	required_reagents = list("cream" = 1, "ice" = 2, "chocolate_milk" = 2)
+	result_amount = 5
+
 /datum/chemical_reaction/rewriter
 	name = "Rewriter"
 	id = "rewriter"

code/modules/reagents/chemistry_reagents/drink.dm

@@ -197,11 +197,25 @@
 	description = "A rich, sweet, non-alcoholic beverage traditionally consumed around Christmastime."
 	color = "#DFD7AF" // rgb: 223, 215, 175
 
+/datum/reagent/drink/milk/chocolate
+	name = "Chocolate Milk"
+	id = "chocolate_milk"
+	description = "Nectar of the gods and nectar of the cow. Fucking delicious."
+	color = "#AD8F70" // rgb: 123, 63, 0
+
 /datum/reagent/drink/cold/milkshake
 	name = "Milkshake"
 	description = "Glorious brainfreezing mixture."
 	id = "milkshake"
-	color = "#AEE5E4" // rgb" 174, 229, 228
+	color = "#AEE5E4" // rgb: 174, 229, 228
+	adj_temp = -2
+	target_temp = T0C
+
+/datum/reagent/drink/cold/milkshake/chocolate
+	name = "Chocolate Milkshake"
+	description = "Glorious brainfreezing mixture in classic chocolate flavor."
+	id = "chocolate_milkshake"
+	color = "#AF9B86" // rgb: 175, 155, 134
 	adj_temp = -2
 	target_temp = T0C
 
@@ -526,6 +540,12 @@
 	id = "lemonade"
 	color = COLOR_YELLOW
 
+/datum/reagent/drink/chocolate
+	name = "Chocolate Syrup"
+	description = "Nectar of the gods."
+	id = "chocolatesyrup"
+	color = "#7B3F00" // rgb: 123, 163, 0
+
 //*****************************************************************************************************/
 //***************************************Remove When Safe**********************************************/
 //*****************************************************************************************************/