Revert "12/21 modernizations from TG live"

code/modules/food_and_drinks/drinks/drinks.dm

@@ -10,7 +10,7 @@
 	var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
 	possible_transfer_amounts = list(5,10,15,20,25,30,50)
 	volume = 50
-	resistance_flags = 0
+	burn_state = FIRE_PROOF
 
 /obj/item/weapon/reagent_containers/food/drinks/New()
 	..()
@@ -74,10 +74,10 @@
 		var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
 		user << "<span class='notice'>You transfer [trans] units of the solution to [target].</span>"
 
-		if(iscyborg(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
+		if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
 			var/mob/living/silicon/robot/bro = user
 			bro.cell.use(30)
-			addtimer(reagents, "add_reagent", 600, TIMER_NORMAL, refill, trans)
+			addtimer(reagents, "add_reagent", 600, FALSE, refill, trans)
 
 /obj/item/weapon/reagent_containers/food/drinks/attackby(obj/item/I, mob/user, params)
 	if(I.is_hot())
@@ -96,7 +96,7 @@
 	name = "pewter cup"
 	desc = "Everyone gets a trophy."
 	icon_state = "pewter_cup"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	force = 1
 	throwforce = 1
 	amount_per_transfer_from_this = 5
@@ -105,13 +105,12 @@
 	volume = 5
 	flags = CONDUCT | OPENCONTAINER
 	spillable = 1
-	resistance_flags = FIRE_PROOF
 
 /obj/item/weapon/reagent_containers/food/drinks/trophy/gold_cup
 	name = "gold cup"
 	desc = "You're winner!"
 	icon_state = "golden_cup"
-	w_class = WEIGHT_CLASS_BULKY
+	w_class = 4
 	force = 14
 	throwforce = 10
 	amount_per_transfer_from_this = 20
@@ -122,7 +121,7 @@
 	name = "silver cup"
 	desc = "Best loser!"
 	icon_state = "silver_cup"
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	force = 10
 	throwforce = 8
 	amount_per_transfer_from_this = 15
@@ -134,7 +133,7 @@
 	name = "bronze cup"
 	desc = "At least you ranked!"
 	icon_state = "bronze_cup"
-	w_class = WEIGHT_CLASS_SMALL
+	w_class = 2
 	force = 5
 	throwforce = 4
 	amount_per_transfer_from_this = 10
@@ -216,44 +215,6 @@
 	else
 		icon_state = "water_cup_e"
 
-/obj/item/weapon/reagent_containers/food/drinks/sillycup/smallcarton
-	name = "small carton"
-	desc = "A small carton, intended for holding drinks."
-	icon_state = "juicebox"
-	volume = 15 //I figure if you have to craft these it should at least be slightly better than something you can get for free from a watercooler
-
-/obj/item/weapon/reagent_containers/food/drinks/sillycup/smallcarton/on_reagent_change()
-	if (reagents.reagent_list.len)
-		switch(reagents.get_master_reagent_id())
-			if("orangejuice")
-				icon_state = "orangebox"
-				name = "orange juice box"
-				desc = "A great source of vitamins. Stay healthy!"
-			if("milk")
-				icon_state = "milkbox"
-				name = "carton of milk"
-				desc = "An excellent source of calcium for growing space explorers."
-			if("applejuice")
-				icon_state = "juicebox"
-				name = "apple juice box"
-				desc = "Sweet apple juice. Don't be late for school!"
-			if("grapejuice")
-				icon_state = "grapebox"
-				name = "grape juice box"
-				desc = "Tasty grape juice in a fun little container. Non-alcoholic!"
-			if("chocolate_milk")
-				icon_state = "chocolatebox"
-				name = "carton of chocolate milk"
-				desc = "Milk for cool kids!"
-			if("eggnog")
-				icon_state = "nog2"
-				name = "carton of eggnog"
-				desc = "For enjoying the most wonderful time of the year."
-	else
-		icon_state = "juicebox"
-		name = "small carton"
-		desc = "A small carton, intended for holding drinks."
-
 
 
 //////////////////////////drinkingglass and shaker//
@@ -295,17 +256,6 @@
 	volume = 30
 	spillable = 1
 
-///Lavaland bowls and bottles///
-
-/obj/item/weapon/reagent_containers/food/drinks/mushroom_bowl
-	name = "mushroom bowl"
-	desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
-	icon = 'icons/obj/lavaland/ash_flora.dmi'
-	icon_state = "mushroom_bowl"
-	w_class = WEIGHT_CLASS_SMALL
-	resistance_flags = 0
-
-
 //////////////////////////soda_cans//
 //These are in their own group to be used as IED's in /obj/item/weapon/grenade/ghettobomb.dm
 
@@ -313,8 +263,8 @@
 	name = "soda can"
 
 /obj/item/weapon/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user)
-	if(M == user && !src.reagents.total_volume && user.a_intent == INTENT_HARM && user.zone_selected == "head")
-		user.visible_message("<span class='warning'>[user] crushes the can of [src] on [user.p_their()] forehead!</span>", "<span class='notice'>You crush the can of [src] on your forehead.</span>")
+	if(M == user && !src.reagents.total_volume && user.a_intent == "harm" && user.zone_selected == "head")
+		user.visible_message("<span class='warning'>[user] crushes the can of [src] on \his forehead!</span>", "<span class='notice'>You crush the can of [src] on your forehead.</span>")
 		playsound(user.loc,'sound/weapons/pierce.ogg', rand(10,50), 1)
 		var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc)
 		crushed_can.icon_state = icon_state
@@ -378,5 +328,3 @@
 	desc = "A delicious mixture of 42 different flavors."
 	icon_state = "dr_gibb"
 	list_reagents = list("dr_gibb" = 30)
-
-

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -53,7 +53,7 @@
 	if(!target)
 		return
 
-	if(user.a_intent != INTENT_HARM || !isGlass)
+	if(user.a_intent != "harm" || !isGlass)
 		return ..()
 
 
@@ -109,8 +109,8 @@
 		target.visible_message("<span class='danger'>[user] has hit [target][head_attack_message] with a bottle of [src.name]!</span>", \
 				"<span class='userdanger'>[user] has hit [target][head_attack_message] with a bottle of [src.name]!</span>")
 	else
-		user.visible_message("<span class='danger'>[target] hits [target.p_them()]self with a bottle of [src.name][head_attack_message]!</span>", \
-				"<span class='userdanger'>[target] hits [target.p_them()]self with a bottle of [src.name][head_attack_message]!</span>")
+		user.visible_message("<span class='danger'>[target] hits \himself with a bottle of [src.name][head_attack_message]!</span>", \
+				"<span class='userdanger'>[target] hits \himself with a bottle of [src.name][head_attack_message]!</span>")
 
 	//Attack logs
 	add_logs(user, target, "attacked", src)
@@ -125,7 +125,7 @@
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/proc/SplashReagents(var/mob/M)
 	if(src.reagents.total_volume)
-		M.visible_message("<span class='danger'>The contents of [src] splashes all over [M]!</span>")
+		M.visible_message("<span class='danger'>The contents of \the [src] splashes all over [M]!</span>")
 		reagents.reaction(M, TOUCH)
 		reagents.clear_reagents()
 	return
@@ -140,7 +140,7 @@
 	throwforce = 5
 	throw_speed = 3
 	throw_range = 5
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	item_state = "beer"
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("stabbed", "slashed", "attacked")
@@ -301,12 +301,6 @@
 	volume = 50
 	list_reagents = list("hcider" = 50)
 
-/obj/item/weapon/reagent_containers/food/drinks/bottle/grappa
-	name = "Phillipes well-aged Grappa"
-	desc = "Bottle of Grappa."
-	icon_state = "grappabottle"
-	list_reagents = list("grappa" = 100)
-
 //////////////////////////JUICES AND STUFF ///////////////////////
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice
@@ -381,12 +375,10 @@
 		active = 1
 		var/turf/bombturf = get_turf(src)
 		var/area/bombarea = get_area(bombturf)
-		var/message = "[ADMIN_LOOKUP(user)] has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)]."
-		bombers += message
-		message_admins(message)
-		log_game("[key_name(user)] has primed a [name] for detonation at [bombarea] [COORD(bombturf)].")
+		message_admins("[key_name(user)]<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A> has primed a [name] for detonation at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[bombarea] (JMP)</a>.")
+		log_game("[key_name(user)] has primed a [name] for detonation at [bombarea] ([bombturf.x],[bombturf.y],[bombturf.z]).")
 
-		user << "<span class='info'>You light [src] on fire.</span>"
+		user << "<span class='info'>You light \the [src] on fire.</span>"
 		add_overlay(fire_overlay)
 		if(!isGlass)
 			spawn(50)
@@ -408,6 +400,6 @@
 		if(!isGlass)
 			user << "<span class='danger'>The flame's spread too far on it!</span>"
 			return
-		user << "<span class='info'>You snuff out the flame on [src].</span>"
+		user << "<span class='info'>You snuff out the flame on \the [src].</span>"
 		overlays -= fire_overlay
 		active = 0

code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm

@@ -7,11 +7,21 @@
 	amount_per_transfer_from_this = 10
 	volume = 50
 	materials = list(MAT_GLASS=500)
-	obj_integrity = 20
-	max_integrity = 20
+	burn_state = FLAMMABLE
+	burntime = 5
 	spillable = 1
-	resistance_flags = ACID_PROOF
-	unique_rename = 1
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fire_act()
+	if(!reagents.total_volume)
+		return
+	..()
+
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/burn()
+	reagents.total_volume = 0 //Burns away all the alcohol :(
+	reagents.reagent_list.Cut()
+	on_reagent_change()
+	extinguish()
+	return
 
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
 	cut_overlays()
@@ -332,7 +342,7 @@
 			if("andalusia")
 				icon_state = "andalusia"
 				name = "Andalusia"
-				desc = "A nice, strangely named drink."
+				desc = "A nice, strange named drink."
 			if("sbiten")
 				icon_state = "sbitenglass"
 				name = "Sbiten"
@@ -340,11 +350,11 @@
 			if("red_mead")
 				icon_state = "red_meadglass"
 				name = "Red Mead"
-				desc = "A True Viking's Beverage, though its color is strange."
+				desc = "A True Vikings Beverage, though its color is strange."
 			if("mead")
 				icon_state = "meadglass"
 				name = "Mead"
-				desc = "A Viking's Beverage, though a cheap one."
+				desc = "A Vikings Beverage, though a cheap one."
 			if("iced_beer")
 				icon_state = "iced_beerglass"
 				name = "Iced Beer"
@@ -452,7 +462,7 @@
 			if("chocolatepudding")
 				icon_state = "chocolatepudding"
 				name = "Chocolate Pudding"
-				desc = "Tasty."
+				desc = ""
 			if("vanillapudding")
 				icon_state = "vanillapudding"
 				name = "Vanilla Pudding"
@@ -505,18 +515,6 @@
 				icon_state = "whiskeyglass"
 				name = "Hard Cider"
 				desc = "Tastes like autumn."
-			if("triple_citrus")
-				icon_state = "triplecitrus" //needs own sprite mine are trash
-				name = "glass of triple citrus"
-				desc = "A mixture of citrus juices. Tangy, yet smooth."
-			if("grappa")
-				icon_state = "grappa"
-				name = "glass of grappa"
-				desc = "A fine drink originally made to prevent waste by using the leftovers from winemaking."
-			if("eggnog")
-				icon_state = "glass_yellow"
-				name = "Eggnog"
-				desc = "For enjoying the most wonderful time of the year."
 			else
 				icon_state ="glass_brown"
 				var/image/I = image(icon, "glassoverlay")
@@ -570,7 +568,7 @@
 			if("hcider")
 				icon_state = "shotglassbrown"
 				name = "shot of hard cider"
-				desc = "Not meant to be drunk from a shot glass."
+				desc = "Not meant to be drinken from a shot glass."
 			if("rum")
 				icon_state = "shotglassbrown"
 				name = "shot of rum"
@@ -663,7 +661,7 @@
 		..()
 
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/attack(obj/target, mob/user)
-	if(user.a_intent == INTENT_HARM && ismob(target) && target.reagents && reagents.total_volume)
+	if(user.a_intent == "harm" && ismob(target) && target.reagents && reagents.total_volume)
 		target.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [target]!</span>", \
 						"<span class='userdanger'>[user] splashes the contents of [src] onto [target]!</span>")
 		add_logs(user, target, "splashed", src)
@@ -676,7 +674,7 @@
 	if((!proximity) || !check_allowed_items(target,target_self=1))
 		return
 
-	else if(reagents.total_volume && user.a_intent == INTENT_HARM)
+	else if(reagents.total_volume && user.a_intent == "harm")
 		user.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [target]!</span>", \
 							"<span class='notice'>You splash the contents of [src] onto [target].</span>")
 		reagents.reaction(target, TOUCH)

code/modules/food_and_drinks/food.dm

@@ -4,7 +4,7 @@
 /obj/item/weapon/reagent_containers/food
 	possible_transfer_amounts = list()
 	volume = 50	//Sets the default container amount for all food items.
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE
 
 /obj/item/weapon/reagent_containers/food/New()
 		..()

code/modules/food_and_drinks/food/condiment.dm

@@ -125,7 +125,7 @@
 	possible_states = list()
 
 /obj/item/weapon/reagent_containers/food/condiment/saltshaker/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] begins to swap forms with the salt shaker! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	user.visible_message("<span class='suicide'>[user] begins to swap forms with the salt shaker! It looks like \he's trying to commit suicide.</span>")
 	var/newname = "[name]"
 	name = "[user.name]"
 	user.name = newname
@@ -134,17 +134,14 @@
 	return (TOXLOSS)
 
 /obj/item/weapon/reagent_containers/food/condiment/saltshaker/afterattack(obj/target, mob/living/user, proximity)
-	if(!proximity)
+	if(!proximity || !isturf(target))
 		return
-	if(isturf(target))
-		if(!reagents.has_reagent("sodiumchloride", 2))
-			user << "<span class='warning'>You don't have enough salt to make a pile!</span>"
-			return
-		user.visible_message("<span class='notice'>[user] shakes some salt onto [target].</span>", "<span class='notice'>You shake some salt onto [target].</span>")
-		reagents.remove_reagent("sodiumchloride", 2)
-		new/obj/effect/decal/cleanable/salt(target)
+	if(!reagents.has_reagent("sodiumchloride", 2))
+		user << "<span class='warning'>You don't have enough salt to make a pile!</span>"
 		return
-	..()
+	user.visible_message("<span class='notice'>[user] shakes some salt onto [target].</span>", "<span class='notice'>You shake some salt onto [target].</span>")
+	reagents.remove_reagent("sodiumchloride", 2)
+	new/obj/effect/decal/cleanable/salt(target)
 
 /obj/item/weapon/reagent_containers/food/condiment/peppermill
 	name = "pepper mill"

code/modules/food_and_drinks/food/customizables.dm

@@ -13,9 +13,8 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable
 	bitesize = 4
-	w_class = WEIGHT_CLASS_SMALL
+	w_class = 3
 	volume = 80
-	unique_rename = 1
 
 	var/ingMax = 12
 	var/list/ingredients = list()
@@ -37,19 +36,18 @@
 	user << "It contains [ingredients.len?"[ingredients_listed]":"no ingredient, "]making a [size]-sized [initial(name)]."
 
 /obj/item/weapon/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
-	if(!istype(I, /obj/item/weapon/reagent_containers/food/snacks/customizable) && istype(I,/obj/item/weapon/reagent_containers/food/snacks))
+	if(istype(I,/obj/item/weapon/reagent_containers/food/snacks))
 		var/obj/item/weapon/reagent_containers/food/snacks/S = I
-		if(I.w_class > WEIGHT_CLASS_SMALL)
+		if(I.w_class > 2)
 			user << "<span class='warning'>The ingredient is too big for [src]!</span>"
 		else if((ingredients.len >= ingMax) || (reagents.total_volume >= volume))
 			user << "<span class='warning'>You can't add more ingredients to [src]!</span>"
-		else if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/custom) || istype(I, /obj/item/weapon/reagent_containers/food/snacks/cakeslice/custom))
-			user << "<span class='warning'>Adding [I.name] to [src] would make a mess.</span>"
 		else
 			if(!user.unEquip(I))
 				return
 			if(S.trash)
-				S.generate_trash(get_turf(user))
+				new S.trash(get_turf(user))
+				S.trash = null  //we remove the plate before adding the ingredient
 			ingredients += S
 			S.loc = src
 			mix_filling_color(S)
@@ -57,6 +55,19 @@
 			update_overlays(S)
 			user << "<span class='notice'>You add the [I.name] to the [name].</span>"
 			update_name(S)
+	else if(istype(I, /obj/item/weapon/pen))
+		var/txt = stripped_input(user, "What would you like the food to be called?", "Food Naming", "", 30)
+		if(txt)
+			ingMax = ingredients.len
+			user << "<span class='notice'>You add a last touch to the dish by renaming it.</span>"
+			customname = txt
+			if(istype(src, /obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich))
+				var/obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich/S = src
+				if(S.finished)
+					name = "[customname] sandwich"
+					return
+			name = "[customname] [initial(name)]"
+
 	else . = ..()
 
 
@@ -282,18 +293,20 @@
 // Bowl ////////////////////////////////////////////////
 
 /obj/item/weapon/reagent_containers/glass/bowl
+	name = "bowl"
+	icon_state	= "snack_bowl"
 	name = "bowl"
 	desc = "A simple bowl, used for soups and salads."
 	icon = 'icons/obj/food/soupsalad.dmi'
 	icon_state = "bowl"
 	flags = OPENCONTAINER
 	materials = list(MAT_GLASS = 500)
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 
 /obj/item/weapon/reagent_containers/glass/bowl/attackby(obj/item/I,mob/user, params)
 	if(istype(I,/obj/item/weapon/reagent_containers/food/snacks))
 		var/obj/item/weapon/reagent_containers/food/snacks/S = I
-		if(I.w_class > WEIGHT_CLASS_SMALL)
+		if(I.w_class > 2)
 			user << "<span class='warning'>The ingredient is too big for [src]!</span>"
 		else if(contents.len >= 20)
 			user << "<span class='warning'>You can't add more ingredients to [src]!</span>"

code/modules/food_and_drinks/food/snacks.dm

@@ -3,7 +3,6 @@
 	desc = "Yummy."
 	icon = 'icons/obj/food/food.dmi'
 	icon_state = null
-	unique_rename = 1
 	var/bitesize = 2
 	var/bitecount = 0
 	var/trash = null
@@ -26,9 +25,19 @@
 		return
 	if(!reagents.total_volume)
 		usr.unEquip(src)	//so icons update :[
-		var/obj/item/trash_item = generate_trash(usr)
-		usr.put_in_hands(trash_item)
+
+		if(trash)
+			if(ispath(trash, /obj/item/weapon/grown) && istype(src, /obj/item/weapon/reagent_containers/food/snacks/grown))
+				var/obj/item/weapon/reagent_containers/food/snacks/grown/G = src
+				var/obj/item/TrashItem = new trash(usr, G.seed)
+				usr.put_in_hands(TrashItem)
+			else if(ispath(trash,/obj/item))
+				var/obj/item/TrashItem = new trash(usr)
+				usr.put_in_hands(TrashItem)
+			else if(istype(trash,/obj/item))
+				usr.put_in_hands(trash)
 		qdel(src)
+	return
 
 
 /obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user)
@@ -36,7 +45,7 @@
 
 
 /obj/item/weapon/reagent_containers/food/snacks/attack(mob/M, mob/user, def_zone)
-	if(user.a_intent == INTENT_HARM)
+	if(user.a_intent == "harm")
 		return ..()
 	if(!eatverb)
 		eatverb = pick("bite","chew","nibble","gnaw","gobble","chomp")
@@ -127,10 +136,10 @@
 	if(istype(W,/obj/item/weapon/reagent_containers/food/snacks))
 		var/obj/item/weapon/reagent_containers/food/snacks/S = W
 		if(custom_food_type && ispath(custom_food_type))
-			if(S.w_class > WEIGHT_CLASS_SMALL)
+			if(S.w_class > 2)
 				user << "<span class='warning'>[S] is too big for [src]!</span>"
 				return 0
-			if(!S.customfoodfilling || istype(W, /obj/item/weapon/reagent_containers/food/snacks/customizable) || istype(W, /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/custom) || istype(W, /obj/item/weapon/reagent_containers/food/snacks/cakeslice/custom))
+			if(!S.customfoodfilling)
 				user << "<span class='warning'>[src] can't be filled with [S]!</span>"
 				return 0
 			if(contents.len >= 20)
@@ -143,22 +152,19 @@
 	if(sharp)
 		if(slice(sharp, W, user))
 			return 1
-	else
-		..()
 
 //Called when you finish tablecrafting a snack.
-/obj/item/weapon/reagent_containers/food/snacks/CheckParts(list/parts_list, datum/crafting_recipe/food/R)
+/obj/item/weapon/reagent_containers/food/snacks/CheckParts(list/parts_list, datum/crafting_recipe/R)
 	..()
 	reagents.reagent_list.Cut()
 	for(var/obj/item/weapon/reagent_containers/RC in contents)
 		RC.reagents.trans_to(reagents, RC.reagents.maximum_volume)
-	if(istype(R))
-		contents_loop:
-			for(var/A in contents)
-				for(var/B in R.real_parts)
-					if(istype(A, B))
-						continue contents_loop
-				qdel(A)
+	contents_loop:
+		for(var/A in contents)
+			for(var/B in initial(R.parts))
+				if(istype(A, B))
+					continue contents_loop
+			qdel(A)
 	feedback_add_details("food_made","[type]")
 	if(bonus_reagents.len)
 		for(var/r_id in bonus_reagents)
@@ -202,19 +208,6 @@
 	reagents.trans_to(slice,reagents_per_slice)
 	return
 
-/obj/item/weapon/reagent_containers/food/snacks/proc/generate_trash(atom/location)
-	if(trash)
-		if(ispath(trash, /obj/item))
-			. = new trash(location)
-			trash = null
-			return
-		else if(istype(trash, /obj/item))
-			var/obj/item/trash_item = trash
-			trash_item.forceMove(location)
-			. = trash
-			trash = null
-			return
-
 /obj/item/weapon/reagent_containers/food/snacks/proc/update_overlays(obj/item/weapon/reagent_containers/food/snacks/S)
 	cut_overlays()
 	var/image/I = new(src.icon, "[initial(icon_state)]_filling")
@@ -235,20 +228,6 @@
 			var/amount = S.bonus_reagents[r_id] * cooking_efficiency
 			S.reagents.add_reagent(r_id, amount)
 
-/obj/item/weapon/reagent_containers/food/snacks/microwave_act(obj/machinery/microwave/M)
-	if(cooked_type)
-		var/obj/item/weapon/reagent_containers/food/snacks/S = new cooked_type(get_turf(src))
-		if(M)
-			initialize_cooked_food(S, M.efficiency)
-		else
-			initialize_cooked_food(S, 1)
-		feedback_add_details("food_made","[type]")
-	else
-		new /obj/item/weapon/reagent_containers/food/snacks/badrecipe(src)
-		if(M && M.dirty < 100)
-			M.dirty++
-	qdel(src)
-
 /obj/item/weapon/reagent_containers/food/snacks/Destroy()
 	if(contents)
 		for(var/atom/movable/something in contents)
@@ -302,12 +281,12 @@
 
 
 /obj/item/weapon/reagent_containers/food/snacks/store
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	var/stored_item = 0
 
 /obj/item/weapon/reagent_containers/food/snacks/store/attackby(obj/item/weapon/W, mob/user, params)
 	..()
-	if(W.w_class <= WEIGHT_CLASS_SMALL & !istype(W, /obj/item/weapon/reagent_containers/food/snacks)) //can't slip snacks inside, they're used for custom foods.
+	if(W.w_class <= 2 & !istype(W, /obj/item/weapon/reagent_containers/food/snacks)) //can't slip snacks inside, they're used for custom foods.
 		if(W.is_sharp())
 			return 0
 		if(stored_item)

code/modules/food_and_drinks/food/snacks/dough.dm

@@ -9,7 +9,7 @@
 	icon_state = "dough"
 	cooked_type = /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain
 	list_reagents = list("nutriment" = 6)
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 
 
 // Dough + rolling pin = flat dough
@@ -35,7 +35,7 @@
 	slices_num = 3
 	cooked_type = /obj/item/weapon/reagent_containers/food/snacks/pizzabread
 	list_reagents = list("nutriment" = 6)
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/pizzabread
 	name = "pizza bread"
@@ -44,7 +44,7 @@
 	icon_state = "pizzabread"
 	custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/pizza
 	list_reagents = list("nutriment" = 7)
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 
 
 /obj/item/weapon/reagent_containers/food/snacks/doughslice
@@ -72,7 +72,7 @@
 	icon_state = "cakebatter"
 	cooked_type = /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain
 	list_reagents = list("nutriment" = 9)
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 
 // Cake batter + rolling pin = pie dough
 /obj/item/weapon/reagent_containers/food/snacks/cakebatter/attackby(obj/item/I, mob/user, params)
@@ -95,7 +95,7 @@
 	slices_num = 3
 	cooked_type = /obj/item/weapon/reagent_containers/food/snacks/pie/plain
 	list_reagents = list("nutriment" = 9)
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/rawpastrybase
 	name = "raw pastry base"

code/modules/food_and_drinks/food/snacks/meat.dm

@@ -177,8 +177,9 @@
 	icon_state = "goliathmeat"
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath/burn()
-	visible_message("[src] finishes cooking!")
-	new /obj/item/weapon/reagent_containers/food/snacks/meat/steak/goliath/(loc)
+	visible_message("\The [src] finishes cooking!")
+	new/obj/item/weapon/reagent_containers/food/snacks/meat/steak/goliath/(src.loc)
+	SSobj.burning -= src
 	qdel(src)
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/slab/meatwheat
@@ -237,7 +238,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/meat/steak/goliath
 	name = "goliath steak"
 	desc = "A delicious, lava cooked steak."
-	resistance_flags = LAVA_PROOF | FIRE_PROOF
+	burn_state = LAVA_PROOF
 	icon_state = "goliathsteak"
 	trash = null
 
@@ -288,6 +289,7 @@
 	name = "raw spider cutlet"
 	cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider
 
+
 //Cooked cutlets
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet
@@ -313,4 +315,5 @@
 	name = "xeno cutlet"
 
 /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider
-	name = "spider cutlet"
+	name = "spider cutlet"
+

code/modules/food_and_drinks/food/snacks_bread.dm

@@ -146,4 +146,4 @@
 	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
 	bitesize = 3
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3

code/modules/food_and_drinks/food/snacks_burgers.dm

@@ -160,7 +160,7 @@
 	icon_state = "bigbiteburger"
 	bonus_reagents = list("vitamin" = 6)
 	list_reagents = list("nutriment" = 10, "vitamin" = 2)
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/burger/jelly
 	name = "jelly burger"
@@ -181,7 +181,7 @@
 	icon_state = "superbiteburger"
 	bonus_reagents = list("vitamin" = 10)
 	list_reagents = list("nutriment" = 40, "vitamin" = 5)
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	bitesize = 7
 	volume = 100
 
@@ -198,14 +198,8 @@
 	icon_state = "ratburger"
 	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
 
-/obj/item/weapon/reagent_containers/food/snacks/burger/baseball
-	name = "home run baseball burger"
-	desc = "It's still warm. The steam coming off of it looks like baseball."
-	icon_state = "baseball"
-	bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
-
 /obj/item/weapon/reagent_containers/food/snacks/burger/baconburger
 	name = "bacon burger"
 	desc = "The perfect combination of all things American."
 	icon_state = "baconburger"
-	bonus_reagents = list("nutriment" = 8, "vitamin" = 1)
+	bonus_reagents = list("nutriment" = 8, "vitamin" = 1)

code/modules/food_and_drinks/food/snacks_egg.dm

@@ -96,7 +96,7 @@
 	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
 	list_reagents = list("nutriment" = 8, "vitamin" = 1)
 	bitesize = 1
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W,/obj/item/weapon/kitchen/fork))
@@ -122,5 +122,5 @@
 	icon_state = "benedict"
 	bonus_reagents = list("vitamin" = 4)
 	trash = /obj/item/trash/plate
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 4)

code/modules/food_and_drinks/food/snacks_meat.dm

@@ -101,7 +101,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/kebab
 	trash = /obj/item/stack/rods
 	icon_state = "kebab"
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	list_reagents = list("nutriment" = 8)
 
 /obj/item/weapon/reagent_containers/food/snacks/kebab/human

code/modules/food_and_drinks/food/snacks_other.dm

@@ -8,7 +8,7 @@
 	slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesewedge
 	slices_num = 5
 	list_reagents = list("nutriment" = 15, "vitamin" = 5)
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/cheesewedge
 	name = "cheese wedge"
@@ -72,13 +72,6 @@
 	list_reagents = list("nutriment" = 4)
 	filling_color = "#FFD700"
 
-/obj/item/weapon/reagent_containers/food/snacks/tatortot
-	name = "tator tot"
-	desc = "A large fried potato nugget that may or may not try to valid you"
-	icon_state = "tatortot"
-	list_reagents = list("nutriment" = 4)
-	filling_color = "FFD700"
-
 /obj/item/weapon/reagent_containers/food/snacks/soydope
 	name = "soy dope"
 	desc = "Dope from a soy."
@@ -249,7 +242,7 @@
 	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
 	list_reagents = list("nutriment" = 6, "vitamin" = 4)
 	filling_color = "#FF5500"
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 
 /obj/item/weapon/reagent_containers/food/snacks/spacefreezy
 	name = "space freezy"
@@ -322,99 +315,4 @@
 	desc = "The former skull of a damned human, filled with goliath meat. It has a decorative lava pool made of ketchup and hotsauce."
 	icon_state = "stuffed_legion"
 	bonus_reagents = list("vitamin" = 3, "capsaicin" = 1, "tricordrazine" = 5)
-	list_reagents = list("nutriment" = 5, "vitamin" = 5, "capsaicin" = 2, "tricordrazine" = 10)
-
-
-/obj/item/weapon/reagent_containers/food/snacks/powercrepe
-	name = "Powercrepe"
-	desc = "With great power, comes great crepes.  It looks like a pancake filled with jelly but packs quite a punch."
-	icon_state = "powercrepe"
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 3, "iron" = 10)
-	list_reagents = list("nutriment" = 10, "vitamin" = 5, "cherryjelly" = 5)
-	force = 20
-	throwforce = 10
-	block_chance = 50
-	armour_penetration = 75
-	attack_verb = list("slapped", "slathered")
-	w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/weapon/reagent_containers/food/snacks/lollipop
-	name = "lollipop"
-	desc = "A delicious lollipop. Makes for a great Valentine's present."
-	icon = 'icons/obj/lollipop.dmi'
-	icon_state = "lollipop_stick"
-	list_reagents = list("nutriment" = 1, "vitamin" = 1, "iron" = 10, "sugar" = 5, "omnizine" = 2)	//Honk
-	var/image/head
-	var/headcolor = rgb(0, 0, 0)
-
-/obj/item/weapon/reagent_containers/food/snacks/lollipop/New()
-	..()
-	head = image(icon = 'icons/obj/lollipop.dmi', icon_state = "lollipop_head")
-	change_head_color(rgb(rand(0, 255), rand(0, 255), rand(0, 255)))
-
-/obj/item/weapon/reagent_containers/food/snacks/lollipop/proc/change_head_color(C)
-	headcolor = C
-	if(head in overlays)
-		overlays -= head
-	head.color = C
-	add_overlay(head)
-
-/obj/item/weapon/reagent_containers/food/snacks/lollipop/throw_impact(atom/A)
-	..(A)
-	throw_speed = 1
-	throwforce = 0
-
-/obj/item/weapon/reagent_containers/food/snacks/lollipop/cyborg
-	var/spamchecking = TRUE
-
-/obj/item/weapon/reagent_containers/food/snacks/lollipop/cyborg/New()
-	..()
-	addtimer(src, "spamcheck", 1200)
-
-/obj/item/weapon/reagent_containers/food/snacks/lollipop/cyborg/equipped(mob/living/user, slot)
-	. = ..(user, slot)
-	spamchecking = FALSE
-
-/obj/item/weapon/reagent_containers/food/snacks/lollipop/cyborg/proc/spamcheck()
-	if(spamchecking)
-		qdel(src)
-
-/obj/item/weapon/reagent_containers/food/snacks/gumball
-	name = "gumball"
-	desc = "A colorful, sugary gumball."
-	icon = 'icons/obj/lollipop.dmi'
-	icon_state = "gumball"
-	list_reagents = list("sugar" = 5, "bicaridine" = 2, "kelotane" = 2)	//Kek
-
-/obj/item/weapon/reagent_containers/food/snacks/gumball/New()
-	..()
-	color = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
-
-/obj/item/weapon/reagent_containers/food/snacks/gumball/cyborg
-	var/spamchecking = TRUE
-
-/obj/item/weapon/reagent_containers/food/snacks/gumball/cyborg/New()
-	..()
-	addtimer(src, "spamcheck", 1200)
-
-/obj/item/weapon/reagent_containers/food/snacks/gumball/cyborg/equipped(mob/living/user, slot)
-	. = ..(user, slot)
-	spamchecking = FALSE
-
-/obj/item/weapon/reagent_containers/food/snacks/gumball/cyborg/proc/spamcheck()
-	if(spamchecking)
-		qdel(src)
-
-/obj/item/weapon/reagent_containers/food/snacks/taco
-	name = "taco"
-	desc = "A traditional taco with meat, cheese, and lettuce."
-	icon_state = "taco"
-	bonus_reagents = list("nutriment" = 3, "vitamin" = 2)
-	list_reagents = list("nutriment" = 4, "vitamin" = 2)
-	filling_color = "F0D830"
-
-/obj/item/weapon/reagent_containers/food/snacks/taco/plain
-	desc = "A traditional taco with meat and cheese, minus the rabbit food."
-	icon_state = "taco_plain"
-	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
-	list_reagents = list("nutriment" = 3, "vitamin" = 1)
+	list_reagents = list("nutriment" = 5, "vitamin" = 5, "capsaicin" = 2, "tricordrazine" = 10,)

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -161,13 +161,6 @@
 	bonus_reagents = list("omnizine" = 3)
 	list_reagents = list("nutriment" = 4, "omnizine" = 3)
 
-/obj/item/weapon/reagent_containers/food/snacks/dankpocket
-	name = "\improper Dank-pocket"
-	desc = "The food of choice for the seasoned botanist."
-	icon_state = "dankpocket"
-	list_reagents = list("lipolicide" = 3, "space_drugs" = 3, "nutriment" = 4)
-	filling_color = "#00FF00"
-
 /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
 	name = "fortune cookie"
 	desc = "A true prophecy in each cookie!"

code/modules/food_and_drinks/food/snacks_pie.dm

@@ -3,7 +3,7 @@
 	icon = 'icons/obj/food/piecake.dmi'
 	trash = /obj/item/trash/plate
 	bitesize = 3
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	volume = 80
 	list_reagents = list("nutriment" = 10, "vitamin" = 2)
 

code/modules/food_and_drinks/food/snacks_pizza.dm

@@ -3,7 +3,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/pizza
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	slices_num = 6
 	volume = 80
 	list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)

code/modules/food_and_drinks/food/snacks_salad.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/food/soupsalad.dmi'
 	trash = /obj/item/weapon/reagent_containers/glass/bowl
 	bitesize = 3
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	list_reagents = list("nutriment" = 7, "vitamin" = 2)
 
 /obj/item/weapon/reagent_containers/food/snacks/salad/New()

code/modules/food_and_drinks/food/snacks_sandwichtoast.dm

@@ -45,7 +45,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
 	name = "icecream sandwich"
-	desc = "Portable Ice-cream in its own packaging."
+	desc = "Portable Ice-cream in it's own packaging."
 	icon = 'icons/obj/food/food.dmi'
 	icon_state = "icecreamsandwich"
 	bonus_reagents = list("nutriment" = 1, "ice" = 2)

code/modules/food_and_drinks/food/snacks_soup.dm

@@ -1,5 +1,5 @@
 /obj/item/weapon/reagent_containers/food/snacks/soup
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	icon = 'icons/obj/food/soupsalad.dmi'
 	trash = /obj/item/weapon/reagent_containers/glass/bowl
 	bitesize = 5

code/modules/food_and_drinks/kitchen_machinery/food_cart.dm

@@ -25,12 +25,6 @@
 	mixer = new /obj/item/weapon/reagent_containers(src, MIXER_CAPACITY)
 	mixer.name = "Mixer"
 
-/obj/machinery/food_cart/Destroy()
-	if(mixer)
-		qdel(mixer)
-		mixer = null
-	return ..()
-
 /obj/machinery/food_cart/attack_hand(mob/user)
 	user.set_machine(src)
 	interact(user)
@@ -156,11 +150,6 @@
 		usr << browse(null,"window=foodcart")
 	return
 
-/obj/machinery/food_cart/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-		new /obj/item/stack/sheet/metal(loc, 4)
-	qdel(src)
-
 #undef STORAGE_CAPACITY
 #undef LIQUID_CAPACIY
 #undef MIXER_CAPACITY

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -62,7 +62,7 @@
 /obj/machinery/gibber/RefreshParts()
 	var/gib_time = 40
 	for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
-		meat_produced += B.rating
+		meat_produced += 3 * B.rating
 	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
 		gib_time -= 5 * M.rating
 		gibtime = gib_time
@@ -85,8 +85,9 @@
 /obj/machinery/gibber/attack_paw(mob/user)
 	return src.attack_hand(user)
 
-/obj/machinery/gibber/container_resist(mob/living/user)
-	go_out()
+/obj/machinery/gibber/container_resist()
+	src.go_out()
+	return
 
 /obj/machinery/gibber/attack_hand(mob/user)
 	if(stat & (NOPOWER|BROKEN))
@@ -95,7 +96,7 @@
 		user << "<span class='danger'>It's locked and running.</span>"
 		return
 
-	if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling))
+	if(user.pulling && user.a_intent == "grab" && isliving(user.pulling))
 		var/mob/living/L = user.pulling
 		if(!iscarbon(L))
 			user << "<span class='danger'>This item is not suitable for the gibber!</span>"
@@ -203,11 +204,10 @@
 		var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/newmeat = new typeofmeat
 		var/obj/item/stack/sheet/animalhide/newskin = new typeofskin
 		newmeat.name = "[sourcename] [newmeat.name]"
-		if(istype(newmeat))
-			newmeat.subjectname = sourcename
-			newmeat.reagents.add_reagent ("nutriment", sourcenutriment / meat_produced) // Thehehe. Fat guys go first
-			if(sourcejob)
-				newmeat.subjectjob = sourcejob
+		newmeat.subjectname = sourcename
+		if(sourcejob)
+			newmeat.subjectjob = sourcejob
+		newmeat.reagents.add_reagent ("nutriment", sourcenutriment / meat_produced) // Thehehe. Fat guys go first
 		src.occupant.reagents.trans_to (newmeat, round (sourcetotalreagents / meat_produced, 1)) // Transfer all the reagents from the
 		allmeat[i] = newmeat
 		allskin = newskin
@@ -228,7 +228,7 @@
 			var/obj/item/meatslab = allmeat[i]
 			meatslab.loc = src.loc
 			meatslab.throw_at_fast(pick(nearby_turfs),i,3)
-			for (var/turfs=1 to meat_produced)
+			for (var/turfs=1 to meat_produced*3)
 				var/turf/gibturf = pick(nearby_turfs)
 				if (!gibturf.density && src in view(gibturf))
 					new gibtype(gibturf,i)

code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm

@@ -18,8 +18,6 @@
 	var/dispense_flavour = ICECREAM_VANILLA
 	var/flavour_name = "vanilla"
 	flags = OPENCONTAINER
-	obj_integrity = 300
-	max_integrity = 300
 
 /obj/machinery/icecream_vat/proc/get_ingredient_list(type)
 	switch(type)
@@ -208,12 +206,6 @@
 			reagents.add_reagent("singulo", 2)
 	ice_creamed = 1
 
-/obj/machinery/icecream_vat/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-		new /obj/item/stack/sheet/metal(loc, 4)
-	qdel(src)
-
-
 #undef ICECREAM_VANILLA
 #undef ICECREAM_CHOCOLATE
 #undef ICECREAM_STRAWBERRY

code/modules/food_and_drinks/kitchen_machinery/juicer.dm

@@ -1,7 +1,6 @@
 
 /obj/machinery/juicer
 	name = "juicer"
-	desc = "a centrifugal juicer with two speeds: Juice and Separate."
 	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "juicer1"
 	layer = BELOW_OBJ_LAYER
@@ -56,7 +55,7 @@
 			src.updateUsrDialog()
 			return 0
 	if (!is_type_in_list(O, allowed_items))
-		user << "This object contains no fluid or extractable reagents."
+		user << "It looks as not containing any juice."
 		return 1
 	if(!user.unEquip(O))
 		user << "<span class='warning'>\the [O] is stuck to your hand, you cannot put it in \the [src]!</span>"
@@ -91,15 +90,15 @@
 		is_chamber_empty = 1
 		processing_chamber = "Nothing."
 	if (!beaker)
-		beaker_contents = "\The [src] has no container attached."
+		beaker_contents = "\The [src] has no beaker attached."
 	else if (!beaker.reagents.total_volume)
-		beaker_contents = "\The [src] has an empty [beaker] attached."
+		beaker_contents = "\The [src]  has attached an empty beaker."
 		is_beaker_ready = 1
 	else if (beaker.reagents.total_volume < beaker.reagents.maximum_volume)
-		beaker_contents = "\The [src] has a partially filled [beaker] attached."
+		beaker_contents = "\The [src]  has attached a beaker with something."
 		is_beaker_ready = 1
 	else
-		beaker_contents = "\The [src] has a completly filled [beaker] attached!"
+		beaker_contents = "\The [src]  has attached a beaker and the beaker is full!"
 
 	var/dat = {"
 <b>Processing chamber contains:</b><br>
@@ -109,7 +108,7 @@
 	if (is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
 		dat += "<A href='?src=\ref[src];action=juice'>Turn on!<BR>"
 	if (beaker)
-		dat += "<A href='?src=\ref[src];action=detach'>Detach the container!<BR>"
+		dat += "<A href='?src=\ref[src];action=detach'>Detach a beaker!<BR>"
 	user << browse("<HEAD><TITLE>Juicer</TITLE></HEAD><TT>[dat]</TT>", "window=juicer")
 	onclose(user, "juicer")
 	return
@@ -130,7 +129,7 @@
 
 /obj/machinery/juicer/verb/detach()
 	set category = "Object"
-	set name = "Detach container from the juicer"
+	set name = "Detach Beaker from the juicer"
 	set src in oview(1)
 	if(usr.stat || !usr.canmove || usr.restrained())
 		return

code/modules/food_and_drinks/kitchen_machinery/microwave.dm

@@ -26,7 +26,6 @@
 	create_reagents(100)
 	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/microwave(null)
 	B.apply_default_parts(src)
-	..()
 
 /obj/item/weapon/circuitboard/machine/microwave
 	name = "circuit board (Microwave)"
@@ -73,7 +72,7 @@
 				"[user] starts to fix part of the microwave.", \
 				"<span class='notice'>You start to fix part of the microwave...</span>" \
 			)
-			if (do_after(user,20*O.toolspeed, target = src))
+			if (do_after(user,20/O.toolspeed, target = src))
 				user.visible_message( \
 					"[user] fixes part of the microwave.", \
 					"<span class='notice'>You fix part of the microwave.</span>" \
@@ -84,7 +83,7 @@
 				"[user] starts to fix part of the microwave.", \
 				"<span class='notice'>You start to fix part of the microwave...</span>" \
 			)
-			if (do_after(user,20*O.toolspeed, target = src))
+			if (do_after(user,20/O.toolspeed, target = src))
 				user.visible_message( \
 					"[user] fixes the microwave.", \
 					"<span class='notice'>You fix the microwave.</span>" \
@@ -141,7 +140,7 @@
 		var/loaded = 0
 		for(var/obj/item/weapon/reagent_containers/food/snacks/S in T.contents)
 			if (contents.len>=max_n_of_items)
-				user << "<span class='warning'>[src] is full, you can't put anything in!</span>"
+				user << "<span class='warning'>[src] is full, you cannot put more!</span>"
 				return 1
 			T.remove_from_storage(S, src)
 			loaded++
@@ -150,15 +149,15 @@
 			user << "<span class='notice'>You insert [loaded] items into [src].</span>"
 
 
-	else if(O.w_class <= WEIGHT_CLASS_NORMAL && !istype(O,/obj/item/weapon/storage) && user.a_intent == INTENT_HELP)
+	else if(istype(O,/obj/item/weapon/reagent_containers/food/snacks))
 		if (contents.len>=max_n_of_items)
-			user << "<span class='warning'>[src] is full, you can't put anything in!</span>"
+			user << "<span class='warning'>[src] is full, you cannot put more!</span>"
 			return 1
 		else
+		//	user.unEquip(O)	//This just causes problems so far as I can tell. -Pete
 			if(!user.drop_item())
 				user << "<span class='warning'>\the [O] is stuck to your hand, you cannot put it in \the [src]!</span>"
 				return 0
-
 			O.loc = src
 			user.visible_message( \
 				"[user] has added \the [O] to \the [src].", \
@@ -197,11 +196,7 @@
 	else
 		var/list/items_counts = new
 		for (var/obj/O in contents)
-			if(istype(O, /obj/item/stack/))
-				var/obj/item/stack/S = O
-				items_counts[O.name] += S.amount
-			else
-				items_counts[O.name]++
+			items_counts[O.name]++
 
 		for (var/O in items_counts)
 			var/N = items_counts[O]
@@ -217,6 +212,7 @@
 	var/datum/browser/popup = new(user, "microwave", name, 300, 300)
 	popup.set_content(dat)
 	popup.open()
+	return
 
 /***********************************
 *   Microwave Menu Handling/Cooking
@@ -235,30 +231,32 @@
 		muck_finish()
 		return
 
-	else
-		if(has_extra_item() && prob(min(dirty*5,100)) && !microwaving(4))
+	else if (has_extra_item())
+		if (!microwaving(4))
 			broke()
 			return
 
+		broke()
+		return
+
+	else
+
 		if(!microwaving(10))
 			abort()
 			return
 		stop()
 
-		var/metal = 0
-		for(var/obj/item/O in contents)
-			O.microwave_act(src)
-			if(O.materials[MAT_METAL])
-				metal += O.materials[MAT_METAL]
+		for(var/obj/item/weapon/reagent_containers/food/snacks/F in contents)
+			if(F.cooked_type)
+				var/obj/item/weapon/reagent_containers/food/snacks/S = new F.cooked_type (get_turf(src))
+				F.initialize_cooked_food(S, efficiency)
+				feedback_add_details("food_made","[F.type]")
+			else
+				new /obj/item/weapon/reagent_containers/food/snacks/badrecipe(src)
+				if(dirty < 100)
+					dirty++
+			qdel(F)
 
-		if(metal)
-			visible_message("<span class='warning'>Sparks fly around [src]!")
-			if(prob(max(metal/2, 33)))
-				explosion(loc,0,1,2)
-			broke()
-			return
-
-		dropContents()
 		return
 
 /obj/machinery/microwave/proc/microwaving(seconds as num)
@@ -342,3 +340,4 @@
 		if ("dispose")
 			dispose()
 	updateUsrDialog()
+	return

code/modules/food_and_drinks/kitchen_machinery/processor.dm

@@ -3,7 +3,7 @@
 	name = "food processor"
 	desc = "An industrial grinder used to process meat and other foods. Keep hands clear of intake area while operating."
 	icon = 'icons/obj/kitchen.dmi'
-	icon_state = "processor1"
+	icon_state = "processor"
 	layer = BELOW_OBJ_LAYER
 	density = 1
 	anchored = 1
@@ -28,23 +28,6 @@
 							/obj/item/weapon/stock_parts/matter_bin = 1,
 							/obj/item/weapon/stock_parts/manipulator = 1)
 
-/obj/item/weapon/circuitboard/machine/processor
-	name = "circuit board (Food Processor)"
-	build_path = /obj/machinery/processor
-
-/obj/item/weapon/circuitboard/machine/processor/attackby(obj/item/I, mob/user, params)
-	if(istype(I,/obj/item/weapon/screwdriver))
-		if(build_path == /obj/machinery/processor)
-			name = "circuit board (slime Processor)"
-			build_path = /obj/machinery/processor/slime
-			user << "<span class='notice'>Name protocols successfully updated.</span>"
-		else
-			name = "circuit board (Food Processor)"
-			build_path = /obj/machinery/processor
-			user << "<span class='notice'>Defaulting name protocols.</span>"
-	else
-		return ..()
-
 /obj/machinery/processor/RefreshParts()
 	for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
 		rating_amount = B.rating
@@ -100,10 +83,6 @@
 
 /datum/food_processor_process/potato
 	input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato
-	output = /obj/item/weapon/reagent_containers/food/snacks/tatortot
-
-/datum/food_processor_process/potatowedges
-	input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato/wedges
 	output = /obj/item/weapon/reagent_containers/food/snacks/fries
 
 /datum/food_processor_process/carrot
@@ -156,10 +135,9 @@
 				"<span class='notice'>You jump out from the processor!</span>", \
 				"<span class='italics'>You hear chimpering.</span>")
 		return
-	var/obj/bucket = new /obj/item/weapon/reagent_containers/glass/bucket(loc)
-
+	var/obj/item/weapon/reagent_containers/glass/bucket/bucket_of_blood = new(loc)
 	var/datum/reagent/blood/B = new()
-	B.holder = bucket
+	B.holder = bucket_of_blood
 	B.volume = 70
 	//set reagent data
 	B.data["donor"] = O
@@ -172,9 +150,9 @@
 
 	if(O.resistances&&O.resistances.len)
 		B.data["resistances"] = O.resistances.Copy()
-	bucket.reagents.reagent_list += B
-	bucket.reagents.update_total()
-	bucket.on_reagent_change()
+	bucket_of_blood.reagents.reagent_list += B
+	bucket_of_blood.reagents.update_total()
+	bucket_of_blood.on_reagent_change()
 	//bucket_of_blood.reagents.handle_reactions() //blood doesn't react
 	..()
 
@@ -193,7 +171,7 @@
 	if(src.processing)
 		user << "<span class='warning'>The processor is in the process of processing!</span>"
 		return 1
-	if(default_deconstruction_screwdriver(user, "processor", "processor1", O))
+	if(default_deconstruction_screwdriver(user, "processor1", "processor", O))
 		return
 
 	if(exchange_parts(user, O))
@@ -216,7 +194,7 @@
 		O.loc = src
 		return 1
 	else
-		if(user.a_intent != INTENT_HARM)
+		if(user.a_intent != "harm")
 			user << "<span class='warning'>That probably won't blend!</span>"
 			return 1
 		else
@@ -228,15 +206,6 @@
 	if(src.processing)
 		user << "<span class='warning'>The processor is in the process of processing!</span>"
 		return 1
-	if(user.a_intent == INTENT_GRAB && user.pulling && (isslime(user.pulling) || ismonkey(user.pulling)))
-		if(user.grab_state < GRAB_AGGRESSIVE)
-			user << "<span class='warning'>You need a better grip to do that!</span>"
-			return
-		var/mob/living/pushed_mob = user.pulling
-		visible_message("<span class='warner'>[user] stuffs [pushed_mob] into [src]!</span>")
-		pushed_mob.forceMove(src)
-		user.stop_pulling()
-		return
 	if(src.contents.len == 0)
 		user << "<span class='warning'>The processor is empty!</span>"
 		return 1
@@ -250,7 +219,7 @@
 	for(var/O in src.contents)
 		var/datum/food_processor_process/P = select_recipe(O)
 		if (!P)
-			log_admin("DEBUG: [O] in processor hasnt got a suitable recipe. How did it get in there? Please report it immediatly!!!")
+			log_admin("DEBUG: [O] in processor havent suitable recipe. How do you put it in?") //-rastaf0 // DEAR GOD THIS BURNS MY EYES HAVE YOU EVER LOOKED IN AN ENGLISH DICTONARY BEFORE IN YOUR LIFE AAAAAAAAAAAAAAAAAAAAA - Iamgoofball
 			continue
 		total_time += P.time
 	var/offset = prob(50) ? -2 : 2
@@ -284,15 +253,3 @@
 		M.loc = src.loc
 	return
 
-/obj/machinery/processor/slime
-	name = "Slime processor"
-	desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating."
-
-/obj/machinery/processor/slime/New()
-	..()
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/processor/slime(null)
-	B.apply_default_parts(src)
-
-/obj/item/weapon/circuitboard/machine/processor/slime
-	name = "circuit board (Slime Processor)"
-	build_path = /obj/machinery/processor/slime

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -29,20 +29,19 @@
 	build_path = /obj/machinery/smartfridge
 	origin_tech = "programming=1"
 	req_components = list(/obj/item/weapon/stock_parts/matter_bin = 1)
-	var/static/list/fridges = list(/obj/machinery/smartfridge = "plant produce",
-							/obj/machinery/smartfridge/food = "food",
-							/obj/machinery/smartfridge/drinks = "drinks",
-							/obj/machinery/smartfridge/extract = "slimes",
-							/obj/machinery/smartfridge/chemistry = "chems",
-							/obj/machinery/smartfridge/chemistry/virology = "viruses")
 
 /obj/item/weapon/circuitboard/machine/smartfridge/New(loc, new_type)
 	if(new_type)
 		build_path = new_type
-	..()
 
 /obj/item/weapon/circuitboard/machine/smartfridge/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/screwdriver))
+		var/list/fridges = list(/obj/machinery/smartfridge = "default",
+								/obj/machinery/smartfridge/drinks = "drinks",
+								/obj/machinery/smartfridge/extract = "slimes",
+								/obj/machinery/smartfridge/chemistry = "chems",
+								/obj/machinery/smartfridge/chemistry/virology = "viruses")
+
 		var/position = fridges.Find(build_path, fridges)
 		position = (position == fridges.len) ? 1 : (position + 1)
 		build_path = fridges[position]
@@ -50,9 +49,13 @@
 	else
 		return ..()
 
-/obj/item/weapon/circuitboard/machine/smartfridge/examine/(mob/user)
-	..()
-	user << "<span class='info'>[src] is set to [fridges[build_path]]. You can use a screwdriver to reconfigure it.</span>"
+/obj/machinery/smartfridge/construction()
+	for(var/datum/A in contents)
+		qdel(A)
+
+/obj/machinery/smartfridge/deconstruction()
+	for(var/atom/movable/A in contents)
+		A.loc = loc
 
 /obj/machinery/smartfridge/RefreshParts()
 	for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts)
@@ -92,44 +95,44 @@
 		updateUsrDialog()
 		return
 
-	if(!stat)
+	if(stat)
+		return 0
 
-		if(contents.len >= max_n_of_items)
-			user << "<span class='warning'>\The [src] is full!</span>"
+	if(contents.len >= max_n_of_items)
+		user << "<span class='warning'>\The [src] is full!</span>"
+		return 0
+
+	if(accept_check(O))
+		load(O)
+		user.visible_message("[user] has added \the [O] to \the [src].", "<span class='notice'>You add \the [O] to \the [src].</span>")
+		updateUsrDialog()
+		return 1
+
+	if(istype(O, /obj/item/weapon/storage/bag))
+		var/obj/item/weapon/storage/P = O
+		var/loaded = 0
+		for(var/obj/G in P.contents)
+			if(contents.len >= max_n_of_items)
+				break
+			if(accept_check(G))
+				load(G)
+				loaded++
+		updateUsrDialog()
+
+		if(loaded)
+			if(contents.len >= max_n_of_items)
+				user.visible_message("[user] loads \the [src] with \the [O].", \
+								 "<span class='notice'>You fill \the [src] with \the [O].</span>")
+			else
+				user.visible_message("[user] loads \the [src] with \the [O].", \
+									 "<span class='notice'>You load \the [src] with \the [O].</span>")
+			if(O.contents.len > 0)
+				user << "<span class='warning'>Some items are refused.</span>"
+		else
+			user << "<span class='warning'>There is nothing in [O] to put in [src]!</span>"
 			return 0
 
-		if(accept_check(O))
-			load(O)
-			user.visible_message("[user] has added \the [O] to \the [src].", "<span class='notice'>You add \the [O] to \the [src].</span>")
-			updateUsrDialog()
-			return 1
-
-		if(istype(O, /obj/item/weapon/storage/bag))
-			var/obj/item/weapon/storage/P = O
-			var/loaded = 0
-			for(var/obj/G in P.contents)
-				if(contents.len >= max_n_of_items)
-					break
-				if(accept_check(G))
-					load(G)
-					loaded++
-			updateUsrDialog()
-
-			if(loaded)
-				if(contents.len >= max_n_of_items)
-					user.visible_message("[user] loads \the [src] with \the [O].", \
-									 "<span class='notice'>You fill \the [src] with \the [O].</span>")
-				else
-					user.visible_message("[user] loads \the [src] with \the [O].", \
-										 "<span class='notice'>You load \the [src] with \the [O].</span>")
-				if(O.contents.len > 0)
-					user << "<span class='warning'>Some items are refused.</span>"
-				return 1
-			else
-				user << "<span class='warning'>There is nothing in [O] to put in [src]!</span>"
-				return 0
-
-	if(user.a_intent != INTENT_HARM)
+	else if(user.a_intent != "harm")
 		user << "<span class='warning'>\The [src] smartly refuses [O].</span>"
 		updateUsrDialog()
 		return 0
@@ -139,7 +142,7 @@
 
 
 /obj/machinery/smartfridge/proc/accept_check(obj/item/O)
-	if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/) || istype(O,/obj/item/weapon/grown/))
+	if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/))
 		return 1
 	return 0
 
@@ -235,7 +238,6 @@
 // ----------------------------
 /obj/machinery/smartfridge/drying_rack
 	name = "drying rack"
-	desc = "A wooden contraption, used to dry plant products, food and leather."
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "drying_rack_on"
 	use_power = 1
@@ -245,24 +247,6 @@
 	icon_off = "drying_rack"
 	var/drying = 0
 
-/obj/machinery/smartfridge/drying_rack/New()
-	..()
-	if(component_parts && component_parts.len)
-		component_parts.Cut()
-	component_parts = null
-
-/obj/machinery/smartfridge/drying_rack/on_deconstruction()
-	new /obj/item/stack/sheet/mineral/wood(loc, 10)
-	..()
-
-/obj/machinery/smartfridge/drying_rack/RefreshParts()
-/obj/machinery/smartfridge/drying_rack/default_deconstruction_screwdriver()
-/obj/machinery/smartfridge/drying_rack/exchange_parts()
-/obj/machinery/smartfridge/drying_rack/spawn_frame()
-
-/obj/machinery/smartfridge/drying_rack/default_deconstruction_crowbar(obj/item/weapon/crowbar/C, ignore_panel = 1)
-	..()
-
 /obj/machinery/smartfridge/drying_rack/interact(mob/user)
 	var/dat = ..()
 	if(dat)
@@ -308,8 +292,6 @@
 		var/obj/item/weapon/reagent_containers/food/snacks/S = O
 		if(S.dried_type)
 			return 1
-	if(istype(O,/obj/item/stack/sheet/wetleather/))
-		return 1
 	return 0
 
 /obj/machinery/smartfridge/drying_rack/proc/toggle_drying(forceoff = 0)
@@ -324,7 +306,7 @@
 /obj/machinery/smartfridge/drying_rack/proc/rack_dry()
 	for(var/obj/item/weapon/reagent_containers/food/snacks/S in contents)
 		if(S.dried_type == S.type)//if the dried type is the same as the object's type, don't bother creating a whole new item...
-			S.add_atom_colour("#ad7257", FIXED_COLOUR_PRIORITY)
+			S.color = "#ad7257"
 			S.dry = 1
 			S.loc = get_turf(src)
 		else
@@ -332,11 +314,6 @@
 			new dried(src.loc)
 			qdel(S)
 		return 1
-	for(var/obj/item/stack/sheet/wetleather/WL in contents)
-		var/obj/item/stack/sheet/leather/L = new(loc)
-		L.amount = WL.amount
-		qdel(WL)
-		return 1
 	return 0
 
 /obj/machinery/smartfridge/drying_rack/emp_act(severity)
@@ -357,16 +334,6 @@
 	if(istype(O,/obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks) || istype(O,/obj/item/weapon/reagent_containers/food/condiment))
 		return 1
 
-// ----------------------------
-//  Food smartfridge
-// ----------------------------
-/obj/machinery/smartfridge/food
-	desc = "A refrigerated storage unit for food."
-
-/obj/machinery/smartfridge/food/accept_check(obj/item/O)
-	if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/))
-		return 1
-	return 0
 
 // -------------------------------------
 // Xenobiology Slime-Extract Smartfridge

code/modules/food_and_drinks/pizzabox.dm

@@ -28,11 +28,9 @@
 
 /obj/item/pizzabox/New()
 	update_icon()
-	..()
 
 /obj/item/pizzabox/Destroy()
 	unprocess()
-	return ..()
 
 /obj/item/pizzabox/update_icon()
 	// Description
@@ -45,7 +43,7 @@
 			if(bomb_defused)
 				desc = "[desc] The bomb seems inert."
 			if(bomb_active)
-				desc = "[desc] It looks like it's about to go off!"
+				desc = "[desc] It looks like its about to go off!"
 	else
 		var/obj/item/pizzabox/box = boxes.len ? boxes[boxes.len] : src
 		if(boxes.len)
@@ -86,7 +84,7 @@
 	update_icon()
 
 /obj/item/pizzabox/attack_hand(mob/user)
-	if(user.get_inactive_held_item() != src)
+	if(user.get_inactive_hand() != src)
 		..()
 		return
 	if(open)
@@ -108,9 +106,7 @@
 				bomb_timer = Clamp(Ceiling(bomb_timer / 2), BOMB_TIMER_MIN, BOMB_TIMER_MAX)
 				bomb_defused = FALSE
 
-				var/message = "[ADMIN_LOOKUPFLW(user)] has trapped a [src] with [bomb] set to [bomb_timer * 2] seconds."
-				bombers += message
-				message_admins(message)
+				message_admins("[key_name_admin(user)]<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) has trapped a [src] with [bomb] set to [bomb_timer * 2] seconds.")
 				log_game("[key_name(user)] has trapped a [src] with [bomb] set to [bomb_timer * 2] seconds.")
 				bomb.adminlog = "The [bomb.name] in [src.name] that [key_name(user)] activated has detonated!"
 

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -4,296 +4,344 @@
 /datum/chemical_reaction/goldschlager
 	name = "Goldschlager"
 	id = "goldschlager"
-	results = list("goldschlager" = 10)
+	result = "goldschlager"
 	required_reagents = list("vodka" = 10, "gold" = 1)
+	result_amount = 10
 
 /datum/chemical_reaction/patron
 	name = "Patron"
 	id = "patron"
-	results = list("patron" = 10)
+	result = "patron"
 	required_reagents = list("tequila" = 10, "silver" = 1)
+	result_amount = 10
 
 /datum/chemical_reaction/bilk
 	name = "Bilk"
 	id = "bilk"
-	results = list("bilk" = 2)
+	result = "bilk"
 	required_reagents = list("milk" = 1, "beer" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/icetea
 	name = "Iced Tea"
 	id = "icetea"
-	results = list("icetea" = 4)
+	result = "icetea"
 	required_reagents = list("ice" = 1, "tea" = 3)
+	result_amount = 4
 
 /datum/chemical_reaction/icecoffee
 	name = "Iced Coffee"
 	id = "icecoffee"
-	results = list("icecoffee" = 4)
+	result = "icecoffee"
 	required_reagents = list("ice" = 1, "coffee" = 3)
+	result_amount = 4
 
 /datum/chemical_reaction/nuka_cola
 	name = "Nuka Cola"
 	id = "nuka_cola"
-	results = list("nuka_cola" = 6)
+	result = "nuka_cola"
 	required_reagents = list("uranium" = 1, "cola" = 6)
+	result_amount = 6
 
 /datum/chemical_reaction/moonshine
 	name = "Moonshine"
 	id = "moonshine"
-	results = list("moonshine" = 10)
-	required_reagents = list("nutriment" = 5, "sugar" = 5)
+	result = "moonshine"
+	required_reagents = list("nutriment" = 10)
 	required_catalysts = list("enzyme" = 5)
+	result_amount = 10
 
 /datum/chemical_reaction/wine
 	name = "Wine"
 	id = "wine"
-	results = list("wine" = 10)
+	result = "wine"
 	required_reagents = list("grapejuice" = 10)
 	required_catalysts = list("enzyme" = 5)
+	result_amount = 10
 
 /datum/chemical_reaction/spacebeer
 	name = "Space Beer"
 	id = "spacebeer"
-	results = list("beer" = 10)
+	result = "beer"
 	required_reagents = list("flour" = 10)
 	required_catalysts = list("enzyme" = 5)
+	result_amount = 10
 
 /datum/chemical_reaction/vodka
 	name = "Vodka"
 	id = "vodka"
-	results = list("vodka" = 10)
+	result = "vodka"
 	required_reagents = list("potato" = 10)
 	required_catalysts = list("enzyme" = 5)
+	result_amount = 10
 
 /datum/chemical_reaction/kahlua
 	name = "Kahlua"
 	id = "kahlua"
-	results = list("kahlua" = 5)
+	result = "kahlua"
 	required_reagents = list("coffee" = 5, "sugar" = 5)
 	required_catalysts = list("enzyme" = 5)
+	result_amount = 5
 
 /datum/chemical_reaction/gin_tonic
 	name = "Gin and Tonic"
 	id = "gintonic"
-	results = list("gintonic" = 3)
+	result = "gintonic"
 	required_reagents = list("gin" = 2, "tonic" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/cuba_libre
 	name = "Cuba Libre"
 	id = "cubalibre"
-	results = list("cubalibre" = 3)
+	result = "cubalibre"
 	required_reagents = list("rum" = 2, "cola" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/martini
 	name = "Classic Martini"
 	id = "martini"
-	results = list("martini" = 3)
+	result = "martini"
 	required_reagents = list("gin" = 2, "vermouth" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/vodkamartini
 	name = "Vodka Martini"
 	id = "vodkamartini"
-	results = list("vodkamartini" = 3)
+	result = "vodkamartini"
 	required_reagents = list("vodka" = 2, "vermouth" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/white_russian
 	name = "White Russian"
 	id = "whiterussian"
-	results = list("whiterussian" = 5)
+	result = "whiterussian"
 	required_reagents = list("blackrussian" = 3, "cream" = 2)
+	result_amount = 5
 
 /datum/chemical_reaction/whiskey_cola
 	name = "Whiskey Cola"
 	id = "whiskeycola"
-	results = list("whiskeycola" = 3)
+	result = "whiskeycola"
 	required_reagents = list("whiskey" = 2, "cola" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/screwdriver
 	name = "Screwdriver"
 	id = "screwdrivercocktail"
-	results = list("screwdrivercocktail" = 3)
+	result = "screwdrivercocktail"
 	required_reagents = list("vodka" = 2, "orangejuice" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/bloody_mary
 	name = "Bloody Mary"
 	id = "bloodymary"
-	results = list("bloodymary" = 4)
+	result = "bloodymary"
 	required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1)
+	result_amount = 4
 
 /datum/chemical_reaction/gargle_blaster
 	name = "Pan-Galactic Gargle Blaster"
 	id = "gargleblaster"
-	results = list("gargleblaster" = 5)
+	result = "gargleblaster"
 	required_reagents = list("vodka" = 1, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1)
+	result_amount = 5
 
 /datum/chemical_reaction/brave_bull
 	name = "Brave Bull"
 	id = "bravebull"
-	results = list("bravebull" = 3)
+	result = "bravebull"
 	required_reagents = list("tequila" = 2, "kahlua" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/tequila_sunrise
 	name = "tequila Sunrise"
 	id = "tequilasunrise"
-	results = list("tequilasunrise" = 3)
+	result = "tequilasunrise"
 	required_reagents = list("tequila" = 2, "orangejuice" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/toxins_special
 	name = "Toxins Special"
 	id = "toxinsspecial"
-	results = list("toxinsspecial" = 5)
+	result = "toxinsspecial"
 	required_reagents = list("rum" = 2, "vermouth" = 1, "plasma" = 2)
+	result_amount = 5
 
 /datum/chemical_reaction/beepsky_smash
 	name = "Beepksy Smash"
 	id = "beepksysmash"
-	results = list("beepskysmash" = 4)
+	result = "beepskysmash"
 	required_reagents = list("limejuice" = 2, "whiskey" = 2, "iron" = 1)
+	result_amount = 4
 
 /datum/chemical_reaction/doctor_delight
 	name = "The Doctor's Delight"
 	id = "doctordelight"
-	results = list("doctorsdelight" = 5)
+	result = "doctorsdelight"
 	required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "cryoxadone" = 1)
+	result_amount = 5
 
 /datum/chemical_reaction/irish_cream
 	name = "Irish Cream"
 	id = "irishcream"
-	results = list("irishcream" = 3)
+	result = "irishcream"
 	required_reagents = list("whiskey" = 2, "cream" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/manly_dorf
 	name = "The Manly Dorf"
 	id = "manlydorf"
-	results = list("manlydorf" = 3)
+	result = "manlydorf"
 	required_reagents = list ("beer" = 1, "ale" = 2)
+	result_amount = 3
 
 /datum/chemical_reaction/greenbeer
 	name = "Green Beer"
 	id = "greenbeer"
-	results = list("greenbeer" = 10)
+	result = "greenbeer"
 	required_reagents = list("greencrayonpowder" = 1, "beer" = 10)
+	result_amount = 10
 
 /datum/chemical_reaction/hooch
 	name = "Hooch"
 	id = "hooch"
-	results = list("hooch" = 3)
+	result = "hooch"
 	required_reagents = list ("ethanol" = 2, "welding_fuel" = 1)
 	required_catalysts = list("enzyme" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/irish_coffee
 	name = "Irish Coffee"
 	id = "irishcoffee"
-	results = list("irishcoffee" = 2)
+	result = "irishcoffee"
 	required_reagents = list("irishcream" = 1, "coffee" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/b52
 	name = "B-52"
 	id = "b52"
-	results = list("b52" = 3)
+	result = "b52"
 	required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/atomicbomb
 	name = "Atomic Bomb"
 	id = "atomicbomb"
-	results = list("atomicbomb" = 10)
+	result = "atomicbomb"
 	required_reagents = list("b52" = 10, "uranium" = 1)
+	result_amount = 10
 
 /datum/chemical_reaction/margarita
 	name = "Margarita"
 	id = "margarita"
-	results = list("margarita" = 3)
+	result = "margarita"
 	required_reagents = list("tequila" = 2, "limejuice" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/longislandicedtea
 	name = "Long Island Iced Tea"
 	id = "longislandicedtea"
-	results = list("longislandicedtea" = 4)
+	result = "longislandicedtea"
 	required_reagents = list("vodka" = 1, "gin" = 1, "tequila" = 1, "cubalibre" = 1)
+	result_amount = 4
 
 /datum/chemical_reaction/threemileisland
 	name = "Three Mile Island Iced Tea"
 	id = "threemileisland"
-	results = list("threemileisland" = 10)
+	result = "threemileisland"
 	required_reagents = list("longislandicedtea" = 10, "uranium" = 1)
+	result_amount = 10
 
 /datum/chemical_reaction/whiskeysoda
 	name = "Whiskey Soda"
 	id = "whiskeysoda"
-	results = list("whiskeysoda" = 3)
+	result = "whiskeysoda"
 	required_reagents = list("whiskey" = 2, "sodawater" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/black_russian
 	name = "Black Russian"
 	id = "blackrussian"
-	results = list("blackrussian" = 5)
+	result = "blackrussian"
 	required_reagents = list("vodka" = 3, "kahlua" = 2)
+	result_amount = 5
 
 /datum/chemical_reaction/manhattan
 	name = "Manhattan"
 	id = "manhattan"
-	results = list("manhattan" = 3)
+	result = "manhattan"
 	required_reagents = list("whiskey" = 2, "vermouth" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/manhattan_proj
 	name = "Manhattan Project"
 	id = "manhattan_proj"
-	results = list("manhattan_proj" = 10)
+	result = "manhattan_proj"
 	required_reagents = list("manhattan" = 10, "uranium" = 1)
+	result_amount = 10
 
 /datum/chemical_reaction/vodka_tonic
 	name = "Vodka and Tonic"
 	id = "vodkatonic"
-	results = list("vodkatonic" = 3)
+	result = "vodkatonic"
 	required_reagents = list("vodka" = 2, "tonic" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/gin_fizz
 	name = "Gin Fizz"
 	id = "ginfizz"
-	results = list("ginfizz" = 4)
+	result = "ginfizz"
 	required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1)
+	result_amount = 4
 
 /datum/chemical_reaction/bahama_mama
 	name = "Bahama mama"
 	id = "bahama_mama"
-	results = list("bahama_mama" = 6)
+	result = "bahama_mama"
 	required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
+	result_amount = 6
 
 /datum/chemical_reaction/singulo
 	name = "Singulo"
 	id = "singulo"
-	results = list("singulo" = 10)
+	result = "singulo"
 	required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5)
+	result_amount = 10
 
 /datum/chemical_reaction/alliescocktail
 	name = "Allies Cocktail"
 	id = "alliescocktail"
-	results = list("alliescocktail" = 2)
+	result = "alliescocktail"
 	required_reagents = list("martini" = 1, "vodka" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/demonsblood
 	name = "Demons Blood"
 	id = "demonsblood"
-	results = list("demonsblood" = 4)
+	result = "demonsblood"
 	required_reagents = list("rum" = 1, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
+	result_amount = 4
 
 /datum/chemical_reaction/booger
 	name = "Booger"
 	id = "booger"
-	results = list("booger" = 4)
+	result = "booger"
 	required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
+	result_amount = 4
 
 /datum/chemical_reaction/antifreeze
 	name = "Anti-freeze"
 	id = "antifreeze"
-	results = list("antifreeze" = 4)
+	result = "antifreeze"
 	required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1)
+	result_amount = 4
 
 /datum/chemical_reaction/barefoot
 	name = "Barefoot"
 	id = "barefoot"
-	results = list("barefoot" = 3)
+	result = "barefoot"
 	required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1)
+	result_amount = 3
 
 
 ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
@@ -301,223 +349,259 @@
 /datum/chemical_reaction/sbiten
 	name = "Sbiten"
 	id = "sbiten"
-	results = list("sbiten" = 10)
+	result = "sbiten"
 	required_reagents = list("vodka" = 10, "capsaicin" = 1)
+	result_amount = 10
 
 /datum/chemical_reaction/red_mead
 	name = "Red Mead"
 	id = "red_mead"
-	results = list("red_mead" = 2)
+	result = "red_mead"
 	required_reagents = list("blood" = 1, "mead" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/mead
 	name = "Mead"
 	id = "mead"
-	results = list("mead" = 2)
+	result = "mead"
 	required_reagents = list("honey" = 2)
 	required_catalysts = list("enzyme" = 5)
+	result_amount = 2
 
 /datum/chemical_reaction/iced_beer
 	name = "Iced Beer"
 	id = "iced_beer"
-	results = list("iced_beer" = 6)
+	result = "iced_beer"
 	required_reagents = list("beer" = 5, "ice" = 1)
+	result_amount = 6
 
 /datum/chemical_reaction/grog
 	name = "Grog"
 	id = "grog"
-	results = list("grog" = 2)
+	result = "grog"
 	required_reagents = list("rum" = 1, "water" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/soy_latte
 	name = "Soy Latte"
 	id = "soy_latte"
-	results = list("soy_latte" = 2)
+	result = "soy_latte"
 	required_reagents = list("coffee" = 1, "soymilk" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/cafe_latte
 	name = "Cafe Latte"
 	id = "cafe_latte"
-	results = list("cafe_latte" = 2)
+	result = "cafe_latte"
 	required_reagents = list("coffee" = 1, "milk" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/acidspit
 	name = "Acid Spit"
 	id = "acidspit"
-	results = list("acidspit" = 6)
+	result = "acidspit"
 	required_reagents = list("sacid" = 1, "wine" = 5)
+	result_amount = 6
 
 /datum/chemical_reaction/amasec
 	name = "Amasec"
 	id = "amasec"
-	results = list("amasec" = 10)
+	result = "amasec"
 	required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5)
+	result_amount = 10
 
 /datum/chemical_reaction/changelingsting
 	name = "Changeling Sting"
 	id = "changelingsting"
-	results = list("changelingsting" = 5)
-	required_reagents = list("screwdrivercocktail" = 1, "lemon_lime" = 2)
+	result = "changelingsting"
+	required_reagents = list("screwdrivercocktail" = 1, "limejuice" = 1, "lemonjuice" = 1)
+	result_amount = 5
 
 /datum/chemical_reaction/aloe
 	name = "Aloe"
 	id = "aloe"
-	results = list("aloe" = 2)
+	result = "aloe"
 	required_reagents = list("irishcream" = 1, "watermelonjuice" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/andalusia
 	name = "Andalusia"
 	id = "andalusia"
-	results = list("andalusia" = 3)
+	result = "andalusia"
 	required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/neurotoxin
 	name = "Neurotoxin"
 	id = "neurotoxin"
-	results = list("neurotoxin" = 2)
+	result = "neurotoxin"
 	required_reagents = list("gargleblaster" = 1, "morphine" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/snowwhite
 	name = "Snow White"
 	id = "snowwhite"
-	results = list("snowwhite" = 2)
+	result = "snowwhite"
 	required_reagents = list("beer" = 1, "lemon_lime" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/irishcarbomb
 	name = "Irish Car Bomb"
 	id = "irishcarbomb"
-	results = list("irishcarbomb" = 2)
+	result = "irishcarbomb"
 	required_reagents = list("ale" = 1, "irishcream" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/syndicatebomb
 	name = "Syndicate Bomb"
 	id = "syndicatebomb"
-	results = list("syndicatebomb" = 2)
+	result = "syndicatebomb"
 	required_reagents = list("beer" = 1, "whiskeycola" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/erikasurprise
 	name = "Erika Surprise"
 	id = "erikasurprise"
-	results = list("erikasurprise" = 5)
+	result = "erikasurprise"
 	required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
+	result_amount = 5
 
 /datum/chemical_reaction/devilskiss
 	name = "Devils Kiss"
 	id = "devilskiss"
-	results = list("devilskiss" = 3)
+	result = "devilskiss"
 	required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/hippiesdelight
 	name = "Hippies Delight"
 	id = "hippiesdelight"
-	results = list("hippiesdelight" = 2)
+	result = "hippiesdelight"
 	required_reagents = list("mushroomhallucinogen" = 1, "gargleblaster" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/bananahonk
 	name = "Banana Honk"
 	id = "bananahonk"
-	results = list("bananahonk" = 3)
+	result = "bananahonk"
 	required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/silencer
 	name = "Silencer"
 	id = "silencer"
-	results = list("silencer" = 3)
+	result = "silencer"
 	required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/driestmartini
 	name = "Driest Martini"
 	id = "driestmartini"
-	results = list("driestmartini" = 2)
+	result = "driestmartini"
 	required_reagents = list("nothing" = 1, "gin" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/thirteenloko
 	name = "Thirteen Loko"
 	id = "thirteenloko"
-	results = list("thirteenloko" = 3)
+	result = "thirteenloko"
 	required_reagents = list("vodka" = 1, "coffee" = 1, "limejuice" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/chocolatepudding
 	name = "Chocolate Pudding"
 	id = "chocolatepudding"
-	results = list("chocolatepudding" = 20)
+	result = "chocolatepudding"
 	required_reagents = list("cocoa" = 5, "milk" = 5, "eggyolk" = 5)
+	result_amount = 20
 
 /datum/chemical_reaction/vanillapudding
 	name = "Vanilla Pudding"
 	id = "vanillapudding"
-	results = list("vanillapudding" = 20)
+	result = "vanillapudding"
 	required_reagents = list("vanilla" = 5, "milk" = 5, "eggyolk" = 5)
+	result_amount = 20
 
 /datum/chemical_reaction/cherryshake
 	name = "Cherry Shake"
 	id = "cherryshake"
-	results = list("cherryshake" = 3)
+	result = "cherryshake"
 	required_reagents = list("cherryjelly" = 1, "ice" = 1, "cream" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/bluecherryshake
 	name = "Blue Cherry Shake"
 	id = "bluecherryshake"
-	results = list("bluecherryshake" = 3)
+	result = "bluecherryshake"
 	required_reagents = list("bluecherryjelly" = 1, "ice" = 1, "cream" = 1)
+	result_amount = 3
 
 /datum/chemical_reaction/drunkenblumpkin
 	name = "Drunken Blumpkin"
 	id = "drunkenblumpkin"
-	results = list("drunkenblumpkin" = 4)
+	result = "drunkenblumpkin"
 	required_reagents = list("blumpkinjuice" = 1, "irishcream" = 2, "ice" = 1)
+	result_amount = 4
 
 /datum/chemical_reaction/pumpkin_latte
 	name = "Pumpkin space latte"
 	id = "pumpkin_latte"
-	results = list("pumpkin_latte" = 15)
+	result = "pumpkin_latte"
 	required_reagents = list("pumpkinjuice" = 5, "coffee" = 5, "cream" = 5)
+	result_amount = 15
 
 /datum/chemical_reaction/gibbfloats
 	name = "Gibb Floats"
 	id = "gibbfloats"
-	results = list("gibbfloats" = 15)
+	result = "gibbfloats"
 	required_reagents = list("dr_gibb" = 5, "ice" = 5, "cream" = 5)
+	result_amount = 15
 
 /datum/chemical_reaction/triple_citrus
 	name = "triple_citrus"
 	id = "triple_citrus"
-	results = list("triple_citrus" = 5)
+	result = "triple_citrus"
 	required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
+	result_amount = 5
 
 /datum/chemical_reaction/grape_soda
 	name = "grape soda"
 	id = "grapesoda"
-	results = list("grapesoda" = 2)
+	result = "grape_soda"
 	required_reagents = list("grapejuice" = 1, "sodawater" = 1)
+	result_amount = 2
 
 /datum/chemical_reaction/grappa
 	name = "grappa"
 	id = "grappa"
-	results = list("grappa" = 10)
+	result = "grappa"
 	required_reagents = list ("wine" = 10)
 	required_catalysts = list ("enzyme" = 5)
+	result_amount = 10
 
 /datum/chemical_reaction/whiskey_sour
 	name = "Whiskey Sour"
 	id = "whiskey_sour"
-	results = list("whiskey_sour" = 3)
+	result = "whiskey_sour"
 	required_reagents = list("whiskey" = 1, "lemonjuice" = 1, "sugar" = 1)
+	result_amount = 3
 	mix_message = "The mixture darkens to a rich gold hue."
 	mix_sound = null
 
 /datum/chemical_reaction/fetching_fizz
 	name = "Fetching Fizz"
 	id = "fetching_fizz"
-	results = list("fetching_fizz" = 3)
+	result = "fetching_fizz"
 	required_reagents = list("nuka_cola" = 1, "iron" = 1) //Manufacturable from only the mining station
+	result_amount = 3
 	mix_message = "The mixture slightly vibrates before settling."
 
 /datum/chemical_reaction/hearty_punch
 	name = "Hearty Punch"
 	id = "hearty_punch"
-	results = list("hearty_punch" = 1)  //Very little, for balance reasons
+	result = "hearty_punch"
 	required_reagents = list("bravebull" = 5, "syndicatebomb" = 5, "absinthe" = 5)
+	result_amount = 1 //Very little, for balance reasons
 	mix_message = "The mixture darkens to a healthy crimson."
 	mix_sound = null
 	required_temp = 315 //Piping hot!
@@ -525,26 +609,15 @@
 /datum/chemical_reaction/bacchus_blessing
 	name = "Bacchus' Blessing"
 	id = "bacchus_blessing"
-	results = list("bacchus_blessing" = 4)
+	result = "bacchus_blessing"
 	required_reagents = list("hooch" = 1, "absinthe" = 1, "manlydorf" = 1, "syndicatebomb" = 1)
+	result_amount = 4
 	mix_message = "<span class='warning'>The mixture turns to a sickening froth.</span>"
 
 /datum/chemical_reaction/arnold_palmer
 	name = "Arnold Palmer"
 	id = "arnold_palmer"
-	results = list("arnold_palmer" = 2)
+	result = "arnold_palmer"
 	required_reagents = list("tea" = 1, "lemonjuice" = 1)
+	result_amount = 2
 	mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange."
-
-/datum/chemical_reaction/chocolate_milk
-	name = "chocolate milk"
-	id = "chocolate_milk"
-	results = list("chocolate_milk" = 2)
-	required_reagents = list("milk" = 1, "cocoa" = 1)
-	mix_message = "The color changes as the mixture blends smoothly."
-	
-/datum/chemical_reaction/eggnog
-	name = "eggnog"
-	id = "eggnog"
-	results = list("eggnog" = 15)
-	required_reagents = list("rum" = 5, "cream" = 5, "eggyolk" = 5) 

code/modules/food_and_drinks/recipes/food_mixtures.dm

@@ -1,8 +1,4 @@
-/datum/crafting_recipe/food
-	var/real_parts
-
 /datum/crafting_recipe/food/New()
-	real_parts = parts.Copy()
 	parts |= reqs
 
 //////////////////////////////////////////FOOD MIXTURES////////////////////////////////////
@@ -10,8 +6,10 @@
 /datum/chemical_reaction/tofu
 	name = "Tofu"
 	id = "tofu"
+	result = null
 	required_reagents = list("soymilk" = 10)
 	required_catalysts = list("enzyme" = 5)
+	result_amount = 1
 	mob_react=1
 
 /datum/chemical_reaction/tofu/on_reaction(datum/reagents/holder, created_volume)
@@ -23,7 +21,9 @@
 /datum/chemical_reaction/chocolate_bar
 	name = "Chocolate Bar"
 	id = "chocolate_bar"
+	result = null
 	required_reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2)
+	result_amount = 1
 
 /datum/chemical_reaction/chocolate_bar/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
@@ -35,9 +35,10 @@
 /datum/chemical_reaction/chocolate_bar2
 	name = "Chocolate Bar"
 	id = "chocolate_bar"
-	required_reagents = list("chocolate_milk" = 4, "sugar" = 2)
+	result = null
+	required_reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2)
+	result_amount = 1
 	mob_react = 1
-
 /datum/chemical_reaction/chocolate_bar2/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
 	for(var/i = 1, i <= created_volume, i++)
@@ -47,85 +48,101 @@
 /datum/chemical_reaction/hot_coco
 	name = "Hot Coco"
 	id = "hot_coco"
-	results = list("hot_coco" = 5)
+	result = "hot_coco"
 	required_reagents = list("water" = 5, "cocoa" = 1)
+	result_amount = 5
 
 /datum/chemical_reaction/coffee
 	name = "Coffee"
 	id = "coffee"
-	results = list("coffee" = 5)
+	result = "coffee"
 	required_reagents = list("coffeepowder" = 1, "water" = 5)
+	result_amount = 5
 
 /datum/chemical_reaction/tea
 	name = "Tea"
 	id = "tea"
-	results = list("tea" = 5)
+	result = "tea"
 	required_reagents = list("teapowder" = 1, "water" = 5)
+	result_amount = 5
 
 /datum/chemical_reaction/soysauce
 	name = "Soy Sauce"
 	id = "soysauce"
-	results = list("soysauce" = 5)
+	result = "soysauce"
 	required_reagents = list("soymilk" = 4, "sacid" = 1)
+	result_amount = 5
 
 /datum/chemical_reaction/corn_syrup
 	name = "corn_syrup"
 	id = "corn_syrup"
-	results = list("corn_syrup" = 5)
+	result = "corn_syrup"
 	required_reagents = list("corn_starch" = 1, "sacid" = 1)
+	result_amount = 5
 	required_temp = 374
 
 /datum/chemical_reaction/cheesewheel
 	name = "Cheesewheel"
 	id = "cheesewheel"
+	result = null
 	required_reagents = list("milk" = 40)
 	required_catalysts = list("enzyme" = 5)
+	result_amount = 1
 
 /datum/chemical_reaction/cheesewheel/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
-	for(var/i = 1, i <= created_volume, i++)
-		new /obj/item/weapon/reagent_containers/food/snacks/store/cheesewheel(location)
+	new /obj/item/weapon/reagent_containers/food/snacks/store/cheesewheel(location)
+	return
 
 /datum/chemical_reaction/synthmeat
 	name = "synthmeat"
 	id = "synthmeat"
+	result = null
 	required_reagents = list("blood" = 5, "cryoxadone" = 1)
+	result_amount = 1
 	mob_react = 1
 
 /datum/chemical_reaction/synthmeat/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
-	for(var/i = 1, i <= created_volume, i++)
-		new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat(location)
+	new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat(location)
+	return
 
 /datum/chemical_reaction/hot_ramen
 	name = "Hot Ramen"
 	id = "hot_ramen"
-	results = list("hot_ramen" = 3)
+	result = "hot_ramen"
 	required_reagents = list("water" = 1, "dry_ramen" = 3)
+	result_amount = 3
 
 /datum/chemical_reaction/hell_ramen
 	name = "Hell Ramen"
 	id = "hell_ramen"
-	results = list("hell_ramen" = 6)
+	result = "hell_ramen"
 	required_reagents = list("capsaicin" = 1, "hot_ramen" = 6)
+	result_amount = 6
+
 
 /datum/chemical_reaction/imitationcarpmeat
 	name = "Imitation Carpmeat"
 	id = "imitationcarpmeat"
+	result = null
 	required_reagents = list("carpotoxin" = 5)
+	result_amount = 1
 	required_container = /obj/item/weapon/reagent_containers/food/snacks/tofu
 	mix_message = "The mixture becomes similar to carp meat."
 
 /datum/chemical_reaction/imitationcarpmeat/on_reaction(datum/reagents/holder)
-	var/location = get_turf(holder.my_atom)
-	new /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation(location)
+	var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation
+	S.loc = get_turf(holder.my_atom)
 	if(holder && holder.my_atom)
 		qdel(holder.my_atom)
 
 /datum/chemical_reaction/dough
 	name = "Dough"
 	id = "dough"
+	result = null
 	required_reagents = list("water" = 10, "flour" = 15)
+	result_amount = 1
 	mix_message = "The ingredients form a dough."
 
 /datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume)
@@ -136,7 +153,9 @@
 /datum/chemical_reaction/cakebatter
 	name = "Cake Batter"
 	id = "cakebatter"
+	result = null
 	required_reagents = list("eggyolk" = 15, "flour" = 15, "sugar" = 5)
+	result_amount = 1
 	mix_message = "The ingredients form a cake batter."
 
 /datum/chemical_reaction/cakebatter/on_reaction(datum/reagents/holder, created_volume)
@@ -151,12 +170,14 @@
 /datum/chemical_reaction/ricebowl
 	name = "Rice Bowl"
 	id = "ricebowl"
+	result = null
 	required_reagents = list("rice" = 10, "water" = 10)
+	result_amount = 1
 	required_container = /obj/item/weapon/reagent_containers/glass/bowl
 	mix_message = "The rice absorbs the water."
 
 /datum/chemical_reaction/ricebowl/on_reaction(datum/reagents/holder)
-	var/location = get_turf(holder.my_atom)
-	new /obj/item/weapon/reagent_containers/food/snacks/salad/ricebowl(location)
+	var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/salad/ricebowl
+	S.loc = get_turf(holder.my_atom)
 	if(holder && holder.my_atom)
 		qdel(holder.my_atom)

code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm

@@ -11,7 +11,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/meat
-	category = CAT_BREAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/xenomeatbread
 	name = "Xenomeat bread"
@@ -21,7 +21,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/xenomeat
-	category = CAT_BREAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/spidermeatbread
 	name = "Spidermeat bread"
@@ -31,7 +31,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/spidermeat
-	category = CAT_BREAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/banananutbread
 	name = "Banana nut bread"
@@ -42,7 +42,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/banana
-	category = CAT_BREAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/tofubread
 	name = "Tofu bread"
@@ -52,7 +52,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/tofu
-	category = CAT_BREAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/creamcheesebread
 	name = "Cream cheese bread"
@@ -62,7 +62,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/creamcheese
-	category = CAT_BREAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/mimanabread
 	name = "Mimana bread"
@@ -73,4 +73,4 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/banana/mime = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/mimana
-	category = CAT_BREAD
+	category = CAT_FOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm

@@ -14,7 +14,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/human
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/burger
 	name = "Burger"
@@ -24,7 +24,7 @@
 	)
 
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/plain
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/corgiburger
 	name = "Corgi burger"
@@ -34,7 +34,7 @@
 	)
 
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/corgi
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/appendixburger
 	name = "Appendix burger"
@@ -43,7 +43,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/appendix
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/brainburger
 	name = "Brain burger"
@@ -52,7 +52,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/brain
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/xenoburger
 	name = "Xeno burger"
@@ -61,7 +61,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/xeno
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/bearger
 	name = "Bearger"
@@ -70,7 +70,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/bearger
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/fishburger
 	name = "Fish burger"
@@ -79,7 +79,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/fish
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/tofuburger
 	name = "Tofu burger"
@@ -88,7 +88,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/tofu
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/ghostburger
 	name = "Ghost burger"
@@ -97,7 +97,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/ghost
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/clownburger
 	name = "Clown burger"
@@ -106,7 +106,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/clown
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/mimeburger
 	name = "Mime burger"
@@ -115,7 +115,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/mime
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/redburger
 	name = "Red burger"
@@ -125,7 +125,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/red
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/orangeburger
 	name = "Orange burger"
@@ -135,7 +135,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/orange
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/yellowburger
 	name = "Yellow burger"
@@ -145,7 +145,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/yellow
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/greenburger
 	name = "Green burger"
@@ -155,7 +155,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/green
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/blueburger
 	name = "Blue burger"
@@ -165,7 +165,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/blue
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/purpleburger
 	name = "Purple burger"
@@ -175,7 +175,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/purple
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/spellburger
 	name = "Spell burger"
@@ -183,7 +183,7 @@
 		/obj/item/clothing/head/wizard/fake = 1,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/spell
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/spellburger2
 	name = "Spell burger"
@@ -192,7 +192,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/spell
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/bigbiteburger
 	name = "Big bite burger"
@@ -201,7 +201,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/bigbite
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/superbiteburger
 	name = "Super bite burger"
@@ -216,7 +216,7 @@
 
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/superbite
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/slimeburger
 	name = "Jelly burger"
@@ -225,7 +225,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/jellyburger
 	name = "Jelly burger"
@@ -234,7 +234,7 @@
 			/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/fivealarmburger
 	name = "Five alarm burger"
@@ -243,7 +243,7 @@
 			/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/fivealarm
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/ratburger
 	name = "Rat burger"
@@ -252,16 +252,7 @@
 			/obj/item/weapon/reagent_containers/food/snacks/bun = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/rat
-	category = CAT_BURGER
-
-/datum/crafting_recipe/food/baseballburger
-	name = "Home run baseball burger"
-	reqs = list(
-			/obj/item/weapon/melee/baseball_bat = 1,
-			/obj/item/weapon/reagent_containers/food/snacks/bun = 1
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/burger/baseball
-	category = CAT_BURGER
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/baconburger
 	name = "Bacon Burger"
@@ -272,4 +263,4 @@
 	)
 
 	result = /obj/item/weapon/reagent_containers/food/snacks/burger/baconburger
-	category = CAT_BURGER
+	category = CAT_FOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm

@@ -10,7 +10,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/carrot
-	category = CAT_CAKE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/cheesecake
 	name = "Cheese cake"
@@ -19,7 +19,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/cheese
-	category = CAT_CAKE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/applecake
 	name = "Apple cake"
@@ -28,7 +28,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/apple = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/apple
-	category = CAT_CAKE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/orangecake
 	name = "Orange cake"
@@ -37,7 +37,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/orange
-	category = CAT_CAKE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/limecake
 	name = "Lime cake"
@@ -46,7 +46,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/lime
-	category = CAT_CAKE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/lemoncake
 	name = "Lemon cake"
@@ -55,7 +55,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/lemon
-	category = CAT_CAKE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/chocolatecake
 	name = "Chocolate cake"
@@ -64,7 +64,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/chocolate
-	category = CAT_CAKE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/birthdaycake
 	name = "Birthday cake"
@@ -73,7 +73,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday
-	category = CAT_CAKE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/braincake
 	name = "Brain cake"
@@ -82,7 +82,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/brain
-	category = CAT_CAKE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/slimecake
 	name = "Slime cake"
@@ -91,7 +91,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/slimecake
-	category = CAT_CAKE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/pumpkinspicecake
 	name = "Pumpkin spice cake"
@@ -100,7 +100,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/pumpkinspice
-	category = CAT_CAKE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/cak
 	name = "Living cat/cake hybrid"
@@ -111,7 +111,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 3,
 		/datum/reagent/blood = 30,
 		/datum/reagent/consumable/sprinkles = 5,
-		/datum/reagent/teslium = 1 //To shock the whole thing into life
+		/datum/reagent/toxin/teslium = 1 //To shock the whole thing into life
 	)
 	result = /mob/living/simple_animal/pet/cat/cak
-	category = CAT_CAKE //Cat! Haha, get it? CAT? GET IT???
+	category = CAT_FOOD //Cat! Haha, get it? CAT? GET IT???

code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm

@@ -11,7 +11,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/boiledegg = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/friedegg
-	category = CAT_EGG
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/omelette
 	name = "omelette"
@@ -20,7 +20,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/omelette
-	category = CAT_EGG
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/chocolateegg
 	name = "Chocolate egg"
@@ -29,7 +29,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/chocolateegg
-	category = CAT_EGG
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/eggsbenedict
 	name = "Eggs benedict"
@@ -39,4 +39,4 @@
 		/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 1,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/benedict
-	category = CAT_EGG
+	category = CAT_FOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm

@@ -9,7 +9,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/kebab/human
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/kebab
 	name = "Kebab"
@@ -18,7 +18,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/steak = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/kebab/monkey
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/tofukebab
 	name = "Tofu kebab"
@@ -27,7 +27,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/tofu = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/kebab/tofu
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/tailkebab
 	name = "Lizard tail kebab"
@@ -36,7 +36,7 @@
 		/obj/item/severedtail = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/kebab/tail
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 // see code/module/crafting/table.dm
 
@@ -50,7 +50,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cubancarp
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/fishandchips
 	name = "Fish and chips"
@@ -59,7 +59,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/fishfingers
 	name = "Fish fingers"
@@ -69,7 +69,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/sashimi
 	name = "Sashimi"
@@ -79,7 +79,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/carpmeat = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sashimi
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 ////////////////////////////////////////////////MR SPIDER////////////////////////////////////////////////
 
@@ -91,7 +91,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/spidereggsham
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 ////////////////////////////////////////////////MISC RECIPE's////////////////////////////////////////////////
 
@@ -103,7 +103,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cornedbeef
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/bearsteak
 	name = "Filet migrawr"
@@ -113,7 +113,7 @@
 	)
 	tools = list(/obj/item/weapon/lighter)
 	result = /obj/item/weapon/reagent_containers/food/snacks/bearsteak
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/enchiladas
 	name = "Enchiladas"
@@ -123,7 +123,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/tortilla = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/stewedsoymeat
 	name = "Stewed soymeat"
@@ -133,7 +133,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/sausage
 	name = "Sausage"
@@ -142,7 +142,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sausage
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/nugget
 	name = "Chicken nugget"
@@ -150,7 +150,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/nugget
-	category = CAT_MEAT
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/rawkhinkali
 	name = "Raw Khinkali"
@@ -159,4 +159,4 @@
 		/obj/item/weapon/reagent_containers/food/snacks/faggot = 1
 	)
 	result =  /obj/item/weapon/reagent_containers/food/snacks/rawkhinkali
-	category = CAT_MEAT
+	category = CAT_FOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

@@ -10,7 +10,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/chococoin
 	name = "Choco coin"
@@ -19,7 +19,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/chococoin
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/fudgedice
 	name = "Fudge dice"
@@ -28,7 +28,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/fudgedice
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/chocoorange
 	name = "Choco orange"
@@ -37,7 +37,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/chocoorange
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/loadedbakedpotato
 	name = "Loaded baked potato"
@@ -47,7 +47,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/cheesyfries
 	name = "Cheesy fries"
@@ -56,7 +56,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cheesyfries
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/wrap
 	name = "Wrap"
@@ -65,7 +65,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/eggwrap
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/beans
 	name = "Beans"
@@ -74,7 +74,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/beans
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/eggplantparm
 	name ="Eggplant parmigiana"
@@ -83,7 +83,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/eggplantparm
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/baguette
 	name = "Baguette"
@@ -93,7 +93,7 @@
 				/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/baguette
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 ////////////////////////////////////////////////TOAST////////////////////////////////////////////////
 
@@ -104,7 +104,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/jelliedyoast
 	name = "Jellied toast"
@@ -113,7 +113,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/twobread
 	name = "Two bread"
@@ -122,7 +122,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/twobread
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/burrito
 	name ="Burrito"
@@ -131,7 +131,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/burrito
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/cheesyburrito
 	name ="Cheesy burrito"
@@ -141,7 +141,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cheesyburrito
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/carneburrito
 	name ="Carne de asada burrito"
@@ -151,7 +151,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/carneburrito
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/fuegoburrito
 	name ="Fuego plasma burrito"
@@ -161,7 +161,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/melonfruitbowl
 	name ="Melon fruit bowl"
@@ -174,7 +174,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/melonfruitbowl
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/spacefreezy
 	name ="Space freezy"
@@ -184,7 +184,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/icecream = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/spacefreezy
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/sundae
 	name ="Sundae"
@@ -195,7 +195,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/icecream = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sundae
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/honkdae
 	name ="Honkdae"
@@ -207,7 +207,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/icecream = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/honkdae
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/nachos
 	name ="Nachos"
@@ -216,7 +216,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/tortilla = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/nachos
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/cheesynachos
 	name ="Cheesy nachos"
@@ -226,7 +226,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/tortilla = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cheesynachos
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/cubannachos
 	name ="Cuban nachos"
@@ -236,7 +236,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/tortilla = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cubannachos
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/melonkeg
 	name ="Melon keg"
@@ -247,7 +247,7 @@
 	)
 	parts = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 1)
 	result = /obj/item/weapon/reagent_containers/food/snacks/melonkeg
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/honeybar
 	name = "Honey nut bar"
@@ -256,10 +256,10 @@
 		/datum/reagent/consumable/honey = 5
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/honeybar
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
 
-/datum/crafting_recipe/food/stuffedlegion
+/datum/crafting_recipe/stuffedlegion
 	name = "Stuffed legion"
 	time = 40
 	reqs = list(
@@ -269,10 +269,9 @@
 		/datum/reagent/consumable/capsaicin = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/stuffedlegion
-	category = CAT_MISCFOOD
+	category = CAT_FOOD
 
-
-/datum/crafting_recipe/food/lizardwine
+/datum/crafting_recipe/lizardwine
 	name = "Lizard wine"
 	time = 40
 	reqs = list(
@@ -280,39 +279,4 @@
 		/datum/reagent/consumable/ethanol = 100
 	)
 	result = /obj/item/weapon/reagent_containers/food/drinks/bottle/lizardwine
-	category = CAT_MISCFOOD
-
-
-/datum/crafting_recipe/food/powercrepe
-	name = "Powercrepe"
-	time = 40
-	reqs = list(
-		/obj/item/weapon/reagent_containers/food/snacks/flatdough = 1,
-		/datum/reagent/consumable/milk = 1,
-		/datum/reagent/consumable/cherryjelly = 5,
-		/obj/item/weapon/stock_parts/cell/super =1,
-		/obj/item/weapon/melee/sabre = 1
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/powercrepe
-	category = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/taco
-	name ="Classic Taco"
-	reqs = list(
-		/obj/item/weapon/reagent_containers/food/snacks/tortilla = 1,
-		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1,
-		/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/taco
-	category = CAT_MISCFOOD
-
-/datum/crafting_recipe/food/tacoplain
-	name ="Plain Taco"
-	reqs = list(
-		/obj/item/weapon/reagent_containers/food/snacks/tortilla = 1,
-		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1,
-		/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/taco/plain
-	category = CAT_MISCFOOD
+	category = CAT_FOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm

@@ -11,7 +11,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/donut
 	time = 15
@@ -21,7 +21,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donut
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/jellydonut
 	name = "Jelly donut"
@@ -30,7 +30,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/cherryjellydonut
 	name = "Cherry jelly donut"
@@ -39,7 +39,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/slimejellydonut
 	name = "Slime jelly donut"
@@ -48,7 +48,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/slimejelly
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 ////////////////////////////////////////////////WAFFLES////////////////////////////////////////////////
 
@@ -59,7 +59,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/waffles
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 
 /datum/crafting_recipe/food/soylenviridians
@@ -69,7 +69,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/soylentgreen
 	name = "Soylent green"
@@ -78,7 +78,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 
 /datum/crafting_recipe/food/rofflewaffles
@@ -88,7 +88,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 ////////////////////////////////////////////////DONKPOCCKETS////////////////////////////////////////////////
 
@@ -100,17 +100,8 @@
 		/obj/item/weapon/reagent_containers/food/snacks/faggot = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
-/datum/crafting_recipe/food/dankpocket
-	time = 15
-	name = "Dankpocket"
-	reqs = list(
-		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
-		/obj/item/weapon/reagent_containers/food/snacks/grown/cannabis = 1
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/dankpocket
-	category = CAT_PASTRY
 
 ////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////
 
@@ -122,7 +113,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/muffin
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/berrymuffin
 	name = "Berry muffin"
@@ -132,7 +123,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/berries = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/muffin/berry
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/booberrymuffin
 	name = "Booberry muffin"
@@ -143,7 +134,7 @@
 		/obj/item/weapon/ectoplasm = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/chawanmushi
 	name = "Chawanmushi"
@@ -154,7 +145,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 ////////////////////////////////////////////OTHER////////////////////////////////////////////
 
@@ -166,7 +157,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/sausage = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/hotdog
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/meatbun
 	name = "Meat bun"
@@ -177,7 +168,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/meatbun
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/khachapuri
 	name = "Khachapuri"
@@ -187,7 +178,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/khachapuri
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/sugarcookie
 	time = 15
@@ -197,7 +188,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/fortunecookie
 	time = 15
@@ -210,7 +201,7 @@
 		/obj/item/weapon/paper = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/poppypretzel
 	time = 15
@@ -220,7 +211,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/plumphelmetbiscuit
 	time = 15
@@ -230,7 +221,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/cracker
 	time = 15
@@ -240,7 +231,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cracker
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/chococornet
 	name = "Choco cornet"
@@ -250,7 +241,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/chococornet
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/oatmealcookie
 	name = "Oatmeal cookie"
@@ -268,7 +259,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/oat = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/raisincookie
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/cherrycupcake
 	name = "Cherry cupcake"
@@ -277,7 +268,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/cherrycupcake
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/bluecherrycupcake
 	name = "Blue cherry cupcake"
@@ -286,7 +277,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/bluecherrycupcake
-	category = CAT_PASTRY
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/honeybun
 	name = "Honey bun"
@@ -295,4 +286,4 @@
 		/datum/reagent/consumable/honey = 5
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/honeybun
-	category = CAT_PASTRY
+	category = CAT_FOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm

@@ -11,7 +11,7 @@
 		 /obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/cream
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/meatpie
 	name = "Meat pie"
@@ -22,7 +22,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/meatpie
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/tofupie
 	name = "Tofu pie"
@@ -31,7 +31,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/tofu = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/tofupie
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/xenopie
 	name = "Xeno pie"
@@ -40,7 +40,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/xemeatpie
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/cherrypie
 	name = "Cherry pie"
@@ -49,7 +49,7 @@
 		 /obj/item/weapon/reagent_containers/food/snacks/grown/cherries = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/cherrypie
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/berryclafoutis
 	name = "Berry clafoutis"
@@ -58,7 +58,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/berries = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/berryclafoutis
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/bearypie
 	name = "Beary Pie"
@@ -68,7 +68,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/bearypie
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/amanitapie
 	name = "Amanita pie"
@@ -77,7 +77,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/amanita_pie
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/plumppie
 	name = "Plump pie"
@@ -86,7 +86,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/plump_pie
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/applepie
 	name = "Apple pie"
@@ -95,7 +95,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/applepie
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/pumpkinpie
 	name = "Pumpkin pie"
@@ -106,7 +106,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/pumpkinpie
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/goldenappletart
 	name = "Golden apple tart"
@@ -117,7 +117,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/appletart
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/grapetart
 	name = "Grape tart"
@@ -128,7 +128,7 @@
 	        /obj/item/weapon/reagent_containers/food/snacks/grown/grapes = 3
 	        )
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/grapetart
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/blumpkinpie
 	name = "Blumpkin pie"
@@ -139,7 +139,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/blumpkinpie
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/dulcedebatata
 	name = "Dulce de batata"
@@ -149,7 +149,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/dulcedebatata
-	category = CAT_PIE
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/frostypie
 	name = "Frosty pie"
@@ -158,4 +158,4 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie/frostypie
-	category = CAT_PIE
+	category = CAT_FOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm

@@ -11,7 +11,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pizza/margherita
-	category = CAT_PIZZA
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/meatpizza
 	name = "Meat pizza"
@@ -22,7 +22,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pizza/meat
-	category = CAT_PIZZA
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/mushroompizza
 	name = "Mushroom pizza"
@@ -31,7 +31,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom = 5
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pizza/mushroom
-	category = CAT_PIZZA
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/vegetablepizza
 	name = "Vegetable pizza"
@@ -43,7 +43,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pizza/vegetable
-	category = CAT_PIZZA
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/donpocketpizza
 	name = "Donkpocket pizza"
@@ -54,7 +54,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pizza/donkpocket
-	category = CAT_PIZZA
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/dankpizza
 	name = "Dank pizza"
@@ -65,7 +65,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pizza/dank
-	category = CAT_PIZZA
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/sassysagepizza
 	name = "Sassysage pizza"
@@ -76,4 +76,4 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pizza/sassysage
-	category = CAT_PIZZA
+	category = CAT_FOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm

@@ -11,7 +11,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/salad/herbsalad
-	category = CAT_SALAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/aesirsalad
 	name = "Aesir salad"
@@ -21,7 +21,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/salad/aesirsalad
-	category = CAT_SALAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/validsalad
 	name = "Valid salad"
@@ -32,7 +32,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/faggot = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/salad/validsalad
-	category = CAT_SALAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/monkeysdelight
 	name = "Monkeys delight"
@@ -45,7 +45,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/monkeysdelight
-	category = CAT_SALAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/oatmeal
 	name = "Oatmeal"
@@ -55,7 +55,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/oat = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/salad/oatmeal
-	category = CAT_SALAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/fruitsalad
 	name = "Fruit salad"
@@ -68,7 +68,7 @@
 
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/salad/fruit
-	category = CAT_SALAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/junglesalad
 	name = "Jungle salad"
@@ -81,7 +81,7 @@
 
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/salad/jungle
-	category = CAT_SALAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/citrusdelight
 	name = "Citrus delight"
@@ -93,7 +93,7 @@
 
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/salad/citrusdelight
-	category = CAT_SALAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/ricepork
 	name = "Rice and pork"
@@ -102,7 +102,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/salad/ricepork
-	category = CAT_SALAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/eggbowl
 	name = "Egg bowl"
@@ -113,7 +113,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/corn = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/salad/eggbowl
-	category = CAT_SALAD
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/ricepudding
 	name = "Rice pudding"
@@ -123,4 +123,4 @@
 		/obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/salad/ricepudding
-	category = CAT_SALAD
+	category = CAT_FOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm

@@ -14,7 +14,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sandwich
-	category = CAT_SANDWICH
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/grilledcheesesandwich
 	name = "Grilled cheese sandwich"
@@ -23,7 +23,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/grilledcheese
-	category = CAT_SANDWICH
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/slimesandwich
 	name = "Jelly sandwich"
@@ -32,7 +32,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime
-	category = CAT_SANDWICH
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/cherrysandwich
 	name = "Jelly sandwich"
@@ -41,7 +41,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
-	category = CAT_SANDWICH
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/icecreamsandwich
 	name = "Icecream sandwich"
@@ -51,7 +51,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/icecream = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
-	category = CAT_SANDWICH
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/notasandwich
 	name = "Not a sandwich"
@@ -60,7 +60,7 @@
 		/obj/item/clothing/mask/fakemoustache = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/notasandwich
-	category = CAT_SANDWICH
+	category = CAT_FOOD
 
 
 

code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm

@@ -13,7 +13,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/potato = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/meatball
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/vegetablesoup
 	name = "Vegetable soup"
@@ -26,7 +26,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/potato = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/vegetable
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/nettlesoup
 	name = "Nettle soup"
@@ -38,7 +38,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/boiledegg = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/nettle
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/wingfangchu
 	name = "Wingfangchu"
@@ -48,7 +48,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/wingfangchu
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/wishsoup
 	name = "Wish soup"
@@ -57,7 +57,7 @@
 		/obj/item/weapon/reagent_containers/glass/bowl = 1
 	)
 	result= /obj/item/weapon/reagent_containers/food/snacks/soup/wish
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/hotchili
 	name = "Hot chili"
@@ -68,7 +68,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/hotchili
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/coldchili
 	name = "Cold chili"
@@ -79,7 +79,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/coldchili
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/tomatosoup
 	name = "Tomato soup"
@@ -89,7 +89,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/milosoup
 	name = "Milo soup"
@@ -100,7 +100,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/tofu = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/milo
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/bloodsoup
 	name = "Blood soup"
@@ -110,7 +110,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blood = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/blood
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/slimesoup
 	name = "Slime soup"
@@ -120,7 +120,7 @@
 			/obj/item/weapon/reagent_containers/glass/bowl = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/slime
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/clownstears
 	name = "Clowns tears"
@@ -131,7 +131,7 @@
 		/obj/item/weapon/ore/bananium = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/clownstears
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/mysterysoup
 	name = "Mystery soup"
@@ -144,7 +144,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/mystery
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/mushroomsoup
 	name = "Mushroom soup"
@@ -155,7 +155,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/mushroom
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/beetsoup
 	name = "Beet soup"
@@ -166,7 +166,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/beet
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/stew
 	name = "Stew"
@@ -181,7 +181,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/stew
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/spacylibertyduff
 	name = "Spacy liberty duff"
@@ -191,7 +191,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap = 3
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/spacylibertyduff
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/amanitajelly
 	name = "Amanita jelly"
@@ -201,7 +201,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita = 3
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/amanitajelly
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/sweetpotatosoup
 	name = "Sweet potato soup"
@@ -212,7 +212,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/sweetpotato
-	category = CAT_SOUP
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/redbeetsoup
 	name = "Red beet soup"
@@ -223,4 +223,4 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/beet/red
-	category = CAT_SOUP
+	category = CAT_FOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm

@@ -10,7 +10,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato
-	category = CAT_SPAGHETTI
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/copypasta
 	name = "Copypasta"
@@ -18,7 +18,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/pastatomato = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/copypasta
-	category = CAT_SPAGHETTI
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/spaghettimeatball
 	name = "Spaghetti meatball"
@@ -27,7 +27,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/faggot = 2
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti
-	category = CAT_SPAGHETTI
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/spesslaw
 	name = "Spesslaw"
@@ -36,7 +36,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/faggot = 4
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw
-	category = CAT_SPAGHETTI
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/beefnoodle
 	name = "Beef noodle"
@@ -47,7 +47,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/beefnoodle
-	category = CAT_SPAGHETTI
+	category = CAT_FOOD
 
 /datum/crafting_recipe/food/chowmein
 	name = "Chowmein"
@@ -58,4 +58,4 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/carrot = 1
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/chowmein
-	category = CAT_SPAGHETTI
+	category = CAT_FOOD