Splitting up food.dmi.

code/datums/trading/traders/food.dm

@@ -60,7 +60,7 @@
 		/obj/item/chems/condiment/capsaicin      = TRADER_THIS_TYPE,
 		/obj/item/food/chazuke                   = TRADER_THIS_TYPE,
 		/obj/item/food/katsucurry                = TRADER_THIS_TYPE,
-		/obj/item/food/meatkabob                 = TRADER_THIS_TYPE,
+		/obj/item/food/skewer/meat                = TRADER_THIS_TYPE,
 		/obj/item/food/boiledegg                 = TRADER_THIS_TYPE,
 		/obj/item/food/boiledrice                = TRADER_THIS_TYPE,
 		/obj/item/food/ricepudding               = TRADER_THIS_TYPE,
@@ -126,7 +126,6 @@
 		/obj/item/food/processed_grown      = TRADER_BLACKLIST_ALL,
 		/obj/item/food/slice                = TRADER_BLACKLIST_ALL,
 		/obj/item/food/grown                = TRADER_BLACKLIST_ALL,
-		/obj/item/food/human                = TRADER_BLACKLIST_ALL,
 		/obj/item/food/sliceable/braincake  = TRADER_BLACKLIST,
 		/obj/item/food/butchery/meat/human  = TRADER_BLACKLIST,
 		/obj/item/food/variable             = TRADER_BLACKLIST_ALL
@@ -188,10 +187,10 @@
 		/obj/item/food/sliceable/pizza            = TRADER_BLACKLIST_ALL,
 		/obj/item/food/sliceable/xenomeatbread    = TRADER_BLACKLIST,
 		/obj/item/food/piecrust                   = TRADER_BLACKLIST,
-		/obj/item/food/unleaveneddough            = TRADER_BLACKLIST,
+		/obj/item/food/sliceable/unleaveneddough  = TRADER_BLACKLIST,
 		/obj/item/food/dough                      = TRADER_BLACKLIST,
 		/obj/item/food/sliceable/flatdough        = TRADER_BLACKLIST,
 		/obj/item/food/sliceable/braincake        = TRADER_BLACKLIST,
-		/obj/item/food/pie                        = TRADER_THIS_TYPE,
+		/obj/item/food/bananapie                  = TRADER_THIS_TYPE,
 		/obj/item/food/applepie                   = TRADER_THIS_TYPE
 	)

code/datums/trading/traders/misc.dm

@@ -114,7 +114,7 @@
 		/obj/item/backpack/clown                   = TRADER_THIS_TYPE,
 		/obj/item/bananapeel                       = TRADER_THIS_TYPE,
 		/obj/item/gun/launcher/money               = TRADER_THIS_TYPE,
-		/obj/item/food/pie                         = TRADER_THIS_TYPE,
+		/obj/item/food/bananapie                   = TRADER_THIS_TYPE,
 		/obj/item/bikehorn                         = TRADER_THIS_TYPE,
 		/obj/item/chems/spray/waterflower          = TRADER_THIS_TYPE,
 		/obj/item/gun/launcher/pneumatic/small     = TRADER_THIS_TYPE,

code/datums/trading/traders/unique.dm

@@ -31,7 +31,6 @@
 	origin = "SGS Severance"
 
 	possible_wanted_items = list(
-		/obj/item/food/human               = TRADER_SUBTYPES_ONLY,
 		/obj/item/food/butchery/meat/human = TRADER_THIS_TYPE,
 		/mob/living/human                  = TRADER_ALL
 	)

code/game/machinery/kitchen/cooking_machines/_cooker_output.dm

@@ -1,7 +1,7 @@
 // Wrapper obj for cooked food. Appearance is set in the cooking code, not on spawn.
 /obj/item/food/variable
 	name = "cooked food"
-	icon = 'icons/obj/food_custom.dmi'
+	icon = 'icons/obj/food/custom/custom.dmi'
 	desc = "If you can see this description then something is wrong. Please report the bug on the tracker."
 	nutriment_amt = 5
 	bitesize = 2

code/game/machinery/kitchen/cooking_machines/cereal.dm

@@ -12,7 +12,7 @@
 	product.SetName("box of [cooking_obj.name] cereal")
 
 /obj/machinery/cooker/cereal/change_product_appearance(var/obj/item/food/product)
-	product.icon = 'icons/obj/food.dmi'
+	product.icon = 'icons/obj/food/custom/custom.dmi'
 	product.icon_state = "cereal_box"
 	product.filling_color = cooking_obj.color
 

code/game/machinery/vending/food.dm

@@ -13,17 +13,17 @@
 		/obj/item/clothing/mask/chewable/candy/lolli = 8,
 		/obj/item/chewables/candy/gum = 4,
 		/obj/item/chewables/candy/cookies = 4,
-		/obj/item/food/candy = 6,
+		/obj/item/food/junk/candy = 6,
 		/obj/item/chems/drinks/dry_ramen = 6,
-		/obj/item/food/chips = 6,
-		/obj/item/food/sosjerky = 6,
-		/obj/item/food/no_raisin = 6,
-		/obj/item/food/spacetwinkie = 6,
-		/obj/item/food/cheesiehonkers = 6,
-		/obj/item/food/tastybread = 6
+		/obj/item/food/junk/chips = 6,
+		/obj/item/food/junk/sosjerky = 6,
+		/obj/item/food/junk/no_raisin = 6,
+		/obj/item/food/junk/spacetwinkie = 6,
+		/obj/item/food/junk/cheesiehonkers = 6,
+		/obj/item/food/junk/tastybread = 6
 	)
 	contraband = list(
-		/obj/item/food/syndicake = 6
+		/obj/item/food/junk/syndicake = 6
 	)
 
 //a food variant of the boda machine - It carries slavic themed foods. Mostly beer snacks
@@ -37,13 +37,13 @@
 	icon_state = "snix"
 	icon_vend = "snix-vend"
 	icon_deny = "snix-deny"
-	products = list(/obj/item/food/semki = 7,
+	products = list(/obj/item/food/junk/semki = 7,
 					/obj/item/food/can/caviar = 7,
-					/obj/item/food/squid = 7,
-					/obj/item/food/croutons = 7,
-					/obj/item/food/salo = 7,
-					/obj/item/food/driedfish = 7,
-					/obj/item/food/pistachios = 7,
+					/obj/item/food/junk/squid = 7,
+					/obj/item/food/junk/croutons = 7,
+					/obj/item/food/junk/salo = 7,
+					/obj/item/food/junk/driedfish = 7,
+					/obj/item/food/junk/pistachios = 7,
 					)
 
 	contraband = list(/obj/item/food/can/caviar/true = 1)
@@ -62,16 +62,16 @@
 	icon_vend = "solsnack-vend"
 	icon_deny = "solsnack-deny"
 	products = list(
-		/obj/item/food/lunacake = 8,
-		/obj/item/food/lunacake/mochicake = 8,
-		/obj/item/food/lunacake/mooncake = 8,
-		/obj/item/food/pluto = 8,
-		/obj/item/food/triton = 8,
-		/obj/item/food/saturn = 8,
-		/obj/item/food/jupiter = 8,
-		/obj/item/food/mars = 8,
-		/obj/item/food/venus = 8,
-		/obj/item/food/oort = 8
+		/obj/item/food/junk/lunacake = 8,
+		/obj/item/food/junk/lunacake/mochicake = 8,
+		/obj/item/food/junk/lunacake/mooncake = 8,
+		/obj/item/food/junk/pluto = 8,
+		/obj/item/food/junk/triton = 8,
+		/obj/item/food/junk/saturn = 8,
+		/obj/item/food/junk/jupiter = 8,
+		/obj/item/food/junk/mars = 8,
+		/obj/item/food/junk/venus = 8,
+		/obj/item/food/junk/oort = 8
 	)
 
 /obj/machinery/vending/weeb
@@ -83,11 +83,11 @@
 	icon_vend = "weeb-vend"
 	icon_deny = "weeb-deny"
 	products = list(
-		/obj/item/food/weebonuts = 8,
-		/obj/item/food/ricecake = 8,
-		/obj/item/food/dango = 8,
-		/obj/item/food/pokey = 8,
-		/obj/item/food/chocobanana = 8
+		/obj/item/food/junk/weebonuts = 8,
+		/obj/item/food/junk/ricecake = 8,
+		/obj/item/food/junk/dango = 8,
+		/obj/item/food/junk/pokey = 8,
+		/obj/item/food/junk/chocobanana = 8
 	)
 
 /obj/machinery/vending/weeb/on_update_icon()
@@ -236,7 +236,7 @@
 	)
 	contraband = list(
 		/obj/item/chems/drinks/cans/thirteenloko = 5,
-		/obj/item/food/liquidfood = 6
+		/obj/item/food/junk/liquidfood = 6
 	)
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
 
@@ -256,7 +256,7 @@
 		/obj/item/chems/drinks/cans/waterbottle = 8,
 		/obj/item/chems/drinks/glass2/fitnessflask/proteinshake = 8,
 		/obj/item/chems/drinks/glass2/fitnessflask = 8,
-		/obj/item/food/candy/proteinbar = 8,
+		/obj/item/food/junk/candy/proteinbar = 8,
 		/obj/item/mre/random = 8,
 		/obj/item/mre/menu9 = 4,
 		/obj/item/mre/menu10 = 4,

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -128,3 +128,12 @@
 	random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")
 	persistent = TRUE
 	generic_filth = TRUE
+
+/obj/effect/decal/cleanable/champagne
+	name = "champagne"
+	desc = "Someone got a bit too excited."
+	gender = PLURAL
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "fchampagne1"
+	color = COLOR_BRASS
+	random_icon_states = list("fchampagne1", "fchampagne2", "fchampagne3", "fchampagne4")

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

@@ -79,7 +79,7 @@
 				/obj/item/chems/hypospray/autoinjector/stabilizer,
 				/obj/item/stack/medical/bandage,
 				/obj/item/flashlight/flare/glowstick,
-				/obj/item/food/candy/proteinbar,
+				/obj/item/food/junk/candy/proteinbar,
 				/obj/item/oxycandle,
 				/obj/item/crowbar/cheap
 			)
@@ -98,7 +98,7 @@
 				/obj/item/chems/hypospray/autoinjector/antirad,
 				/obj/item/stack/medical/bandage,
 				/obj/item/flashlight/flare/glowstick,
-				/obj/item/food/candy/proteinbar,
+				/obj/item/food/junk/candy/proteinbar,
 				/obj/item/oxycandle
 			)
 
@@ -672,22 +672,22 @@
 	desc = "A box full of snack foods."
 
 /obj/item/box/snack/WillContain()
-	return list(/obj/item/food/sosjerky = 7)
+	return list(/obj/item/food/junk/sosjerky = 7)
 
 /obj/item/box/snack/noraisin/WillContain()
-	return list(/obj/item/food/no_raisin = 7)
+	return list(/obj/item/food/junk/no_raisin = 7)
 
 /obj/item/box/snack/cheesehonks/WillContain()
-	return list(/obj/item/food/cheesiehonkers = 7)
+	return list(/obj/item/food/junk/cheesiehonkers = 7)
 
 /obj/item/box/snack/tastybread/WillContain()
-	return list(/obj/item/food/tastybread = 7)
+	return list(/obj/item/food/junk/tastybread = 7)
 
 /obj/item/box/snack/candy/WillContain()
-	return list(/obj/item/food/candy = 7)
+	return list(/obj/item/food/junk/candy = 7)
 
 /obj/item/box/snack/chips/WillContain()
-	return list(/obj/item/food/chips = 7)
+	return list(/obj/item/food/junk/chips = 7)
 
 /obj/item/box/snack/buns/WillContain()
 	return list(/obj/item/food/bun = 7)

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

@@ -99,7 +99,7 @@ MRE Stuff
 /obj/item/mre/menu10/WillContain()
 	. = list(
 		main_meal,
-		/obj/item/food/candy/proteinbar,
+		/obj/item/food/junk/candy/proteinbar,
 		/obj/item/chems/packet/protein,
 		/obj/random/mre/sauce/sugarfree,
 		/obj/item/utensil/spoon/plastic
@@ -177,7 +177,7 @@ MRE Stuff
 	return list(/obj/item/food/boiledrice)
 
 /obj/item/mrebag/menu10/WillContain()
-	return list(/obj/item/food/meatcube)
+	return list(/obj/item/food/junk/meatcube)
 
 /obj/item/mrebag/dessert
 	name = "dessert"

code/game/objects/random/subtypes/food.dm

@@ -53,8 +53,8 @@
 
 /obj/random/mre/dessert/spawn_choices()
 	var/static/list/spawnable_choices = list(
-		/obj/item/food/candy,
-		/obj/item/food/candy/proteinbar,
+		/obj/item/food/junk/candy,
+		/obj/item/food/junk/candy/proteinbar,
 		/obj/item/food/donut,
 		/obj/item/food/donut/jelly,
 		/obj/item/food/chocolatebar,
@@ -70,7 +70,7 @@
 
 /obj/random/mre/dessert/vegan/spawn_choices()
 	var/static/list/spawnable_choices = list(
-		/obj/item/food/candy,
+		/obj/item/food/junk/candy,
 		/obj/item/food/chocolatebar,
 		/obj/item/food/donut/jelly,
 		/obj/item/food/plumphelmetbiscuit
@@ -168,22 +168,22 @@
 /obj/random/snack
 	name = "random snack"
 	desc = "This is a random snack item."
-	icon = 'icons/obj/food.dmi'
+	icon = 'icons/obj/food/junk/junkfood.dmi'
 	icon_state = "sosjerky"
 
 /obj/random/snack/spawn_choices()
 	var/static/list/spawnable_choices = list(
-		/obj/item/food/liquidfood,
-		/obj/item/food/candy,
+		/obj/item/food/junk/liquidfood,
+		/obj/item/food/junk/candy,
 		/obj/item/chems/drinks/dry_ramen,
-		/obj/item/food/chips,
-		/obj/item/food/sosjerky,
-		/obj/item/food/no_raisin,
-		/obj/item/food/spacetwinkie,
-		/obj/item/food/cheesiehonkers,
-		/obj/item/food/tastybread,
-		/obj/item/food/candy/proteinbar,
-		/obj/item/food/syndicake,
+		/obj/item/food/junk/chips,
+		/obj/item/food/junk/sosjerky,
+		/obj/item/food/junk/no_raisin,
+		/obj/item/food/junk/spacetwinkie,
+		/obj/item/food/junk/cheesiehonkers,
+		/obj/item/food/junk/tastybread,
+		/obj/item/food/junk/candy/proteinbar,
+		/obj/item/food/junk/syndicake,
 		/obj/item/food/donut,
 		/obj/item/food/donut/jelly,
 		/obj/item/pizzabox/meat,

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

@@ -76,7 +76,7 @@
 		/obj/item/clothing/gloves/black,
 		/obj/item/radio/headset/headset_sci,
 		/obj/item/flashlight,
-		/obj/item/food/liquidfood,
+		/obj/item/food/junk/liquidfood,
 		/obj/item/chems/drinks/cans/waterbottle,
 		/obj/item/box/flares,
 		/obj/item/cell/device,

code/modules/butchery/butchery_data_animal.dm

@@ -31,7 +31,7 @@
 
 /decl/butchery_data/animal/space_bear
 	meat_name         = "bear"
-	meat_type         = /obj/item/food/bearmeat
+	meat_type         = /obj/item/food/butchery/meat/bear
 	meat_amount       = 10
 	bone_amount       = 20
 	skin_amount       = 20
@@ -99,7 +99,7 @@
 
 /decl/butchery_data/animal/antlion
 	meat_name         = "insect"
-	meat_type         = /obj/item/food/xenomeat
+	meat_type         = /obj/item/food/butchery/meat/xeno
 	meat_amount       = 5
 	skin_material     = /decl/material/solid/organic/skin/insect
 	skin_amount       = 15

code/modules/butchery/butchery_products.dm

@@ -99,7 +99,7 @@
 /obj/item/food/butchery/offal
 	name                = "offal"
 	desc                = "An assortmant of organs and lumps of unidentified gristle. Packed with nutrients and bile."
-	icon                = 'icons/obj/items/butchery/offal.dmi'
+	icon                = 'icons/obj/food/butchery/offal.dmi'
 	material            = /decl/material/solid/organic/meat/gut
 	nutriment_amt       = 15
 	slice_path          = /obj/item/food/butchery/offal/small
@@ -158,7 +158,7 @@
 	return ..()
 
 /obj/item/food/butchery/offal/small
-	icon                = 'icons/obj/items/butchery/offal_small.dmi'
+	icon                = 'icons/obj/food/butchery/offal_small.dmi'
 	nutriment_amt       = 5
 	w_class             = ITEM_SIZE_SMALL
 	slice_path          = null
@@ -173,7 +173,7 @@
 /obj/item/food/butchery/haunch
 	name                = "haunch"
 	desc                = "A severed leg of some unfortunate beast, cleaned and ready for cooking."
-	icon                = 'icons/obj/items/butchery/haunch.dmi'
+	icon                = 'icons/obj/food/butchery/haunch.dmi'
 	slice_num           = 2
 	slice_path          = /obj/item/food/butchery/meat
 	w_class             = ITEM_SIZE_LARGE
@@ -210,7 +210,7 @@
 /obj/item/food/butchery/haunch/side
 	name                = "side of meat"
 	desc                = "Approximately half the torso and body of an unfortunate animal, split lengthways, cleaned, and ready for cooking."
-	icon                = 'icons/obj/items/butchery/side.dmi'
+	icon                = 'icons/obj/food/butchery/side.dmi'
 	w_class             = ITEM_SIZE_HUGE
 
 /obj/item/food/butchery/haunch/side/Initialize(mapload, material_key, skip_plate = FALSE, mob/living/donor)
@@ -229,7 +229,7 @@
 /obj/item/food/butchery/stomach
 	name                = "stomach"
 	desc                = "The stomach of a large animal. It would probably make a decent waterskin if properly treated."
-	icon                = 'icons/obj/items/butchery/ruminant_stomach.dmi'
+	icon                = 'icons/obj/food/butchery/ruminant_stomach.dmi'
 	material            = /decl/material/solid/organic/meat/gut
 	nutriment_amt       = 8
 	dried_type          = /obj/item/chems/waterskin

code/modules/butchery/butchery_products_chopped.dm

@@ -1,7 +1,7 @@
 /obj/item/food/butchery/chopped
 	name          = "chopped meat"
 	desc          = "A handful of chopped meat."
-	icon          = 'icons/obj/items/butchery/chopped.dmi'
+	icon          = 'icons/obj/food/butchery/chopped.dmi'
 	bitesize      = 2
 	nutriment_amt = 1
 	w_class       = ITEM_SIZE_TINY

code/modules/butchery/butchery_products_cutlet.dm

@@ -1,7 +1,7 @@
 /obj/item/food/butchery/cutlet
 	name                = "cutlet"
 	desc                = "A tasty meat slice."
-	icon                = 'icons/obj/items/butchery/cutlet.dmi'
+	icon                = 'icons/obj/food/butchery/cutlet.dmi'
 	bitesize            = 2
 	nutriment_amt       = 1
 	center_of_mass      = @'{"x":17,"y":20}'