Kēki ❤️

code/datums/cookingrecipes.dm

@@ -1193,8 +1193,12 @@
 
 		var/obj/item/reagent_containers/food/snacks/S = docakeitem.custom_item
 		var/obj/item/reagent_containers/food/snacks/cake/custom/B = new /obj/item/reagent_containers/food/snacks/cake/custom(ourCooker)
+		var/image/overlay = new /image('icons/obj/foodNdrink/food_dessert.dmi',"cake1-overlay")
 		B.food_color = S ? S.food_color : "#F0F0F0"
-		B.update_icon(0)
+		overlay.color = S.food_color
+		overlay.alpha = 255
+		B.UpdateOverlays(image(overlay),"base")
+
 		if (S)
 			S.reagents.trans_to(B, 50)
 			if(S.real_name)
@@ -1206,7 +1210,11 @@
 			B.name = "[rand(50) ? "yellow" : "white"] cake"
 
 		B.desc = "Mmm! A delicious-looking [B.name]!"
-		B.food_effects += S.food_effects
+
+		for(var/i=1,i<=S.food_effects.len,i++)
+			if(S.food_effects[i] in B.food_effects)
+				continue
+			B.food_effects += S.food_effects[i]
 		return B
 
 
@@ -1241,19 +1249,6 @@
 			if (istype(I, item1))
 				continue
 			else if (istype(I,/obj/item/reagent_containers/food/snacks/))
-				/*
-				var/obj/item/reagent_containers/food/snacks/S = I
-				var/obj/item/reagent_containers/food/snacks/cake/custom/B = new /obj/item/reagent_containers/food/snacks/cake/custom(src.loc)
-				B.food_color = S.food_color
-				B.update_icon(0)
-				S.reagents.trans_to(B, 50)
-				if(S.real_name)
-					B.name = "[S.real_name] cake"
-
-				else
-					B.name = "[S.name] cake"
-				B.desc = "Mmm! A delicious-looking [B.name]!"
-				*/
 				var/obj/item/reagent_containers/food/snacks/cake/batter/batter = new
 
 				batter.custom_item = I

code/mob/living/silicon/robot/robot_modules.dm

@@ -133,7 +133,7 @@
 		// TODO: some sort of nutrient dispenser?
 		/obj/item/kitchen/utensil/knife/bread,
 		/obj/item/kitchen/rollingpin/light,
-		/obj/item/reagent_containers/glass/bottle/icing
+		/obj/item/reagent_containers/food/drinks/drinkingglass/icing //icing tube path update
 		// TODO: portable oven
 	)
 

code/modules/chemistry/Chemistry-Recipes.dm

@@ -3883,13 +3883,5 @@ datum
 			required_reagents = list("ash" = 1, "ectoplasm" = 1, "salt" = 1)
 			result_amount = 3
 			mix_phrase = "A strange green goopy liquid forms in the container."
-
-
-
-
-
-
-
-
-
-#undef get_fucked_clarks
+
+#undef get_fucked_clarks

code/modules/chemistry/tools/bottles.dm

@@ -310,15 +310,6 @@
 	amount_per_transfer_from_this = 5
 	rc_flags = RC_FULLNESS
 
-/obj/item/reagent_containers/glass/bottle/icing
-	name = "icing tube"
-	desc = "Used to put icing on cakes."
-	icon = 'icons/obj/food.dmi'
-	icon_state = "icing_tube"
-	initial_volume = 50
-	amount_per_transfer_from_this = 5
-	rc_flags = RC_FULLNESS
-
 /obj/item/reagent_containers/glass/bottle/holywater
 	name = "Holy Water"
 	desc = "A small bottle filled with blessed water."

code/modules/chemistry/tools/food_and_drink.dm

@@ -912,6 +912,8 @@
 		src.update_icon()
 
 	proc/update_icon()
+		if(istype(src, /obj/item/reagent_containers/food/drinks/drinkingglass/icing))
+			return
 		if (src.reagents.total_volume <= 0)
 			icon_state = "glass-[glass_style]"
 			src.UpdateOverlays(null, "fluid")
@@ -968,6 +970,8 @@
 		return
 
 	attackby(obj/item/W as obj, mob/user as mob)
+		if(istype(src, /obj/item/reagent_containers/food/drinks/drinkingglass/icing))
+			return
 		if (istype(W, /obj/item/raw_material/ice))
 			if (src.reagents.total_volume >= (src.reagents.maximum_volume - 5))
 				if (user.bioHolder.HasEffect("clumsy") && prob(50))
@@ -1191,6 +1195,12 @@
 	glass_style = "oldf"
 	initial_volume = 20
 
+/obj/item/reagent_containers/food/drinks/drinkingglass/round
+	name = "round glass"
+	icon_state = "glass-round"
+	glass_style = "round"
+	initial_volume = 100
+
 /obj/item/reagent_containers/food/drinks/drinkingglass/wine
 	name = "wine glass"
 	icon_state = "glass-wine"
@@ -1217,6 +1227,31 @@
 	initial_volume = 120
 	shard_amt = 2
 
+/obj/item/reagent_containers/food/drinks/drinkingglass/icing //icing tube path and usage update
+	name = "icing tube"
+	desc = "Used to put icing on cakes."
+	icon = 'icons/obj/food.dmi'
+	icon_state = "icing_tube"
+	initial_volume = 50
+	amount_per_transfer_from_this = 5
+	rc_flags = RC_FULLNESS | RC_VISIBLE | RC_SPECTRO
+
+	on_reagent_change()
+		src.underlays = null
+		if (reagents.total_volume >= 0)
+			if(reagents.total_volume == 0)
+				src.icon_state = "icing_tube"
+			else
+				src.icon_state = "icing_tube_2"
+			var/datum/color/average = reagents.get_average_color()
+			var/image/chem = new /image('icons/obj/food.dmi',"icing_tube_chem")
+			chem.color = average.to_rgba()
+			src.underlays += chem
+		signal_event("icon_updated")
+
+	throw_impact(var/turf/T)
+		return
+
 /obj/item/reagent_containers/food/drinks/drinkingglass/random_style
 	rand_pos = 1
 	New()