diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm
index eff6fb84fd0..10eac815bfd 100644
--- a/code/datums/supplypacks/supply.dm
+++ b/code/datums/supplypacks/supply.dm
@@ -9,6 +9,7 @@
 /datum/supply_pack/supply/food
 	name = "Kitchen supply crate"
 	contains = list(
+<<<<<<< HEAD
 			/obj/item/weapon/reagent_containers/food/condiment/flour = 6,
 			/obj/item/weapon/reagent_containers/food/drinks/milk = 3,
 			/obj/item/weapon/reagent_containers/food/drinks/soymilk = 2,
@@ -16,11 +17,32 @@
 			/obj/item/weapon/reagent_containers/food/snacks/tofu = 4,
 			/obj/item/weapon/reagent_containers/food/snacks/meat = 4,
 			/obj/item/weapon/reagent_containers/food/condiment/yeast = 3
+=======
+			/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/weapon/reagent_containers/food/condiment/sprinkles = 1
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 			)
 	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/device/toner = 6)
@@ -143,6 +165,7 @@
 	cost = 15
 	containertype = /obj/structure/closet/crate/large/xion
 	containername = "Cargo Train Trolley Crate"
+<<<<<<< HEAD
 
 /datum/supply_pack/explorergear
 	name="Explorer gear"
@@ -193,3 +216,5 @@
 	containername = "Pilot equipment"
 	access = access_pilot
 
+=======
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 63a5613c887..e56146bdce6 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -3,9 +3,17 @@
 	req_access = list(access_kitchen)
 
 	starts_with = list(
+<<<<<<< HEAD
 		/obj/item/weapon/reagent_containers/food/condiment/flour = 7,
 		/obj/item/weapon/reagent_containers/food/condiment/sugar = 2,
 		/obj/item/weapon/reagent_containers/food/condiment/spacespice = 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
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 		)
 
 	open_sound = 'sound/machines/click.ogg'
diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm
index 5b137957db7..c99367d767a 100644
--- a/code/modules/food/food/condiment.dm
+++ b/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)
@@ -208,7 +213,18 @@
 	. = ..()
 	reagents.add_reagent("yeast", 50)
 
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/condiment/small
+=======
+/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
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 	possible_transfer_amounts = list(1,20)
 	amount_per_transfer_from_this = 1
 	volume = 20
@@ -448,23 +464,76 @@
 
 //End of MRE stuff.
 
+<<<<<<< HEAD
 /obj/item/weapon/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!"
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 	icon = 'icons/obj/food.dmi'
 	icon_state = "flour"
 	volume = 220
 	center_of_mass = list("x"=16, "y"=8)
 
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/condiment/flour/on_reagent_change()
 	return
 
 /obj/item/weapon/reagent_containers/food/condiment/flour/Initialize()
+=======
+/obj/item/reagent_containers/food/condiment/carton/flour/on_reagent_change()
+	update_icon()
+	return
+
+/obj/item/reagent_containers/food/condiment/carton/flour/Initialize()
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 	. = ..()
 	reagents.add_reagent("flour", 200)
 	randpixel_xy()
 
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/condiment/spacespice
+=======
+/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
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 	name = "space spices"
 	desc = "An exotic blend of spices for cooking. Definitely not worms."
 	icon_state = "spacespicebottle"
@@ -477,4 +546,4 @@
 
 /obj/item/weapon/reagent_containers/food/condiment/spacespice/Initialize()
 	. = ..()
-	reagents.add_reagent("spacespice", 40)
\ No newline at end of file
+	reagents.add_reagent("spacespice", 40)
diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm
index 981a809fd46..210b74e93bc 100644
--- a/code/modules/food/kitchen/cooking_machines/container.dm
+++ b/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/weapon/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/weapon/reagent_containers/cooking_container/verb/empty()
@@ -102,6 +105,8 @@
 
 /obj/item/weapon/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/weapon/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"
\ No newline at end of file
+	icon_state = "grillrack"
diff --git a/icons/obj/cooking_machines.dmi b/icons/obj/cooking_machines.dmi
index 4009cb62249..b8c3ea6f5d2 100644
Binary files a/icons/obj/cooking_machines.dmi and b/icons/obj/cooking_machines.dmi differ
diff --git a/maps/submaps/surface_submaps/plains/Diner.dmm b/maps/submaps/surface_submaps/plains/Diner.dmm
index 69f2b63996c..9554816a933 100644
--- a/maps/submaps/surface_submaps/plains/Diner.dmm
+++ b/maps/submaps/surface_submaps/plains/Diner.dmm
@@ -30,8 +30,13 @@
 /area/submap/Diner)
 "ai" = (
 /obj/structure/table/standard,
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/condiment/enzyme,
 /obj/item/weapon/reagent_containers/glass/beaker,
+=======
+/obj/item/reagent_containers/food/condiment/enzyme,
+/obj/item/reagent_containers/glass/beaker,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "aj" = (
@@ -39,11 +44,19 @@
 /obj/machinery/light{
 	dir = 1
 	},
+<<<<<<< HEAD
 /obj/item/weapon/material/knife/butch,
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "ak" = (
 /obj/machinery/vending/cola,
+=======
+/obj/item/material/knife/butch,
+/turf/simulated/floor/tiled/white,
+/area/submap/Diner)
+"ak" = (
+/obj/machinery/vending/hotfood,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "al" = (
@@ -78,17 +91,29 @@
 "ar" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/structure/table/standard,
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
 /obj/item/weapon/material/kitchen/utensil/fork,
+=======
+/obj/item/reagent_containers/food/condiment/small/saltshaker,
+/obj/item/material/kitchen/utensil/fork,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "as" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/structure/table/standard,
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/condiment/small/peppermill,
 /obj/machinery/light{
 	icon_state = "tube1";
 	dir = 4
+=======
+/obj/item/reagent_containers/food/condiment/small/peppershaker,
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 	},
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
@@ -102,19 +127,32 @@
 /area/submap/Diner)
 "au" = (
 /obj/structure/table/standard,
+<<<<<<< HEAD
 /obj/item/weapon/book/manual/chef_recipes,
+=======
+/obj/item/book/manual/chef_recipes,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "av" = (
 /obj/structure/table/standard,
+<<<<<<< HEAD
 /obj/item/weapon/material/kitchen/rollingpin,
+=======
+/obj/item/material/kitchen/rollingpin,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "aw" = (
 /obj/machinery/appliance/mixer/cereal,
 /obj/machinery/light{
+<<<<<<< HEAD
 	icon_state = "tube1";
 	dir = 4
+=======
+	dir = 4;
+	icon_state = "tube1"
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 	},
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
@@ -125,6 +163,7 @@
 /area/submap/Diner)
 "ay" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
+<<<<<<< HEAD
 /obj/item/weapon/storage/fancy/egg_box,
 /obj/item/weapon/storage/fancy/egg_box,
 /obj/item/weapon/reagent_containers/food/drinks/bottle/milk,
@@ -135,6 +174,18 @@
 /obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
 /obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
 /obj/item/weapon/reagent_containers/food/condiment/sugar,
+=======
+/obj/item/storage/fancy/egg_box,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/food/drinks/bottle/milk,
+/obj/item/reagent_containers/food/drinks/bottle/milk,
+/obj/item/reagent_containers/food/drinks/bottle/milk,
+/obj/item/reagent_containers/food/drinks/bottle/cream,
+/obj/item/reagent_containers/food/drinks/bottle/cream,
+/obj/item/reagent_containers/food/drinks/bottle/cream,
+/obj/item/reagent_containers/food/drinks/bottle/cream,
+/obj/item/reagent_containers/food/condiment/sugar,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "az" = (
@@ -151,20 +202,34 @@
 /area/submap/Diner)
 "aC" = (
 /obj/structure/table/standard,
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/item/weapon/material/kitchen/utensil/fork,
+=======
+/obj/item/reagent_containers/food/condiment/small/saltshaker,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/item/material/kitchen/utensil/fork,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "aD" = (
 /obj/structure/table/standard,
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/condiment/small/peppermill,
+=======
+/obj/item/reagent_containers/food/condiment/small/peppershaker,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "aE" = (
 /obj/effect/floor_decal/corner/red/diagonal,
+<<<<<<< HEAD
 /obj/item/weapon/stool/padded,
+=======
+/obj/item/stool/padded,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "aF" = (
@@ -180,6 +245,7 @@
 /area/submap/Diner)
 "aI" = (
 /obj/structure/closet/crate/freezer,
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/snacks/meat,
 /obj/item/weapon/reagent_containers/food/snacks/meat,
 /obj/item/weapon/reagent_containers/food/snacks/meat,
@@ -187,19 +253,37 @@
 /obj/item/weapon/reagent_containers/food/snacks/meat,
 /obj/item/weapon/reagent_containers/food/snacks/meat,
 /obj/item/weapon/reagent_containers/food/snacks/meat,
+=======
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/freezer,
 /area/submap/Diner)
 "aJ" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/corner/red/diagonal,
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
+=======
+/obj/item/reagent_containers/food/condiment/small/saltshaker,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "aK" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/machinery/light{
+<<<<<<< HEAD
 	icon_state = "tube1";
 	dir = 4
+=======
+	dir = 4;
+	icon_state = "tube1"
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 	},
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
@@ -226,6 +310,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/snacks/meat,
 /obj/item/weapon/reagent_containers/food/snacks/meat,
 /obj/item/weapon/reagent_containers/food/snacks/meat,
@@ -234,12 +319,26 @@
 /obj/item/weapon/reagent_containers/food/snacks/meat,
 /obj/item/weapon/reagent_containers/food/snacks/meat,
 /obj/item/weapon/reagent_containers/food/snacks/meat,
+=======
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/reagent_containers/food/snacks/meat,
+/obj/item/reagent_containers/food/snacks/meat,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/freezer,
 /area/submap/Diner)
 "aO" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/corner/red/diagonal,
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/condiment/small/peppermill,
+=======
+/obj/item/reagent_containers/food/condiment/small/peppershaker,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "aP" = (
@@ -250,6 +349,7 @@
 /area/submap/Diner)
 "aQ" = (
 /obj/structure/closet/crate/freezer,
+<<<<<<< HEAD
 /obj/item/weapon/reagent_containers/food/condiment/flour,
 /obj/item/weapon/reagent_containers/food/condiment/flour,
 /obj/item/weapon/reagent_containers/food/condiment/flour,
@@ -257,6 +357,15 @@
 /obj/item/weapon/reagent_containers/food/condiment/flour,
 /obj/item/weapon/reagent_containers/food/condiment/flour,
 /obj/item/weapon/reagent_containers/food/condiment/flour,
+=======
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+/obj/item/reagent_containers/food/condiment/carton/flour,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/freezer,
 /area/submap/Diner)
 "aR" = (
@@ -317,14 +426,20 @@
 /area/submap/Diner)
 "bc" = (
 /obj/machinery/light{
+<<<<<<< HEAD
 	icon_state = "tube1";
 	dir = 4
+=======
+	dir = 4;
+	icon_state = "tube1"
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 	},
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "bd" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/structure/closet/secure_closet/freezer/fridge,
+<<<<<<< HEAD
 /obj/item/weapon/storage/fancy/egg_box,
 /obj/item/weapon/storage/fancy/egg_box,
 /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice,
@@ -338,6 +453,21 @@
 /obj/item/weapon/reagent_containers/food/drinks/bottle/milk,
 /obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
 /obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
+=======
+/obj/item/storage/fancy/egg_box,
+/obj/item/storage/fancy/egg_box,
+/obj/item/reagent_containers/food/drinks/bottle/orangejuice,
+/obj/item/reagent_containers/food/drinks/bottle/orangejuice,
+/obj/item/reagent_containers/food/drinks/bottle/orangejuice,
+/obj/item/reagent_containers/food/drinks/bottle/orangejuice,
+/obj/item/reagent_containers/food/drinks/bottle/orangejuice,
+/obj/item/reagent_containers/food/drinks/bottle/milk,
+/obj/item/reagent_containers/food/drinks/bottle/milk,
+/obj/item/reagent_containers/food/drinks/bottle/milk,
+/obj/item/reagent_containers/food/drinks/bottle/milk,
+/obj/item/reagent_containers/food/drinks/bottle/cream,
+/obj/item/reagent_containers/food/drinks/bottle/cream,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
 "be" = (
@@ -351,7 +481,11 @@
 /area/submap/Diner)
 "bg" = (
 /obj/structure/table/woodentable,
+<<<<<<< HEAD
 /obj/item/device/flashlight/lamp,
+=======
+/obj/item/flashlight/lamp,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/lino,
 /area/submap/Diner)
 "bh" = (
@@ -361,6 +495,14 @@
 "bi" = (
 /turf/simulated/floor/lino,
 /area/submap/Diner)
+<<<<<<< HEAD
+=======
+"bj" = (
+/obj/structure/table/standard,
+/obj/random/mug,
+/turf/simulated/floor/tiled/white,
+/area/submap/Diner)
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 "bk" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -369,11 +511,19 @@
 /area/submap/Diner)
 "bl" = (
 /obj/structure/table/woodentable,
+<<<<<<< HEAD
 /obj/item/weapon/cell/high,
+=======
+/obj/item/cell/high,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/lino,
 /area/submap/Diner)
 "bm" = (
 /obj/structure/table/woodentable,
+<<<<<<< HEAD
+=======
+/obj/random/mug,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/lino,
 /area/submap/Diner)
 "bn" = (
@@ -389,8 +539,13 @@
 "bp" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/structure/windoor_assembly{
+<<<<<<< HEAD
 	icon_state = "l_windoor_assembly01";
 	dir = 2
+=======
+	dir = 2;
+	icon_state = "l_windoor_assembly01"
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 	},
 /turf/simulated/floor/tiled/white,
 /area/submap/Diner)
@@ -406,8 +561,13 @@
 /area/submap/Diner)
 "bs" = (
 /obj/structure/sink{
+<<<<<<< HEAD
 	icon_state = "sink";
 	dir = 8;
+=======
+	dir = 8;
+	icon_state = "sink";
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 	pixel_x = -12;
 	pixel_y = 2
 	},
@@ -452,6 +612,10 @@
 /area/submap/Diner)
 "bA" = (
 /obj/structure/table/standard,
+<<<<<<< HEAD
+=======
+/obj/random/soap/anom,
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 /turf/simulated/floor/tiled/hydro,
 /area/submap/Diner)
 
@@ -863,7 +1027,11 @@ aa
 (16,1,1) = {"
 aa
 ad
+<<<<<<< HEAD
 ah
+=======
+bj
+>>>>>>> edb54f137d6... Cooking QOL V2 (#8644)
 ap
 ap
 ap