some moire

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -27,7 +27,7 @@
 	var/label_text = ""
 
 	var/blood_type = null
-	var/reag_id = "blood"
+	var/reag_id = REAGENT_ID_BLOOD
 
 /obj/item/reagent_containers/blood/Initialize()
 	. = ..()
@@ -98,11 +98,11 @@
 
 /obj/item/reagent_containers/blood/synthplas
 	blood_type = "O-"
-	reag_id = "synthblood_dilute"
+	reag_id = REAGENT_ID_SYNTHBLOOD_DILUTE
 
 /obj/item/reagent_containers/blood/synthblood
 	blood_type = "O-"
-	reag_id = "synthblood"
+	reag_id = REAGENT_ID_SYNTHBLOOD
 
 /obj/item/reagent_containers/blood/empty
 	name = "Empty BloodPack"

code/modules/reagents/reagent_containers/blood_pack_vr.dm

@@ -4,7 +4,7 @@
 			var/remove_volume = volume* 0.1 //10% of what the bloodpack can hold.
 			var/reagent_to_remove = reagents.get_master_reagent_id()
 			switch(reagents.get_master_reagent_id())
-				if("blood")
+				if(REAGENT_ID_BLOOD)
 					user.show_message(span_warning("You sink your fangs into \the [src] and suck the blood out of it!"))
 					user.visible_message(span_red("[user] sinks their fangs into \the [src] and drains it!"))
 					user.adjust_nutrition(remove_volume*5)

code/modules/reagents/reagent_containers/borghypo.dm

@@ -32,7 +32,7 @@
 	desc = "An advanced nanite and chemical synthesizer and injection system, designed for heavy-duty medical equipment.  This type is capable of safely bypassing \
 	thick materials that other hyposprays would struggle with."
 	bypass_protection = TRUE // Because mercs tend to be in spacesuits.
-	reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", "synthblood")
+	reagent_ids = list("healing_nanites", "hyperzine", "tramadol", "oxycodone", "spaceacillin", "peridaxon", "osteodaxon", "myelamine", REAGENT_ID_SYNTHBLOOD)
 
 /obj/item/reagent_containers/borghypo/Initialize()
 	. = ..()
@@ -165,14 +165,14 @@
 		"spacemountainwind",
 		"spacespice",
 		"specialwhiskey",
-		"sugar",
+		REAGENT_ID_SUGAR,
 		"tea",
 		"tequilla",
 		"tomatojuice",
 		"tonic",
 		"vermouth",
 		"vodka",
-		"water",
+		REAGENT_ID_WATER,
 		"watermelonjuice",
 		"whiskey")
 

code/modules/reagents/reagent_containers/glass.dm

@@ -285,7 +285,7 @@
 	prefill = list("cryoxadone" = 30)
 
 /obj/item/reagent_containers/glass/beaker/sulphuric
-	prefill = list("sacid" = 60)
+	prefill = list(REAGENT_ID_SACID = 60)
 
 /obj/item/reagent_containers/glass/beaker/stopperedbottle
 	name = "stoppered bottle"

code/modules/reagents/reagent_containers/glass_vr.dm

@@ -50,32 +50,32 @@
 	prefill = list("hyronalin" = 30)
 
 /obj/item/reagent_containers/glass/beaker/vial/amorphorovir
-	name = "vial (amorphorovir)"
-	prefill = list("amorphorovir" = 1)
+	name = "vial (" + REAGENT_ID_AMORPHOROVIR + ")"
+	prefill = list(REAGENT_ID_AMORPHOROVIR = 1)
 
 /obj/item/reagent_containers/glass/beaker/vial/androrovir
-	name = "vial (androrovir)"
-	prefill = list("androrovir" = 1)
+	name = "vial (" + REAGENT_ID_ANDROROVIR + ")"
+	prefill = list(REAGENT_ID_ANDROROVIR = 1)
 
 /obj/item/reagent_containers/glass/beaker/vial/gynorovir
-	name = "vial (gynorovir)"
-	prefill = list("gynorovir" = 1)
+	name = "vial (" + REAGENT_ID_GYNOROVIR + ")"
+	prefill = list(REAGENT_ID_GYNOROVIR = 1)
 
 /obj/item/reagent_containers/glass/beaker/vial/androgynorovir
-	name = "vial (androgynorovir)"
-	prefill = list("androgynorovir" = 1)
+	name = "vial (" + REAGENT_ID_ANDROGYNOROVIR + ")"
+	prefill = list(REAGENT_ID_ANDROGYNOROVIR = 1)
 
 /obj/item/reagent_containers/glass/beaker/vial/macrocillin
-	name = "vial (macrocillin)"
-	prefill = list("macrocillin" = 1)
+	name = "vial (" + REAGENT_ID_MACROCILLIN + ")"
+	prefill = list(REAGENT_ID_MACROCILLIN = 1)
 
 /obj/item/reagent_containers/glass/beaker/vial/microcillin
-	name = "vial (microcillin)"
-	prefill = list("microcillin" = 1)
+	name = "vial (" + REAGENT_ID_MICROCILLIN + ")"
+	prefill = list(REAGENT_ID_MICROCILLIN = 1)
 
 /obj/item/reagent_containers/glass/beaker/vial/normalcillin
-	name = "vial (normalcillin)"
-	prefill = list("normalcillin" = 1)
+	name = "vial (" + REAGENT_ID_NORMALCILLIN + ")"
+	prefill = list(REAGENT_ID_NORMALCILLIN = 1)
 
 /obj/item/reagent_containers/glass/beaker/vial/supermatter
 	name = "vial (supermatter)"
@@ -87,4 +87,4 @@
 	desc = "A measuring cup."
 	icon = 'icons/obj/chemical_vr.dmi'
 	icon_state = "measure_cup"
-	item_state = "measure_cup"
+	item_state = "measure_cup"

code/modules/reagents/reagent_containers/hypospray.dm

@@ -312,7 +312,7 @@
 	name = "illicit injector"
 	desc = "A refined version of the standard autoinjector, allowing greater capacity. \
 	This one contains various illicit drugs, held inside a hypospray to make smuggling easier."
-	filled_reagents = list("bliss" = 15)
+	filled_reagents = list(REAGENT_ID_BLISS = 15)
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin
 	name = "cryptobiolin injector"
@@ -339,7 +339,7 @@
 	desc = "A refined version of the standard autoinjector, allowing greater capacity. \
 	This has psilocybin inside, which is a strong psychotropic derived from certain species of mushroom. \
 	This autoinjector likely was made by criminal elements to avoid detection from casual inspection."
-	filled_reagents = list("psilocybin" = 15)
+	filled_reagents = list(REAGENT_ID_PSILOCYBIN = 15)
 
 /obj/item/reagent_containers/hypospray/autoinjector/biginjector/mutagen
 	name = "unstable mutagen injector"

code/modules/reagents/reagent_containers/pill.dm

@@ -206,7 +206,7 @@
 
 /obj/item/reagent_containers/pill/methylphenidate/Initialize()
 	. = ..()
-	reagents.add_reagent("methylphenidate", 15)
+	reagents.add_reagent(REAGENT_ID_METHYLPHENIDATE, 15)
 	color = reagents.get_color()
 
 /obj/item/reagent_containers/pill/citalopram
@@ -216,7 +216,7 @@
 
 /obj/item/reagent_containers/pill/citalopram/Initialize()
 	. = ..()
-	reagents.add_reagent("citalopram", 15)
+	reagents.add_reagent(REAGENT_ID_CITALOPRAM, 15)
 	color = reagents.get_color()
 
 /obj/item/reagent_containers/pill/dexalin
@@ -296,7 +296,7 @@
 
 /obj/item/reagent_containers/pill/carbon/Initialize()
 	. = ..()
-	reagents.add_reagent("carbon", 30) //VOREStation Edit
+	reagents.add_reagent(REAGENT_ID_CARBON, 30) //VOREStation Edit
 	color = reagents.get_color()
 
 /obj/item/reagent_containers/pill/iron
@@ -306,7 +306,7 @@
 
 /obj/item/reagent_containers/pill/iron/Initialize()
 	. = ..()
-	reagents.add_reagent("iron", 30) //VOREStation Edit
+	reagents.add_reagent(REAGENT_ID_IRON, 30) //VOREStation Edit
 	color = reagents.get_color()
 
 /obj/item/reagent_containers/pill/copper
@@ -316,7 +316,7 @@
 
 /obj/item/reagent_containers/pill/copper/Initialize()
 	. = ..()
-	reagents.add_reagent("copper", 30)
+	reagents.add_reagent(REAGENT_ID_COPPER, 30)
 	color = reagents.get_color()
 
 //Not-quite-medicine
@@ -327,8 +327,8 @@
 
 /obj/item/reagent_containers/pill/happy/Initialize()
 	. = ..()
-	reagents.add_reagent("bliss", 15)
-	reagents.add_reagent("sugar", 15)
+	reagents.add_reagent(REAGENT_ID_BLISS, 15)
+	reagents.add_reagent(REAGENT_ID_SUGAR, 15)
 	color = reagents.get_color()
 
 /obj/item/reagent_containers/pill/zoom

code/modules/reagents/reagent_containers/pill_vr.dm

@@ -5,7 +5,7 @@
 
 /obj/item/reagent_containers/pill/nutriment/Initialize()
 	. = ..()
-	reagents.add_reagent("nutriment", 30)
+	reagents.add_reagent(REAGENT_ID_NUTRIMENT, 30)
 
 /obj/item/reagent_containers/pill/protein
 	name = "Protein (30u)"
@@ -155,4 +155,4 @@
 /obj/item/reagent_containers/pill/airlock/New()
 	..()
 	reagents.add_reagent("anti_toxin", 15)
-	reagents.add_reagent("paracetamol", 5)
+	reagents.add_reagent("paracetamol", 5)

code/modules/reagents/reagent_containers/spray.dm

@@ -42,10 +42,10 @@
 
 	user.setClickCooldown(4)
 
-	if(reagents.has_reagent("sacid"))
+	if(reagents.has_reagent(REAGENT_ID_SACID))
 		message_admins("[key_name_admin(user)] fired sulphuric acid from \a [src].")
 		log_game("[key_name(user)] fired sulphuric acid from \a [src].")
-	if(reagents.has_reagent("pacid"))
+	if(reagents.has_reagent(REAGENT_ID_PACID))
 		message_admins("[key_name_admin(user)] fired Polyacid from \a [src].")
 		log_game("[key_name(user)] fired Polyacid from \a [src].")
 	if(reagents.has_reagent("lube"))
@@ -160,7 +160,7 @@
 
 /obj/item/reagent_containers/spray/waterflower/Initialize()
 	. = ..()
-	reagents.add_reagent("water", 10)
+	reagents.add_reagent(REAGENT_ID_WATER, 10)
 
 /obj/item/reagent_containers/spray/chemsprayer
 	name = "chem sprayer"

code/modules/reagents/reagent_containers/syringes.dm

@@ -106,7 +106,7 @@
 				return
 
 			if(ismob(target))//Blood!
-				if(reagents.has_reagent("blood"))
+				if(reagents.has_reagent(REAGENT_ID_BLOOD))
 					to_chat(user, span_notice("There is already a blood sample in this syringe."))
 					return
 
@@ -368,7 +368,7 @@
 
 /obj/item/reagent_containers/syringe/drugs/Initialize()
 	. = ..()
-	reagents.add_reagent("bliss",  5)
+	reagents.add_reagent(REAGENT_ID_BLISS,  5)
 	reagents.add_reagent("mindbreaker",  5)
 	reagents.add_reagent("cryptobiolin", 5)
 	//mode = SYRINGE_INJECT //VOREStation Edit - Starts capped

code/modules/reagents/reagent_containers/virology.dm

@@ -13,7 +13,7 @@
 	. = ..()
 	diseases += new /datum/disease/advance/cold
 	data["viruses"] = diseases
-	reagents.add_reagent("blood", 10, data)
+	reagents.add_reagent(REAGENT_ID_BLOOD, 10, data)
 
 /obj/item/reagent_containers/glass/bottle/culture/flu
 	name = "flu virus culture"
@@ -23,4 +23,4 @@
 	. = ..()
 	diseases += new /datum/disease/advance/flu
 	data["viruses"] = diseases
-	reagents.add_reagent("blood", 10, data)
+	reagents.add_reagent(REAGENT_ID_BLOOD, 10, data)