Merge pull request #14525 from FlattestGuitar/oc-donut-steel

fancier donut boxes

code/game/objects/items/weapons/storage/fancy.dm

@@ -13,12 +13,10 @@
  *		Cigarette Box
  */
 
-/obj/item/storage/fancy/
+/obj/item/storage/fancy
 	icon = 'icons/obj/food/containers.dmi'
-	icon_state = "donutbox6"
-	name = "donut box"
 	resistance_flags = FLAMMABLE
-	var/icon_type = "donut"
+	var/icon_type
 
 /obj/item/storage/fancy/update_icon(var/itemremoved = 0)
 	var/total_contents = src.contents.len - itemremoved
@@ -36,24 +34,35 @@
 		else
 			. += "There are [src.contents.len] [src.icon_type]s in the box."
 
-
-
 /*
  * Donut Box
  */
 
 /obj/item/storage/fancy/donut_box
-	icon_state = "donutbox6"
 	icon_type = "donut"
+	icon_state = "donutbox_back"
+	name = "donut box"
 	name = "donut box"
 	storage_slots = 6
 	can_hold = list(/obj/item/reagent_containers/food/snacks/donut)
+	icon_type = "donut"
 
+/obj/item/storage/fancy/donut_box/update_icon()
+	overlays.Cut()
+
+	for(var/i = 1 to length(contents))
+		var/obj/item/reagent_containers/food/snacks/donut/donut = contents[i]
+		var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "donut_[donut.donut_sprite_type]")
+		new_donut_icon.Shift(EAST, 3 * (i-1))
+		overlays += new_donut_icon
+
+	overlays += icon('icons/obj/food/containers.dmi', "donutbox_front")
 
 /obj/item/storage/fancy/donut_box/New()
 	..()
 	for(var/i = 1 to storage_slots)
 		new /obj/item/reagent_containers/food/snacks/donut(src)
+	update_icon()
 
 /*
  * Egg Box

code/modules/food_and_drinks/food/foods/baked_goods.dm

@@ -370,6 +370,7 @@
 	var/extra_reagent = null
 	filling_color = "#D2691E"
 	var/randomized_sprinkles = 1
+	var/donut_sprite_type = "regular"
 	tastes = list("donut" = 1)
 
 /obj/item/reagent_containers/food/snacks/donut/New()
@@ -378,6 +379,7 @@
 		icon_state = "donut2"
 		name = "frosted donut"
 		reagents.add_reagent("sprinkles", 2)
+		donut_sprite_type = "frosted"
 		filling_color = "#FF69B4"
 
 /obj/item/reagent_containers/food/snacks/donut/sprinkles
@@ -385,6 +387,7 @@
 	icon_state = "donut2"
 	list_reagents = list("nutriment" = 3, "sugar" = 2, "sprinkles" = 2)
 	filling_color = "#FF69B4"
+	donut_sprite_type = "frosted"
 	randomized_sprinkles = 0
 
 /obj/item/reagent_containers/food/snacks/donut/chaos
@@ -408,6 +411,7 @@
 	desc = "You jelly?"
 	icon_state = "jdonut1"
 	extra_reagent = "berryjuice"
+	donut_sprite_type = "jelly"
 	tastes = list("jelly" = 1, "donut" = 3)
 
 /obj/item/reagent_containers/food/snacks/donut/jelly/New()
@@ -417,6 +421,7 @@
 	if(prob(30))
 		icon_state = "jdonut2"
 		name = "frosted jelly Donut"
+		donut_sprite_type = "frostedjelly"
 		reagents.add_reagent("sprinkles", 2)
 		filling_color = "#FF69B4"