Makes food not a subtype of reagent holders (#23379)

* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

code/game/objects/effects/effects.dm

@@ -99,7 +99,7 @@
 		reagents.add_reagent_list(scoop_reagents)
 
 /obj/effect/decal/attackby(obj/item/I, mob/user)
-	if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks))
+	if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks))
 		scoop(I, user)
 	else if(issimulatedturf(loc))
 		I.melee_attack_chain(user, loc)

code/game/objects/effects/meteors.dm

@@ -304,7 +304,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
 	hits = 2
 	heavy = TRUE
 	meteorsound = 'sound/effects/blobattack.ogg'
-	meteordrop = list(/obj/item/reagent_containers/food/snacks/meat/human, /obj/item/organ/internal/heart, /obj/item/organ/internal/lungs, /obj/item/organ/internal/appendix)
+	meteordrop = list(/obj/item/food/snacks/meat/human, /obj/item/organ/internal/heart, /obj/item/organ/internal/lungs, /obj/item/organ/internal/appendix)
 	var/meteorgibs = /obj/effect/gibspawner/generic
 
 /obj/effect/meteor/meaty/make_debris()
@@ -323,7 +323,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
 //Meaty Ore Xeno edition
 /obj/effect/meteor/meaty/xeno
 	color = "#5EFF00"
-	meteordrop = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat)
+	meteordrop = list(/obj/item/food/snacks/monstermeat/xenomeat)
 	meteorgibs = /obj/effect/gibspawner/xeno
 
 /obj/effect/meteor/meaty/xeno/Initialize(mapload, target)
@@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
 	hits = 10
 	hitpwr = EXPLODE_DEVASTATE
 	meteorsound = 'sound/effects/blobattack.ogg'
-	meteordrop = list(/obj/item/reagent_containers/food/snacks/meat)
+	meteordrop = list(/obj/item/food/snacks/meat)
 	var/meteorgibs = /obj/effect/gibspawner/generic
 
 /obj/effect/meteor/goreops/make_debris()
@@ -370,7 +370,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
 	hits = 10
 	heavy = TRUE
 	dropamt = 1
-	meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/reagent_containers/food/snacks/grown/pumpkin)
+	meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/food/snacks/grown/pumpkin)
 
 /obj/effect/meteor/pumpkin/Initialize(mapload, target)
 	. = ..()

code/game/objects/effects/spawners/lootdrop.dm

@@ -421,20 +421,20 @@
 	lootcount = 3
 	lootdoubles = FALSE
 	var/soups = list(
-			/obj/item/reagent_containers/food/snacks/soup/beetsoup,
-			/obj/item/reagent_containers/food/snacks/soup/stew,
-			/obj/item/reagent_containers/food/snacks/soup/hotchili,
-			/obj/item/reagent_containers/food/snacks/soup/nettlesoup,
-			/obj/item/reagent_containers/food/snacks/soup/meatballsoup)
+			/obj/item/food/snacks/soup/beetsoup,
+			/obj/item/food/snacks/soup/stew,
+			/obj/item/food/snacks/soup/hotchili,
+			/obj/item/food/snacks/soup/nettlesoup,
+			/obj/item/food/snacks/soup/meatballsoup)
 	var/salads = list(
-			/obj/item/reagent_containers/food/snacks/salad/herb,
-			/obj/item/reagent_containers/food/snacks/salad/valid,
-			/obj/item/reagent_containers/food/snacks/salad/aesir)
+			/obj/item/food/snacks/salad/herb,
+			/obj/item/food/snacks/salad/valid,
+			/obj/item/food/snacks/salad/aesir)
 	var/mains = list(
-			/obj/item/reagent_containers/food/snacks/enchiladas,
-			/obj/item/reagent_containers/food/snacks/stewedsoymeat,
-			/obj/item/reagent_containers/food/snacks/burger/bigbite,
-			/obj/item/reagent_containers/food/snacks/burger/superbite)
+			/obj/item/food/snacks/enchiladas,
+			/obj/item/food/snacks/stewedsoymeat,
+			/obj/item/food/snacks/burger/bigbite,
+			/obj/item/food/snacks/burger/superbite)
 
 /obj/effect/spawner/lootdrop/three_course_meal/Initialize(mapload)
 	loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1)

code/game/objects/effects/spawners/random_spawners.dm

@@ -266,7 +266,7 @@
 	spawn_inside = null
 	result = list(/datum/nothing = 1,
 		/obj/item/wrench = 1,
-		/obj/item/reagent_containers/food/snacks/syndicake = 1,
+		/obj/item/food/snacks/syndicake = 1,
 		/obj/item/coin/antagtoken/syndicate = 1,
 		/obj/item/gun/projectile/automatic/pistol = 1)
 

code/game/objects/items/granters/action_granters/summon_cheese.dm

@@ -22,7 +22,7 @@
 
 /obj/item/book/granter/spell/summon_cheese/recoil(mob/living/user)
 	to_chat(user, "<span class='warning'>[src] turns into a wedge of cheese!</span>")
-	var/obj/item/reagent_containers/food/snacks/cheesewedge/presliced/book_cheese = new
+	var/obj/item/food/snacks/cheesewedge/presliced/book_cheese = new
 	user.drop_item()
 	user.put_in_hands(book_cheese)
 	qdel(src)
@@ -35,7 +35,7 @@
 	overlay = null
 	action_icon_state = "cheese_wedge"
 	action_background_icon_state = "bg_spell"
-	summon_type = list(/obj/item/reagent_containers/food/snacks/cheesewedge/presliced)
+	summon_type = list(/obj/item/food/snacks/cheesewedge/presliced)
 	summon_amt = 9
 	aoe_range = 1
 	summon_ignore_prev_spawn_points = TRUE

code/game/objects/items/mixing_bowl.dm

@@ -39,7 +39,7 @@
 				return add_item(S, user)
 		else
 			return add_item(I, user)
-	else if(is_type_in_list(I, list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/drinks, /obj/item/reagent_containers/food/condiment)))
+	else if(is_type_in_list(I, list(/obj/item/reagent_containers/glass, /obj/item/reagent_containers/drinks, /obj/item/reagent_containers/condiment)))
 		if(!I.reagents)
 			return 1
 		for(var/datum/reagent/R in I.reagents.reagent_list)
@@ -68,20 +68,20 @@
 		var/list/items_measures_p = new
 		for(var/obj/O in contents)
 			var/display_name = O.name
-			if(istype(O,/obj/item/reagent_containers/food/snacks/egg))
+			if(istype(O,/obj/item/food/snacks/egg))
 				items_measures[display_name] = "egg"
 				items_measures_p[display_name] = "eggs"
-			if(istype(O,/obj/item/reagent_containers/food/snacks/tofu))
+			if(istype(O,/obj/item/food/snacks/tofu))
 				items_measures[display_name] = "tofu chunk"
 				items_measures_p[display_name] = "tofu chunks"
-			if(istype(O,/obj/item/reagent_containers/food/snacks/meat)) //any meat
+			if(istype(O,/obj/item/food/snacks/meat)) //any meat
 				items_measures[display_name] = "slab of meat"
 				items_measures_p[display_name] = "slabs of meat"
-			if(istype(O,/obj/item/reagent_containers/food/snacks/donkpocket))
+			if(istype(O,/obj/item/food/snacks/donkpocket))
 				display_name = "Turnovers"
 				items_measures[display_name] = "turnover"
 				items_measures_p[display_name] = "turnovers"
-			if(istype(O,/obj/item/reagent_containers/food/snacks/carpmeat))
+			if(istype(O,/obj/item/food/snacks/carpmeat))
 				items_measures[display_name] = "fillet of meat"
 				items_measures_p[display_name] = "fillets of meat"
 			items_counts[display_name]++
@@ -165,7 +165,7 @@
 		if(id)
 			amount += reagents.get_reagent_amount(id)
 	reagents.clear_reagents()
-	var/obj/item/reagent_containers/food/snacks/badrecipe/mysteryfood = new(get_turf(source))
+	var/obj/item/food/snacks/badrecipe/mysteryfood = new(get_turf(source))
 	mysteryfood.reagents.add_reagent("carbon", amount)
 	mysteryfood.reagents.add_reagent("????", amount / 10)
 	make_dirty(75)

code/game/objects/items/random_items.dm

@@ -25,11 +25,11 @@
 	new T(loc)
 	qdel(src)
 
-/obj/item/reagent_containers/food/drinks/bottle/random_drink
+/obj/item/reagent_containers/drinks/bottle/random_drink
 	name = "unlabelled drink"
 	icon = 'icons/obj/drinks.dmi'
 
-/obj/item/reagent_containers/food/drinks/bottle/random_drink/Initialize(mapload)
+/obj/item/reagent_containers/drinks/bottle/random_drink/Initialize(mapload)
 	. = ..()
 	var/list/possible_drinks = GLOB.drinks.Copy()
 	if(prob(50))

code/game/objects/items/toys.dm

@@ -68,7 +68,7 @@
 	return
 
 /obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params)
-	if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass))
+	if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/drinks/drinkingglass))
 		if(O.reagents)
 			if(O.reagents.total_volume < 1)
 				to_chat(user, "[O] is empty.")
@@ -781,8 +781,8 @@
 	item_state = "plushie_ipc"
 
 /obj/item/toy/plushie/ipcplushie/attackby(obj/item/B, mob/user, params)
-	if(istype(B, /obj/item/reagent_containers/food/snacks/breadslice))
-		new /obj/item/reagent_containers/food/snacks/toast(get_turf(loc))
+	if(istype(B, /obj/item/food/snacks/breadslice))
+		new /obj/item/food/snacks/toast(get_turf(loc))
 		to_chat(user, "<span class='notice'> You insert bread into the toaster. </span>")
 		playsound(loc, 'sound/machines/ding.ogg', 50, 1)
 		qdel(B)

code/game/objects/items/weapons/RSF.dm

@@ -22,15 +22,15 @@
 		to_chat(user, "<span class='notice'>Choose an item to dispense!</span>")
 	else
 		to_chat(user, "<span class='notice'>You are currently dispensing a [initial(currently_dispensing.name)].</span>")
-	var/static/list/rsf_items = list("Drinking Glass" = /obj/item/reagent_containers/food/drinks/drinkingglass,
+	var/static/list/rsf_items = list("Drinking Glass" = /obj/item/reagent_containers/drinks/drinkingglass,
 							"Paper" = /obj/item/paper,
 							"Pen" = /obj/item/pen,
 							"Dice Pack" = /obj/item/storage/bag/dice,
 							"Cigarette" = /obj/item/clothing/mask/cigarette,
-							"Newdles" = /obj/item/reagent_containers/food/snacks/chinese/newdles,
-							"Donut" = /obj/item/reagent_containers/food/snacks/donut,
-							"Chicken Soup" = /obj/item/reagent_containers/food/drinks/chicken_soup,
-							"Tofu Burger" = /obj/item/reagent_containers/food/snacks/burger/tofu)
+							"Newdles" = /obj/item/food/snacks/chinese/newdles,
+							"Donut" = /obj/item/food/snacks/donut,
+							"Chicken Soup" = /obj/item/reagent_containers/drinks/chicken_soup,
+							"Tofu Burger" = /obj/item/food/snacks/burger/tofu)
 	var/static/list/rsf_icons = list("Drinking Glass" = image(icon = 'icons/obj/drinks.dmi', icon_state = "glass_empty"),
 							"Paper" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "paper"),
 							"Pen" = image(icon = 'icons/obj/bureaucracy.dmi', icon_state = "pen"),

code/game/objects/items/weapons/cigs.dm

@@ -534,8 +534,8 @@ LIGHTERS ARE IN LIGHTERS.DM
 /obj/item/rollingpaper/afterattack(atom/target, mob/user, proximity)
 	if(!proximity)
 		return
-	if(istype(target, /obj/item/reagent_containers/food/snacks/grown))
-		var/obj/item/reagent_containers/food/snacks/grown/O = target
+	if(istype(target, /obj/item/food/snacks/grown))
+		var/obj/item/food/snacks/grown/O = target
 		if(O.dry)
 			user.unEquip(target, 1)
 			user.unEquip(src, 1)

code/game/objects/items/weapons/dice.dm

@@ -225,7 +225,7 @@
 		if(11)
 			//Cookie
 			T.visible_message("<span class='userdanger'>A cookie appears out of thin air!</span>")
-			var/obj/item/reagent_containers/food/snacks/cookie/C = new(drop_location())
+			var/obj/item/food/snacks/cookie/C = new(drop_location())
 			create_smoke(2)
 			C.name = "Cookie of Fate"
 		if(12)

code/game/objects/items/weapons/gift_wrappaper.dm

@@ -79,8 +79,8 @@
 		/obj/random/mech,
 		/obj/item/toy/spinningtoy,
 		/obj/item/toy/sword,
-		/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus,
-		/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
+		/obj/item/food/snacks/grown/ambrosia/deus,
+		/obj/item/food/snacks/grown/ambrosia/vulgaris,
 		/obj/item/paicard,
 		/obj/item/instrument/violin,
 		/obj/item/instrument/guitar,

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -324,8 +324,8 @@
 	desc = "A custom made large grenade. It affects a larger area."
 	icon_state = "large_grenade"
 	bomb_state = "largebomb"
-	allowed_containers = list(/obj/item/reagent_containers/glass,/obj/item/reagent_containers/food/condiment,
-								/obj/item/reagent_containers/food/drinks)
+	allowed_containers = list(/obj/item/reagent_containers/glass,/obj/item/reagent_containers/condiment,
+								/obj/item/reagent_containers/drinks)
 	origin_tech = "combat=3;engineering=3"
 	affected_area = 5
 	ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades.

code/game/objects/items/weapons/grenades/clusterbuster.dm

@@ -141,7 +141,7 @@
 
 /obj/item/grenade/clusterbuster/booze
 	name = "\improper Booze Grenade"
-	payload = /obj/item/reagent_containers/food/drinks/bottle/random_drink
+	payload = /obj/item/reagent_containers/drinks/bottle/random_drink
 
 /obj/item/grenade/clusterbuster/honk
 	name = "\improper Mega Honk Grenade"

code/game/objects/items/weapons/grenades/ghettobomb.dm

@@ -27,7 +27,7 @@
 
 /obj/item/grenade/iedcasing/CheckParts(list/parts_list)
 	..()
-	var/obj/item/reagent_containers/food/drinks/cans/can = locate() in contents
+	var/obj/item/reagent_containers/drinks/cans/can = locate() in contents
 	if(can)
 		can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED
 		can.pixel_y = 0

code/game/objects/items/weapons/kitchen.dm

@@ -57,7 +57,7 @@
 			return ..()
 
 	if(length(contents))
-		var/obj/item/reagent_containers/food/snacks/toEat = contents[1]
+		var/obj/item/food/snacks/toEat = contents[1]
 		if(istype(toEat))
 			if(C.eat(toEat, user))
 				toEat.On_Consume(C, user)

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

@@ -116,12 +116,12 @@
 	new /obj/item/radio/headset/headset_service(src)
 	new /obj/item/pda/clown(src)
 	new /obj/item/storage/box/survival(src)
-	new /obj/item/reagent_containers/food/snacks/grown/banana(src)
+	new /obj/item/food/snacks/grown/banana(src)
 	new /obj/item/stamp/clown(src)
 	new /obj/item/toy/crayon/rainbow(src)
 	new /obj/item/storage/fancy/crayons(src)
 	new /obj/item/reagent_containers/spray/waterflower(src)
-	new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
+	new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(src)
 	new /obj/item/instrument/bikehorn(src)
 	new /obj/item/bikehorn(src)
 	new /obj/item/dnainjector/comic(src)
@@ -717,7 +717,7 @@
 		/obj/item/organ/internal/heart/cursed/wizard = 1,
 		/obj/item/organ/internal/vocal_cords/colossus/wizard = 2,
 		/obj/item/warp_cube/red = 1,
-		/obj/item/reagent_containers/food/drinks/everfull = 2,
+		/obj/item/reagent_containers/drinks/everfull = 2,
 		/obj/item/clothing/suit/space/hardsuit/shielded/wizard = 2,
 		/obj/item/immortality_talisman = 1 ) //spells recharge when invincible
 	var/obj/item/pickeda = pick(list_a)
@@ -749,7 +749,7 @@
 			value += 1
 		if(8)
 			if(prob(25))
-				new /obj/item/reagent_containers/food/snacks/grown/nymph_pod(src)
+				new /obj/item/food/snacks/grown/nymph_pod(src)
 				new /obj/item/slimepotion/sentience(src)
 			else
 				new /obj/item/paicard(src) //Still useful, not a point useful.
@@ -757,10 +757,10 @@
 	//Treat / potion. Free.
 	var/obj/item/pickedt = pick(
 			/obj/item/storage/box/syndidonkpockets, // Healing + speed
-			/obj/item/reagent_containers/food/drinks/bottle/dragonsbreath, // Killing
-			/obj/item/reagent_containers/food/drinks/bottle/immortality, // Super healing for 20 seconds
-			/obj/item/reagent_containers/food/snacks/meatsteak/stimulating, //Healing + stun immunity
-			/obj/item/reagent_containers/food/snacks/plum_pie ) // Great healing over long period of time
+			/obj/item/reagent_containers/drinks/bottle/dragonsbreath, // Killing
+			/obj/item/reagent_containers/drinks/bottle/immortality, // Super healing for 20 seconds
+			/obj/item/food/snacks/meatsteak/stimulating, //Healing + stun immunity
+			/obj/item/food/snacks/plum_pie ) // Great healing over long period of time
 	new pickedt(src)
 
 
@@ -774,7 +774,7 @@
 #undef NANNY_MAX_VALUE
 #undef NANNY_MIN_VALUE
 
-/obj/item/reagent_containers/food/drinks/bottle/dragonsbreath
+/obj/item/reagent_containers/drinks/bottle/dragonsbreath
 	name = "flask of dragons breath"
 	desc = "Not recommended for wizardly consumption. Recommended for mundane consumption!"
 	icon_state = "holyflask"
@@ -782,7 +782,7 @@
 	volume = 100
 	list_reagents = list("dragonsbreath" = 80, "hell_water" = 20)
 
-/obj/item/reagent_containers/food/drinks/bottle/immortality
+/obj/item/reagent_containers/drinks/bottle/immortality
 	name = "drop of immortality"
 	desc = "Drinking this will make you immortal. For a moment or two, at least."
 	icon_state = "holyflask"
@@ -790,13 +790,13 @@
 	volume = 5
 	list_reagents = list("adminordrazine" = 5)
 
-/obj/item/reagent_containers/food/snacks/meatsteak/stimulating
+/obj/item/food/snacks/meatsteak/stimulating
 	name = "stimulating steak"
 	desc = "Stimulate your senses."
 	list_reagents = list("nutriment" = 5, "stimulants" = 25)
 	bitesize = 100
 
-/obj/item/reagent_containers/food/snacks/plum_pie
+/obj/item/food/snacks/plum_pie
 	name = "perfect plum pie"
 	desc = "The Jack Horner brand of pie. 2 big thumbs up."
 	icon = 'icons/obj/food/bakedgoods.dmi'

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

@@ -206,7 +206,7 @@
 	max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
 	max_w_class = WEIGHT_CLASS_NORMAL
 	w_class = WEIGHT_CLASS_TINY
-	can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/food/snacks/grown/ash_flora,/obj/item/reagent_containers/food/snacks/honeycomb)
+	can_hold = list(/obj/item/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/food/snacks/grown/ash_flora,/obj/item/food/snacks/honeycomb)
 	resistance_flags = FLAMMABLE
 
 /obj/item/storage/bag/plants/portaseeder
@@ -497,7 +497,7 @@
 
 
 /obj/item/storage/bag/tray/cookies_tray
-	var/cookie = /obj/item/reagent_containers/food/snacks/cookie
+	var/cookie = /obj/item/food/snacks/cookie
 
 /obj/item/storage/bag/tray/cookies_tray/populate_contents() // By Azule Utama, thank you a lot!
 	for(var/i in 1 to 6)
@@ -506,7 +506,7 @@
 	update_icon(UPDATE_OVERLAYS)
 
 /obj/item/storage/bag/tray/cookies_tray/sugarcookie
-	cookie = /obj/item/reagent_containers/food/snacks/sugarcookie
+	cookie = /obj/item/food/snacks/sugarcookie
 
 /*
  *	Chemistry bag
@@ -537,7 +537,7 @@
 	storage_slots = 25
 	max_combined_w_class = 200
 	w_class = WEIGHT_CLASS_TINY
-	can_hold = list(/obj/item/slime_extract, /obj/item/reagent_containers/food/snacks/monkeycube,
+	can_hold = list(/obj/item/slime_extract, /obj/item/food/snacks/monkeycube,
 					/obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker,
 					/obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/iv_bag,
 					/obj/item/reagent_containers/hypospray/autoinjector/epinephrine)

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

@@ -278,7 +278,7 @@
 		/obj/item/clothing/glasses,
 		/obj/item/ammo_casing/shotgun,
 		/obj/item/ammo_box,
-		/obj/item/reagent_containers/food/snacks/donut,
+		/obj/item/food/snacks/donut,
 		/obj/item/kitchen/knife/combat,
 		/obj/item/melee/baton,
 		/obj/item/melee/classic_baton,
@@ -329,7 +329,7 @@
 		/obj/item/clothing/glasses,
 		/obj/item/ammo_casing/shotgun,
 		/obj/item/ammo_box,
-		/obj/item/reagent_containers/food/snacks/donut,
+		/obj/item/food/snacks/donut,
 		/obj/item/kitchen/knife/combat,
 		/obj/item/melee/baton,
 		/obj/item/melee/classic_baton,
@@ -420,7 +420,7 @@
 	can_hold = list(
 		/obj/item/grenade,
 		/obj/item/lighter,
-		/obj/item/reagent_containers/food/drinks/bottle/molotov
+		/obj/item/reagent_containers/drinks/bottle/molotov
 		)
 
 /obj/item/storage/belt/grenade/full/populate_contents()
@@ -919,7 +919,7 @@
 		/obj/item/stack/sheet/bone,
 		/obj/item/lighter,
 		/obj/item/storage/fancy/cigarettes,
-		/obj/item/reagent_containers/food/drinks/bottle,
+		/obj/item/reagent_containers/drinks/bottle,
 		/obj/item/stack/medical,
 		/obj/item/kitchen/knife,
 		/obj/item/reagent_containers/hypospray,
@@ -930,7 +930,7 @@
 		/obj/item/reagent_containers/pill,
 		/obj/item/storage/pill_bottle,
 		/obj/item/stack/ore,
-		/obj/item/reagent_containers/food/drinks,
+		/obj/item/reagent_containers/drinks,
 		/obj/item/organ/internal/regenerative_core,
 		/obj/item/wormhole_jaunter,
 		/obj/item/storage/bag/plants,
@@ -968,11 +968,11 @@
 		/obj/item/kitchen/cutter,
 		/obj/item/assembly/mousetrap,
 		/obj/item/reagent_containers/spray/pestspray,
-		/obj/item/reagent_containers/food/drinks/flask,
-		/obj/item/reagent_containers/food/drinks/drinkingglass,
-		/obj/item/reagent_containers/food/drinks/bottle,
-		/obj/item/reagent_containers/food/drinks/cans,
-		/obj/item/reagent_containers/food/drinks/shaker,
-		/obj/item/reagent_containers/food/snacks,
-		/obj/item/reagent_containers/food/condiment,
+		/obj/item/reagent_containers/drinks/flask,
+		/obj/item/reagent_containers/drinks/drinkingglass,
+		/obj/item/reagent_containers/drinks/bottle,
+		/obj/item/reagent_containers/drinks/cans,
+		/obj/item/reagent_containers/drinks/shaker,
+		/obj/item/food/snacks,
+		/obj/item/reagent_containers/condiment,
 		/obj/item/reagent_containers/glass/beaker)

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

@@ -58,8 +58,8 @@
 	icon_state ="bible"
 
 /obj/item/storage/bible/booze/populate_contents()
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)
 	new /obj/item/stack/spacecash(src)
 	new /obj/item/stack/spacecash(src)
 	new /obj/item/stack/spacecash(src)

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

@@ -302,7 +302,7 @@
 
 /obj/item/storage/box/cups/populate_contents()
 	for(var/I in 1 to 7)
-		new /obj/item/reagent_containers/food/drinks/sillycup(src)
+		new /obj/item/reagent_containers/drinks/sillycup(src)
 
 /obj/item/storage/box/drinkingglasses
 	name = "box of drinking glasses"
@@ -310,7 +310,7 @@
 
 /obj/item/storage/box/drinkingglasses/populate_contents()
 	for(var/I in 1 to 6)
-		new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
+		new /obj/item/reagent_containers/drinks/drinkingglass(src)
 
 /obj/item/storage/box/condimentbottles
 	name = "box of condiment bottles"
@@ -318,7 +318,7 @@
 
 /obj/item/storage/box/condimentbottles/populate_contents()
 	for(var/I in 1 to 6)
-		new /obj/item/reagent_containers/food/condiment(src)
+		new /obj/item/reagent_containers/condiment(src)
 
 /obj/item/storage/box/mousetraps
 	name = "box of Pest-B-Gon mousetraps"
@@ -424,9 +424,9 @@
 	desc = "A box intended for experienced chefs."
 
 /obj/item/storage/box/chef_rare_ingredients_kit/populate_contents()
-	new /obj/item/reagent_containers/food/condiment/soysauce(src)
-	new /obj/item/reagent_containers/food/condiment/enzyme(src)
-	new /obj/item/reagent_containers/food/condiment/pack/hotsauce(src)
+	new /obj/item/reagent_containers/condiment/soysauce(src)
+	new /obj/item/reagent_containers/condiment/enzyme(src)
+	new /obj/item/reagent_containers/condiment/pack/hotsauce(src)
 	new /obj/item/kitchen/knife/butcher(src)
 	var/list/reagent_list = list("msg", "triple_citrus", "salglu_solution", "nutriment", "gravy", "honey", "vitfro")
 	for(var/reag in reagent_list)
@@ -490,8 +490,8 @@
 	desc = "Drymate brand monkey cubes. Just add water!"
 	icon_state = "monkey_box"
 	storage_slots = 7
-	can_hold = list(/obj/item/reagent_containers/food/snacks/monkeycube)
-	var/monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
+	can_hold = list(/obj/item/food/snacks/monkeycube)
+	var/monkey_cube_type = /obj/item/food/snacks/monkeycube
 
 /obj/item/storage/box/monkeycubes/populate_contents()
 	for(var/I in 1 to 5)
@@ -499,31 +499,31 @@
 
 /obj/item/storage/box/monkeycubes/syndicate
 	desc = "Waffle Co. brand monkey cubes. Just add water and a dash of subterfuge!"
-	monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/syndicate
+	monkey_cube_type = /obj/item/food/snacks/monkeycube/syndicate
 
 /obj/item/storage/box/monkeycubes/farwacubes
 	name = "farwa cube box"
 	desc = "Drymate brand farwa cubes. Just add water!"
 	icon_state = "farwa_box"
-	monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
+	monkey_cube_type = /obj/item/food/snacks/monkeycube/farwacube
 
 /obj/item/storage/box/monkeycubes/stokcubes
 	name = "stok cube box"
 	desc = "Drymate brand stok cubes. Just add water!"
 	icon_state = "stok_box"
-	monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube
+	monkey_cube_type = /obj/item/food/snacks/monkeycube/stokcube
 
 /obj/item/storage/box/monkeycubes/neaeracubes
 	name = "neaera cube box"
 	desc = "Drymate brand neaera cubes. Just add water!"
 	icon_state = "neaera_box"
-	monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
+	monkey_cube_type = /obj/item/food/snacks/monkeycube/neaeracube
 
 /obj/item/storage/box/monkeycubes/wolpincubes
 	name = "wolpin cube box"
 	desc = "Drymate brand wolpin cubes. Just add water!"
 	icon_state = "wolpin_box"
-	monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
+	monkey_cube_type = /obj/item/food/snacks/monkeycube/wolpincube
 
 ///////////////////
 /* Medical Boxes */
@@ -864,14 +864,14 @@
 	icon_state = "donk_box"
 	storage_slots = 6
 	can_hold = list(
-		/obj/item/reagent_containers/food/snacks/donkpocket,
-		/obj/item/reagent_containers/food/snacks/warmdonkpocket,
-		/obj/item/reagent_containers/food/snacks/warmdonkpocket_weak,
-		/obj/item/reagent_containers/food/snacks/syndidonkpocket)
+		/obj/item/food/snacks/donkpocket,
+		/obj/item/food/snacks/warmdonkpocket,
+		/obj/item/food/snacks/warmdonkpocket_weak,
+		/obj/item/food/snacks/syndidonkpocket)
 
 /obj/item/storage/box/donkpockets/populate_contents()
 	for(var/I in 1 to 6)
-		new /obj/item/reagent_containers/food/snacks/donkpocket(src)
+		new /obj/item/food/snacks/donkpocket(src)
 
 /obj/item/storage/box/donkpockets/empty/populate_contents()
 	return
@@ -883,7 +883,7 @@
 
 /obj/item/storage/box/syndidonkpockets/populate_contents()
 	for(var/I in 1 to 6)
-		new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
+		new /obj/item/food/snacks/syndidonkpocket(src)
 
 ////////////////
 /* Misc Boxes */

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

@@ -41,7 +41,7 @@
 	icon_type = "donut"
 	icon_state = "donutbox"
 	storage_slots = 6
-	can_hold = list(/obj/item/reagent_containers/food/snacks/donut)
+	can_hold = list(/obj/item/food/snacks/donut)
 	icon_type = "donut"
 	foldable = /obj/item/stack/sheet/cardboard
 	foldable_amt = 1
@@ -49,7 +49,7 @@
 /obj/item/storage/fancy/donut_box/update_overlays()
 	. = ..()
 	for(var/I = 1 to length(contents))
-		var/obj/item/reagent_containers/food/snacks/donut/donut = contents[I]
+		var/obj/item/food/snacks/donut/donut = contents[I]
 		var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "[(I - 1)]donut[donut.donut_sprite_type]")
 		. += new_donut_icon
 
@@ -58,7 +58,7 @@
 
 /obj/item/storage/fancy/donut_box/populate_contents()
 	for(var/I in 1 to storage_slots)
-		new /obj/item/reagent_containers/food/snacks/donut(src)
+		new /obj/item/food/snacks/donut(src)
 	update_icon(UPDATE_OVERLAYS)
 
 /obj/item/storage/fancy/donut_box/empty/populate_contents()
@@ -82,11 +82,11 @@
 	item_state = "eggbox"
 	name = "egg box"
 	storage_slots = 12
-	can_hold = list(/obj/item/reagent_containers/food/snacks/egg)
+	can_hold = list(/obj/item/food/snacks/egg)
 
 /obj/item/storage/fancy/egg_box/populate_contents()
 	for(var/I in 1 to storage_slots)
-		new /obj/item/reagent_containers/food/snacks/egg(src)
+		new /obj/item/food/snacks/egg(src)
 
 /*
  * Candle Box

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

@@ -68,7 +68,7 @@
 		/obj/item/storage/box/syndie_kit/emp, // 10TC
 		/obj/item/clothing/glasses/hud/security/chameleon, // 10TC
 		/obj/item/encryptionkey/syndicate, // 10TC
-		/obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail,	// 0TC
+		/obj/item/reagent_containers/drinks/drinkingglass/alliescocktail,	// 0TC
 		/obj/item/storage/box/syndie_kit/pen_bomb, // 30 TC
 		/obj/item/CQC_manual) // 13TC
 
@@ -310,9 +310,9 @@
 	name = "combat bakery kit"
 
 /obj/item/storage/box/syndie_kit/combat_baking/populate_contents()
-	new /obj/item/reagent_containers/food/snacks/baguette/combat(src)
+	new /obj/item/food/snacks/baguette/combat(src)
 	for(var/i in 1 to 2)
-		new /obj/item/reagent_containers/food/snacks/croissant/throwing(src)
+		new /obj/item/food/snacks/croissant/throwing(src)
 	new /obj/item/book/granter/crafting_recipe/combat_baking(src)
 
 /obj/item/storage/box/syndie_kit/atmosn2ogrenades

code/game/objects/mail.dm

@@ -56,13 +56,13 @@
 
 /obj/item/envelope/security
 	icon_state = "mail_sec"
-	possible_contents = list(/obj/item/reagent_containers/food/snacks/donut/sprinkles,
+	possible_contents = list(/obj/item/food/snacks/donut/sprinkles,
 							/obj/item/megaphone,
 							/obj/item/clothing/mask/whistle,
 							/obj/item/poster/random_official,
 							/obj/item/restraints/handcuffs/pinkcuffs,
 							/obj/item/restraints/legcuffs/bola/energy,
-							/obj/item/reagent_containers/food/drinks/coffee,
+							/obj/item/reagent_containers/drinks/coffee,
 							/obj/item/stock_parts/cell/super,
 							/obj/item/grenade/barrier/dropwall,
 							/obj/item/toy/figure/crew/detective,
@@ -92,7 +92,7 @@
 /obj/item/envelope/supply
 	icon_state = "mail_sup"
 	possible_contents = list(/obj/item/reagent_containers/hypospray/autoinjector/survival,
-							/obj/item/reagent_containers/food/drinks/bottle/absinthe/premium,
+							/obj/item/reagent_containers/drinks/bottle/absinthe/premium,
 							/obj/item/clothing/glasses/meson/gar,
 							/obj/item/stack/marker_beacon/ten,
 							/obj/item/stack/medical/splint,
@@ -113,7 +113,7 @@
 							/obj/item/reagent_containers/applicator/brute,
 							/obj/item/reagent_containers/applicator/burn,
 							/obj/item/clothing/glasses/sunglasses,
-							/obj/item/reagent_containers/food/snacks/fortunecookie,
+							/obj/item/food/snacks/fortunecookie,
 							/obj/item/scalpel/laser/laser1,
 							/obj/item/toy/figure/crew/cmo,
 							/obj/item/toy/figure/crew/chemist,
@@ -126,8 +126,8 @@
 /obj/item/envelope/engineering
 	icon_state = "mail_eng"
 	possible_contents = list(/obj/item/airlock_electronics,
-							/obj/item/reagent_containers/food/drinks/cans/beer,
-							/obj/item/reagent_containers/food/snacks/candy/confectionery/nougat,
+							/obj/item/reagent_containers/drinks/cans/beer,
+							/obj/item/food/snacks/candy/confectionery/nougat,
 							/obj/item/mod/module/storage/large_capacity,
 							/obj/item/weldingtool/hugetank,
 							/obj/item/geiger_counter,
@@ -143,7 +143,7 @@
 	icon_state = "mail_serv"
 	possible_contents = list(/obj/item/painter,
 							/obj/item/gun/energy/floragun,
-							/obj/item/reagent_containers/food/drinks/bottle/fernet,
+							/obj/item/reagent_containers/drinks/bottle/fernet,
 							/obj/item/whetstone,
 							/obj/item/soap/deluxe,
 							/obj/item/stack/tile/disco_light/thirty,
@@ -162,7 +162,7 @@
 	possible_contents = list(/obj/item/painter,
 							/obj/item/stack/sheet/mineral/tranquillite/ten,
 							/obj/item/stack/sheet/mineral/bananium/ten,
-							/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
+							/obj/item/reagent_containers/drinks/bottle/bottleofnothing,
 							/obj/item/gun/throw/piecannon,
 							/obj/item/ammo_box/shotgun/confetti,
 							/obj/item/book/manual/wiki/sop_security, // They'll need this.
@@ -183,7 +183,7 @@
 							/obj/item/book/manual/wiki/sop_command,
 							/obj/item/reagent_containers/patch/synthflesh,
 							/obj/item/paper_bin/nanotrasen,
-							/obj/item/reagent_containers/food/snacks/spesslaw,
+							/obj/item/food/snacks/spesslaw,
 							/obj/item/clothing/head/collectable/petehat,
 							/obj/item/toy/figure/crew/captain,
 							/obj/item/toy/figure/crew/lawyer,

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

@@ -11,13 +11,13 @@
 	close_sound_volume = 50
 
 /obj/structure/closet/secure_closet/bar/populate_contents()
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
-	new /obj/item/reagent_containers/food/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)
+	new /obj/item/reagent_containers/drinks/cans/beer(src)

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

@@ -27,7 +27,7 @@
 	new /obj/item/clothing/accessory/medal/supply(src)
 	new /obj/item/rcs(src)
 	new /obj/item/destTagger(src)
-	new /obj/item/reagent_containers/food/drinks/mug/qm(src)
+	new /obj/item/reagent_containers/drinks/mug/qm(src)
 	new /obj/item/flash(src)
 	new /obj/item/cartridge/qm(src)
 	new /obj/item/storage/bag/mail(src)

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

@@ -24,7 +24,7 @@
 	new /obj/item/clothing/glasses/meson/engine(src)
 	new /obj/item/door_remote/chief_engineer(src)
 	new /obj/item/rpd(src)
-	new /obj/item/reagent_containers/food/drinks/mug/ce(src)
+	new /obj/item/reagent_containers/drinks/mug/ce(src)
 	new /obj/item/organ/internal/eyes/cybernetic/meson(src)
 	new /obj/item/clothing/accessory/medal/engineering(src)
 	new /obj/item/holosign_creator/atmos(src)

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

@@ -15,9 +15,9 @@
 
 /obj/structure/closet/secure_closet/freezer/kitchen/populate_contents()
 	for(var/i in 1 to 3)
-		new /obj/item/reagent_containers/food/condiment/flour(src)
-	new /obj/item/reagent_containers/food/condiment/rice(src)
-	new /obj/item/reagent_containers/food/condiment/sugar(src)
+		new /obj/item/reagent_containers/condiment/flour(src)
+	new /obj/item/reagent_containers/condiment/rice(src)
+	new /obj/item/reagent_containers/condiment/sugar(src)
 
 
 /obj/structure/closet/secure_closet/freezer/kitchen/mining
@@ -30,9 +30,9 @@
 
 /obj/structure/closet/secure_closet/freezer/kitchen/maintenance/populate_contents()
 	for(var/i = 0, i < 5, i++)
-		new /obj/item/reagent_containers/food/condiment/milk(src)
+		new /obj/item/reagent_containers/condiment/milk(src)
 	for(var/i = 0, i < 5, i++)
-		new /obj/item/reagent_containers/food/condiment/soymilk(src)
+		new /obj/item/reagent_containers/condiment/soymilk(src)
 	for(var/i = 0, i < 2, i++)
 		new /obj/item/storage/fancy/egg_box(src)
 
@@ -43,7 +43,7 @@
 
 /obj/structure/closet/secure_closet/freezer/meat/populate_contents()
 	for(var/i in 1 to 4)
-		new /obj/item/reagent_containers/food/snacks/meat/monkey(src)
+		new /obj/item/food/snacks/meat/monkey(src)
 
 /obj/structure/closet/secure_closet/freezer/meat/open
 	req_access = null
@@ -56,8 +56,8 @@
 
 /obj/structure/closet/secure_closet/freezer/fridge/populate_contents()
 	for(var/i in 1 to 5)
-		new /obj/item/reagent_containers/food/condiment/milk(src)
-		new /obj/item/reagent_containers/food/condiment/soymilk(src)
+		new /obj/item/reagent_containers/condiment/milk(src)
+		new /obj/item/reagent_containers/condiment/soymilk(src)
 	for(var/i in 1 to 2)
 		new /obj/item/storage/fancy/egg_box(src)
 

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

@@ -135,7 +135,7 @@
 	new /obj/item/storage/pill_bottle/psychiatrist(src)
 	new /obj/random/plushie(src)
 	for(var/i in 0 to 3)
-		var/candy = pick(subtypesof(/obj/item/reagent_containers/food/snacks/candy/fudge))
+		var/candy = pick(subtypesof(/obj/item/food/snacks/candy/fudge))
 		new candy(src)
 
 /obj/structure/closet/secure_closet/CMO
@@ -163,7 +163,7 @@
 	new /obj/item/reagent_containers/hypospray/CMO(src)
 	new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src)
 	new /obj/item/door_remote/chief_medical_officer(src)
-	new /obj/item/reagent_containers/food/drinks/mug/cmo(src)
+	new /obj/item/reagent_containers/drinks/mug/cmo(src)
 	new /obj/item/clothing/accessory/medal/medical(src)
 	new /obj/item/storage/briefcase(src)
 	new /obj/item/clothing/mask/gas(src)

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

@@ -17,7 +17,7 @@
 	new /obj/item/clown_recorder(src)
 	new /obj/item/bikehorn(src)
 	new /obj/item/reagent_containers/spray/waterflower(src)
-	new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
+	new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(src)
 	new /obj/item/toy/crayon/rainbow(src)
 	new /obj/item/seeds/banana(src)
 	new /obj/item/restraints/handcuffs/toy(src)
@@ -44,7 +44,7 @@
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/storage/backpack/mime(src)
 	new /obj/item/toy/crayon/mime(src)
-	new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)
+	new /obj/item/reagent_containers/drinks/bottle/bottleofnothing(src)
 	new /obj/item/cane(src)
 
 /obj/structure/closet/secure_closet/syndicate_officer

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

@@ -57,7 +57,7 @@
 	new /obj/item/flash(src)
 	new /obj/item/laser_pointer(src)
 	new /obj/item/door_remote/research_director(src)
-	new /obj/item/reagent_containers/food/drinks/mug/rd(src)
+	new /obj/item/reagent_containers/drinks/mug/rd(src)
 	new /obj/item/organ/internal/cyberimp/eyes/hud/diagnostic(src)
 	new /obj/item/clothing/accessory/medal/science(src)
 

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

@@ -18,7 +18,7 @@
 	new /obj/item/gun/energy/gun(src)
 	new /obj/item/flash(src)
 	new /obj/item/door_remote/captain(src)
-	new /obj/item/reagent_containers/food/drinks/mug/cap(src)
+	new /obj/item/reagent_containers/drinks/mug/cap(src)
 	new /obj/item/tank/internals/emergency_oxygen/double(src)
 
 /obj/structure/closet/secure_closet/hop
@@ -35,7 +35,7 @@
 	new /obj/item/gun/energy/gun/mini(src)
 	new /obj/item/flash(src)
 	new /obj/item/door_remote/civillian(src)
-	new /obj/item/reagent_containers/food/drinks/mug/hop(src)
+	new /obj/item/reagent_containers/drinks/mug/hop(src)
 	new /obj/item/clothing/accessory/medal/service(src)
 	new /obj/item/storage/bag/garment/head_of_personnel(src)
 
@@ -62,10 +62,10 @@
 	new /obj/item/storage/belt/security/full(src)
 	new /obj/item/gun/energy/gun/hos(src)
 	new /obj/item/door_remote/head_of_security(src)
-	new /obj/item/reagent_containers/food/drinks/mug/hos(src)
+	new /obj/item/reagent_containers/drinks/mug/hos(src)
 	new /obj/item/organ/internal/cyberimp/eyes/hud/security(src)
 	new /obj/item/clothing/accessory/medal/security(src)
-	new /obj/item/reagent_containers/food/drinks/flask/barflask(src)
+	new /obj/item/reagent_containers/drinks/flask/barflask(src)
 	new /obj/item/clothing/mask/gas/sechailer(src)
 
 /obj/structure/closet/secure_closet/warden

code/game/objects/structures/statues.dm

@@ -332,7 +332,7 @@
 	desc = "Just like the ones you remember from childhood!"
 
 /obj/structure/snowman/built/Destroy()
-	new /obj/item/reagent_containers/food/snacks/grown/carrot(drop_location())
+	new /obj/item/food/snacks/grown/carrot(drop_location())
 	new /obj/item/grown/log(drop_location())
 	new /obj/item/grown/log(drop_location())
 	return ..()