diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index 1fabca3a59a..01fcc5385e6 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -174,11 +174,6 @@
 				if(istype(O,/obj/item/weapon/reagent_containers/food/condiment/enzyme))
 					if(O.reagents.get_reagent_amount("enzyme") < 50)
 						O.reagents.add_reagent("enzyme", 2 * coeff)
-				//Medical
-				if(istype(O,/obj/item/weapon/reagent_containers/glass/bottle/robot))
-					var/obj/item/weapon/reagent_containers/glass/bottle/robot/B = O
-					if(B.reagent && (B.reagents.get_reagent_amount(B.reagent) < B.volume))
-						B.reagents.add_reagent(B.reagent, 2 * coeff)
 				//Janitor
 				if(istype(O, /obj/item/device/lightreplacer))
 					var/obj/item/device/lightreplacer/LR = O
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 2521b8c4f28..73e97fa6b9b 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -4,9 +4,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 /obj/item/weapon/reagent_containers/glass
 	name = "glass"
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "null"
-	item_state = "null"
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5, 10, 15, 25, 30, 50)
 	volume = 50
diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index bccc3191087..8bdb9492d2e 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -4,345 +4,199 @@
 /obj/item/weapon/reagent_containers/glass/bottle
 	name = "bottle"
 	desc = "A small bottle."
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = null
 	item_state = "atoxinbottle"
-	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30)
-	flags = OPENCONTAINER
 	volume = 30
+	var/spawned_reagent = null
+	var/spawned_amount = 30
+	var/spawned_disease = null
+
+/obj/item/weapon/reagent_containers/glass/bottle/New()
+	..()
+	if(!icon_state)
+		icon_state = "bottle[rand(1,20)]"
+	if(spawned_disease)
+		var/datum/disease/F = new spawned_disease(0)
+		var/list/data = list("viruses"= list(F))
+		reagents.add_reagent("blood", 20, data)
+	if(spawned_reagent && spawned_amount)
+		reagents.add_reagent("[spawned_reagent]", spawned_amount)
 
-	New()
-		..()
-		if(!icon_state)
-			icon_state = "bottle[rand(1,20)]"
 
 /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 = "bottle16"
-
-	New()
-		..()
-		reagents.add_reagent("inaprovaline", 30)
+	spawned_reagent = "inaprovaline"
 
 /obj/item/weapon/reagent_containers/glass/bottle/toxin
 	name = "toxin bottle"
 	desc = "A small bottle of toxins. Do not drink, it is poisonous."
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle12"
-
-	New()
-		..()
-		reagents.add_reagent("toxin", 30)
+	spawned_reagent = "toxin"
 
 /obj/item/weapon/reagent_containers/glass/bottle/cyanide
 	name = "cyanide bottle"
 	desc = "A small bottle of cyanide. Bitter almonds?"
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle12"
-
-	New()
-		..()
-		reagents.add_reagent("cyanide", 30)
+	spawned_reagent = "cyanide"
 
 /obj/item/weapon/reagent_containers/glass/bottle/stoxin
 	name = "sleep-toxin bottle"
 	desc = "A small bottle of sleep toxins. Just the fumes make you sleepy."
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle20"
-
-	New()
-		..()
-		reagents.add_reagent("stoxin", 30)
+	spawned_reagent = "stoxin"
 
 /obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate
 	name = "Chloral Hydrate Bottle"
 	desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle20"
-
-	New()
-		..()
-		reagents.add_reagent("chloralhydrate", 15)		//Intentionally low since it is so strong. Still enough to knock someone out.
+	spawned_reagent = "chloralhydrate"
+	spawned_amount = 15
 
 /obj/item/weapon/reagent_containers/glass/bottle/antitoxin
 	name = "anti-toxin bottle"
 	desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug."
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle17"
-
-	New()
-		..()
-		reagents.add_reagent("anti_toxin", 30)
+	spawned_reagent = "anti_toxin"
 
 /obj/item/weapon/reagent_containers/glass/bottle/mutagen
 	name = "unstable mutagen bottle"
 	desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle20"
-
-	New()
-		..()
-		reagents.add_reagent("mutagen", 30)
+	spawned_reagent = "mutagen"
 
 /obj/item/weapon/reagent_containers/glass/bottle/plasma
 	name = "liquid plasma bottle"
 	desc = "A small bottle of liquid plasma. Extremely toxic and reacts with micro-organisms inside blood."
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle8"
-
-	New()
-		..()
-		reagents.add_reagent("plasma", 30)
-
+	spawned_reagent = "plasma"
 
 /obj/item/weapon/reagent_containers/glass/bottle/synaptizine
 	name = "synaptizine bottle"
 	desc = "A small bottle of synaptizine."
-	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle20"
-
-	New()
-		..()
-		reagents.add_reagent("synaptizine", 30)
+	spawned_reagent = "synaptizine"
 
 /obj/item/weapon/reagent_containers/glass/bottle/ammonia
 	name = "ammonia bottle"
-	desc = "A small bottle."
-	icon = 'icons/obj/chemical.dmi'
+	desc = "A small bottle of ammonia."
 	icon_state = "bottle20"
-
-	New()
-		..()
-		reagents.add_reagent("ammonia", 30)
+	spawned_reagent = "ammonia"
 
 /obj/item/weapon/reagent_containers/glass/bottle/diethylamine
 	name = "diethylamine bottle"
-	desc = "A small bottle."
-	icon = 'icons/obj/chemical.dmi'
+	desc = "A small bottle of diethylamine."
 	icon_state = "bottle17"
-
-	New()
-		..()
-		reagents.add_reagent("diethylamine", 30)
-
-/obj/item/weapon/reagent_containers/glass/bottle/flu_virion
-	name = "Flu virion culture bottle"
-	desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/advance/flu(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-/obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion
-	name = "Epiglottis virion culture bottle"
-	desc = "A small bottle. Contains Epiglottis virion culture in synthblood medium."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/advance/voice_change(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-/obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion
-	name = "Liver enhancement virion culture bottle"
-	desc = "A small bottle. Contains liver enhancement virion culture in synthblood medium."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/advance/heal(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-/obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion
-	name = "Hullucigen virion culture bottle"
-	desc = "A small bottle. Contains hullucigen virion culture in synthblood medium."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/advance/hullucigen(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat
-	name = "Pierrot's Throat culture bottle"
-	desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/pierrot_throat(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-/obj/item/weapon/reagent_containers/glass/bottle/cold
-	name = "Rhinovirus culture bottle"
-	desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/advance/F = new /datum/disease/advance/cold(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-/obj/item/weapon/reagent_containers/glass/bottle/random
-	name = "Random culture bottle"
-	desc = "A small bottle. Contains a random disease."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/advance/F = new(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-/obj/item/weapon/reagent_containers/glass/bottle/retrovirus
-	name = "Retrovirus culture bottle"
-	desc = "A small bottle. Contains a retrovirus culture in a synthblood medium."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/dna_retrovirus(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-
-/obj/item/weapon/reagent_containers/glass/bottle/gbs
-	name = "GBS culture bottle"
-	desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	amount_per_transfer_from_this = 5
-
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/gbs
-		var/list/data = list("virus"= F)
-		reagents.add_reagent("blood", 20, data)
-
-/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs
-	name = "GBS culture bottle"
-	desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/fake_gbs(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-/*
-/obj/item/weapon/reagent_containers/glass/bottle/rhumba_beat
-	name = "Rhumba Beat culture bottle"
-	desc = "A small bottle. Contains The Rhumba Beat culture in synthblood medium."//Or simply - General BullShit
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	amount_per_transfer_from_this = 5
-
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/rhumba_beat
-		var/list/data = list("virus"= F)
-		R.add_reagent("blood", 20, data)
-*/
-
-/obj/item/weapon/reagent_containers/glass/bottle/brainrot
-	name = "Brainrot culture bottle"
-	desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/brainrot(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-/obj/item/weapon/reagent_containers/glass/bottle/magnitis
-	name = "Magnitis culture bottle"
-	desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/magnitis(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-
-/obj/item/weapon/reagent_containers/glass/bottle/wizarditis
-	name = "Wizarditis culture bottle"
-	desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/wizarditis(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-/obj/item/weapon/reagent_containers/glass/bottle/anxiety
-	name = "Severe Anxiety culture bottle"
-	desc = "A small bottle. Contains a sample of Lepidopticides."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/anxiety(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
-
-/obj/item/weapon/reagent_containers/glass/bottle/beesease
-	name = "Beesease culture bottle"
-	desc = "A small bottle. Contains a sample of invasive Apidae."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle3"
-	New()
-		..()
-		var/datum/disease/F = new /datum/disease/beesease(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 20, data)
+	spawned_reagent = "diethylamine"
 
 /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 = "bottle17"
-	New()
-		..()
-		reagents.add_reagent("pacid", 30)
+	spawned_reagent = "pacid"
 
 /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", 30)
+	spawned_reagent = "adminordrazine"
 
 /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 = "bottle3"
-	New()
-		..()
-		reagents.add_reagent("capsaicin", 30)
+	spawned_reagent = "capsaicin"
 
 /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 = "bottle17"
-	New()
-		..()
-		reagents.add_reagent("frostoil", 30)
\ No newline at end of file
+	spawned_reagent = "frostoil"
+
+/obj/item/weapon/reagent_containers/glass/bottle/flu_virion
+	name = "Flu virion culture bottle"
+	desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/advance/flu
+
+/obj/item/weapon/reagent_containers/glass/bottle/epiglottis_virion
+	name = "Epiglottis virion culture bottle"
+	desc = "A small bottle. Contains Epiglottis virion culture in synthblood medium."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/advance/voice_change
+
+/obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion
+	name = "Liver enhancement virion culture bottle"
+	desc = "A small bottle. Contains liver enhancement virion culture in synthblood medium."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/advance/heal
+
+/obj/item/weapon/reagent_containers/glass/bottle/hullucigen_virion
+	name = "Hullucigen virion culture bottle"
+	desc = "A small bottle. Contains hullucigen virion culture in synthblood medium."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/advance/hullucigen
+
+/obj/item/weapon/reagent_containers/glass/bottle/pierrot_throat
+	name = "Pierrot's Throat culture bottle"
+	desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/pierrot_throat
+
+/obj/item/weapon/reagent_containers/glass/bottle/cold
+	name = "Rhinovirus culture bottle"
+	desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/advance/cold
+
+/obj/item/weapon/reagent_containers/glass/bottle/retrovirus
+	name = "Retrovirus culture bottle"
+	desc = "A small bottle. Contains a retrovirus culture in a synthblood medium."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/dna_retrovirus
+
+/obj/item/weapon/reagent_containers/glass/bottle/gbs
+	name = "GBS culture bottle"
+	desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit
+	icon_state = "bottle3"
+	amount_per_transfer_from_this = 5
+	spawned_disease = /datum/disease/gbs
+
+/obj/item/weapon/reagent_containers/glass/bottle/fake_gbs
+	name = "GBS culture bottle"
+	desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/fake_gbs
+
+/obj/item/weapon/reagent_containers/glass/bottle/brainrot
+	name = "Brainrot culture bottle"
+	desc = "A small bottle. Contains Cryptococcus Cosmosis culture in synthblood medium."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/brainrot
+
+/obj/item/weapon/reagent_containers/glass/bottle/magnitis
+	name = "Magnitis culture bottle"
+	desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/magnitis
+
+/obj/item/weapon/reagent_containers/glass/bottle/wizarditis
+	name = "Wizarditis culture bottle"
+	desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/wizarditis
+
+/obj/item/weapon/reagent_containers/glass/bottle/anxiety
+	name = "Severe Anxiety culture bottle"
+	desc = "A small bottle. Contains a sample of Lepidopticides."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/anxiety
+
+/obj/item/weapon/reagent_containers/glass/bottle/beesease
+	name = "Beesease culture bottle"
+	desc = "A small bottle. Contains a sample of invasive Apidae."
+	icon_state = "bottle3"
+	spawned_disease = /datum/disease/beesease
diff --git a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
deleted file mode 100644
index 7c8bf02a5bb..00000000000
--- a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
+++ /dev/null
@@ -1,33 +0,0 @@
-
-/obj/item/weapon/reagent_containers/glass/bottle/robot
-	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5,10,15,25,30,50,100)
-	flags = OPENCONTAINER
-	volume = 60
-	var/reagent = ""
-
-
-/obj/item/weapon/reagent_containers/glass/bottle/robot/inaprovaline
-	name = "internal inaprovaline bottle"
-	desc = "A small bottle. Contains inaprovaline - used to stabilize patients."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle16"
-	reagent = "inaprovaline"
-
-	New()
-		..()
-		reagents.add_reagent("inaprovaline", 60)
-		return
-
-
-/obj/item/weapon/reagent_containers/glass/bottle/robot/antitoxin
-	name = "internal anti-toxin bottle"
-	desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug."
-	icon = 'icons/obj/chemical.dmi'
-	icon_state = "bottle17"
-	reagent = "anti_toxin"
-
-	New()
-		..()
-		reagents.add_reagent("anti_toxin", 60)
-		return
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index f7653dd2169..4c40a28a77e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1288,7 +1288,6 @@
 #include "code\modules\reagents\reagent_containers\spray.dm"
 #include "code\modules\reagents\reagent_containers\syringes.dm"
 #include "code\modules\reagents\reagent_containers\glass\bottle.dm"
-#include "code\modules\reagents\reagent_containers\glass\bottle\robot.dm"
 #include "code\modules\recycling\conveyor2.dm"
 #include "code\modules\recycling\disposal-construction.dm"
 #include "code\modules\recycling\disposal.dm"