diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index 4888484cd9e..55dfcc7745d 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -55,16 +55,18 @@
 			var/image/lid = image(icon, src, "lid_bottle")
 			overlays += lid
 
+
 /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline
 	name = "inaprovaline bottle"
 	desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-4"
 
-	New()
-		..()
-		reagents.add_reagent("inaprovaline", 60)
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline/New()
+	..()
+	reagents.add_reagent("inaprovaline", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/toxin
 	name = "toxin bottle"
@@ -72,10 +74,11 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-3"
 
-	New()
-		..()
-		reagents.add_reagent("toxin", 60)
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/toxin/New()
+	..()
+	reagents.add_reagent("toxin", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/cyanide
 	name = "cyanide bottle"
@@ -83,10 +86,11 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-3"
 
-	New()
-		..()
-		reagents.add_reagent("cyanide", 30) //volume changed to match chloral
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/cyanide/New()
+	..()
+	reagents.add_reagent("cyanide", 30) //volume changed to match chloral
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/stoxin
 	name = "soporific bottle"
@@ -94,10 +98,11 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-3"
 
-	New()
-		..()
-		reagents.add_reagent("stoxin", 60)
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/stoxin/New()
+	..()
+	reagents.add_reagent("stoxin", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate
 	name = "Chloral Hydrate Bottle"
@@ -105,10 +110,11 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-3"
 
-	New()
-		..()
-		reagents.add_reagent("chloralhydrate", 30)		//Intentionally low since it is so strong. Still enough to knock someone out.
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate/New()
+	..()
+	reagents.add_reagent("chloralhydrate", 30)		//Intentionally low since it is so strong. Still enough to knock someone out.
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/antitoxin
 	name = "dylovene bottle"
@@ -116,10 +122,11 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-4"
 
-	New()
-		..()
-		reagents.add_reagent("anti_toxin", 60)
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/antitoxin/New()
+	..()
+	reagents.add_reagent("anti_toxin", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/mutagen
 	name = "unstable mutagen bottle"
@@ -127,10 +134,11 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-1"
 
-	New()
-		..()
-		reagents.add_reagent("mutagen", 60)
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/mutagen/New()
+	..()
+	reagents.add_reagent("mutagen", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/ammonia
 	name = "ammonia bottle"
@@ -138,10 +146,11 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-1"
 
-	New()
-		..()
-		reagents.add_reagent("ammonia", 60)
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/ammonia/New()
+	..()
+	reagents.add_reagent("ammonia", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/eznutrient
 	name = "\improper EZ NUtrient bottle"
@@ -149,10 +158,11 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-4"
 
-	New()
-		..()
-		reagents.add_reagent("eznutrient", 60)
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/eznutrient/New()
+	..()
+	reagents.add_reagent("eznutrient", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/left4zed
 	name = "\improper Left-4-Zed bottle"
@@ -160,10 +170,11 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-4"
 
-	New()
-		..()
-		reagents.add_reagent("left4zed", 60)
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/left4zed/New()
+	..()
+	reagents.add_reagent("left4zed", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/robustharvest
 	name = "\improper Robust Harvest"
@@ -171,10 +182,11 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-4"
 
-	New()
-		..()
-		reagents.add_reagent("robustharvest", 60)
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/robustharvest/New()
+	..()
+	reagents.add_reagent("robustharvest", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/diethylamine
 	name = "diethylamine bottle"
@@ -182,47 +194,56 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-4"
 
-	New()
-		..()
-		reagents.add_reagent("diethylamine", 60)
-		update_icon()
+/obj/item/weapon/reagent_containers/glass/bottle/diethylamine/New()
+	..()
+	reagents.add_reagent("diethylamine", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/pacid
 	name = "Polytrinic Acid Bottle"
 	desc = "A small bottle. Contains a small amount of Polytrinic Acid"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-4"
-	New()
-		..()
-		reagents.add_reagent("pacid", 60)
-		update_icon()
+
+/obj/item/weapon/reagent_containers/glass/bottle/pacid/New()
+	..()
+	reagents.add_reagent("pacid", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/adminordrazine
 	name = "Adminordrazine Bottle"
 	desc = "A small bottle. Contains the liquid essence of the gods."
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "holyflask"
-	New()
-		..()
-		reagents.add_reagent("adminordrazine", 60)
-		update_icon()
+
+
+/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine/New()
+	..()
+	reagents.add_reagent("adminordrazine", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/capsaicin
 	name = "Capsaicin Bottle"
 	desc = "A small bottle. Contains hot sauce."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-4"
-	New()
-		..()
-		reagents.add_reagent("capsaicin", 60)
-		update_icon()
+
+/obj/item/weapon/reagent_containers/glass/bottle/capsaicin/New()
+	..()
+	reagents.add_reagent("capsaicin", 60)
+	update_icon()
+
 
 /obj/item/weapon/reagent_containers/glass/bottle/frostoil
 	name = "Frost Oil Bottle"
 	desc = "A small bottle. Contains cold sauce."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-4"
-	New()
-		..()
-		reagents.add_reagent("frostoil", 60)
-		update_icon()
+
+/obj/item/weapon/reagent_containers/glass/bottle/frostoil/New()
+	..()
+	reagents.add_reagent("frostoil", 60)
+	update_icon()