is this really that fucking esoteric

code/game/machinery/biogenerator.dm

@@ -67,7 +67,7 @@
 
 /singleton/biorecipe/food/milk
 	name = "Space Milk (50u)"
-	object = /obj/item/reagent_containers/food/drinks/carton/milk
+	object = /obj/item/reagent_containers/food/drinks/milk
 	cost = 100
 
 /singleton/biorecipe/food/nutrispread

code/game/machinery/vending_types.dm

@@ -267,7 +267,7 @@
 	)
 	contraband = list(
 		/obj/item/reagent_containers/food/drinks/ice = 10,
-		/obj/item/reagent_containers/food/drinks/carton/soymilk = 2
+		/obj/item/reagent_containers/food/drinks/soymilk = 2
 	)
 	prices = list(
 		/obj/item/reagent_containers/food/drinks/coffee = 20,
@@ -404,9 +404,9 @@
 		/obj/item/reagent_containers/food/drinks/cans/peach_soda = 10,
 		/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 10,
 		/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 10,
-		/obj/item/reagent_containers/food/drinks/carton/small/milk = 10,
-		/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 10,
-		/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 10,
+		/obj/item/reagent_containers/food/drinks/milk = 10,
+		/obj/item/reagent_containers/food/drinks/milk/choco = 10,
+		/obj/item/reagent_containers/food/drinks/milk/strawberry = 10,
 		/obj/item/reagent_containers/food/drinks/cans/melon_soda = 10
 	)
 	contraband = list(
@@ -434,9 +434,9 @@
 		/obj/item/reagent_containers/food/drinks/cans/koispunch = 50,
 		/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 5,
 		/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 35,
-		/obj/item/reagent_containers/food/drinks/carton/small/milk = 18,
-		/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 18,
-		/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 18,
+		/obj/item/reagent_containers/food/drinks/milk = 18,
+		/obj/item/reagent_containers/food/drinks/milk/choco = 18,
+		/obj/item/reagent_containers/food/drinks/milk/strawberry = 18,
 		/obj/item/reagent_containers/food/drinks/cans/melon_soda = 16
 	)
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.

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

@@ -50,9 +50,9 @@
 /obj/structure/closet/secure_closet/freezer/fridge/fill()
 	..()
 	for(var/i = 0, i < 5, i++)
-		new /obj/item/reagent_containers/food/drinks/carton/milk(src)
+		new /obj/item/reagent_containers/food/drinks/milk(src)
 	for(var/i = 0, i < 2, i++)
-		new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
+		new /obj/item/reagent_containers/food/drinks/soymilk(src)
 	for(var/i = 0, i < 2, i++)
 		new /obj/item/storage/box/fancy/egg_box(src)
 
@@ -86,10 +86,10 @@
 /obj/structure/closet/secure_closet/freezer/cafe/fill()
 	..()
 	for(var/i = 0, i < 6, i++)
-		new /obj/item/reagent_containers/food/drinks/carton/milk(src)
+		new /obj/item/reagent_containers/food/drinks/milk(src)
 	for(var/i = 0, i < 3, i++)
 		new /obj/item/storage/box/fancy/egg_box(src)
 		new /obj/item/reagent_containers/food/condiment/flour(src)
 	for(var/i = 0, i < 2, i++)
-		new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
+		new /obj/item/reagent_containers/food/drinks/soymilk(src)
 		new /obj/item/reagent_containers/food/condiment/sugar(src)

code/modules/random_map/drop/drop_types.dm

@@ -92,8 +92,8 @@ var/global/list/datum/supply_drop_loot/supply_drop
 		/obj/item/reagent_containers/food/condiment/flour,
 		/obj/item/reagent_containers/food/condiment/flour,
 		/obj/item/reagent_containers/food/condiment/flour,
-		/obj/item/reagent_containers/food/drinks/carton/milk,
-		/obj/item/reagent_containers/food/drinks/carton/milk,
+		/obj/item/reagent_containers/food/drinks/milk,
+		/obj/item/reagent_containers/food/drinks/milk,
 		/obj/item/storage/box/fancy/egg_box,
 		/obj/item/reagent_containers/food/snacks/tofu,
 		/obj/item/reagent_containers/food/snacks/tofu,

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -102,6 +102,136 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
 /// Drinks. END
 ////////////////////////////////////////////////////////////////////////////////
 
+/obj/item/reagent_containers/food/drinks/carton
+	name = "carton"
+	desc = "An abstract way to organize bottles that are really cartons. Finally!"
+	icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'
+	icon_state = "carton"
+	item_state = "carton" //dear contributors, item_state handles inhands and onmob sprites. do not touch if you do not have added/changed the inhands. thanks. -wezzy
+	volume = 100
+	center_of_mass = list("x"=16, "y"=6)
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
+
+/obj/item/reagent_containers/food/drinks/milk
+	name = "space milk"
+	desc = "It's milk. White and nutritious goodness!"
+	icon_state = "milk"
+	reagents_to_add = list(/singleton/reagent/drink/milk = 50)
+	icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'
+	item_state = "carton"
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
+
+/obj/item/reagent_containers/food/drinks/soymilk
+	name = "soymilk"
+	desc = "It's soy milk. White and nutritious goodness!"
+	icon_state = "soymilk"
+	reagents_to_add = list(/singleton/reagent/drink/milk/soymilk = 50)
+	icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'
+	item_state = "carton"
+	drop_sound = 'sound/items/drop/cardboardbox.ogg'
+	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
+
+/obj/item/reagent_containers/food/drinks/carton/orangejuice
+	name = "orange juice"
+	desc = "Full of vitamins and deliciousness!"
+	icon_state = "orangejuice"
+	reagents_to_add = list(/singleton/reagent/drink/orangejuice = 100)
+
+/obj/item/reagent_containers/food/drinks/carton/cream
+	name = "milk cream"
+	desc = "It's cream. Made from milk. What else did you think you'd find in there?"
+	icon_state = "cream"
+	reagents_to_add = list(/singleton/reagent/drink/milk/cream = 100)
+
+/obj/item/reagent_containers/food/drinks/carton/tomatojuice
+	name = "tomato juice"
+	desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
+	icon_state = "tomatojuice"
+	reagents_to_add = list(/singleton/reagent/drink/tomatojuice = 100)
+
+/obj/item/reagent_containers/food/drinks/carton/limejuice
+	name = "lime juice"
+	desc = "Sweet-sour goodness."
+	icon_state = "limejuice"
+	reagents_to_add = list(/singleton/reagent/drink/limejuice = 100)
+
+/obj/item/reagent_containers/food/drinks/carton/lemonjuice
+	name = "lemon juice"
+	desc = "This juice is VERY sour."
+	icon_state = "lemoncarton"
+	reagents_to_add = list(/singleton/reagent/drink/lemonjuice = 100)
+
+/obj/item/reagent_containers/food/drinks/carton/dynjuice
+	name = "dyn juice"
+	desc = "Juice from a Skrell medicinal herb. It's supposed to be diluted."
+	icon_state = "dyncarton"
+	reagents_to_add = list(/singleton/reagent/drink/dynjuice = 100)
+
+/obj/item/reagent_containers/food/drinks/carton/applejuice
+	name = "apple juice"
+	desc = "Juice from an apple. Yes."
+	icon_state = "applejuice"
+	reagents_to_add = list(/singleton/reagent/drink/applejuice = 100)
+
+/obj/item/reagent_containers/food/drinks/carton/fatshouters
+	name = "fatshouters milk carton"
+	desc = "Fatty fatshouters milk in a carton."
+	reagents_to_add = list(/singleton/reagent/drink/milk/adhomai = 100)
+
+/obj/item/reagent_containers/food/drinks/carton/mutthir
+	name = "mutthir carton"
+	icon_state = "mutthir"
+	desc = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs."
+	desc_extended = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs. Mutthir is usually consumed during meals by both nobles and commoners. \
+	The drink can also be smoked for flavor. Mutthir is believed to have originated from the worldwide appreciated Fatshouters' fermented milk. Rock Nomads living in the Nomadic Host \
+	were quick to adopt the drink to their diet."
+	reagents_to_add = list(/singleton/reagent/drink/milk/adhomai/mutthir = 100)
+
+/obj/item/reagent_containers/food/drinks/carton/eggnog
+	name = "eggnog carton"
+	icon_state = "cream"
+	desc = "A beverage, made out of egg, sugar alcohol and in this case, cream."
+	desc_extended = "Eggnog, also called Egg flip, is an alcoholic beverage, made out of egg, milk or cream, sugar and alcohol. Eggnog is by principle a longdrink and they can be served \
+	hot or cold. Originally it was served in winter and hot. Every serving uses one egg. It is a classic Christmas beverage, loved by every species, universe-wide. Or so you heard."
+	reagents_to_add = list(/singleton/reagent/alcohol/eggnog = 100)
+
+//small carton
+
+/obj/item/reagent_containers/food/drinks/milk
+	name = "small milk carton"
+	desc = "It's milk. White and nutritious goodness!"
+	reagents_to_add = list(/singleton/reagent/drink/milk = 20)
+	icon_state = "mini-milk"
+	drop_sound = 'sound/items/drop/papercup.ogg'
+	pickup_sound = 'sound/items/pickup/papercup.ogg'
+	center_of_mass = list("x"=16, "y"=14)
+	volume = 30
+	icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'
+
+/obj/item/reagent_containers/food/drinks/milk/choco
+	name = "small chocolate milk carton"
+	desc = "It's milk. This one is in delicious chocolate flavor."
+	icon_state = "mini-milk_choco"
+	reagents_to_add = list(/singleton/reagent/drink/milk/chocolate = 20)
+	drop_sound = 'sound/items/drop/papercup.ogg'
+	pickup_sound = 'sound/items/pickup/papercup.ogg'
+	center_of_mass = list("x"=16, "y"=14)
+	volume = 30
+	icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'
+
+/obj/item/reagent_containers/food/drinks/milk/strawberry
+	name = "small strawberry milk carton"
+	desc = "It's milk. This one is in delicious strawberry flavor."
+	icon_state = "mini-milk_strawberry"
+	reagents_to_add = list(/singleton/reagent/drink/milk/strawberry = 20)
+	drop_sound = 'sound/items/drop/papercup.ogg'
+	pickup_sound = 'sound/items/pickup/papercup.ogg'
+	center_of_mass = list("x"=16, "y"=14)
+	volume = 30
+	icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'
+
 ///////////////////////////////////////////////Drinks
 //Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly
 //	rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50.

code/modules/reagents/reagent_containers/food/drinks/carton.dm

@@ -1,113 +0,0 @@
-/obj/item/reagent_containers/food/drinks/carton
-	name = "carton"
-	desc = "An abstract way to organize bottles that are really cartons. Finally!"
-	icon = 'icons/obj/item/reagent_containers/food/drinks/carton.dmi'
-	icon_state = "carton"
-	item_state = "carton" //dear contributors, item_state handles inhands and onmob sprites. do not touch if you do not have added/changed the inhands. thanks. -wezzy
-	volume = 100
-	center_of_mass = list("x"=16, "y"=6)
-	drop_sound = 'sound/items/drop/cardboardbox.ogg'
-	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
-
-/obj/item/reagent_containers/food/drinks/carton/milk
-	name = "space milk"
-	desc = "It's milk. White and nutritious goodness!"
-	icon_state = "milk"
-	reagents_to_add = list(/singleton/reagent/drink/milk = 50)
-
-/obj/item/reagent_containers/food/drinks/carton/soymilk
-	name = "soymilk"
-	desc = "It's soy milk. White and nutritious goodness!"
-	icon_state = "soymilk"
-	reagents_to_add = list(/singleton/reagent/drink/milk/soymilk = 50)
-
-/obj/item/reagent_containers/food/drinks/carton/orangejuice
-	name = "orange juice"
-	desc = "Full of vitamins and deliciousness!"
-	icon_state = "orangejuice"
-	reagents_to_add = list(/singleton/reagent/drink/orangejuice = 100)
-
-/obj/item/reagent_containers/food/drinks/carton/cream
-	name = "milk cream"
-	desc = "It's cream. Made from milk. What else did you think you'd find in there?"
-	icon_state = "cream"
-	reagents_to_add = list(/singleton/reagent/drink/milk/cream = 100)
-
-/obj/item/reagent_containers/food/drinks/carton/tomatojuice
-	name = "tomato juice"
-	desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
-	icon_state = "tomatojuice"
-	reagents_to_add = list(/singleton/reagent/drink/tomatojuice = 100)
-
-/obj/item/reagent_containers/food/drinks/carton/limejuice
-	name = "lime juice"
-	desc = "Sweet-sour goodness."
-	icon_state = "limejuice"
-	reagents_to_add = list(/singleton/reagent/drink/limejuice = 100)
-
-/obj/item/reagent_containers/food/drinks/carton/lemonjuice
-	name = "lemon juice"
-	desc = "This juice is VERY sour."
-	icon_state = "lemoncarton"
-	reagents_to_add = list(/singleton/reagent/drink/lemonjuice = 100)
-
-/obj/item/reagent_containers/food/drinks/carton/dynjuice
-	name = "dyn juice"
-	desc = "Juice from a Skrell medicinal herb. It's supposed to be diluted."
-	icon_state = "dyncarton"
-	reagents_to_add = list(/singleton/reagent/drink/dynjuice = 100)
-
-/obj/item/reagent_containers/food/drinks/carton/applejuice
-	name = "apple juice"
-	desc = "Juice from an apple. Yes."
-	icon_state = "applejuice"
-	reagents_to_add = list(/singleton/reagent/drink/applejuice = 100)
-
-/obj/item/reagent_containers/food/drinks/carton/fatshouters
-	name = "fatshouters milk carton"
-	desc = "Fatty fatshouters milk in a carton."
-	reagents_to_add = list(/singleton/reagent/drink/milk/adhomai = 100)
-
-/obj/item/reagent_containers/food/drinks/carton/mutthir
-	name = "mutthir carton"
-	icon_state = "mutthir"
-	desc = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs."
-	desc_extended = "A beverage made with Fatshouters' yogurt mixed with Nm'shaan's sugar and sweet herbs. Mutthir is usually consumed during meals by both nobles and commoners. \
-	The drink can also be smoked for flavor. Mutthir is believed to have originated from the worldwide appreciated Fatshouters' fermented milk. Rock Nomads living in the Nomadic Host \
-	were quick to adopt the drink to their diet."
-	reagents_to_add = list(/singleton/reagent/drink/milk/adhomai/mutthir = 100)
-
-/obj/item/reagent_containers/food/drinks/carton/eggnog
-	name = "eggnog carton"
-	icon_state = "cream"
-	desc = "A beverage, made out of egg, sugar alcohol and in this case, cream."
-	desc_extended = "Eggnog, also called Egg flip, is an alcoholic beverage, made out of egg, milk or cream, sugar and alcohol. Eggnog is by principle a longdrink and they can be served \
-	hot or cold. Originally it was served in winter and hot. Every serving uses one egg. It is a classic Christmas beverage, loved by every species, universe-wide. Or so you heard."
-	reagents_to_add = list(/singleton/reagent/alcohol/eggnog = 100)
-
-//small carton
-
-/obj/item/reagent_containers/food/drinks/carton/small
-	name = "small_carton"
-	icon_state = "mini-milk"
-	drop_sound = 'sound/items/drop/papercup.ogg'
-	pickup_sound = 'sound/items/pickup/papercup.ogg'
-	center_of_mass = list("x"=16, "y"=14)
-	volume = 30
-
-/obj/item/reagent_containers/food/drinks/carton/small/milk
-	name = "small milk carton"
-	desc = "It's milk. White and nutritious goodness!"
-	reagents_to_add = list(/singleton/reagent/drink/milk = 20)
-
-/obj/item/reagent_containers/food/drinks/carton/small/milk/choco
-	name = "small chocolate milk carton"
-	desc = "It's milk. This one is in delicious chocolate flavor."
-	icon_state = "mini-milk_choco"
-	reagents_to_add = list(/singleton/reagent/drink/milk/chocolate = 20)
-
-/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry
-	name = "small strawberry milk carton"
-	desc = "It's milk. This one is in delicious strawberry flavor."
-	icon_state = "mini-milk_strawberry"
-	reagents_to_add = list(/singleton/reagent/drink/milk/strawberry = 20)

code/modules/reagents/reagent_containers/food/lunch.dm

@@ -86,9 +86,9 @@ var/list/lunchables_drinks_ = list(
 	/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda,
 	/obj/item/reagent_containers/food/drinks/bottle/small/midynhr_water,
 	/obj/item/reagent_containers/food/drinks/bottle/small/khlibnyz,
-	/obj/item/reagent_containers/food/drinks/carton/small/milk,
-	/obj/item/reagent_containers/food/drinks/carton/small/milk/choco,
-	/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry,
+	/obj/item/reagent_containers/food/drinks/milk,
+	/obj/item/reagent_containers/food/drinks/milk/choco,
+	/obj/item/reagent_containers/food/drinks/milk/strawberry,
 	/obj/item/reagent_containers/food/drinks/cans/melon_soda
 )
 

maps/aurora/aurora-1_centcomm.dmm

@@ -11539,10 +11539,10 @@
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /turf/unsimulated/floor{
 	icon_state = "lino_diamond"
 	},
@@ -37191,7 +37191,7 @@
 	},
 /area/shuttle/escape)
 "uql" = (
-/obj/item/reagent_containers/food/drinks/carton/soymilk{
+/obj/item/reagent_containers/food/drinks/soymilk{
 	pixel_x = 6;
 	pixel_y = 12
 	},

maps/aurora/aurora-4_mainlevel.dmm

@@ -49668,10 +49668,10 @@
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/structure/extinguisher_cabinet/east{
 	pixel_y = -1
 	},

maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm

@@ -5496,15 +5496,15 @@
 /area/abandoned_industrial_station/hangar)
 "rC" = (
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/soymilk,
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/structure/closet/secure_closet/freezer,
 /obj/item/reagent_containers/food/snacks/meat,
 /obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
 /obj/item/storage/box/fancy/egg_box,
 /obj/random/dirt_75,
 /obj/random/dirt_75,

maps/away/away_site/racers/racers.dmm

@@ -1139,10 +1139,10 @@
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/machinery/light/colored/red{
 	dir = 1
 	},

maps/away/away_site/shady/shady.dmm

@@ -190,7 +190,7 @@
 	pixel_x = -2
 	},
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk{
+/obj/item/reagent_containers/food/drinks/milk{
 	pixel_y = 7
 	},
 /obj/effect/floor_decal/corner_wide/grey/diagonal,

maps/away/away_site/space_bar/space_bar.dmm

@@ -101,10 +101,10 @@
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/machinery/light{
 	dir = 1;
 	icon_state = "tube_empty"

maps/away/away_site/tajara/peoples_station/peoples_station.dmm

@@ -1628,8 +1628,8 @@
 	pixel_x = 3;
 	pixel_y = -11
 	},
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,

maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm

@@ -191,7 +191,7 @@
 /area/shuttle/unathi_pirate_izharshan/operations)
 "fA" = (
 /obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/structure/closet/secure_closet/freezer/meat,
 /obj/item/reagent_containers/food/snacks/meat/chicken,
 /obj/item/reagent_containers/food/snacks/meat/chicken,

maps/away/away_site/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm

@@ -3005,7 +3005,7 @@
 /area/tarwa_ship/bridge)
 "QV" = (
 /obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/structure/closet/secure_closet/freezer/meat,
 /obj/item/reagent_containers/food/snacks/meat/chicken,
 /obj/item/reagent_containers/food/snacks/meat/chicken,

maps/away/ships/casino/casino.dmm

@@ -2006,7 +2006,7 @@
 /obj/structure/table/standard{
 	name = "plastic table frame"
 	},
-/obj/item/reagent_containers/food/drinks/carton/small/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /turf/simulated/floor/tiled/rust,
 /area/casino/casino_crew_cantina)
 "fW" = (

maps/away/ships/coc_ranger/coc_ship.dmm

@@ -2850,8 +2850,8 @@
 	},
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube_empty"
@@ -4729,11 +4729,11 @@
 "waI" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/structure/table/steel,
-/obj/item/reagent_containers/food/drinks/carton/small/milk/choco{
+/obj/item/reagent_containers/food/drinks/milk/choco{
 	pixel_x = -5;
 	pixel_y = 8
 	},
-/obj/item/reagent_containers/food/drinks/carton/small/milk/choco{
+/obj/item/reagent_containers/food/drinks/milk/choco{
 	pixel_x = 5
 	},
 /turf/simulated/floor/tiled/white,

maps/away/ships/freebooter/freebooter_ship.dmm

@@ -4181,8 +4181,8 @@
 	},
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/item/reagent_containers/food/condiment/enzyme{
 	pixel_x = -9;
 	pixel_y = 5

maps/away/ships/nka/nka_merchant/nka_merchant.dmm

@@ -986,8 +986,8 @@
 	pixel_x = 3;
 	pixel_y = -11
 	},
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,

maps/away/ships/orion/orion_express_ship.dmm

@@ -855,8 +855,8 @@
 	},
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/item/reagent_containers/food/condiment/enzyme{
 	pixel_x = -9;

maps/away/ships/pra/headmaster/headmaster_ship.dmm

@@ -5940,8 +5940,8 @@
 	pixel_x = 3;
 	pixel_y = -11
 	},
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,

maps/away/ships/skrell_smuggler/tirakqi_freighter.dmm

@@ -689,8 +689,8 @@
 /obj/structure/closet/secure_closet/freezer/kitchen{
 	req_access = "208"
 	},
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/item/storage/box/produce{
 	layer = 2.99;
 	pixel_x = 3;

maps/away/ships/sol_merc/fsf_patrol_ship.dmm

@@ -1176,8 +1176,8 @@
 	},
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/light{
 	dir = 8;

maps/away/ships/sol_pirate/sfa_patrol_ship.dmm

@@ -1063,8 +1063,8 @@
 	},
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube_empty"

maps/away/ships/sol_ssmd/ssmd_ship.dmm

@@ -310,8 +310,8 @@
 	},
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/item/reagent_containers/food/condiment/enzyme{
 	pixel_x = -9;
 	pixel_y = 5
@@ -6652,8 +6652,8 @@
 	},
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/item/reagent_containers/food/condiment/enzyme{
 	pixel_x = -9;
 	pixel_y = 5
@@ -7304,8 +7304,8 @@
 	},
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/item/reagent_containers/food/condiment/enzyme{
 	pixel_x = -9;
 	pixel_y = 5

maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm

@@ -3310,8 +3310,8 @@
 	pixel_x = 3;
 	pixel_y = -11
 	},
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,

maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dmm

@@ -2549,8 +2549,8 @@
 	},
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/ship/tcfl_peacekeeper_ship)

maps/away/ships/tramp_freighter/tramp_freighter.dmm

@@ -562,8 +562,8 @@
 	},
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/ship/tramp_freighter)

maps/away/ships/wildlands_militia/militia_ship.dmm

@@ -1186,8 +1186,8 @@
 	},
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/ship/militia_ship)

maps/event/generic_dock/generic_dock-1.dmm

@@ -4150,10 +4150,10 @@
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /turf/unsimulated/floor{
 	icon_state = "lino_diamond"
 	},

maps/event/idris_cruise/idris_cruise-1.dmm

@@ -1179,21 +1179,21 @@
 "aMO" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/closet/secure_closet/freezer,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
@@ -9384,21 +9384,21 @@
 "hqg" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/closet/secure_closet/freezer,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,

maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm

@@ -1002,10 +1002,10 @@
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
 /turf/simulated/floor/tiled/freezer{
 	name = "cooled tiles";
 	temperature = 253.15

maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm

@@ -868,8 +868,8 @@
 	pixel_x = 3;
 	pixel_y = -11
 	},
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,

maps/random_ruins/exoplanets/raskara/raskara_okon.dmm

@@ -2605,8 +2605,8 @@
 	pixel_x = 3;
 	pixel_y = -11
 	},
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,
 /obj/item/reagent_containers/food/snacks/meat/adhomai,

maps/sccv_horizon/sccv_horizon-2_deck_2.dmm

@@ -25788,10 +25788,10 @@
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
 /obj/machinery/firealarm/east,
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/dark/full,

maps/sccv_horizon/sccv_horizon-4_centcomm.dmm

@@ -5913,10 +5913,10 @@
 /obj/structure/closet/secure_closet/freezer/fridge,
 /obj/item/storage/box/fancy/egg_box,
 /obj/item/storage/box/fancy/egg_box,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/reagent_containers/food/drinks/carton/milk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/soymilk,
+/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/reagent_containers/food/drinks/milk,
 /turf/unsimulated/floor{
 	icon_state = "tiled_preview"
 	},
@@ -22916,7 +22916,7 @@
 	},
 /area/centcom/legion)
 "bcU" = (
-/obj/item/reagent_containers/food/drinks/carton/soymilk{
+/obj/item/reagent_containers/food/drinks/soymilk{
 	pixel_x = 6;
 	pixel_y = 12
 	},