Cooking QOL V2 (#8644)

* cooking_qol

* fixes

* fixesconflictindiner

code/datums/supplypacks/supply.dm

@@ -9,18 +9,30 @@
 /datum/supply_pack/supply/food
 	name = "Kitchen supply crate"
 	contains = list(
-			/obj/item/reagent_containers/food/condiment/flour = 6,
+			/obj/item/reagent_containers/food/condiment/carton/flour = 6,
 			/obj/item/reagent_containers/food/drinks/milk = 3,
 			/obj/item/reagent_containers/food/drinks/soymilk = 2,
 			/obj/item/storage/fancy/egg_box = 2,
 			/obj/item/reagent_containers/food/snacks/tofu = 4,
 			/obj/item/reagent_containers/food/snacks/meat = 4,
-			/obj/item/reagent_containers/food/condiment/yeast = 3
+			/obj/item/reagent_containers/food/condiment/yeast = 3,
+			/obj/item/weapon/reagent_containers/food/condiment/sprinkles = 1
 			)
 	cost = 10
 	containertype = /obj/structure/closet/crate/freezer/centauri
 	containername = "Food crate"
 
+/datum/supply_pack/supply/fancyfood
+	name = "Artisanal food delivery"
+	contains = list(
+			/obj/item/reagent_containers/food/condiment/carton/flour/rustic = 6,
+			/obj/item/reagent_containers/food/condiment/carton/sugar/rustic = 6
+			)
+	cost = 25
+	containertype = /obj/structure/closet/crate/freezer/centauri
+	containername = "Artisanal food crate"
+
+
 /datum/supply_pack/supply/toner
 	name = "Toner cartridges"
 	contains = list(/obj/item/toner = 6)
@@ -142,4 +154,4 @@
 	contains = list(/obj/vehicle/train/trolley)
 	cost = 15
 	containertype = /obj/structure/closet/crate/large/xion
-	containername = "Cargo Train Trolley Crate"
+	containername = "Cargo Train Trolley Crate"

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

@@ -4,8 +4,10 @@
 	door_anim_time = 0 //Unsupported
 
 	starts_with = list(
-		/obj/item/reagent_containers/food/condiment/flour = 7,
-		/obj/item/reagent_containers/food/condiment/sugar = 2,
+		/obj/item/reagent_containers/food/condiment/carton/flour = 6,
+		/obj/item/reagent_containers/food/condiment/carton/sugar = 1,
+		/obj/item/reagent_containers/food/condiment/carton/flour/rustic = 1,
+		/obj/item/reagent_containers/food/condiment/carton/sugar/rustic = 1,
 		/obj/item/reagent_containers/food/condiment/spacespice = 2
 		)
 

code/modules/food/food/condiment.dm

@@ -135,6 +135,11 @@
 				desc = "Barbecue sauce, it's labeled 'sweet and spicy'."
 				icon_state = "barbecue"
 				center_of_mass = list("x"=16, "y"=6)
+			if("sprinkles")
+				name = "sprinkles"
+				desc = "Bottle of sprinkles, colourful!"
+				icon_state= "sprinkles"
+				center_of_mass = list("x"=16, "y"=6)
 			else
 				name = "Misc Condiment Bottle"
 				if (reagents.reagent_list.len==1)
@@ -201,6 +206,13 @@
 	. = ..()
 	reagents.add_reagent("yeast", 50)
 
+/obj/item/weapon/reagent_containers/food/condiment/sprinkles
+	name = "Sprinkles"
+
+/obj/item/weapon/reagent_containers/food/condiment/sprinkles/Initialize()
+	. = ..()
+	reagents.add_reagent("sprinkles", 50)
+
 /obj/item/reagent_containers/food/condiment/small
 	possible_transfer_amounts = list(1,20)
 	amount_per_transfer_from_this = 1
@@ -441,26 +453,61 @@
 
 //End of MRE stuff.
 
-/obj/item/reagent_containers/food/condiment/flour
-	name = "flour sack"
-	desc = "A big bag of flour. Good for baking!"
+/obj/item/reagent_containers/food/condiment/carton/flour
+	name = "flour carton"
+	desc = "A big carton of flour. Good for baking!"
 	icon = 'icons/obj/food.dmi'
 	icon_state = "flour"
 	volume = 220
 	center_of_mass = list("x"=16, "y"=8)
 
-/obj/item/reagent_containers/food/condiment/flour/on_reagent_change()
+/obj/item/reagent_containers/food/condiment/carton/flour/on_reagent_change()
+	update_icon()
 	return
 
-/obj/item/reagent_containers/food/condiment/flour/Initialize()
+/obj/item/reagent_containers/food/condiment/carton/flour/Initialize()
 	. = ..()
 	reagents.add_reagent("flour", 200)
 	randpixel_xy()
 
+/obj/item/reagent_containers/food/condiment/carton/update_icon()
+	overlays.Cut()
+
+	if(reagents.total_volume)
+		var/image/filling = image('icons/obj/food.dmi', src, "[icon_state]10")
+
+		filling.icon_state = "[icon_state]-[clamp(round(100 * reagents.total_volume / volume, 25), 0, 100)]"
+
+		overlays += filling
+
+/obj/item/reagent_containers/food/condiment/carton/flour/rustic
+	name = "flour sack"
+	desc = "An artisanal sack of flour. Classy!"
+	icon_state = "flour_bag"
+
+/obj/item/reagent_containers/food/condiment/carton/sugar
+	name = "sugar carton"
+	desc = "A big carton of sugar. Sweet!"
+	icon_state = "sugar"
+	volume = 120
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/reagent_containers/food/condiment/carton/sugar/on_reagent_change()
+	update_icon()
+	return
+
+/obj/item/reagent_containers/food/condiment/carton/sugar/Initialize()
+	. = ..()
+	reagents.add_reagent("sugar", 100)
+
+/obj/item/reagent_containers/food/condiment/carton/sugar/rustic
+	name = "sugar sack"
+	desc = "An artisanal sack of sugar. Classy!"
+	icon_state = "sugar_bag"
+
 /obj/item/reagent_containers/food/condiment/spacespice
 	name = "space spices"
 	desc = "An exotic blend of spices for cooking. Definitely not worms."
-	icon = 'icons/obj/food.dmi'
 	icon_state = "spacespicebottle"
 	possible_transfer_amounts = list(1,40) //for clown turning the lid off
 	amount_per_transfer_from_this = 1
@@ -471,4 +518,4 @@
 
 /obj/item/reagent_containers/food/condiment/spacespice/Initialize()
 	. = ..()
-	reagents.add_reagent("spacespice", 40)
+	reagents.add_reagent("spacespice", 40)

code/modules/food/kitchen/cooking_machines/container.dm

@@ -7,6 +7,7 @@
 	var/shortname
 	var/max_space = 20//Maximum sum of w-classes of foods in this container at once
 	var/max_reagents = 80//Maximum units of reagents
+	var/food_items = 0 // Used for icon updates
 	flags = OPENCONTAINER | NOREACT
 	var/list/insertable = list(
 		/obj/item/reagent_containers/food/snacks,
@@ -59,6 +60,8 @@
 				return
 			I.forceMove(src)
 			to_chat(user, "<span class='notice'>You put the [I] into the [src].</span>")
+			food_items += 1
+			update_icon()
 			return
 
 /obj/item/reagent_containers/cooking_container/verb/empty()
@@ -102,6 +105,8 @@
 
 /obj/item/reagent_containers/cooking_container/AltClick(var/mob/user)
 	do_empty(user)
+	food_items = 0
+	update_icon()
 
 //Deletes contents of container.
 //Used when food is burned, before replacing it with a burned mess
@@ -158,6 +163,22 @@
 			if (weights[I])
 				holder.trans_to(I, weights[I] / total)
 
+/obj/item/reagent_containers/cooking_container/update_icon()
+	overlays.Cut()
+
+	if(food_items)
+		var/image/filling = image('icons/obj/cooking_machines.dmi', src, "[icon_state]10")
+
+		var/percent = round((food_items / max_space) * 100)
+		switch(percent)
+			if(0 to 2)	        filling.icon_state = "[icon_state]"
+			if(3 to 24)         filling.icon_state = "[icon_state]1"
+			if(25 to 49)        filling.icon_state = "[icon_state]2"
+			if(50 to 74)        filling.icon_state = "[icon_state]3"
+			if(75 to 79)        filling.icon_state = "[icon_state]4"
+			if(80 to INFINITY)  filling.icon_state = "[icon_state]5"
+
+		overlays += filling
 
 /obj/item/reagent_containers/cooking_container/oven
 	name = "oven dish"
@@ -186,4 +207,4 @@
 	name = "grill rack"
 	shortname = "rack"
 	desc = "Put ingredients 'in'/on this; designed for use with a grill. Warranty void if used incorrectly. Alt click to remove contents."
-	icon_state = "grillrack"
+	icon_state = "grillrack"