diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm
index 157d9e187a9..66cdff02d72 100644
--- a/code/__defines/items_clothing.dm
+++ b/code/__defines/items_clothing.dm
@@ -33,6 +33,7 @@
 #define HELDMAPTEXT        0x100 // Uses the special held maptext system, which sets a specific maptext if the item is in possession of a mob.
 #define NOMOVE             0x200 // Cannot be moved from its current inventory slot. Mostly for augments, modules, and other "attached" items.
 #define HTML_USE_INITAL_ICON  0x400 // Should we use the initial icon for display? Mostly used by overlay only objects
+#define POURCONTAINER      0x800  // reagent container that can pour its contents with a lid on. only used for syrup bottles for now
 
 //Flags for items (equipment)
 #define THICKMATERIAL          BITFLAG(0)  // Prevents syringes, parapens and hyposprays if equiped to slot_suit or slot_head.
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 74a71ad3508..f80d4335a70 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -105,6 +105,9 @@
 /atom/proc/is_open_container()
 	return flags & OPENCONTAINER
 
+/atom/proc/is_pour_container()
+	return flags & POURCONTAINER
+
 /atom/proc/CheckExit()
 	return 1
 
diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm
index 159203c13c0..3b0fc538142 100644
--- a/code/game/machinery/vending_types.dm
+++ b/code/game/machinery/vending_types.dm
@@ -136,7 +136,7 @@
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot = 10,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup = 10,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 4,
-		/obj/item/reagent_containers/glass/pitcher = 4
+		/obj/item/reagent_containers/glass/beaker/pitcher = 4
 	)
 	contraband = list(
 		/obj/item/reagent_containers/food/drinks/tea = 10
@@ -279,7 +279,7 @@
 		/obj/item/reagent_containers/food/snacks/donut/normal = 6
 	)
 	premium = list(
-		/obj/item/reagent_containers/glass/teapot/ = 5
+		/obj/item/reagent_containers/glass/beaker/teapot/ = 5
 	)
 	vending_sound = 'sound/machines/vending/vending_coffee.ogg'
 	cooling_temperature = T0C + 57 //Optimal coffee temperature
@@ -971,7 +971,7 @@
 		/obj/item/material/hatchet/butch = 2,
 		/obj/item/reagent_containers/food/drinks/drinkingglass = 12,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 3,
-		/obj/item/reagent_containers/glass/pitcher = 3,
+		/obj/item/reagent_containers/glass/beaker/pitcher = 3,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6,
 		/obj/item/reagent_containers/food/drinks/takeaway_cup_idris = 6,
 		/obj/item/clothing/accessory/apron/chef = 2,
@@ -1014,7 +1014,7 @@
 		/obj/item/material/kitchen/utensil/fork/chopsticks/cheap = 12,
 		/obj/item/reagent_containers/food/drinks/drinkingglass = 12,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 3,
-		/obj/item/reagent_containers/glass/pitcher = 3,
+		/obj/item/reagent_containers/glass/beaker/pitcher = 3,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6,
 		/obj/item/reagent_containers/food/drinks/takeaway_cup_idris = 6,
 	)
@@ -1025,7 +1025,7 @@
 	products = list(
 		/obj/item/reagent_containers/food/drinks/drinkingglass = 12,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 3,
-		/obj/item/reagent_containers/glass/pitcher = 3,
+		/obj/item/reagent_containers/glass/beaker/pitcher = 3,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6,
 		/obj/item/reagent_containers/food/drinks/takeaway_cup_idris = 6,
 	)
diff --git a/code/game/objects/random/loot.dm b/code/game/objects/random/loot.dm
index f505dbd7055..de15848260c 100644
--- a/code/game/objects/random/loot.dm
+++ b/code/game/objects/random/loot.dm
@@ -97,7 +97,7 @@
 		/obj/item/razor = 0.5,
 		/obj/item/reagent_containers/extinguisher_refill = 0.1,
 		/obj/item/reagent_containers/extinguisher_refill/filled = 0.5,
-		/obj/item/reagent_containers/glass/teapot = 0.4,
+		/obj/item/reagent_containers/glass/beaker/teapot = 0.4,
 		/obj/item/reagent_containers/cooking_container/board/bowl = 0.8,
 		/obj/item/reagent_containers/inhaler/hyperzine = 0.1,
 		/obj/item/reagent_containers/spray/cleaner = 0.6,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index ad9e014d34a..a7f67b1f868 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -204,7 +204,7 @@
 /obj/structure/closet/secure_closet/psychiatric/fill()
 	..()
 	new /obj/item/clothing/suit/straight_jacket(src)
-	new /obj/item/reagent_containers/glass/teapot(src)
+	new /obj/item/reagent_containers/glass/beaker/teapot(src)
 	new /obj/item/toy/plushie/therapy(src)
 	new /obj/item/toy/plushie/slime(src)
 	new /obj/item/toy/plushie/bee(src)
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 66e3b97656f..cfa05b5050f 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -122,7 +122,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon_state = "oz_plushie"
 
 
-/obj/item/reagent_containers/glass/teapot/fluff/brianne_teapot //Ceramic Teapot - Sean Brianne - zelmana
+/obj/item/reagent_containers/glass/beaker/teapot/fluff/brianne_teapot //Ceramic Teapot - Sean Brianne - zelmana
 	name = "ceramic teapot"
 	desc = "A blue ceramic teapot, gilded with the abbreviation for NanoTrasen."
 	icon = 'icons/obj/custom_items/brianne_items.dmi'
@@ -585,7 +585,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	user.update_inv_l_hand()
 	user.update_inv_r_hand()
 
-/obj/item/reagent_containers/glass/teapot/fluff/thea_teapot //Bronze Teapot - Thea Reeves - shestrying
+/obj/item/reagent_containers/glass/beaker/teapot/fluff/thea_teapot //Bronze Teapot - Thea Reeves - shestrying
 	name = "bronze teapot"
 	desc = "A round-bottomed, well-used teapot. It looks as though it's been carefully maintained."
 	icon = 'icons/obj/custom_items/thea_tea.dmi'
@@ -608,10 +608,10 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon_override = 'icons/obj/custom_items/thea_tea.dmi'
 	icon_state = "thea_teabox"
 	foldable = null
-	can_hold = list(/obj/item/reagent_containers/glass/teapot/fluff/thea_teapot, /obj/item/reagent_containers/food/drinks/fluff/thea_teacup)
+	can_hold = list(/obj/item/reagent_containers/glass/beaker/teapot/fluff/thea_teapot, /obj/item/reagent_containers/food/drinks/fluff/thea_teacup)
 
 /obj/item/storage/box/fluff/thea_teabox/fill()
-	new /obj/item/reagent_containers/glass/teapot/fluff/thea_teapot(src)
+	new /obj/item/reagent_containers/glass/beaker/teapot/fluff/thea_teapot(src)
 	for(var/i in 1 to 4)
 		new /obj/item/reagent_containers/food/drinks/fluff/thea_teacup(src)
 	make_exact_fit()
diff --git a/code/modules/holidays/christmas/props.dm b/code/modules/holidays/christmas/props.dm
index bc07a1fbed3..88f8de7fb33 100644
--- a/code/modules/holidays/christmas/props.dm
+++ b/code/modules/holidays/christmas/props.dm
@@ -290,7 +290,7 @@
 		/obj/item/clothing/accessory/horrible,
 		/obj/item/clothing/shoes/heels,
 		/obj/item/storage/box/donkpockets,
-		/obj/item/reagent_containers/glass/teapot,
+		/obj/item/reagent_containers/glass/beaker/teapot,
 		/obj/item/device/flashlight/lantern,
 		/obj/item/clothing/mask/balaclava,
 		/obj/item/clothing/accessory/badge/old,
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 120e26a9ce4..74171281dbc 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -3147,22 +3147,22 @@
 	id = "pumpkinspce"
 	result = /singleton/reagent/spacespice/pumpkinspice
 	mix_message = "The spice brightens up."
-	required_reagents = list(/singleton/reagent/spacespice = 8, /singleton/reagent/nutriment/pumpkinpulp = 2)
-	result_amount = 10
+	required_reagents = list(/singleton/reagent/spacespice = 4, /singleton/reagent/nutriment/pumpkinpulp = 1)
+	result_amount = 5
 
 /datum/chemical_reaction/drink/psfrappe
 	name = "Pumpkin Spice Frappe"
 	id = "psfrappe"
 	result = /singleton/reagent/drink/coffee/icecoffee/psfrappe
-	required_reagents = list(/singleton/reagent/drink/coffee/icecoffee = 6, /singleton/reagent/drink/syrup_pumpkin = 2, /singleton/reagent/drink/milk/cream = 2)
-	result_amount = 10
+	required_reagents = list(/singleton/reagent/drink/coffee/icecoffee = 4, /singleton/reagent/drink/syrup_pumpkin = 1)
+	result_amount = 5
 
 /datum/chemical_reaction/drink/pslatte
 	name = "Pumpkin Spice Latte"
 	id = "pslatte"
 	result = /singleton/reagent/drink/coffee/latte/pumpkinspice
-	required_reagents = list(/singleton/reagent/drink/coffee = 6, /singleton/reagent/drink/syrup_pumpkin = 2, /singleton/reagent/drink/milk/cream = 2)
-	result_amount = 10
+	required_reagents = list(/singleton/reagent/drink/coffee/latte = 4, /singleton/reagent/drink/syrup_pumpkin = 1)
+	result_amount = 5
 
 /datum/chemical_reaction/drink/caramel_latte
 	name = "Caramel latte"
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 1f0e98c00fc..33b43cd3c0a 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -115,7 +115,7 @@
 		return ..()
 
 /obj/item/reagent_containers/afterattack(var/atom/target, var/mob/user, var/proximity, var/params)
-	if(!proximity || !is_open_container())
+	if(!proximity || (!is_open_container() && !is_pour_container()))
 		return
 	if(is_type_in_list(target,can_be_placed_into))
 		return
diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
index 82e5cb25775..e524f16dbc6 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm
@@ -7,6 +7,7 @@
 	desc = "This blank bottle is unyieldingly anonymous, offering no clues to its contents."
 	icon_state = "glassbottle"
 	icon = 'icons/obj/item/reagent_containers/food/drinks/bottle.dmi'
+	filling_states = "10;20;30;40;50;60;70;80;90;100"
 	amount_per_transfer_from_this = 5//Smaller sip size for more BaRP and less guzzling a litre of vodka before you realise it
 	volume = 100
 	item_state = "broken_beer" //Generic held-item sprite until unique ones are made.
@@ -638,21 +639,18 @@
 /obj/item/reagent_containers/food/drinks/bottle/small/beer/light
 	name = "Carp Lite"
 	desc = "Brewed with \"Pure Ice Asteroid Spring Water\"."
-	desc_extended = DRINK_FLUFF_GETMORE
 	icon_state = "litebeer"
 	reagents_to_add = list(/singleton/reagent/alcohol/beer/light = 30)
 
 /obj/item/reagent_containers/food/drinks/bottle/small/beer/root
 	name = "Two-Time root beer"
 	desc = "A popular, old-fashioned brand of root beer, known for its extremely sugary formula. Might make you want a nap afterwards."
-	desc_extended = DRINK_FLUFF_GETMORE
 	icon_state = "twotime"
 	reagents_to_add = list(/singleton/reagent/drink/root_beer = 30)
 
 /obj/item/reagent_containers/food/drinks/bottle/small/ale
 	name = "\improper Burszi-ale"
 	desc = "Manufactured in Virklund on New Gibson by Getmore, this is a true Burszian's drink of choice. That is, if you're not an IPC. You wouldn't be able to buy this ale then. Or think of buying it. Or afford it."
-	desc_extended = DRINK_FLUFF_GETMORE
 	icon_state = "alebottle"
 	item_state = "beer"
 	reagents_to_add = list(/singleton/reagent/alcohol/ale = 30)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 232ce207095..af22ff3415c 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -102,7 +102,7 @@
 	icon_state = "beaker"
 	item_state = "beaker"
 	filling_states = "20;40;60;80;100"
-	center_of_mass = list("x" = 15,"y" = 11)
+	center_of_mass = list("x" = 16,"y" = 13)
 	matter = list(MATERIAL_GLASS = 500)
 	drop_sound = 'sound/items/drop/drinkglass.ogg'
 	pickup_sound = 'sound/items/pickup/drinkglass.ogg'
@@ -152,7 +152,7 @@
 	name = "large beaker"
 	desc = "A large beaker."
 	icon_state = "beakerlarge"
-	center_of_mass = list("x" = 16,"y" = 11)
+	center_of_mass = list("x" = 17,"y" = 14)
 	matter = list(MATERIAL_GLASS = 5000)
 	volume = 120
 	amount_per_transfer_from_this = 10
@@ -174,7 +174,7 @@
 	name = "bluespace beaker"
 	desc = "A bluespace beaker, powered by experimental bluespace technology."
 	icon_state = "beakerbluespace"
-	center_of_mass = list("x" = 16,"y" = 11)
+	center_of_mass = list("x" = 16,"y" = 15)
 	matter = list(MATERIAL_PHORON = 1000, MATERIAL_DIAMOND = 100)
 	volume = 300
 	amount_per_transfer_from_this = 10
@@ -186,7 +186,7 @@
 	desc = "A small glass vial."
 	icon_state = "vial"
 	item_state = "dropper"
-	center_of_mass = list("x" = 15,"y" = 9)
+	center_of_mass = list("x" = 16,"y" = 16)
 	matter = list(MATERIAL_GLASS = 250)
 	volume = 30
 	amount_per_transfer_from_this = 10
@@ -198,7 +198,7 @@
 	desc = "A glass medicine cup. Like a shot glass for medicine."
 	icon_state = "medcup"
 	filling_states = "25;50;75;100"
-	center_of_mass = list("x" = 15,"y" = 9)
+	center_of_mass = list("x" = 16,"y" = 13)
 	matter = list(MATERIAL_GLASS = 250)
 	volume = 15
 	amount_per_transfer_from_this = 5
@@ -212,6 +212,26 @@
 
 /obj/item/reagent_containers/glass/beaker/sulphuric/reagents_to_add = list(/singleton/reagent/acid = 60)
 
+/obj/item/reagent_containers/glass/beaker/teapot
+	name = "teapot"
+	desc = "An elegant teapot. It simply oozes class."
+	icon_state = "teapot"
+	item_state = "teapot"
+	unacidable = TRUE
+	amount_per_transfer_from_this = 10
+	volume = 120
+
+/obj/item/reagent_containers/glass/beaker/pitcher
+	name = "pitcher"
+	desc = "Everyone's best friend in the morning."
+	icon_state = "coffeepot"
+	unacidable = TRUE
+	amount_per_transfer_from_this = 10
+	volume = 120
+	possible_transfer_amounts = list(5,10,15,30,60,120)
+
+// buckets
+
 /obj/item/reagent_containers/glass/bucket
 	desc = "A blue plastic bucket."
 	name = "bucket"
@@ -290,21 +310,3 @@
 		return
 
 	..()
-
-/obj/item/reagent_containers/glass/teapot
-	name = "teapot"
-	desc = "An elegant teapot. It simply oozes class."
-	icon_state = "teapot"
-	item_state = "teapot"
-	unacidable = TRUE
-	amount_per_transfer_from_this = 10
-	volume = 120
-
-/obj/item/reagent_containers/glass/pitcher
-	name = "pitcher"
-	desc = "Everyone's best friend in the morning."
-	icon_state = "pitcher"
-	unacidable = TRUE
-	amount_per_transfer_from_this = 10
-	volume = 120
-	possible_transfer_amounts = list(5,10,15,30,60,120)
diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index 57feb6eb988..7ca2ddc3269 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -30,7 +30,7 @@
 /obj/item/reagent_containers/glass/bottle/Initialize()
 	. = ..()
 	if(!icon_state)
-		icon_state = "bottle-[rand(1,6)]"
+		icon_state = "bottle-[rand(1,4)]"
 
 	update_icon()
 
@@ -234,7 +234,7 @@
 	desc = "A small bottle dispenser."
 	icon_state = "syrup"
 	filling_states = "20;40;60;80;100"
-	flags = OPENCONTAINER
+	flags = POURCONTAINER
 	volume = 50
 
 /obj/item/reagent_containers/glass/bottle/syrup/chocolate
diff --git a/html/changelogs/wezzy_reagentcontainerfixes.yml b/html/changelogs/wezzy_reagentcontainerfixes.yml
new file mode 100644
index 00000000000..2202d3feff5
--- /dev/null
+++ b/html/changelogs/wezzy_reagentcontainerfixes.yml
@@ -0,0 +1,48 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Fixes coffee pitchers and bluespace beakers not having filled states."
+  - bugfix: "Fixes gumball jars not having gumballs."
+  - imageadd: "Updates syrup dispensers to 3/4 standards."
+  - tweak: "Tweaked syrup dispensers to be one-way - you no longer can accidentally pour your latte into them, but still can dispense syrup."
+  - tweak: "Pumpkin Spice Latte recipe has been changed to 4 units of latte to 1 unit of pumpkin spice syrup to match its counterparts."
+  - tweak: "Pumpkin Spice Frappe recipe has been changed to 4 units of iced coffee to 1 unit of pumpkin spice syrup."
+  - tweak: "Pumpkin Spice recipe has been changed to need only 4 units of space spice and 1 unit of pumpkin pulp - ratio unchanged."
+
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index ba42a0c6787..9f0ff5f14ec 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/item/reagent_containers/food/drinks/bottle.dmi b/icons/obj/item/reagent_containers/food/drinks/bottle.dmi
index 26bb98e40e8..6cbd3306bd8 100644
Binary files a/icons/obj/item/reagent_containers/food/drinks/bottle.dmi and b/icons/obj/item/reagent_containers/food/drinks/bottle.dmi differ
diff --git a/icons/obj/item/reagent_containers/glass.dmi b/icons/obj/item/reagent_containers/glass.dmi
index ac5b2dda11c..1209a034914 100644
Binary files a/icons/obj/item/reagent_containers/glass.dmi and b/icons/obj/item/reagent_containers/glass.dmi differ
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index be0885d9901..20ea429cf51 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -32159,7 +32159,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/item/reagent_containers/glass/teapot{
+/obj/item/reagent_containers/glass/beaker/teapot{
 	pixel_y = 16
 	},
 /obj/item/storage/box/snack{
@@ -36291,7 +36291,7 @@
 	pixel_x = 1;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/glass/pitcher{
+/obj/item/reagent_containers/glass/beaker/pitcher{
 	pixel_x = -3;
 	pixel_y = 2
 	},
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 19d0d7495dc..19938d95285 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -14057,7 +14057,7 @@
 	pixel_x = 10
 	},
 /obj/structure/table/wood,
-/obj/item/reagent_containers/glass/pitcher{
+/obj/item/reagent_containers/glass/beaker/pitcher{
 	pixel_x = -3;
 	pixel_y = 2
 	},
@@ -31675,7 +31675,7 @@
 /obj/machinery/light_switch{
 	pixel_x = 24
 	},
-/obj/item/reagent_containers/glass/pitcher{
+/obj/item/reagent_containers/glass/beaker/pitcher{
 	pixel_x = -3;
 	pixel_y = 2
 	},
@@ -51232,7 +51232,7 @@
 	dir = 1
 	},
 /obj/item/wrench,
-/obj/item/reagent_containers/glass/teapot,
+/obj/item/reagent_containers/glass/beaker/teapot,
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "bUE" = (
diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm
index bc2a0e46b9d..443f27028bb 100644
--- a/maps/aurora/aurora-5_interstitial.dmm
+++ b/maps/aurora/aurora-5_interstitial.dmm
@@ -2066,7 +2066,7 @@
 	pixel_x = 1;
 	pixel_y = 4
 	},
-/obj/item/reagent_containers/glass/pitcher{
+/obj/item/reagent_containers/glass/beaker/pitcher{
 	pixel_x = -3;
 	pixel_y = 2
 	},
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 2d1b524ade5..e78020f3465 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -14553,7 +14553,7 @@
 /obj/machinery/light_switch{
 	pixel_x = -26
 	},
-/obj/item/reagent_containers/glass/pitcher{
+/obj/item/reagent_containers/glass/beaker/pitcher{
 	pixel_x = -3;
 	pixel_y = 2
 	},
diff --git a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm
index e0f6040b08e..370194642c0 100644
--- a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm
+++ b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm
@@ -137,7 +137,7 @@
 /area/abandoned_industrial_station/docks_a2)
 "ar" = (
 /obj/structure/table/steel,
-/obj/item/reagent_containers/glass/teapot{
+/obj/item/reagent_containers/glass/beaker/teapot{
 	pixel_x = 2;
 	pixel_y = 7
 	},
diff --git a/maps/away/ships/coc_ranger/coc_ship.dmm b/maps/away/ships/coc_ranger/coc_ship.dmm
index d2180f56b7f..f1eec5e2df2 100644
--- a/maps/away/ships/coc_ranger/coc_ship.dmm
+++ b/maps/away/ships/coc_ranger/coc_ship.dmm
@@ -1973,7 +1973,7 @@
 	pixel_x = 8;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/pitcher{
+/obj/item/reagent_containers/glass/beaker/pitcher{
 	pixel_x = -5;
 	reagents_to_add = list(/singleton/reagent/drink/coffee=30)
 	},
diff --git a/maps/away/ships/iac/iac_rescue_ship.dmm b/maps/away/ships/iac/iac_rescue_ship.dmm
index 4bfb2b1f0c5..c3f036b67bd 100644
--- a/maps/away/ships/iac/iac_rescue_ship.dmm
+++ b/maps/away/ships/iac/iac_rescue_ship.dmm
@@ -2365,7 +2365,7 @@
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/glass{
 	pixel_x = 5
 	},
-/obj/item/reagent_containers/glass/pitcher{
+/obj/item/reagent_containers/glass/beaker/pitcher{
 	pixel_x = -5;
 	reagents_to_add = list(/singleton/reagent/drink/coffee=30)
 	},
diff --git a/maps/away/ships/sol_ssmd/ssmd_ship.dmm b/maps/away/ships/sol_ssmd/ssmd_ship.dmm
index ac9eafba40f..b76b7d7bca1 100644
--- a/maps/away/ships/sol_ssmd/ssmd_ship.dmm
+++ b/maps/away/ships/sol_ssmd/ssmd_ship.dmm
@@ -5776,7 +5776,7 @@
 	pixel_x = -6;
 	pixel_y = 5
 	},
-/obj/item/reagent_containers/glass/teapot{
+/obj/item/reagent_containers/glass/beaker/teapot{
 	pixel_y = -15
 	},
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup{
@@ -6105,7 +6105,7 @@
 /area/ship/ssmd_corvette/storage)
 "sBO" = (
 /obj/structure/filingcabinet/chestdrawer,
-/obj/item/reagent_containers/glass/pitcher{
+/obj/item/reagent_containers/glass/beaker/pitcher{
 	pixel_x = -3;
 	pixel_y = 10
 	},
diff --git a/maps/away/ships/yacht/yacht.dmm b/maps/away/ships/yacht/yacht.dmm
index b67e4cf8f6e..5fe23eaeaf4 100644
--- a/maps/away/ships/yacht/yacht.dmm
+++ b/maps/away/ships/yacht/yacht.dmm
@@ -306,7 +306,7 @@
 	dir = 4
 	},
 /obj/item/book/manual/chef_recipes,
-/obj/item/reagent_containers/glass/pitcher,
+/obj/item/reagent_containers/glass/beaker/pitcher,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/stone/marble,
 /turf/simulated/floor/wood/yew,
diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm
index 61c59e1cb09..7d192b46ed1 100644
--- a/maps/event/idris_cruise/idris_cruise-1.dmm
+++ b/maps/event/idris_cruise/idris_cruise-1.dmm
@@ -7463,7 +7463,7 @@
 	pixel_y = 14
 	},
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/glass/teapot,
+/obj/item/reagent_containers/glass/beaker/teapot,
 /obj/machinery/door/blast/shutters/open{
 	id = "bar_east"
 	},
@@ -11206,7 +11206,7 @@
 "iQL" = (
 /obj/structure/table/stone/marble,
 /obj/machinery/door/firedoor,
-/obj/item/reagent_containers/glass/teapot,
+/obj/item/reagent_containers/glass/beaker/teapot,
 /obj/machinery/door/blast/shutters/open{
 	id = "bar_southwest"
 	},
diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm
index f66fb504d30..36014c729c4 100644
--- a/maps/event/rooftop/rooftop-1.dmm
+++ b/maps/event/rooftop/rooftop-1.dmm
@@ -6510,7 +6510,7 @@
 /area/city/mendell/interior)
 "Lv" = (
 /obj/structure/table/stone/marble,
-/obj/item/reagent_containers/glass/teapot{
+/obj/item/reagent_containers/glass/beaker/teapot{
 	pixel_y = 7
 	},
 /turf/unsimulated/floor{
@@ -8118,7 +8118,7 @@
 /area/shuttle/city)
 "TD" = (
 /obj/structure/table/stone/marble,
-/obj/item/reagent_containers/glass/teapot{
+/obj/item/reagent_containers/glass/beaker/teapot{
 	pixel_y = 7
 	},
 /turf/simulated/floor/marble/dark,
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index 9dbf45cd8a7..d5af0c9d563 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -1512,7 +1512,7 @@
 /area/engineering/storage_eva)
 "aIh" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/glass/teapot{
+/obj/item/reagent_containers/glass/beaker/teapot{
 	pixel_x = 2;
 	pixel_y = 7
 	},
@@ -10613,7 +10613,7 @@
 	req_one_access = list(24,11,55)
 	},
 /obj/structure/table/stone/marble,
-/obj/item/reagent_containers/glass/teapot,
+/obj/item/reagent_containers/glass/beaker/teapot,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/bar)
 "flS" = (
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index 05966f68045..9b150a5b345 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -18436,7 +18436,7 @@
 	dir = 4
 	},
 /obj/structure/table/reinforced/wood,
-/obj/item/reagent_containers/glass/teapot,
+/obj/item/reagent_containers/glass/beaker/teapot,
 /turf/simulated/floor/wood,
 /area/bridge/minibar)
 "ogp" = (