some moire

code/game/objects/effects/chem/foam.dm

@@ -127,7 +127,7 @@
 				for(var/id in carried_reagents)
 					F.reagents.add_reagent(id, 1, safety = 1) //makes a safety call because all reagents should have already reacted anyway
 			else
-				F.reagents.add_reagent("water", 1, safety = 1)
+				F.reagents.add_reagent(REAGENT_ID_WATER, 1, safety = 1)
 
 // wall formed by metal foams, dense and opaque, but easy to break
 

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -105,7 +105,7 @@
 
 /obj/effect/temp_visual/heal
 	name = "healing glow"
-	icon_state = "heal"
+	icon_state = XENO_CHEM_HEAL
 	duration = 15
 
 /obj/effect/temp_visual/heal/Initialize(mapload)

code/game/objects/items/contraband.dm

@@ -17,11 +17,11 @@
 
 /obj/item/reagent_containers/glass/beaker/vial/random
 	flags = 0
-	var/list/random_reagent_list = list(list("water" = 15) = 1, list("cleaner" = 15) = 1)
+	var/list/random_reagent_list = list(list(REAGENT_ID_WATER = 15) = 1, list("cleaner" = 15) = 1)
 
 /obj/item/reagent_containers/glass/beaker/vial/random/toxin
 	random_reagent_list = list(
-		list("mindbreaker" = 10, "bliss" = 20)	= 3,
+		list("mindbreaker" = 10, REAGENT_ID_BLISS = 20)	= 3,
 		list("carpotoxin" = 15)							= 2,
 		list("impedrezene" = 15)						= 2,
 		list("zombiepowder" = 10)						= 1)

code/game/objects/items/devices/defib.dm

@@ -339,7 +339,7 @@
 	if(!heart)
 		return TRUE
 
-	var/blood_volume = H.vessel.get_reagent_amount("blood")
+	var/blood_volume = H.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
 	if(!heart || heart.is_broken())
 		blood_volume *= 0.3
 	else if(heart.is_bruised())

code/game/objects/items/devices/flashlight.dm

@@ -150,7 +150,7 @@
 					to_chat(user, span_notice("There's visible lag between left and right pupils' reactions."))
 
 				var/list/pinpoint = list("oxycodone"=1,"tramadol"=5)
-				var/list/dilating = list("bliss"=5,"ambrosia_extract"=5,"mindbreaker"=1)
+				var/list/dilating = list(REAGENT_ID_BLISS=5,REAGENT_ID_AMBROSIAEXTRACT=5,"mindbreaker"=1)
 				if(M.reagents.has_any_reagent(pinpoint) || H.ingested.has_any_reagent(pinpoint))
 					to_chat(user, span_notice("\The [M]'s pupils are already pinpoint and cannot narrow any more."))
 				else if(M.reagents.has_any_reagent(dilating) || H.ingested.has_any_reagent(dilating))

code/game/objects/items/devices/scanners/guide.dm

@@ -67,7 +67,7 @@
 		if(org.damage >= 1 && !istype(org, /obj/item/organ/internal/brain))
 			organ = TRUE
 
-	var/blood_volume = M.vessel.get_reagent_amount("blood")
+	var/blood_volume = M.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
 	if(blood_volume <= M.species.blood_volume*M.species.blood_level_safe)
 		bloodloss = TRUE
 

code/game/objects/items/devices/scanners/health.dm

@@ -359,7 +359,7 @@
 
 		// Blood level
 		if(M:vessel)
-			var/blood_volume = H.vessel.get_reagent_amount("blood")
+			var/blood_volume = H.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
 			var/blood_percent =  round((blood_volume / H.species.blood_volume)*100)
 			var/blood_type = H.dna.b_type
 			var/blood_reagent = H.species.blood_reagents

code/game/objects/items/devices/scanners/mass_spectrometer.dm

@@ -40,7 +40,7 @@
 	if(reagents.total_volume)
 		var/list/blood_traces = list()
 		for(var/datum/reagent/R in reagents.reagent_list)
-			if(R.id != "blood")
+			if(R.id != REAGENT_ID_BLOOD)
 				reagents.clear_reagents()
 				to_chat(user, span_warning("The sample was contaminated! Please insert another sample"))
 				return

code/game/objects/items/selectable_item_vr.dm

@@ -43,6 +43,6 @@
 	desc = "A pre-arranged home chemistry kit. This one is for rather specific set of gender-altering chemicals."
 	preface_string = "This kit can be used to create a vial of a gender-altering chemical, but there's only enough material for one."
 	preface_title = "Gender Chemistry Kit"
-	item_options = list("Androrovir" = /obj/item/reagent_containers/glass/beaker/vial/androrovir,
-						"Gynorovir" = /obj/item/reagent_containers/glass/beaker/vial/gynorovir,
-						"Androgynorovir" = /obj/item/reagent_containers/glass/beaker/vial/androgynorovir)
+	item_options = list(REAGENT_ANDROROVIR = /obj/item/reagent_containers/glass/beaker/vial/androrovir,
+						REAGENT_GYNOROVIR = /obj/item/reagent_containers/glass/beaker/vial/gynorovir,
+						REAGENT_ANDROGYNOROVIR = /obj/item/reagent_containers/glass/beaker/vial/androgynorovir)

code/game/objects/items/toys/toys.dm

@@ -59,7 +59,7 @@
 			if(O.reagents.total_volume < 1)
 				to_chat(user, "The [O] is empty.")
 			else if(O.reagents.total_volume >= 1)
-				if(O.reagents.has_reagent("pacid", 1))
+				if(O.reagents.has_reagent(REAGENT_ID_PACID, 1))
 					to_chat(user, "The acid chews through the balloon!")
 					O.reagents.splash(user, reagents.total_volume)
 					qdel(src)

code/game/objects/items/weapons/chewables.dm

@@ -104,12 +104,12 @@
 /obj/item/clothing/mask/chewable/tobacco/cheap
 	name = "chewing tobacco"
 	desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it tastes less like an ash-tray when you stuff it into your face."
-	filling = list("nicotine" = 2)
+	filling = list(REAGENT_ID_NICOTINE = 2)
 
 /obj/item/clothing/mask/chewable/tobacco/fine
 	name = "deluxe chewing tobacco"
 	desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face."
-	filling = list("nicotine" = 3)
+	filling = list(REAGENT_ID_NICOTINE = 3)
 
 /obj/item/clothing/mask/chewable/tobacco/nico
 	name = "nicotine gum"
@@ -120,7 +120,7 @@
 
 /obj/item/clothing/mask/chewable/tobacco/nico/Initialize()
 	. = ..()
-	reagents.add_reagent("nicotine", 2)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 2)
 	color = reagents.get_color()
 
 /obj/item/storage/chewables
@@ -215,7 +215,7 @@
 	slot_flags = SLOT_EARS | SLOT_MASK
 	chem_volume = 50
 	chewtime = 300
-	filling = list("sugar" = 2)
+	filling = list(REAGENT_ID_SUGAR = 2)
 
 /obj/item/clothing/mask/chewable/candy/gum
 	name = "chewing gum"
@@ -287,7 +287,7 @@
 	desc = "A chocolate-coated biscuit stick."
 	icon_state = "pockystick"
 	item_state = "pocky"
-	filling = list("sugar" = 2, "chocolate" = 5)
+	filling = list(REAGENT_ID_SUGAR = 2, "chocolate" = 5)
 	type_butt = null
 
 /obj/item/clothing/mask/chewable/candy/pocky/process()

code/game/objects/items/weapons/cigs_lighters.dm

@@ -175,9 +175,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			e.start()
 			qdel(src)
 			return
-		if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
+		if(reagents.get_reagent_amount(REAGENT_ID_FUEL)) // the fuel explodes, too, but much less violently
 			var/datum/effect/effect/system/reagents_explosion/e = new()
-			e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0)
+			e.set_up(round(reagents.get_reagent_amount(REAGENT_ID_FUEL) / 5, 1), get_turf(src), 0, 0)
 			e.start()
 			qdel(src)
 			return
@@ -292,7 +292,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/clothing/mask/smokable/cigarette/Initialize()
 	. = ..()
 	if(nicotine_amt)
-		reagents.add_reagent("nicotine", nicotine_amt)
+		reagents.add_reagent(REAGENT_ID_NICOTINE, nicotine_amt)
 
 /obj/item/clothing/mask/smokable/cigarette/attackby(obj/item/W as obj, mob/user as mob)
 	..()

code/game/objects/items/weapons/ecigs.dm

@@ -170,32 +170,32 @@
 	desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says you can add whatever flavoring agents you want."
 /obj/item/reagent_containers/ecig_cartridge/blanknico/New()
 	..()
-	reagents.add_reagent("nicotine", 5)
-	reagents.add_reagent("water", 10)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+	reagents.add_reagent(REAGENT_ID_WATER, 10)
 
 /obj/item/reagent_containers/ecig_cartridge/med_nicotine
 	name = "tobacco flavour cartridge"
 	desc =  "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored."
 /obj/item/reagent_containers/ecig_cartridge/med_nicotine/New()
 	..()
-	reagents.add_reagent("nicotine", 5)
-	reagents.add_reagent("water", 15)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+	reagents.add_reagent(REAGENT_ID_WATER, 15)
 
 /obj/item/reagent_containers/ecig_cartridge/high_nicotine
 	name = "high nicotine tobacco flavour cartridge"
 	desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored, with extra nicotine."
 /obj/item/reagent_containers/ecig_cartridge/high_nicotine/New()
 	..()
-	reagents.add_reagent("nicotine", 10)
-	reagents.add_reagent("water", 10)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 10)
+	reagents.add_reagent(REAGENT_ID_WATER, 10)
 
 /obj/item/reagent_containers/ecig_cartridge/orange
 	name = "orange flavour cartridge"
 	desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its orange flavored."
 /obj/item/reagent_containers/ecig_cartridge/orange/New()
 	..()
-	reagents.add_reagent("nicotine", 5)
-	reagents.add_reagent("water", 10)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+	reagents.add_reagent(REAGENT_ID_WATER, 10)
 	reagents.add_reagent("orangejuice", 5)
 
 /obj/item/reagent_containers/ecig_cartridge/mint
@@ -203,8 +203,8 @@
 	desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its mint flavored."
 /obj/item/reagent_containers/ecig_cartridge/mint/New()
 	..()
-	reagents.add_reagent("nicotine", 5)
-	reagents.add_reagent("water", 10)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+	reagents.add_reagent(REAGENT_ID_WATER, 10)
 	reagents.add_reagent("menthol", 5)
 
 /obj/item/reagent_containers/ecig_cartridge/watermelon
@@ -212,8 +212,8 @@
 	desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its watermelon flavored."
 /obj/item/reagent_containers/ecig_cartridge/watermelon/New()
 	..()
-	reagents.add_reagent("nicotine", 5)
-	reagents.add_reagent("water", 10)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+	reagents.add_reagent(REAGENT_ID_WATER, 10)
 	reagents.add_reagent("watermelonjuice", 5)
 
 /obj/item/reagent_containers/ecig_cartridge/grape
@@ -221,8 +221,8 @@
 	desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its grape flavored."
 /obj/item/reagent_containers/ecig_cartridge/grape/New()
 	..()
-	reagents.add_reagent("nicotine", 5)
-	reagents.add_reagent("water", 10)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+	reagents.add_reagent(REAGENT_ID_WATER, 10)
 	reagents.add_reagent("grapejuice", 5)
 
 /obj/item/reagent_containers/ecig_cartridge/lemonlime
@@ -230,8 +230,8 @@
 	desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its lemon-lime flavored."
 /obj/item/reagent_containers/ecig_cartridge/lemonlime/New()
 	..()
-	reagents.add_reagent("nicotine", 5)
-	reagents.add_reagent("water", 10)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+	reagents.add_reagent(REAGENT_ID_WATER, 10)
 	reagents.add_reagent("lemon_lime", 5)
 
 /obj/item/reagent_containers/ecig_cartridge/coffee
@@ -239,8 +239,8 @@
 	desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its coffee flavored."
 /obj/item/reagent_containers/ecig_cartridge/coffee/New()
 	..()
-	reagents.add_reagent("nicotine", 5)
-	reagents.add_reagent("water", 10)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+	reagents.add_reagent(REAGENT_ID_WATER, 10)
 	reagents.add_reagent("coffee", 5)
 /*
 /obj/item/reagent_containers/ecig_cartridge/cannabis
@@ -248,7 +248,7 @@
 	desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label seems to be suspiciously scuffed off..."
 /obj/item/reagent_containers/ecig_cartridge/cannabis/New()
 	..()
-	reagents.add_reagent("nicotine", 5)
-	reagents.add_reagent("water", 10)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
+	reagents.add_reagent(REAGENT_ID_WATER, 10)
 	reagents.add_reagent("cannabis", 5)
 */

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -213,9 +213,9 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
-	B1.reagents.add_reagent("aluminum", 30)
+	B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 30)
 	B2.reagents.add_reagent("foaming_agent", 10)
-	B2.reagents.add_reagent("pacid", 10)
+	B2.reagents.add_reagent(REAGENT_ID_PACID, 10)
 
 	detonator = new/obj/item/assembly_holder/timer_igniter(src)
 
@@ -235,11 +235,11 @@
 	var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
-	B1.reagents.add_reagent("aluminum", 15)
-	B1.reagents.add_reagent("fuel",20)
+	B1.reagents.add_reagent(REAGENT_ID_ALUMINIUM, 15)
+	B1.reagents.add_reagent(REAGENT_ID_FUEL,20)
 	B2.reagents.add_reagent(REAGENT_ID_PHORON, 15)
-	B2.reagents.add_reagent("sacid", 15)
-	B1.reagents.add_reagent("fuel",20)
+	B2.reagents.add_reagent(REAGENT_ID_SACID, 15)
+	B1.reagents.add_reagent(REAGENT_ID_FUEL,20)
 
 	detonator = new/obj/item/assembly_holder/timer_igniter(src)
 
@@ -259,9 +259,9 @@
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
 	B1.reagents.add_reagent("plantbgone", 25)
-	B1.reagents.add_reagent("potassium", 25)
-	B2.reagents.add_reagent("phosphorus", 25)
-	B2.reagents.add_reagent("sugar", 25)
+	B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 25)
+	B2.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 25)
+	B2.reagents.add_reagent(REAGENT_ID_SUGAR, 25)
 
 	detonator = new/obj/item/assembly_holder/timer_igniter(src)
 
@@ -283,7 +283,7 @@
 	var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
 
 	B1.reagents.add_reagent("fluorosurfactant", 40)
-	B2.reagents.add_reagent("water", 40)
+	B2.reagents.add_reagent(REAGENT_ID_WATER, 40)
 	B2.reagents.add_reagent("cleaner", 10)
 
 	detonator = new/obj/item/assembly_holder/timer_igniter(src)
@@ -304,10 +304,10 @@
 	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
 
-	B1.reagents.add_reagent("phosphorus", 40)
-	B1.reagents.add_reagent("potassium", 40)
+	B1.reagents.add_reagent(REAGENT_ID_PHOSPHORUS, 40)
+	B1.reagents.add_reagent(REAGENT_ID_POTASSIUM, 40)
 	B1.reagents.add_reagent("condensedcapsaicin", 40)
-	B2.reagents.add_reagent("sugar", 40)
+	B2.reagents.add_reagent(REAGENT_ID_SUGAR, 40)
 	B2.reagents.add_reagent("condensedcapsaicin", 80)
 
 	detonator = new/obj/item/assembly_holder/timer_igniter(src)

code/game/objects/items/weapons/implants/implantreagent_vr.dm

@@ -2,8 +2,8 @@
 	name = "reagent generator implant"
 	desc = "This is an implant that has attached storage and generates a reagent."
 	implant_color = "r"
-	var/list/generated_reagents = list("water" = 2) //Any number of reagents, the associated value is how many units are generated per process()
-	var/reagent_name = "water" //What is shown when reagents are removed, doesn't need to be an actual reagent
+	var/list/generated_reagents = list(REAGENT_ID_WATER = 2) //Any number of reagents, the associated value is how many units are generated per process()
+	var/reagent_name = REAGENT_ID_WATER //What is shown when reagents are removed, doesn't need to be an actual reagent
 	var/gen_cost = 0.5 //amount of nutrient taken from the host per process tick
 	var/transfer_amount = 30 //amount transferred when using verb
 	var/usable_volume = 120

code/game/objects/items/weapons/material/chainsaw.dm

@@ -16,7 +16,7 @@
 	var/datum/reagents/R = new/datum/reagents(max_fuel)
 	reagents = R
 	R.my_atom = src
-	R.add_reagent("fuel", max_fuel)
+	R.add_reagent(REAGENT_ID_FUEL, max_fuel)
 	START_PROCESSING(SSobj, src)
 	. = ..()
 
@@ -73,7 +73,7 @@
 		playsound(src, 'sound/weapons/chainsaw_attack.ogg',40,1)
 	if(A && on)
 		if(get_fuel() > 0)
-			reagents.remove_reagent("fuel", 1)
+			reagents.remove_reagent(REAGENT_ID_FUEL, 1)
 		if(istype(A,/obj/structure/window))
 			var/obj/structure/window/W = A
 			W.shatter()
@@ -103,14 +103,14 @@
 
 	if(on)
 		if(get_fuel() > 0)
-			reagents.remove_reagent("fuel", 1)
+			reagents.remove_reagent(REAGENT_ID_FUEL, 1)
 			playsound(src, 'sound/weapons/chainsaw_turnoff.ogg',15,1)
 		if(get_fuel() <= 0)
 			to_chat(usr, "\The [src] sputters to a stop!")
 			turnOff()
 
 /obj/item/chainsaw/proc/get_fuel()
-	return reagents.get_reagent_amount("fuel")
+	return reagents.get_reagent_amount(REAGENT_ID_FUEL)
 
 /obj/item/chainsaw/examine(mob/user)
 	. = ..()

code/game/objects/items/weapons/mop_deploy.dm

@@ -20,7 +20,7 @@
 	START_PROCESSING(SSobj, src)
 
 /turf/proc/clean_deploy(atom/source)
-	if(source.reagents.has_reagent("water", 1))
+	if(source.reagents.has_reagent(REAGENT_ID_WATER, 1))
 		clean_blood()
 		if(istype(src, /turf/simulated))
 			var/turf/simulated/T = src

code/game/objects/items/weapons/storage/bags.dm

@@ -108,26 +108,26 @@
 	var/current_capacity = 0
 	var/max_pickup = 100 //How much ore can be picked up in one go. There to prevent someone from walking on a turf with 10000 ore and making the server cry.
 	var/list/stored_ore = list(
-		"sand" = 0,
-		"hematite" = 0,
-		"carbon" = 0,
-		"raw copper" = 0,
-		"raw tin" = 0,
-		"void opal" = 0,
-		"painite" = 0,
-		"quartz" = 0,
-		"raw bauxite" = 0,
-		"phoron" = 0,
-		"silver" = 0,
-		"gold" = 0,
-		"marble" = 0,
-		"uranium" = 0,
-		"diamond" = 0,
-		"platinum" = 0,
-		"lead" = 0,
-		"mhydrogen" = 0,
-		"verdantium" = 0,
-		"rutile" = 0)
+		ORE_SAND = 0,
+		ORE_HEMATITE = 0,
+		ORE_CARBON = 0,
+		ORE_COPPER = 0,
+		ORE_TIN = 0,
+		ORE_VOPAL = 0,
+		ORE_PAINITE = 0,
+		ORE_QUARTZ = 0,
+		ORE_BAUXITE = 0,
+		ORE_PHORON = 0,
+		ORE_SILVER = 0,
+		ORE_GOLD = 0,
+		ORE_MARBLE = 0,
+		ORE_URANIUM = 0,
+		ORE_DIAMOND = 0,
+		ORE_PLATINUM = 0,
+		ORE_LEAD = 0,
+		ORE_MHYDROGEN = 0,
+		ORE_VERDANTIUM = 0,
+		ORE_RUTILE = 0)
 	var/last_update = 0
 
 /obj/item/storage/bag/ore/holding

code/game/objects/items/weapons/storage/bible.dm

@@ -103,10 +103,10 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
 /obj/item/storage/bible/afterattack(atom/A, mob/user as mob, proximity)
 	if(!proximity) return
 	if(user.mind && (user.mind.assigned_role == JOB_CHAPLAIN))
-		if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder
+		if(A.reagents && A.reagents.has_reagent(REAGENT_ID_WATER)) //blesses all the water in the holder
 			to_chat(user, span_notice("You bless [A]."))
-			var/water2holy = A.reagents.get_reagent_amount("water")
-			A.reagents.del_reagent("water")
+			var/water2holy = A.reagents.get_reagent_amount(REAGENT_ID_WATER)
+			A.reagents.del_reagent(REAGENT_ID_WATER)
 			A.reagents.add_reagent("holywater",water2holy)
 
 /obj/item/storage/bible/attackby(obj/item/W as obj, mob/user as mob)

code/game/objects/items/weapons/storage/mre.dm

@@ -364,19 +364,19 @@ MRE Stuff
 		if("boneless pork ribs", "grilled chicken", "pizza square", "spaghetti", "chicken tenders")
 			icon_state = "tgmcmre_entree"
 			nutriment_amt = 5
-			starts_with = list("sodiumchloride" = 1)
+			starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1)
 		if("meatballs", "cheese spread", "beef turnover", "mashed potatoes")
 			icon_state = "tgmcmre_side"
 			nutriment_amt = 3
-			starts_with = list("sodiumchloride" = 1)
+			starts_with = list(REAGENT_ID_SODIUMCHLORIDE= 1)
 		if("biscuit", "pretzels", "peanuts", "cracker")
 			icon_state = "tgmcmre_snack"
 			nutriment_amt = 2
-			starts_with = list("sodiumchloride" = 1)
+			starts_with = list(REAGENT_ID_SODIUMCHLORIDE = 1)
 		if("spiced apples", "chocolate brownie", "sugar cookie", "choco bar")
 			icon_state = "tgmcmre_dessert"
 			nutriment_amt = 2
-			starts_with = list("sugar" = 1)
+			starts_with = list(REAGENT_ID_SUGAR = 1)
 
 	package_open_state = "tgmcmre_[flavor]"
 	nutriment_desc = list("[new_taste]" = nutriment_amt)

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -196,26 +196,26 @@
 	var/obj/item/storage/fancy/cigarettes/pack
 
 	pack = new /obj/item/storage/fancy/cigarettes(src)
-	fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5))
+	fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5))
 	pack.desc += " 'F' has been scribbled on it."
 
 	pack = new /obj/item/storage/fancy/cigarettes(src)
-	fill_cigarre_package(pack, list("aluminum" = 5, "potassium" = 5, "sulfur" = 5))
+	fill_cigarre_package(pack, list(REAGENT_ID_ALUMINIUM = 5, REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SULFUR = 5))
 	pack.desc += " 'F' has been scribbled on it."
 
 	pack = new /obj/item/storage/fancy/cigarettes(src)
-	fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5))
+	fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5))
 	pack.desc += " 'S' has been scribbled on it."
 
 	pack = new /obj/item/storage/fancy/cigarettes(src)
-	fill_cigarre_package(pack, list("potassium" = 5, "sugar" = 5, "phosphorus" = 5))
+	fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 5, REAGENT_ID_SUGAR = 5, REAGENT_ID_PHOSPHORUS = 5))
 	pack.desc += " 'S' has been scribbled on it."
 
 	pack = new /obj/item/storage/fancy/cigarettes(src)
 	// Dylovene. Going with 1.5 rather than 1.6666666...
-	fill_cigarre_package(pack, list("potassium" = 1.5, REAGENT_ID_NITROGEN = 1.5, "silicon" = 1.5))
+	fill_cigarre_package(pack, list(REAGENT_ID_POTASSIUM = 1.5, REAGENT_ID_NITROGEN = 1.5, REAGENT_ID_SILICON = 1.5))
 	// Mindbreaker
-	fill_cigarre_package(pack, list("silicon" = 4.5, "hydrogen" = 4.5))
+	fill_cigarre_package(pack, list(REAGENT_ID_SILICON = 4.5, REAGENT_ID_HYDROGEN = 4.5))
 
 	pack.desc += " 'MB' has been scribbled on it."
 

code/game/objects/items/weapons/tools/weldingtool.dm

@@ -49,7 +49,7 @@
 	var/datum/reagents/R = new/datum/reagents(max_fuel)
 	reagents = R
 	R.my_atom = src
-	R.add_reagent("fuel", max_fuel)
+	R.add_reagent(REAGENT_ID_FUEL, max_fuel)
 	update_icon()
 	if(always_process)
 		START_PROCESSING(SSobj, src)
@@ -185,7 +185,7 @@
 
 //Returns the amount of fuel in the welder
 /obj/item/weldingtool/proc/get_fuel()
-	return reagents.get_reagent_amount("fuel")
+	return reagents.get_reagent_amount(REAGENT_ID_FUEL)
 
 /obj/item/weldingtool/proc/get_max_fuel()
 	return max_fuel
@@ -197,7 +197,7 @@
 	if(amount)
 		burned_fuel_for = 0 // Reset the counter since we're removing fuel.
 	if(get_fuel() >= amount)
-		reagents.remove_reagent("fuel", amount)
+		reagents.remove_reagent(REAGENT_ID_FUEL, amount)
 		if(M)
 			eyecheck(M)
 		update_icon()
@@ -440,7 +440,7 @@
 
 /obj/item/weldingtool/alien/process()
 	if(get_fuel() <= get_max_fuel())
-		reagents.add_reagent("fuel", 1)
+		reagents.add_reagent(REAGENT_ID_FUEL, 1)
 	..()
 
 /obj/item/weldingtool/experimental
@@ -461,7 +461,7 @@
 	..()
 	if(get_fuel() < get_max_fuel() && nextrefueltick < world.time)
 		nextrefueltick = world.time + 10
-		reagents.add_reagent("fuel", 1)
+		reagents.add_reagent(REAGENT_ID_FUEL, 1)
 
 /obj/item/weldingtool/experimental/hybrid
 	name = "strange welding tool"

code/game/objects/items/weapons/weldbackpack.dm

@@ -17,7 +17,7 @@
 	var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills
 	reagents = R
 	R.my_atom = src
-	R.add_reagent("fuel", max_fuel)
+	R.add_reagent(REAGENT_ID_FUEL, max_fuel)
 	nozzle = new nozzle_type(src)
 	nozzle_attached = 1
 

code/game/objects/structures/medical_stand_vr.dm

@@ -423,7 +423,7 @@
 				return
 
 			// If the human is losing too much blood, beep.
-			if(H.vessel.get_reagent_amount("blood") < H.species.blood_volume*H.species.blood_level_safe)
+			if(H.vessel.get_reagent_amount(REAGENT_ID_BLOOD) < H.species.blood_volume*H.species.blood_level_safe)
 				visible_message("\The [src] beeps loudly.")
 
 			var/datum/reagent/B = H.take_blood(beaker,amount)

code/game/objects/structures/watercloset.dm

@@ -216,7 +216,7 @@
 		mymist = null
 
 	if(on)
-		add_overlay(image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir))
+		add_overlay(image('icons/obj/watercloset.dmi', src, REAGENT_ID_WATER, MOB_LAYER + 1, dir))
 		if(temperature_settings[watertemp] < T20C)
 			return //no mist for cold water
 		if(!ismist)
@@ -265,7 +265,7 @@
 				var/mob/living/L = AM
 				process_heat(L)
 	wash_floor()
-	reagents.add_reagent("water", reagents.get_free_space())
+	reagents.add_reagent(REAGENT_ID_WATER, reagents.get_free_space())
 
 /obj/machinery/shower/proc/wash_floor()
 	if(is_washing)
@@ -588,7 +588,7 @@
 
 	var/obj/item/reagent_containers/RG = O
 	if (istype(RG) && RG.is_open_container())
-		RG.reagents.add_reagent("water", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
+		RG.reagents.add_reagent(REAGENT_ID_WATER, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
 		user.visible_message(span_notice("[user] fills \the [RG] using \the [src]."),span_notice("You fill \the [RG] using \the [src]."))
 		playsound(src, 'sound/effects/sink.ogg', 75, 1)
 		return 1
@@ -612,7 +612,7 @@
 					span_userdanger("[user] was stunned by [TU.his] wet [O]!"))
 				return 1
 	else if(istype(O, /obj/item/mop))
-		O.reagents.add_reagent("water", 5)
+		O.reagents.add_reagent(REAGENT_ID_WATER, 5)
 		to_chat(user, span_notice("You wet \the [O] in \the [src]."))
 		playsound(src, 'sound/effects/slosh.ogg', 25, 1)
 		return