Converts gas, mat and reagent strings to defines

code/modules/admin/topic.dm

@@ -2012,7 +2012,7 @@
 		if(check_rights(R_ADMIN|R_SERVER|R_EVENT))
 			if(href_list["vsc"] == "airflow")
 				vsc.ChangeSettingsDialog(usr,vsc.settings)
-			if(href_list["vsc"] == "phoron")
+			if(href_list["vsc"] == GAS_PHORON)
 				vsc.ChangeSettingsDialog(usr,vsc.plc.settings)
 			if(href_list["vsc"] == "default")
 				vsc.SetDefault(usr)

code/modules/admin/verbs/debug.dm

@@ -489,7 +489,7 @@
 		if(Rad.anchored)
 			if(!Rad.P)
 				var/obj/item/tank/phoron/Phoron = new/obj/item/tank/phoron(Rad)
-				Phoron.air_contents.gas["phoron"] = 70
+				Phoron.air_contents.gas[GAS_PHORON] = 70
 				Rad.drainratio = 0
 				Rad.P = Phoron
 				Phoron.loc = Rad
@@ -528,7 +528,7 @@
 
 				var/obj/item/tank/phoron/Phoron = new/obj/item/tank/phoron(Rad)
 
-				Phoron.air_contents.gas["phoron"] = 29.1154	//This is a full tank if you filled it from a canister
+				Phoron.air_contents.gas[GAS_PHORON] = 29.1154	//This is a full tank if you filled it from a canister
 				Rad.P = Phoron
 
 				Phoron.loc = Rad
@@ -541,7 +541,7 @@
 				var/obj/machinery/atmospherics/binary/pump/Pump = M
 				if(Pump.name == "Engine Feed" && response == "Setup Completely")
 					found_the_pump = 1
-					Pump.air2.gas["nitrogen"] = 3750	//The contents of 2 canisters.
+					Pump.air2.gas[GAS_N2] = 3750	//The contents of 2 canisters.
 					Pump.air2.temperature = 50
 					Pump.air2.update_values()
 				Pump.update_use_power(USE_POWER_IDLE)
@@ -569,7 +569,7 @@
 	if(!found_the_pump && response == "Setup Completely")
 		to_chat(src, span_red("Unable to locate air supply to fill up with coolant, adding some coolant around the supermatter"))
 		var/turf/simulated/T = SM.loc
-		T.zone.air.gas["nitrogen"] += 450
+		T.zone.air.gas[GAS_N2] += 450
 		T.zone.air.temperature = 50
 		T.zone.air.update_values()
 

code/modules/blob2/core_chunk.dm

@@ -122,7 +122,7 @@
 	name = "Hostile Blob Revival"
 	id = "blob_revival"
 	result = null
-	required_reagents = list("phoron" = 60)
+	required_reagents = list(REAGENT_ID_PHORON = 60)
 	result_amount = 1
 
 /decl/chemical_reaction/instant/blob_reconstitution/can_happen(var/datum/reagents/holder)

code/modules/client/preference_setup/vore/07_traits.dm

@@ -2,7 +2,7 @@
 #define NEUTRAL_MODE 2
 #define NEGATIVE_MODE 3
 
-var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","silver","gold","slimejelly")	//allowlist-based so people don't make their blood restored by alcohol or something really silly. use reagent IDs!
+var/global/list/valid_bloodreagents = list("default",REAGENT_ID_IRON,REAGENT_ID_COPPER,REAGENT_ID_PHORON,REAGENT_ID_SILVER,REAGENT_ID_GOLD,REAGENT_ID_SLIMEJELLY)	//allowlist-based so people don't make their blood restored by alcohol or something really silly. use reagent IDs!
 
 /datum/preferences
 	var/custom_species	// Custom species name, can't be changed due to it having been used in savefiles already.

code/modules/clothing/accessories/hands.dm

@@ -68,31 +68,31 @@
 	return material
 
 /obj/item/clothing/accessory/bracelet/material/wood/New(var/newloc)
-	..(newloc, "wood")
+	..(newloc, MAT_WOOD)
 
 /obj/item/clothing/accessory/bracelet/material/plastic/New(var/newloc)
-	..(newloc, "plastic")
+	..(newloc, MAT_PLASTIC)
 
 /obj/item/clothing/accessory/bracelet/material/iron/New(var/newloc)
-	..(newloc, "iron")
+	..(newloc, MAT_IRON)
 
 /obj/item/clothing/accessory/bracelet/material/steel/New(var/newloc)
-	..(newloc, "steel")
+	..(newloc, MAT_STEEL)
 
 /obj/item/clothing/accessory/bracelet/material/silver/New(var/newloc)
-	..(newloc, "silver")
+	..(newloc, MAT_SILVER)
 
 /obj/item/clothing/accessory/bracelet/material/gold/New(var/newloc)
-	..(newloc, "gold")
+	..(newloc, MAT_GOLD)
 
 /obj/item/clothing/accessory/bracelet/material/platinum/New(var/newloc)
-	..(newloc, "platinum")
+	..(newloc, MAT_PLATINUM)
 
 /obj/item/clothing/accessory/bracelet/material/phoron/New(var/newloc)
-	..(newloc, "phoron")
+	..(newloc, MAT_PHORON)
 
 /obj/item/clothing/accessory/bracelet/material/glass/New(var/newloc)
-	..(newloc, "glass")
+	..(newloc, MAT_GLASS)
 
 //wristbands
 

code/modules/clothing/masks/gasmask.dm

@@ -11,7 +11,7 @@
 	permeability_coefficient = 0.01
 	siemens_coefficient = 0.9
 	var/gas_filter_strength = 1			//For gas mask filters
-	var/list/filtered_gases = list("phoron", "nitrous_oxide")
+	var/list/filtered_gases = list(GAS_PHORON, GAS_N2O)
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 75, rad = 0)
 	pickup_sound = 'sound/items/pickup/rubber.ogg'
 
@@ -88,7 +88,7 @@
 	flags = PHORONGUARD
 	item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
 	species_restricted = list(SPECIES_VOX)
-	filtered_gases = list("oxygen", "nitrous_oxide")
+	filtered_gases = list(GAS_O2, GAS_N2O)
 	var/mask_open = FALSE	// Controls if the Vox can eat through this mask
 	actions_types = list(/datum/action/item_action/toggle_feeding_port)
 
@@ -115,7 +115,7 @@
 	//body_parts_covered = 0
 	species_restricted = list(SPECIES_ZADDAT)
 	flags_inv = HIDEEARS //semi-transparent
-	filtered_gases = list("phoron", "nitrogen", "nitrous_oxide")
+	filtered_gases = list(GAS_PHORON, GAS_N2, GAS_N2O)
 
 /obj/item/clothing/mask/gas/syndicate
 	name = "tactical mask"

code/modules/detectivework/tools/rag.dm

@@ -184,10 +184,10 @@
 		return
 
 	//also copied from matches
-	if(reagents.get_reagent_amount("phoron")) // the phoron explodes when exposed to fire
+	if(reagents.get_reagent_amount(REAGENT_ID_PHORON)) // the phoron explodes when exposed to fire
 		visible_message(span_danger("\The [src] conflagrates violently!"))
 		var/datum/effect/effect/system/reagents_explosion/e = new()
-		e.set_up(round(reagents.get_reagent_amount("phoron") / 2.5, 1), get_turf(src), 0, 0)
+		e.set_up(round(reagents.get_reagent_amount(REAGENT_ID_PHORON) / 2.5, 1), get_turf(src), 0, 0)
 		e.start()
 		qdel(src)
 		return

code/modules/economy/mint.dm

@@ -7,7 +7,7 @@
 	density = TRUE
 	anchored = TRUE
 	var/coinsToProduce = 6	//how many coins do we make per sheet? a sheet is 2000 units whilst a coin is 250, and some material should be lost in the process
-	var/list/validMats = list("silver", "gold", "diamond", "iron", "phoron", "uranium")	//what's valid stuff to make coins out of?
+	var/list/validMats = list(MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_IRON, MAT_PHORON, MAT_URANIUM)	//what's valid stuff to make coins out of?
 
 /obj/machinery/mineral/mint/attackby(obj/item/stack/material/M as obj, mob/user as mob)
 	if(M.default_type in validMats)
@@ -16,22 +16,22 @@
 			icon_state = "coinpress1"
 			if(do_after(user, 2 SECONDS, src))
 				M.amount--
-				if(M.default_type == "silver")
+				if(M.default_type == MAT_SILVER)
 					while(coinsToProduce-- > 0)
 						new /obj/item/coin/silver(user.loc)
-				else if(M.default_type == "gold")
+				else if(M.default_type == MAT_GOLD)
 					while(coinsToProduce-- > 0)
 						new /obj/item/coin/gold(user.loc)
-				else if(M.default_type == "diamond")
+				else if(M.default_type == MAT_DIAMOND)
 					while(coinsToProduce-- > 0)
 						new /obj/item/coin/diamond(user.loc)
-				else if(M.default_type == "iron")
+				else if(M.default_type == MAT_IRON)
 					while(coinsToProduce-- > 0)
 						new /obj/item/coin/iron(user.loc)
-				else if(M.default_type == "phoron")
+				else if(M.default_type == MAT_PHORON)
 					while(coinsToProduce-- > 0)
 						new /obj/item/coin/phoron(user.loc)
-				else if(M.default_type == "uranium")
+				else if(M.default_type == MAT_URANIUM)
 					while(coinsToProduce-- > 0)
 						new /obj/item/coin/uranium(user.loc)
 				src.visible_message(span_notice("\The [src] rattles and dispenses several [M.default_type] coins!"))

code/modules/economy/money_bag.dm

@@ -67,17 +67,17 @@
 	if(href_list["remove"])
 		var/obj/item/coin/COIN
 		switch(href_list["remove"])
-			if("gold")
+			if(MAT_GOLD)
 				COIN = locate(/obj/item/coin/gold,src.contents)
-			if("silver")
+			if(MAT_SILVER)
 				COIN = locate(/obj/item/coin/silver,src.contents)
-			if("iron")
+			if(MAT_IRON)
 				COIN = locate(/obj/item/coin/iron,src.contents)
-			if("diamond")
+			if(MAT_DIAMOND)
 				COIN = locate(/obj/item/coin/diamond,src.contents)
-			if("phoron")
+			if(MAT_URANIUM)
 				COIN = locate(/obj/item/coin/phoron,src.contents)
-			if("uranium")
+			if(MAT_URANIUM)
 				COIN = locate(/obj/item/coin/uranium,src.contents)
 		if(!COIN)
 			return

code/modules/events/atmos_leak.dm

@@ -19,11 +19,11 @@
 
 // Decide which area will be targeted!
 /datum/event/atmos_leak/setup()
-	var/gas_choices = list("carbon_dioxide", "nitrous_oxide") // Annoying
+	var/gas_choices = list(GAS_CO2, GAS_N2O) // Annoying
 	if(severity >= EVENT_LEVEL_MODERATE)
-		gas_choices += "phoron" // Dangerous
+		gas_choices += GAS_PHORON // Dangerous
 	// if(severity >= EVENT_LEVEL_MAJOR)
-	// 	gas_choices += "volatile_fuel" // Dangerous and no default atmos setup!
+	// 	gas_choices += GAS_VOLATILE_FUEL // Dangerous and no default atmos setup!
 	gas_type = pick(gas_choices)
 
 	var/list/area/grand_list_of_areas = get_station_areas(excluded)

code/modules/events/supply_demand_vr.dm

@@ -315,7 +315,7 @@
 	var/datum/gas_mixture/mixture = new
 	mixture.temperature = T20C
 	var/unpickedTypes = gas_data.gases.Copy()
-	unpickedTypes -= "volatile_fuel" // Don't do that one
+	unpickedTypes -= GAS_VOLATILE_FUEL // Don't do that one
 	for(var/i in 1 to differentTypes)
 		var/gasId = pick(unpickedTypes)
 		unpickedTypes -= gasId

code/modules/flufftext/Dreaming.dm

@@ -3,7 +3,7 @@ var/list/dreams = list(
 	"an ID card","a bottle","a familiar face","a crewmember","a toolbox","a " + JOB_SECURITY_OFFICER,"the " + JOB_SITE_MANAGER,
 	"voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness",
 	"light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun",
-	"a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights",
+	"a hat","the Luna","a ruined station","a planet",GAS_PHORON,"air","the medical bay","the bridge","blinking lights",
 	"a blue light","an abandoned laboratory","NanoTrasen","mercenaries","blood","healing","power","respect",
 	"riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money",
 	"the " + JOB_HEAD_OF_PERSONNEL,"the " + JOB_HEAD_OF_SECURITY,"the " + JOB_CHIEF_ENGINEER,"the " + JOB_RESEARCH_DIRECTOR,"the " + JOB_CHIEF_MEDICAL_OFFICER,

code/modules/food/food/snacks.dm

@@ -797,7 +797,7 @@
 		if(4)
 			reagents.add_reagent("sprinkles", 3)
 		if(5)
-			reagents.add_reagent("phoron", 3)
+			reagents.add_reagent(REAGENT_ID_PHORON, 3)
 		if(6)
 			reagents.add_reagent("coco", 3)
 		if(7)
@@ -4748,7 +4748,7 @@
 
 /obj/item/reagent_containers/food/snacks/bageleverything/Initialize()
 	. = ..()
-	reagents.add_reagent("phoron", 5)
+	reagents.add_reagent(REAGENT_ID_PHORON, 5)
 	reagents.add_reagent("defective_nanites", 5)
 
 /obj/item/reagent_containers/food/snacks/bageltwo

code/modules/food/food/snacks/meat.dm

@@ -169,7 +169,7 @@
 /obj/item/reagent_containers/food/snacks/meat/worm/Initialize()
 	. = ..()
 	reagents.add_reagent("protein", 6)
-	reagents.add_reagent("phoron", 3)
+	reagents.add_reagent(REAGENT_ID_PHORON, 3)
 	reagents.add_reagent("myelamine", 3)
 	src.bitesize = 3
 

code/modules/food/glass/bottle_potion.dm

@@ -152,5 +152,4 @@
 /obj/item/reagent_containers/glass/bottle/potion/phoron
 	name = "volatile potion"
 	desc = "A small green bottle containing some volatile purple liquid."
-	prefill = list("phoron" = 10)
-
+	prefill = list(REAGENT_ID_PHORON = 10)

code/modules/gamemaster/event2/events/engineering/gas_leak.dm

@@ -15,7 +15,7 @@
 
 
 /datum/event2/event/gas_leak
-	var/potential_gas_choices = list("carbon_dioxide", "nitrous_oxide", "phoron", "volatile_fuel")
+	var/potential_gas_choices = list(GAS_CO2, GAS_N2O, GAS_PHORON, GAS_VOLATILE_FUEL)
 	var/chosen_gas = null
 	var/turf/chosen_turf = null
 
@@ -44,4 +44,4 @@
 	air_contents.temperature = T20C + rand(-50, 50)
 	air_contents.gas[chosen_gas] = 10 * MOLES_CELLSTANDARD
 	chosen_turf.assume_air(air_contents)
-	playsound(chosen_turf, 'sound/effects/smoke.ogg', 75, 1)
+	playsound(chosen_turf, 'sound/effects/smoke.ogg', 75, 1)

code/modules/hydroponics/backtank.dm

@@ -235,7 +235,7 @@
 	. = ..()
 	reagents.add_reagent("fuel", 500)
 	reagents.add_reagent("cryptobiolin", 500)
-	reagents.add_reagent("phoron", 500)
+	reagents.add_reagent(REAGENT_ID_PHORON, 500)
 	reagents.add_reagent("condensedcapsaicin", 500)
 
 /obj/item/watertank/op/make_noz()

code/modules/hydroponics/seed.dm

@@ -445,12 +445,12 @@
 
 	if(prob(5))
 		consume_gasses = list()
-		var/gas = pick("oxygen","nitrogen","phoron","carbon_dioxide")
+		var/gas = pick(GAS_O2,GAS_N2,GAS_PHORON,GAS_CO2)
 		consume_gasses[gas] = rand(3,9)
 
 	if(prob(5))
 		exude_gasses = list()
-		var/gas = pick("oxygen","nitrogen","phoron","carbon_dioxide")
+		var/gas = pick(GAS_O2,GAS_N2,GAS_PHORON,GAS_CO2)
 		exude_gasses[gas] = rand(3,9)
 
 	chems = list()

code/modules/hydroponics/seedtypes/xeno.dm

@@ -4,7 +4,7 @@
 	seed_name = "alien weed"
 	display_name = "alien weeds"
 	force_layer = 3
-	chems = list("phoron" = list(1,3))
+	chems = list(REAGENT_ID_PHORON = list(1,3))
 
 /datum/seed/xenomorph/New()
 	..()
@@ -16,4 +16,4 @@
 	set_trait(TRAIT_PRODUCTION,1)
 	set_trait(TRAIT_YIELD,-1)
 	set_trait(TRAIT_SPREAD,2)
-	set_trait(TRAIT_POTENCY,50)
+	set_trait(TRAIT_POTENCY,50)

code/modules/integrated_electronics/passive/power.dm

@@ -118,7 +118,7 @@
 	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
 	origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2, TECH_BIO = 2)
 	var/volume = 60
-	var/list/fuel = list("phoron" = 50000, "slimejelly" = 25000, "fuel" = 15000, "carbon" = 10000, "ethanol"= 10000, "nutriment" =8000, "blood" = 5000)
+	var/list/fuel = list(REAGENT_ID_PHORON = 50000, REAGENT_ID_SLIMEJELLY = 25000, "fuel" = 15000, "carbon" = 10000, "ethanol"= 10000, "nutriment" = 8000, "blood" = 5000)
 
 /obj/item/integrated_circuit/passive/power/chemical_cell/New()
 	..()

code/modules/integrated_electronics/subtypes/input.dm

@@ -741,10 +741,10 @@
 	outputs = list(
 		"pressure"       = IC_PINTYPE_NUMBER,
 		"temperature" = IC_PINTYPE_NUMBER,
-		"oxygen"         = IC_PINTYPE_NUMBER,
-		"nitrogen"          = IC_PINTYPE_NUMBER,
+		GAS_O2         = IC_PINTYPE_NUMBER,
+		GAS_N2          = IC_PINTYPE_NUMBER,
 		"carbon dioxide"           = IC_PINTYPE_NUMBER,
-		"phoron"           = IC_PINTYPE_NUMBER,
+		GAS_PHORON           = IC_PINTYPE_NUMBER,
 		"other"           = IC_PINTYPE_NUMBER
 	)
 	activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
@@ -762,10 +762,10 @@
 	var/total_moles = environment.total_moles
 
 	if (total_moles)
-		var/o2_level = environment.gas["oxygen"]/total_moles
-		var/n2_level = environment.gas["nitrogen"]/total_moles
-		var/co2_level = environment.gas["carbon_dioxide"]/total_moles
-		var/phoron_level = environment.gas["phoron"]/total_moles
+		var/o2_level = environment.gas[GAS_O2]/total_moles
+		var/n2_level = environment.gas[GAS_N2]/total_moles
+		var/co2_level = environment.gas[GAS_CO2]/total_moles
+		var/phoron_level = environment.gas[GAS_PHORON]/total_moles
 		var/unknown_level =  1-(o2_level+n2_level+co2_level+phoron_level)
 		set_pin_data(IC_OUTPUT, 1, pressure)
 		set_pin_data(IC_OUTPUT, 2, round(environment.temperature-T0C,0.1))
@@ -851,7 +851,7 @@
 	complexity = 3
 	inputs = list()
 	outputs = list(
-		"oxygen"       = IC_PINTYPE_NUMBER
+		GAS_O2       = IC_PINTYPE_NUMBER
 	)
 	activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
 	spawn_flags = IC_SPAWN_RESEARCH
@@ -867,7 +867,7 @@
 	var/total_moles = environment.total_moles
 
 	if (total_moles)
-		var/o2_level = environment.gas["oxygen"]/total_moles
+		var/o2_level = environment.gas[GAS_O2]/total_moles
 		set_pin_data(IC_OUTPUT, 1, round(o2_level*100,0.1))
 	else
 		set_pin_data(IC_OUTPUT, 1, 0)
@@ -897,7 +897,7 @@
 	var/total_moles = environment.total_moles
 
 	if (total_moles)
-		var/co2_level = environment.gas["carbon_dioxide"]/total_moles
+		var/co2_level = environment.gas[GAS_CO2]/total_moles
 		set_pin_data(IC_OUTPUT, 1, round(co2_level*100,0.1))
 	else
 		set_pin_data(IC_OUTPUT, 1, 0)
@@ -911,7 +911,7 @@
 	complexity = 3
 	inputs = list()
 	outputs = list(
-		"nitrogen"       = IC_PINTYPE_NUMBER
+		GAS_N2       = IC_PINTYPE_NUMBER
 	)
 	activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
 	spawn_flags = IC_SPAWN_RESEARCH
@@ -927,7 +927,7 @@
 	var/total_moles = environment.total_moles
 
 	if (total_moles)
-		var/n2_level = environment.gas["nitrogen"]/total_moles
+		var/n2_level = environment.gas[GAS_N2]/total_moles
 		set_pin_data(IC_OUTPUT, 1, round(n2_level*100,0.1))
 	else
 		set_pin_data(IC_OUTPUT, 1, 0)
@@ -941,7 +941,7 @@
 	complexity = 3
 	inputs = list()
 	outputs = list(
-		"phoron"       = IC_PINTYPE_NUMBER
+		GAS_PHORON       = IC_PINTYPE_NUMBER
 	)
 	activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
 	spawn_flags = IC_SPAWN_RESEARCH
@@ -957,7 +957,7 @@
 	var/total_moles = environment.total_moles
 
 	if (total_moles)
-		var/phoron_level = environment.gas["phoron"]/total_moles
+		var/phoron_level = environment.gas[GAS_PHORON]/total_moles
 		set_pin_data(IC_OUTPUT, 1, round(phoron_level*100,0.1))
 	else
 		set_pin_data(IC_OUTPUT, 1, 0)

code/modules/materials/materials/gems.dm

@@ -1,5 +1,5 @@
 /datum/material/phoron
-	name = "phoron"
+	name = MAT_PHORON
 	stack_type = /obj/item/stack/material/phoron
 	ignition_point = PHORON_MINIMUM_BURN_TEMPERATURE
 	icon_base = "stone"
@@ -24,7 +24,7 @@
 	for(var/turf/simulated/floor/target_tile in range(2,T))
 		var/phoronToDeduce = (temperature/30) * effect_multiplier
 		totalPhoron += phoronToDeduce
-		target_tile.assume_gas("phoron", phoronToDeduce, 200+T0C)
+		target_tile.assume_gas(GAS_PHORON, phoronToDeduce, 200+T0C)
 		spawn (0)
 			target_tile.hotspot_expose(temperature, 400)
 	return round(totalPhoron/100)
@@ -165,5 +165,3 @@
 	supply_conversion_value = 13
 	icon_base = "stone"
 	table_icon_base = "stone"
-
-

code/modules/materials/sheets/gems.dm

@@ -1,39 +1,39 @@
 /obj/item/stack/material/phoron
-	name = "solid phoron"
+	name = "solid " + MAT_PHORON
 	icon_state = "sheet-phoron"
-	default_type = "phoron"
+	default_type = MAT_PHORON
 	no_variants = FALSE
 	drop_sound = 'sound/items/drop/glass.ogg'
 	pickup_sound = 'sound/items/pickup/glass.ogg'
 
 /obj/item/stack/material/diamond
-	name = "diamond"
+	name = MAT_DIAMOND
 	icon_state = "sheet-diamond"
-	default_type = "diamond"
+	default_type = MAT_DIAMOND
 	drop_sound = 'sound/items/drop/glass.ogg'
 	pickup_sound = 'sound/items/pickup/glass.ogg'
 
 /obj/item/stack/material/painite
-	name = "painite"
+	name = MAT_PAINITE
 	icon_state = "sheet-gem"
 	singular_name = "painite gem"
-	default_type = "painite"
+	default_type = MAT_PAINITE
 	apply_colour = 1
 	no_variants = FALSE
 
 /obj/item/stack/material/void_opal
-	name = "void opal"
+	name = MAT_VOPAL
 	icon_state = "sheet-void_opal"
 	singular_name = "void opal"
-	default_type = "void opal"
+	default_type = MAT_VOPAL
 	apply_colour = 1
 	no_variants = FALSE
 
 /obj/item/stack/material/quartz
-	name = "quartz"
+	name = MAT_QUARTZ
 	icon_state = "sheet-gem"
 	singular_name = "quartz gem"
-	default_type = "quartz"
+	default_type = MAT_QUARTZ
 	apply_colour = 1
 	no_variants = FALSE
 
@@ -61,6 +61,3 @@
 	default_type = MAT_MORPHIUM
 	no_variants = FALSE
 	apply_colour = TRUE
-
-
-

code/modules/mining/drilling/drill.dm

@@ -22,42 +22,42 @@
 	var/current_capacity = 0
 
 	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/list/ore_types = list(
-		"hematite" = /obj/item/ore/iron,
-		"uranium" = /obj/item/ore/uranium,
-		"gold" = /obj/item/ore/gold,
-		"silver" = /obj/item/ore/silver,
-		"diamond" = /obj/item/ore/diamond,
-		"phoron" = /obj/item/ore/phoron,
-		"platinum" = /obj/item/ore/osmium,
-		"mhydrogen" = /obj/item/ore/hydrogen,
-		"sand" = /obj/item/ore/glass,
-		"carbon" = /obj/item/ore/coal,
-	//	"copper" = /obj/item/ore/copper,
-	//	"tin" = /obj/item/ore/tin,
-	//	"bauxite" = /obj/item/ore/bauxite,
-		"rutile" = /obj/item/ore/rutile
+		ORE_HEMATITE = /obj/item/ore/iron,
+		ORE_URANIUM = /obj/item/ore/uranium,
+		ORE_GOLD = /obj/item/ore/gold,
+		ORE_SILVER = /obj/item/ore/silver,
+		ORE_DIAMOND = /obj/item/ore/diamond,
+		ORE_PHORON = /obj/item/ore/phoron,
+		ORE_PLATINUM = /obj/item/ore/osmium,
+		ORE_MHYDROGEN = /obj/item/ore/hydrogen,
+		ORE_SAND = /obj/item/ore/glass,
+		ORE_CARBON = /obj/item/ore/coal,
+	//	ORE_COPPER = /obj/item/ore/copper,
+	//	ORE_TIN = /obj/item/ore/tin,
+	//	ORE_BAUXITE = /obj/item/ore/bauxite,
+		ORE_RUTILE = /obj/item/ore/rutile
 		)
 
 	//Upgrades
@@ -69,16 +69,16 @@
 
 	// Found with an advanced laser. exotic_drilling >= 1
 	var/list/ore_types_uncommon = list(
-		MAT_MARBLE = /obj/item/ore/marble,
-		//"painite" = /obj/item/ore/painite,
-		//"quartz" = /obj/item/ore/quartz,
-		MAT_LEAD = /obj/item/ore/lead
+		ORE_MARBLE = /obj/item/ore/marble,
+		//ORE_PAINITE = /obj/item/ore/painite,
+		//ORE_QUARTZ = /obj/item/ore/quartz,
+		ORE_LEAD = /obj/item/ore/lead
 		)
 
 	// Found with an ultra laser. exotic_drilling >= 2
 	var/list/ore_types_rare = list(
-		//"void opal" = /obj/item/ore/void_opal,
-		MAT_VERDANTIUM = /obj/item/ore/verdantium
+		//ORE_VOPAL = /obj/item/ore/void_opal,
+		ORE_VERDANTIUM = /obj/item/ore/verdantium
 		)
 
 	//Flags

code/modules/mining/drilling/scanner.dm

@@ -41,13 +41,13 @@
 			var/ore_type
 
 			switch(metal)
-				if("sand", "carbon", "marble", /*"quartz"*/)	ore_type = "surface minerals"
-				if("hematite", /*"tin", "copper", "bauxite",*/ "lead")	ore_type = "industrial metals"
-				if("gold", "silver", "rutile")					ore_type = "precious metals"
-				if("diamond", /*"painite"*/)	ore_type = "precious gems"
-				if("uranium")									ore_type = "nuclear fuel"
-				if("phoron", "platinum", "mhydrogen")				ore_type = "exotic matter"
-				if("verdantium", /*"void opal"*/)				ore_type = "anomalous matter"
+				if(ORE_SAND, ORE_CARBON, ORE_MARBLE, /*ORE_QUARTZ*/)	ore_type = "surface minerals"
+				if(ORE_HEMATITE, /*ORE_TIN, ORE_COPPER, ORE_BAUXITE,*/ ORE_LEAD)	ore_type = "industrial metals"
+				if(ORE_GOLD, ORE_SILVER, ORE_RUTILE)					ore_type = "precious metals"
+				if(ORE_DIAMOND, /*ORE_PAINITE*/)	ore_type = "precious gems"
+				if(ORE_URANIUM)									ore_type = "nuclear fuel"
+				if(ORE_PHORON, ORE_PLATINUM, ORE_MHYDROGEN)				ore_type = "exotic matter"
+				if(ORE_VERDANTIUM, /*ORE_VOPAL*/)				ore_type = "anomalous matter"
 
 			if(ore_type) metals[ore_type] += T.resources[metal]
 

code/modules/mining/machinery/machine_processing.dm

@@ -166,26 +166,26 @@
 	var/points = 0
 	var/points_mult = 1 //VOREStation Add - multiplier for points generated when ore hits the processors
 	var/static/list/ore_values = list(
-		"sand" = 1,
-		"hematite" = 1,
-		"carbon" = 1,
-		"raw copper" = 1,
-		"raw tin" = 1,
-		"void opal" = 3,
-		"painite" = 3,
-		"quartz" = 3,
-		"raw bauxite" = 5,
-		"phoron" = 15,
-		"silver" = 16,
-		"gold" = 18,
-		"marble" = 20,
-		"uranium" = 30,
-		"diamond" = 50,
-		"platinum" = 40,
-		"lead" = 40,
-		"mhydrogen" = 40,
-		"verdantium" = 60,
-		"rutile" = 40) //VOREStation Add
+		ORE_SAND = 1,
+		ORE_HEMATITE = 1,
+		ORE_CARBON = 1,
+		ORE_COPPER = 1,
+		ORE_TIN = 1,
+		ORE_VOPAL = 3,
+		ORE_PAINITE = 3,
+		ORE_QUARTZ= 3,
+		ORE_BAUXITE = 5,
+		ORE_PHORON = 15,
+		ORE_SILVER = 16,
+		ORE_GOLD = 18,
+		ORE_MARBLE = 20,
+		ORE_URANIUM = 30,
+		ORE_DIAMOND = 50,
+		ORE_PLATINUM = 40,
+		ORE_LEAD = 40,
+		ORE_MHYDROGEN = 40,
+		ORE_VERDANTIUM = 60,
+		ORE_RUTILE = 40) //VOREStation Add
 
 /obj/machinery/mineral/processing_unit/Initialize()
 	. = ..()

code/modules/mining/machinery/machine_unloading.dm

@@ -47,45 +47,45 @@
 					BOX.stored_ore[ore] = 0
 
 					//Icon code here. Going from most to least common.
-					if(ore == "sand")
+					if(ore == ORE_SAND)
 						ore_chunk.icon_state = "ore_glass"
-					else if(ore == "carbon")
+					else if(ore == ORE_CARBON)
 						ore_chunk.icon_state = "ore_coal"
-					else if(ore == "hematite")
+					else if(ore == ORE_HEMATITE)
 						ore_chunk.icon_state = "ore_iron"
-					else if(ore == "phoron")
+					else if(ore == ORE_PHORON)
 						ore_chunk.icon_state = "ore_phoron"
-					else if(ore == "silver")
+					else if(ore == ORE_SILVER)
 						ore_chunk.icon_state = "ore_silver"
-					else if(ore == "gold")
+					else if(ore == ORE_GOLD)
 						ore_chunk.icon_state = "ore_gold"
-					else if(ore == "uranium")
+					else if(ore == ORE_URANIUM)
 						ore_chunk.icon_state = "ore_uranium"
-					else if(ore == "diamond")
+					else if(ore == ORE_DIAMOND)
 						ore_chunk.icon_state = "ore_diamond"
-					else if(ore == "platinum")
+					else if(ore == ORE_PLATINUM)
 						ore_chunk.icon_state = "ore_platinum"
-					else if(ore == "marble")
+					else if(ore == ORE_MARBLE)
 						ore_chunk.icon_state = "ore_marble"
-					else if(ore == "lead")
+					else if(ore == ORE_LEAD)
 						ore_chunk.icon_state = "ore_lead"
-					else if(ore == "rutile")
+					else if(ore == ORE_RUTILE)
 						ore_chunk.icon_state = "ore_rutile"
-					else if(ore == "quartz")
+					else if(ore == ORE_QUARTZ)
 						ore_chunk.icon_state = "ore_quartz"
-					else if(ore == "mhydrogen")
+					else if(ore == ORE_MHYDROGEN)
 						ore_chunk.icon_state = "ore_hydrogen"
-					else if(ore == "verdantium")
+					else if(ore == ORE_VERDANTIUM)
 						ore_chunk.icon_state = "ore_verdantium"
-					else if(ore == "raw copper")
+					else if(ore == ORE_COPPER)
 						ore_chunk.icon_state = "ore_copper"
-					else if(ore == "raw tin")
+					else if(ore == ORE_TIN)
 						ore_chunk.icon_state = "ore_tin"
-					else if(ore == "void opal")
+					else if(ore == ORE_VOPAL)
 						ore_chunk.icon_state = "ore_void_opal"
-					else if(ore == "raw bauxite")
+					else if(ore == ORE_BAUXITE)
 						ore_chunk.icon_state = "ore_bauxite"
-					else if(ore == "painite")
+					else if(ore == ORE_PAINITE)
 						ore_chunk.icon_state = "ore_painite"
 					else
 						ore_chunk.icon_state = "boulder[rand(1,4)]"
@@ -102,4 +102,4 @@
 					O.loc = src.output.loc
 				else
 					return
-	return
+	return

code/modules/mining/mine_turfs.dm

@@ -45,26 +45,26 @@ var/list/mining_overlay_cache = list()
 	var/ignore_mapgen
 
 	var/static/list/ore_types = list(
-		"hematite" = /obj/item/ore/iron,
-		"uranium" = /obj/item/ore/uranium,
-		"gold" = /obj/item/ore/gold,
-		"silver" = /obj/item/ore/silver,
-		"diamond" = /obj/item/ore/diamond,
-		"phoron" = /obj/item/ore/phoron,
-		"platinum" = /obj/item/ore/osmium,
-		"mhydrogen" = /obj/item/ore/hydrogen,
-		"sand" = /obj/item/ore/glass,
-		"carbon" = /obj/item/ore/coal,
-		"verdantium" = /obj/item/ore/verdantium,
-		"marble" = /obj/item/ore/marble,
-		"lead" = /obj/item/ore/lead,
-//		"copper" = /obj/item/ore/copper,
-//		"tin" = /obj/item/ore/tin,
-//		"bauxite" = /obj/item/ore/bauxite,
-//		"void opal" = /obj/item/ore/void_opal,
-//		"painite" = /obj/item/ore/painite,
-//		"quartz" = /obj/item/ore/quartz,
-		"rutile" = /obj/item/ore/rutile
+		ORE_HEMATITE = /obj/item/ore/iron,
+		ORE_URANIUM = /obj/item/ore/uranium,
+		ORE_GOLD = /obj/item/ore/gold,
+		ORE_SILVER = /obj/item/ore/silver,
+		ORE_DIAMOND = /obj/item/ore/diamond,
+		ORE_PHORON = /obj/item/ore/phoron,
+		ORE_PLATINUM = /obj/item/ore/osmium,
+		ORE_MHYDROGEN = /obj/item/ore/hydrogen,
+		ORE_SAND = /obj/item/ore/glass,
+		ORE_CARBON = /obj/item/ore/coal,
+		ORE_VERDANTIUM = /obj/item/ore/verdantium,
+		ORE_MARBLE = /obj/item/ore/marble,
+		ORE_LEAD = /obj/item/ore/lead,
+//		ORE_COPPER = /obj/item/ore/copper,
+//		ORE_TIN = /obj/item/ore/tin,
+//		ORE_BAUXITE = /obj/item/ore/bauxite,
+//		ORE_VOPAL = /obj/item/ore/void_opal,
+//		ORE_PAINITE = /obj/item/ore/painite,
+//		ORE_QUARTZ = /obj/item/ore/quartz,
+		ORE_RUTILE = /obj/item/ore/rutile
 	)
 
 	has_resources = 1
@@ -725,10 +725,10 @@ var/list/mining_overlay_cache = list()
 
 	var/mineral_name
 	if(rare_ore)
-		mineral_name = pickweight(list("marble" = 5,/* "quartz" = 15, "copper" = 10, "tin" = 5, "bauxite" = 5*/, "uranium" = 15, "platinum" = 20, "hematite" = 15, "rutile" = 20, "carbon" = 15, "diamond" = 3, "gold" = 15, "silver" = 15, "phoron" = 25, "lead" = 5,/* "void opal" = 1,*/ "verdantium" = 2/*, "painite" = 1*/))
+		mineral_name = pickweight(list(ORE_MARBLE = 5,/* ORE_QUARTZ = 15, ORE_COPPER = 10, ORE_TIN = 5, ORE_BAUXITE = 5*/, ORE_URANIUM = 15, ORE_PLATINUM = 20, ORE_HEMATITE = 15, ORE_RUTILE = 20, ORE_CARBON = 15, ORE_DIAMOND = 3, ORE_GOLD = 15, ORE_SILVER = 15, ORE_PHORON = 25, ORE_LEAD = 5,/* ORE_VOPAL = 1,*/ ORE_VERDANTIUM = 2/*, ORE_PAINITE = 1*/))
 
 	else
-		mineral_name = pickweight(list("marble" = 3,/* "quartz" = 10, "copper" = 20, "tin" = 15, "bauxite" = 15*/, "uranium" = 10, "platinum" = 10, "hematite" = 70, "rutile" = 15, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 3,/* "void opal" = 1,*/ "verdantium" = 1/*, "painite" = 1*/))
+		mineral_name = pickweight(list(ORE_MARBLE = 3,/* ORE_QUARTZ = 10, ORE_COPPER = 20, ORE_TIN = 15, ORE_BAUXITE = 15*/, ORE_URANIUM = 10, ORE_PLATINUM = 10, ORE_HEMATITE = 70, ORE_RUTILE = 15, ORE_CARBON = 70, ORE_DIAMOND = 2, ORE_GOLD = 10, ORE_SILVER = 10, ORE_PHORON = 20, ORE_LEAD = 3,/* ORE_VOPAL = 1,*/ ORE_VERDANTIUM = 1/*, ORE_PAINITE = 1*/))
 
 	if(mineral_name && (mineral_name in GLOB.ore_data))
 		mineral = GLOB.ore_data[mineral_name]

code/modules/mining/ore.dm

@@ -11,31 +11,31 @@
 	name = "pitchblende"
 	icon_state = "ore_uranium"
 	origin_tech = list(TECH_MATERIAL = 5)
-	material = "uranium"
+	material = ORE_URANIUM
 
 /obj/item/ore/iron
 	name = "hematite"
 	icon_state = "ore_iron"
 	origin_tech = list(TECH_MATERIAL = 1)
-	material = "hematite"
+	material = ORE_HEMATITE
 
 /obj/item/ore/coal
 	name = "raw carbon"
 	icon_state = "ore_coal"
 	origin_tech = list(TECH_MATERIAL = 1)
-	material = "carbon"
+	material = ORE_CARBON
 
 /obj/item/ore/marble
 	name = "recrystallized carbonate"
 	icon_state = "ore_marble"
 	origin_tech = list(TECH_MATERIAL = 1)
-	material = "marble"
+	material = ORE_MARBLE
 
 /obj/item/ore/glass
 	name = "sand"
 	icon_state = "ore_glass"
 	origin_tech = list(TECH_MATERIAL = 1)
-	material = "sand"
+	material = ORE_SAND
 	slot_flags = SLOT_HOLSTER
 
 // POCKET SAND!
@@ -54,40 +54,40 @@
 	name = "phoron crystals"
 	icon_state = "ore_phoron"
 	origin_tech = list(TECH_MATERIAL = 2)
-	material = "phoron"
+	material = ORE_PHORON
 
 /obj/item/ore/silver
 	name = "native silver ore"
 	icon_state = "ore_silver"
 	origin_tech = list(TECH_MATERIAL = 3)
-	material = "silver"
+	material = ORE_SILVER
 
 /obj/item/ore/gold
 	name = "native gold ore"
 	icon_state = "ore_gold"
 	origin_tech = list(TECH_MATERIAL = 4)
-	material = "gold"
+	material = ORE_GOLD
 
 /obj/item/ore/diamond
 	name = "diamonds"
 	icon_state = "ore_diamond"
 	origin_tech = list(TECH_MATERIAL = 6)
-	material = "diamond"
+	material = ORE_DIAMOND
 
 /obj/item/ore/osmium
 	name = "raw platinum"
 	icon_state = "ore_platinum"
-	material = "platinum"
+	material = ORE_PLATINUM
 
 /obj/item/ore/hydrogen
 	name = "raw hydrogen"
 	icon_state = "ore_hydrogen"
-	material = "mhydrogen"
+	material = ORE_MHYDROGEN
 
 /obj/item/ore/verdantium
 	name = "verdantite dust"
 	icon_state = "ore_verdantium"
-	material = MAT_VERDANTIUM
+	material = ORE_VERDANTIUM
 	origin_tech = list(TECH_MATERIAL = 7)
 
 // POCKET ... Crystal dust.
@@ -104,43 +104,43 @@
 /obj/item/ore/lead
 	name = "lead glance"
 	icon_state = "ore_lead"
-	material = MAT_LEAD
+	material = ORE_LEAD
 	origin_tech = list(TECH_MATERIAL = 3)
 /*
 /obj/item/ore/copper
 	name = "raw copper"
 	icon_state = "ore_copper"
-	material = "copper"
+	material = ORE_COPPER
 
 /obj/item/ore/tin
 	name = "raw tin"
 	icon_state = "ore_tin"
-	material = "tin"
+	material = ORE_TIN
 
 /obj/item/ore/bauxite
 	name = "raw bauxite"
 	icon_state = "ore_bauxite"
-	material = "bauxite"
+	material = ORE_BAUXITE
 */
 /obj/item/ore/rutile
 	name = "raw rutile"
 	icon_state = "ore_rutile"
-	material = "rutile"
+	material = ORE_RUTILE
 /*
 /obj/item/ore/void_opal
 	name = "raw void opal"
 	icon_state = "ore_void_opal"
-	material = "void opal"
+	material = ORE_VOPAL
 
 /obj/item/ore/painite
 	name = "raw painite"
 	icon_state = "ore_painite"
-	material = "painite"
+	material = ORE_PAINITE
 
 /obj/item/ore/quartz
 	name = "raw quartz"
 	icon_state = "ore_quartz"
-	material = "quartz"
+	material = ORE_QUARTZ
 */
 /obj/item/ore/slag
 	name = "Slag"
@@ -179,26 +179,26 @@
 	randpixel = 8
 	w_class = ITEMSIZE_SMALL
 	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)
 
 /obj/item/ore_chunk/examine(mob/user)
 	. = ..()

code/modules/mining/ore_box.dm

@@ -8,26 +8,26 @@
 	density = TRUE
 	var/last_update = 0
 	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)
 
 
 /obj/structure/ore_box/attackby(obj/item/W as obj, mob/user as mob)

code/modules/mining/ore_datum.dm

@@ -14,8 +14,8 @@
 		"thousand" = 999,
 		"million" = 999
 		)
-	var/xarch_source_mineral = "iron"
-	var/reagent = "silicate"
+	var/xarch_source_mineral = REAGENT_ID_IRON
+	var/reagent = REAGENT_SILICATE
 
 /ore/New()
 	. = ..()
@@ -23,9 +23,9 @@
 		display_name = name
 
 /ore/uranium
-	name = "uranium"
+	name = ORE_LEAD
 	display_name = "pitchblende"
-	smelts_to = "uranium"
+	smelts_to = MAT_URANIUM
 	result_amount = 5
 	spread_chance = 10
 	ore = /obj/item/ore/uranium
@@ -34,43 +34,43 @@
 		"thousand" = 999,
 		"million" = 704
 		)
-	xarch_source_mineral = "potassium"
-	reagent = "uranium"
+	xarch_source_mineral = REAGENT_ID_POTASSIUM
+	reagent = REAGENT_ID_URANIUM
 
 /ore/hematite
-	name = "hematite"
+	name = ORE_HEMATITE
 	display_name = "hematite"
-	smelts_to = "iron"
+	smelts_to = MAT_IRON
 	alloy = 1
 	result_amount = 5
 	spread_chance = 25
 	ore = /obj/item/ore/iron
 	scan_icon = "mineral_common"
-	reagent = "iron"
+	reagent = REAGENT_ID_IRON
 
 /ore/coal
-	name = "carbon"
+	name = ORE_CARBON
 	display_name = "raw carbon"
-	smelts_to = "plastic"
-	compresses_to = "graphite"
+	smelts_to = MAT_PLASTIC
+	compresses_to = MAT_GRAPHITE
 	alloy = 1
 	result_amount = 5
 	spread_chance = 25
 	ore = /obj/item/ore/coal
 	scan_icon = "mineral_common"
-	reagent = "carbon"
+	reagent = REAGENT_ID_CARBON
 
 /ore/glass
-	name = "sand"
+	name = ORE_SAND
 	display_name = "sand"
-	smelts_to = "glass"
+	smelts_to = MAT_GLASS
 	alloy = 1
 	compresses_to = "sandstone"
 
 /ore/phoron
-	name = "phoron"
+	name = ORE_PHORON
 	display_name = "phoron crystals"
-	compresses_to = "phoron"
+	compresses_to = MAT_PHORON
 	//smelts_to = something that explodes violently on the conveyor, huhuhuhu
 	result_amount = 5
 	spread_chance = 25
@@ -82,22 +82,22 @@
 		"billion" = 13,
 		"billion_lower" = 10
 		)
-	xarch_source_mineral = "phoron"
-	reagent = "phoron"
+	xarch_source_mineral = REAGENT_ID_PHORON
+	reagent = REAGENT_ID_PHORON
 
 /ore/silver
-	name = "silver"
+	name = ORE_SILVER
 	display_name = "native silver"
-	smelts_to = "silver"
+	smelts_to = MAT_SILVER
 	result_amount = 5
 	spread_chance = 10
 	ore = /obj/item/ore/silver
 	scan_icon = "mineral_uncommon"
-	reagent = "silver"
+	reagent = REAGENT_ID_SILVER
 
 /ore/gold
-	smelts_to = "gold"
-	name = "gold"
+	name = ORE_GOLD
+	smelts_to = MAT_GOLD
 	display_name = "native gold"
 	result_amount = 5
 	spread_chance = 10
@@ -109,42 +109,42 @@
 		"billion" = 4,
 		"billion_lower" = 3
 		)
-	reagent = "gold"
+	reagent = REAGENT_ID_GOLD
 
 /ore/diamond
-	name = "diamond"
+	name = ORE_DIAMOND
 	display_name = "diamond"
 	alloy = 1
-	compresses_to = "diamond"
+	compresses_to = MAT_DIAMOND
 	result_amount = 5
 	spread_chance = 10
 	ore = /obj/item/ore/diamond
 	scan_icon = "mineral_rare"
-	xarch_source_mineral = "nitrogen"
-	reagent = "carbon"
+	xarch_source_mineral = REAGENT_ID_NITROGEN
+	reagent = REAGENT_ID_CARBON
 
 /ore/platinum
-	name = "platinum"
+	name = ORE_PLATINUM
 	display_name = "raw platinum"
-	smelts_to = "platinum"
-	compresses_to = "osmium"
+	smelts_to = MAT_PLATINUM
+	compresses_to = MAT_OSMIUM
 	alloy = 1
 	result_amount = 5
 	spread_chance = 10
 	ore = /obj/item/ore/osmium
 	scan_icon = "mineral_rare"
-	reagent = "platinum"
+	reagent = REAGENT_ID_PLATINUM
 
 /ore/hydrogen
-	name = "mhydrogen"
+	name = ORE_MHYDROGEN
 	display_name = "metallic hydrogen"
-	smelts_to = "tritium"
-	compresses_to = "mhydrogen"
+	smelts_to = MAT_TRITIUM
+	compresses_to = MAT_METALHYDROGEN
 	scan_icon = "mineral_rare"
-	reagent = "hydrogen"
+	reagent = REAGENT_ID_HYDROGEN
 
 /ore/verdantium
-	name = MAT_VERDANTIUM
+	name = ORE_VERDANTIUM
 	display_name = "crystalline verdantite"
 	compresses_to = MAT_VERDANTIUM
 	result_amount = 2
@@ -157,40 +157,40 @@
 		)
 
 /ore/marble
-	name = MAT_MARBLE
+	name = ORE_MARBLE
 	display_name = "recrystallized carbonate"
-	compresses_to = "marble"
+	compresses_to = MAT_MARBLE
 	result_amount = 1
 	spread_chance = 10
 	ore = /obj/item/ore/marble
 	scan_icon = "mineral_common"
-	reagent = "calciumcarbonate"
+	reagent = REAGENT_ID_CALCIUMCARBONATE
 
 /ore/lead
-	name = MAT_LEAD
+	name = ORE_LEAD
 	display_name = "lead glance"
-	smelts_to = "lead"
+	smelts_to = MAT_LEAD
 	result_amount = 3
 	spread_chance = 20
 	ore = /obj/item/ore/lead
 	scan_icon = "mineral_rare"
-	reagent = "lead"
+	reagent = REAGENT_ID_LEAD
 /*
 /ore/copper
-	name = "copper"
+	name = ORE_COPPER
 	display_name = "copper"
-	smelts_to = "copper"
+	smelts_to = MAT_COPPER
 	alloy = 1
 	result_amount = 5
 	spread_chance = 15
 	ore = /obj/item/ore/copper
 	scan_icon = "mineral_common"
-	reagent = "copper"
+	reagent = REAGENT_ID_COPPER
 
 /ore/tin
-	name = "tin"
+	name = ORE_TIN
 	display_name = "tin"
-	smelts_to = "tin"
+	smelts_to = MAT_TIN
 	alloy = 1
 	result_amount = 5
 	spread_chance = 10
@@ -198,28 +198,28 @@
 	scan_icon = "mineral_common"
 
 /ore/quartz
-	name = "quartz"
+	name = ORE_QUARTZ
 	display_name = "unrefined quartz"
-	compresses_to = "quartz"
+	compresses_to = MAT_QUARTZ
 	result_amount = 5
 	spread_chance = 5
 	ore = /obj/item/ore/quartz
 	scan_icon = "mineral_common"
 
 /ore/bauxite
-	name = "bauxite"
+	name = ORE_BAUXITE
 	display_name = "bauxite"
-	smelts_to = "aluminium"
+	smelts_to = MAT_ALUMINIUM
 	result_amount = 5
 	spread_chance = 25
 	ore = /obj/item/ore/bauxite
 	scan_icon = "mineral_common"
-	reagent = "aluminum"
+	reagent = REAGENT_ID_ALUMINIUM
 */
 /ore/rutile
-	name = "rutile"
+	name = ORE_RUTILE
 	display_name = "rutile"
-	smelts_to = "titanium"
+	smelts_to = MAT_TITANIUM
 	result_amount = 5
 	spread_chance = 12
 	alloy = 1
@@ -227,20 +227,20 @@
 	scan_icon = "mineral_uncommon"
 /*
 /ore/painite
-	name = "painite"
+	name = ORE_PAINITE
 	display_name = "rough painite"
-	compresses_to = "painite"
+	compresses_to = MAT_PAINITE
 	result_amount = 5
 	spread_chance = 3
 	ore = /obj/item/ore/painite
 	scan_icon = "mineral_rare"
 
 /ore/void_opal
-	name = "void opal"
+	name = ORE_VOPAL
 	display_name = "rough void opal"
-	compresses_to = "void opal"
+	compresses_to = MAT_VOPAL
 	result_amount = 5
 	spread_chance = 1
 	ore = /obj/item/ore/void_opal
 	scan_icon = "mineral_rare"
-*/
+*/

code/modules/mob/living/carbon/alien/larva/life.dm

@@ -5,7 +5,7 @@
 	if(!environment) return
 
 	var/turf/T = get_turf(src)
-	if(environment.gas["phoron"] > 0 || (T && locate(/obj/effect/alien/weeds) in T.contents))
+	if(environment.gas[GAS_PHORON] > 0 || (T && locate(/obj/effect/alien/weeds) in T.contents))
 		update_progression()
 		adjustBruteLoss(-1)
 		adjustFireLoss(-1)

code/modules/mob/living/carbon/human/life.dm

@@ -609,13 +609,13 @@
 	if(species.breath_type)
 		breath_type = species.breath_type
 	else
-		breath_type = "oxygen"
+		breath_type = GAS_O2
 	inhaling = breath.gas[breath_type]
 
 	if(species.poison_type)
 		poison_type = species.poison_type
 	else
-		poison_type = "phoron"
+		poison_type = GAS_PHORON
 	poison = breath.gas[poison_type]
 
 	if(species.exhale_type)
@@ -640,17 +640,17 @@
 		failed_inhale = 1
 
 		switch(breath_type)
-			if("oxygen")
+			if(GAS_O2)
 				throw_alert("oxy", /obj/screen/alert/not_enough_oxy)
-			if("phoron")
+			if(GAS_PHORON)
 				throw_alert("oxy", /obj/screen/alert/not_enough_tox)
-			if("nitrogen")
+			if(GAS_N2)
 				throw_alert("oxy", /obj/screen/alert/not_enough_nitro)
-			if("carbon_dioxide")
+			if(GAS_CO2)
 				throw_alert("oxy", /obj/screen/alert/not_enough_co2)
-			if("volatile_fuel")
+			if(GAS_VOLATILE_FUEL)
 				throw_alert("oxy", /obj/screen/alert/not_enough_fuel)
-			if("nitrous_oxide")
+			if(GAS_N2O)
 				throw_alert("oxy", /obj/screen/alert/not_enough_n2o)
 
 	else
@@ -702,8 +702,8 @@
 		clear_alert("tox_in_air")
 
 	// If there's some other shit in the air lets deal with it here.
-	if(breath.gas["nitrous_oxide"])
-		var/SA_pp = (breath.gas["nitrous_oxide"] / breath.total_moles) * breath_pressure
+	if(breath.gas[GAS_N2O])
+		var/SA_pp = (breath.gas[GAS_N2O] / breath.total_moles) * breath_pressure
 
 		// Enough to make us paralysed for a bit
 		if(SA_pp > SA_para_min)
@@ -719,7 +719,7 @@
 		else if(SA_pp > 0.15)
 			if(prob(20))
 				spawn(0) emote(pick("giggle", "laugh"))
-		breath.adjust_gas("nitrous_oxide", -breath.gas["nitrous_oxide"]/6, update = 0) //update after
+		breath.adjust_gas(GAS_N2O, -breath.gas[GAS_N2O]/6, update = 0) //update after
 
 	// Were we able to breathe?
 	if (failed_inhale || failed_exhale)

code/modules/mob/living/carbon/human/species/outsider/vox.dm

@@ -43,8 +43,8 @@
 
 	gluttonous = 1
 
-	breath_type = "phoron"
-	poison_type = "oxygen"
+	breath_type = GAS_PHORON
+	poison_type = GAS_O2
 	ideal_air_type = /datum/gas_mixture/belly_air/vox
 	siemens_coefficient = 0.2
 

code/modules/mob/living/carbon/human/species/species.dm

@@ -133,9 +133,9 @@
 
 	// Environment tolerance/life processes vars.
 	var/reagent_tag											//Used for metabolizing reagents.
-	var/breath_type = "oxygen"								// Non-oxygen gas breathed, if any.
-	var/poison_type = "phoron"								// Poisonous air.
-	var/exhale_type = "carbon_dioxide"						// Exhaled gas type.
+	var/breath_type = GAS_O2								// Non-oxygen gas breathed, if any.
+	var/poison_type = GAS_PHORON								// Poisonous air.
+	var/exhale_type = GAS_CO2								// Exhaled gas type.
 	var/water_breather = FALSE
 	var/bad_swimmer = FALSE
 

code/modules/mob/living/carbon/human/species/station/alraune.dm

@@ -18,9 +18,9 @@
 	selects_bodytype = SELECTS_BODYTYPE_CUSTOM //VOREStation edit
 
 	body_temperature = T20C
-	breath_type = "oxygen"
-	poison_type = "phoron"
-	exhale_type = "oxygen"
+	breath_type = GAS_O2
+	poison_type = GAS_PHORON
+	exhale_type = GAS_O2
 	water_breather = TRUE  //eh, why not? Aquatic plants are a thing.
 
 	// Heat and cold resistances are 20 degrees broader on the level 1 range, level 2 is default, level 3 is much weaker, halfway between L2 and normal L3.
@@ -169,7 +169,7 @@
 	var/failed_inhale = 0
 	var/failed_exhale = 0
 
-	inhaling = breath.gas["carbon_dioxide"]
+	inhaling = breath.gas[GAS_CO2]
 	poison = breath.gas[poison_type]
 	exhaling = breath.gas[exhale_type]
 
@@ -193,7 +193,7 @@
 		H.clear_alert("oxy")
 
 	inhaled_gas_used = inhaling/6
-	breath.adjust_gas("carbon_dioxide", -inhaled_gas_used, update = 0) //update afterwards
+	breath.adjust_gas(GAS_CO2, -inhaled_gas_used, update = 0) //update afterwards
 	breath.adjust_gas_temp(exhale_type, inhaled_gas_used, H.bodytemperature, update = 0) //update afterwards
 
 	//Now we handle CO2.

code/modules/mob/living/carbon/human/species/station/blank_vr.dm

@@ -69,10 +69,10 @@
 //Called when spawning to equip them with special things.
 /datum/species/custom/equip_survival_gear(var/mob/living/carbon/human/H, var/extendedtank = 0, var/comprehensive = 0)
 	. = ..()
-	if(breath_type != "oxygen")
+	if(breath_type != GAS_O2)
 		H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
 		var/obj/item/tank/tankpath
-		if(breath_type == "phoron")
+		if(breath_type == GAS_PHORON)
 			tankpath = /obj/item/tank/vox
 		else
 			tankpath = text2path("/obj/item/tank/" + breath_type)

code/modules/mob/living/carbon/human/species/station/station.dm

@@ -430,7 +430,7 @@
 	warning_low_pressure = 300   // Low pressure warning.
 	hazard_low_pressure = 220     // Dangerously low pressure.
 	safe_pressure = 400
-	poison_type = "nitrogen"      // technically it's a partial pressure thing but IDK if we can emulate that
+	poison_type = GAS_N2      // technically it's a partial pressure thing but IDK if we can emulate that
 	ideal_air_type = /datum/gas_mixture/belly_air/zaddat
 
 	genders = list(FEMALE, PLURAL) //females are polyp-producing, infertile females and males are nigh-identical

code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm

@@ -154,12 +154,12 @@
 /datum/trait/negative/breathes/phoron
 	name = "Phoron Breather"
 	desc = "You breathe phoron instead of oxygen (which is poisonous to you), much like a Vox."
-	var_changes = list("breath_type" = "phoron", "poison_type" = "oxygen", "ideal_air_type" = /datum/gas_mixture/belly_air/vox)
+	var_changes = list("breath_type" = GAS_PHORON, "poison_type" = GAS_O2, "ideal_air_type" = /datum/gas_mixture/belly_air/vox)
 
 /datum/trait/negative/breathes/nitrogen
 	name = "Nitrogen Breather"
 	desc = "You breathe nitrogen instead of oxygen (which is poisonous to you). Incidentally, phoron isn't poisonous to breathe to you."
-	var_changes = list("breath_type" = "nitrogen", "poison_type" = "oxygen", "ideal_air_type" = /datum/gas_mixture/belly_air/nitrogen_breather)
+	var_changes = list("breath_type" = GAS_N2, "poison_type" = GAS_O2, "ideal_air_type" = /datum/gas_mixture/belly_air/nitrogen_breather)
 
 /datum/trait/negative/monolingual
 	name = "Monolingual"

code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm

@@ -114,7 +114,7 @@
 	var/datum/gas_mixture/environment = T.return_air()
 	if(!environment) return
 
-	if(environment.gas["phoron"] > 0 || locate(/obj/effect/alien/weeds) in T)
+	if(environment.gas[GAS_PHORON] > 0 || locate(/obj/effect/alien/weeds) in T)
 		if(!regenerate(H))
 			var/obj/item/organ/internal/xenos/plasmavessel/P = H.internal_organs_by_name[O_PLASMA]
 			P.stored_plasma += weeds_plasma_rate

code/modules/mob/living/living_defense.dm

@@ -442,7 +442,7 @@
 		return 1
 
 	var/datum/gas_mixture/G = loc.return_air() // Check if we're standing in an oxygenless environment
-	if(G.gas["oxygen"] < 1)
+	if(G.gas[GAS_O2] < 1)
 		ExtinguishMob() //If there's no oxygen in the tile we're on, put out the fire
 		return 1
 

code/modules/mob/living/silicon/pai/software_modules.dm

@@ -340,10 +340,10 @@
 		var/pressure = environment.return_pressure()
 		var/total_moles = environment.total_moles
 		if (total_moles)
-			var/o2_level = environment.gas["oxygen"]/total_moles
-			var/n2_level = environment.gas["nitrogen"]/total_moles
-			var/co2_level = environment.gas["carbon_dioxide"]/total_moles
-			var/phoron_level = environment.gas["phoron"]/total_moles
+			var/o2_level = environment.gas[GAS_O2]/total_moles
+			var/n2_level = environment.gas[GAS_N2]/total_moles
+			var/co2_level = environment.gas[GAS_CO2]/total_moles
+			var/phoron_level = environment.gas[GAS_PHORON]/total_moles
 			var/unknown_level =  1-(o2_level+n2_level+co2_level+phoron_level)
 
 			// entry is what the element is describing

code/modules/mob/living/simple_mob/life.dm

@@ -118,37 +118,37 @@
 			if( abs(Environment.temperature - bodytemperature) > temperature_range )	//VOREStation Edit: heating adjustments
 				bodytemperature += ((Environment.temperature - bodytemperature) / 5)
 
-			if(min_oxy && Environment.gas["oxygen"] < min_oxy)
+			if(min_oxy && Environment.gas[GAS_O2] < min_oxy)
 				atmos_unsuitable = 1
 				throw_alert("oxy", /obj/screen/alert/not_enough_oxy)
-			else if(max_oxy && Environment.gas["oxygen"] > max_oxy)
+			else if(max_oxy && Environment.gas[GAS_O2] > max_oxy)
 				atmos_unsuitable = 1
 				throw_alert("oxy", /obj/screen/alert/too_much_oxy)
 			else
 				clear_alert("oxy")
 
-			if(min_tox && Environment.gas["phoron"] < min_tox)
+			if(min_tox && Environment.gas[GAS_PHORON] < min_tox)
 				atmos_unsuitable = 2
 				throw_alert("tox_in_air", /obj/screen/alert/not_enough_tox)
-			else if(max_tox && Environment.gas["phoron"] > max_tox)
+			else if(max_tox && Environment.gas[GAS_PHORON] > max_tox)
 				atmos_unsuitable = 2
 				throw_alert("tox_in_air", /obj/screen/alert/tox_in_air)
 			else
 				clear_alert("tox_in_air")
 
-			if(min_n2 && Environment.gas["nitrogen"] < min_n2)
+			if(min_n2 && Environment.gas[GAS_N2] < min_n2)
 				atmos_unsuitable = 1
 				throw_alert("n2o", /obj/screen/alert/not_enough_nitro)
-			else if(max_n2 && Environment.gas["nitrogen"] > max_n2)
+			else if(max_n2 && Environment.gas[GAS_N2] > max_n2)
 				atmos_unsuitable = 1
 				throw_alert("n2o", /obj/screen/alert/too_much_nitro)
 			else
 				clear_alert("n2o")
 
-			if(min_co2 && Environment.gas["carbon_dioxide"] < min_co2)
+			if(min_co2 && Environment.gas[GAS_CO2] < min_co2)
 				atmos_unsuitable = 1
 				throw_alert("co2", /obj/screen/alert/not_enough_co2)
-			else if(max_co2 && Environment.gas["carbon_dioxide"] > max_co2)
+			else if(max_co2 && Environment.gas[GAS_CO2] > max_co2)
 				atmos_unsuitable = 1
 				throw_alert("co2", /obj/screen/alert/too_much_co2)
 			else

code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/phorogenic.dm

@@ -43,7 +43,7 @@
 
 	poison_chance = 30
 	poison_per_bite = 0.5
-	poison_type = "phoron"
+	poison_type = REAGENT_ID_PHORON
 
 	tame_items = list(
 	/obj/item/tank/phoron = 20,

code/modules/mob/living/simple_mob/subtypes/animal/sif/leech.dm

@@ -49,8 +49,8 @@
 	var/list/bodypart_targets = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD)
 	var/infest_target = BP_TORSO	// The currently chosen bodypart to infest.
 	var/mob/living/carbon/host		// Our humble host.
-	var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine","iron","phoron","condensedcapsaicin_v","frostoil")
-	var/randomized_reagent = "iron"	// The reagent chosen at random to be produced, if there's no one piloting the worm.
+	var/list/produceable_chemicals = list("inaprovaline","anti_toxin","alkysine","bicaridine","tramadol","kelotane","leporazine",REAGENT_ID_IRON,REAGENT_ID_PHORON,"condensedcapsaicin_v","frostoil")
+	var/randomized_reagent = REAGENT_ID_IRON	// The reagent chosen at random to be produced, if there's no one piloting the worm.
 	var/passive_reagent = "paracetamol"	// Reagent passively produced by the leech. Should usually be a painkiller.
 
 	var/feeding_delay = 30 SECONDS	// How long do we have to wait to bite our host's organs?

code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm

@@ -173,7 +173,7 @@
 	color = "#660088"
 	slime_color = "dark purple"
 	coretype = /obj/item/slime_extract/dark_purple
-	reagent_injected = "phoron"
+	reagent_injected = REAGENT_ID_PHORON
 
 	description_info = "This slime applies phoron to enemies it attacks.  A biosuit or other thick armor can protect from the toxic attack.  \
 	If hit with a burning attack, it will erupt in flames."
@@ -190,7 +190,7 @@
 /mob/living/simple_mob/slime/xenobio/dark_purple/proc/ignite()
 	visible_message(span_critical("\The [src] erupts in an inferno!"))
 	for(var/turf/simulated/target_turf in view(2, src))
-		target_turf.assume_gas("phoron", 30, 1500+T0C)
+		target_turf.assume_gas(GAS_PHORON, 30, 1500+T0C)
 		spawn(0)
 			target_turf.hotspot_expose(1500+T0C, 400)
 	qdel(src)

code/modules/nifsoft/software/05_health.dm

@@ -123,7 +123,7 @@
 				else if(mode == 1)
 					mode = 2
 					nif.notify("Medichines unable to repair all damage. Perform manual repairs.",TRUE)
-		
+
 		if(mode == 2 && HP_percent < -0.4) //lets inform someone who might be able to help us that we got toasted and roasted
 			nif.notify("User Status: CRITICAL. Notifying medical!",TRUE)
 			mode = 3 //this does nothing except stop it from repeating over and over and over and over and over and over and over
@@ -186,7 +186,7 @@
 /datum/nifsoft/spare_breath/proc/resp_breath()
 	if(!active) return null
 	var/datum/gas_mixture/breath = new(BREATH_VOLUME)
-	breath.adjust_gas("oxygen", BREATH_MOLES)
+	breath.adjust_gas(GAS_O2, BREATH_MOLES)
 	breath.temperature = T20C
 	return breath
 

code/modules/organs/internal/brain.dm

@@ -284,7 +284,7 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
 	name = "Promethean Revival"
 	id = "prom_revival"
 	result = null
-	required_reagents = list("phoron" = 40)
+	required_reagents = list(REAGENT_ID_PHORON = 40)
 	result_amount = 1
 
 /decl/chemical_reaction/instant/promethean_brain_revival/can_happen(var/datum/reagents/holder)

code/modules/organs/subtypes/replicant.dm

@@ -59,10 +59,10 @@
 
 	var/modifier = 1 - 0.5 * is_bruised()
 
-	if(owner.bloodstr.has_reagent("phoron"))
+	if(owner.bloodstr.has_reagent(REAGENT_ID_PHORON))
 		adjust_plasma(round(4 * modifier))
 
-	if(owner.ingested.has_reagent("phoron"))
+	if(owner.ingested.has_reagent(REAGENT_ID_PHORON))
 		adjust_plasma(round(2 * modifier))
 
 	adjust_plasma(2) //Make it a decent amount so people can actually build stuff without stealing all of medbays phoron

code/modules/organs/subtypes/xenos.dm

@@ -39,10 +39,10 @@
 
 	var/modifier = 1 - 0.5 * is_bruised()
 
-	if(owner.bloodstr.has_reagent("phoron"))
+	if(owner.bloodstr.has_reagent(REAGENT_ID_PHORON))
 		adjust_plasma(round(4 * modifier))
 
-	if(owner.ingested.has_reagent("phoron"))
+	if(owner.ingested.has_reagent(REAGENT_ID_PHORON))
 		adjust_plasma(round(2 * modifier))
 
 	adjust_plasma(1)

code/modules/pda/core_apps.dm

@@ -229,10 +229,10 @@
 		var/pressure = environment.return_pressure()
 		var/total_moles = environment.total_moles
 		if (total_moles)
-			var/o2_level = environment.gas["oxygen"]/total_moles
-			var/n2_level = environment.gas["nitrogen"]/total_moles
-			var/co2_level = environment.gas["carbon_dioxide"]/total_moles
-			var/phoron_level = environment.gas["phoron"]/total_moles
+			var/o2_level = environment.gas[GAS_O2]/total_moles
+			var/n2_level = environment.gas[GAS_N2]/total_moles
+			var/co2_level = environment.gas[GAS_CO2]/total_moles
+			var/phoron_level = environment.gas[GAS_PHORON]/total_moles
 			var/unknown_level =  1-(o2_level+n2_level+co2_level+phoron_level)
 
 			// entry is what the element is describing

code/modules/power/cell.dm

@@ -160,7 +160,7 @@
 
 		to_chat(user, "You inject the solution into the power cell.")
 
-		if(S.reagents.has_reagent("phoron", 5))
+		if(S.reagents.has_reagent(REAGENT_ID_PHORON, 5))
 
 			rigged = 1
 

code/modules/power/fusion/core/core_field.dm

@@ -303,8 +303,8 @@
 	var/turf/T = get_turf(src)
 	if(istype(T))
 		var/datum/gas_mixture/plasma = new
-		plasma.adjust_gas("oxygen", (size*100), 0)
-		plasma.adjust_gas("phoron", (size*100), 0)
+		plasma.adjust_gas(GAS_O2, (size*100), 0)
+		plasma.adjust_gas(GAS_PHORON, (size*100), 0)
 		plasma.temperature = (plasma_temperature/2)
 		plasma.update_values()
 		T.assume_air(plasma)
@@ -639,8 +639,8 @@
 		var/turf/TT = get_turf(pick(turfs_in_range))
 		if(istype(TT))
 			var/datum/gas_mixture/plasma = new
-			plasma.adjust_gas("oxygen", (size*100), 0)
-			plasma.adjust_gas("phoron", (size*100), 0)
+			plasma.adjust_gas(GAS_O2, (size*100), 0)
+			plasma.adjust_gas(GAS_PHORON, (size*100), 0)
 			plasma.temperature = (plasma_temperature/2)
 			plasma.update_values()
 			TT.assume_air(plasma)
@@ -655,8 +655,8 @@
 	var/turf/TT = get_turf(owned_core)
 	if(istype(TT))
 		var/datum/gas_mixture/plasma = new
-		plasma.adjust_gas("oxygen", (size*100), 0)
-		plasma.adjust_gas("phoron", (size*100), 0)
+		plasma.adjust_gas(GAS_O2, (size*100), 0)
+		plasma.adjust_gas(GAS_PHORON, (size*100), 0)
 		plasma.temperature = (plasma_temperature/2)
 		plasma.update_values()
 		TT.assume_air(plasma)

code/modules/power/fusion/fuel_assembly/fuel_assembly.dm

@@ -7,7 +7,7 @@
 
 	var/percent_depleted = 1
 	var/list/rod_quantities = list()
-	var/fuel_type = "composite"
+	var/fuel_type = MAT_COMPOSITE
 	var/fuel_colour
 	var/radioactivity = 0
 	var/const/initial_amount = 3000000
@@ -54,13 +54,13 @@
 
 // Mapper shorthand.
 /obj/item/fuel_assembly/deuterium/New(var/newloc)
-	..(newloc, "deuterium")
+	..(newloc, MAT_DEUTERIUM)
 
 /obj/item/fuel_assembly/tritium/New(var/newloc)
-	..(newloc, "tritium")
+	..(newloc, MAT_TRITIUM)
 
 /obj/item/fuel_assembly/phoron/New(var/newloc)
-	..(newloc, "phoron")
+	..(newloc, MAT_PHORON)
 
 /obj/item/fuel_assembly/supermatter/New(var/newloc)
-	..(newloc, "supermatter")
+	..(newloc, MAT_SUPERMATTER)

code/modules/power/fusion/fusion_reactions.dm

@@ -76,8 +76,8 @@ var/list/fusion_reactions
 
 // Unideal/material production reactions
 /decl/fusion_reaction/oxygen_oxygen
-	p_react = "oxygen"
-	s_react = "oxygen"
+	p_react = REAGENT_ID_OXYGEN
+	s_react = REAGENT_ID_OXYGEN
 	energy_consumption = 10
 	energy_production = 0
 	instability = 5
@@ -85,17 +85,17 @@ var/list/fusion_reactions
 	products = list("silicon"= 1)
 
 /decl/fusion_reaction/iron_iron
-	p_react = "iron"
-	s_react = "iron"
-	products = list("silver" = 1, "gold" = 1, "platinum" = 1) // Not realistic but w/e
+	p_react = REAGENT_ID_IRON
+	s_react = REAGENT_ID_IRON
+	products = list(REAGENT_ID_SILVER = 1, REAGENT_ID_GOLD = 1, REAGENT_ID_PLATINUM = 1) // Not realistic but w/e
 	energy_consumption = 10
 	energy_production = 0
 	instability = 2
 	minimum_reaction_temperature = 10000
 
 /decl/fusion_reaction/phoron_hydrogen
-	p_react = "hydrogen"
-	s_react = "phoron"
+	p_react = REAGENT_ID_HYDROGEN
+	s_react = REAGENT_ID_PHORON
 	energy_consumption = 10
 	energy_production = 0
 	instability = 5
@@ -105,7 +105,7 @@ var/list/fusion_reactions
 // VERY UNIDEAL REACTIONS.
 /decl/fusion_reaction/phoron_supermatter
 	p_react = "supermatter"
-	s_react = "phoron"
+	s_react = REAGENT_ID_PHORON
 	energy_consumption = 0
 	energy_production = 5
 	radiation = 20
@@ -145,7 +145,7 @@ var/list/fusion_reactions
 // High end reactions.
 /decl/fusion_reaction/boron_hydrogen
 	p_react = "boron"
-	s_react = "hydrogen"
+	s_react = REAGENT_ID_HYDROGEN
 	minimum_energy_level = FUSION_HEAT_CAP * 0.5
 	energy_consumption = 3
 	energy_production = 15
@@ -153,8 +153,8 @@ var/list/fusion_reactions
 	instability = 3
 
 /decl/fusion_reaction/hydrogen_hydrogen
-	p_react = "hydrogen"
-	s_react = "hydrogen"
+	p_react = REAGENT_ID_HYDROGEN
+	s_react = REAGENT_ID_HYDROGEN
 	minimum_energy_level = FUSION_HEAT_CAP * 0.75
 	energy_consumption = 0
 	energy_production = 20

code/modules/power/lighting.dm

@@ -1141,7 +1141,7 @@ var/global/list/light_type_cache = list()
 
 		to_chat(user, "You inject the solution into the [src].")
 
-		if(S.reagents.has_reagent("phoron", 5))
+		if(S.reagents.has_reagent(REAGENT_ID_PHORON, 5))
 
 			log_admin("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.")
 			message_admins("LOG: [user.name] ([user.ckey]) injected a light with phoron, rigging it to explode.")

code/modules/power/port_gen.dm

@@ -254,7 +254,7 @@
 	var/phoron = (sheets+sheet_left)*20
 	var/datum/gas_mixture/environment = loc.return_air()
 	if (environment)
-		environment.adjust_gas_temp("phoron", phoron/10, temperature + T0C)
+		environment.adjust_gas_temp(GAS_PHORON, phoron/10, temperature + T0C)
 
 	sheets = 0
 	sheet_left = 0

code/modules/power/singularity/collector.dm

@@ -37,11 +37,11 @@ var/global/list/rad_collectors = list()
 			receive_pulse(rads * 5) //Maths is hard
 
 	if(P)
-		if(P.air_contents.gas["phoron"] == 0)
+		if(P.air_contents.gas[GAS_PHORON] == 0)
 			investigate_log("<font color='red'>out of fuel</font>.","singulo")
 			eject()
 		else
-			P.air_contents.adjust_gas("phoron", -0.001*drainratio)
+			P.air_contents.adjust_gas(GAS_PHORON, -0.001*drainratio)
 	return
 
 
@@ -51,7 +51,7 @@ var/global/list/rad_collectors = list()
 			toggle_power()
 			user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
 			"You turn the [src.name] [active? "on":"off"].")
-			investigate_log("turned [active?"<font color='green'>on</font>":"<font color='red'>off</font>"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas["phoron"]/0.29)]%":"<font color='red'>It is empty</font>"].","singulo")
+			investigate_log("turned [active?"<font color='green'>on</font>":"<font color='red'>off</font>"] by [user.key]. [P?"Fuel: [round(P.air_contents.gas[GAS_PHORON]/0.29)]%":"<font color='red'>It is empty</font>"].","singulo")
 			return
 		else
 			to_chat(user, span_red("The controls are locked!"))
@@ -130,7 +130,7 @@ var/global/list/rad_collectors = list()
 /obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength)
 	if(P && active)
 		var/power_produced = 0
-		power_produced = P.air_contents.gas["phoron"]*pulse_strength*20
+		power_produced = P.air_contents.gas[GAS_PHORON]*pulse_strength*20
 		add_avail(power_produced)
 		last_power_new = power_produced
 		return

code/modules/power/singularity/particle_accelerator/particle_smasher.dm

@@ -362,7 +362,7 @@
 	probability = 50
 
 /datum/particle_smasher_recipe/phoron_valhollide
-	reagents = list("phoron" = 10, "pacid" = 10)
+	reagents = list(REAGENT_ID_PHORON = 10, "pacid" = 10)
 
 	result = /obj/item/stack/material/valhollide
 	required_material = /obj/item/stack/material/phoron
@@ -375,7 +375,7 @@
 	probability = 10
 
 /datum/particle_smasher_recipe/valhollide_supermatter
-	reagents = list("phoron" = 300)
+	reagents = list(REAGENT_ID_PHORON = 300)
 
 	result = /obj/item/stack/material/supermatter
 	required_material = /obj/item/stack/material/valhollide
@@ -404,7 +404,7 @@
 
 /datum/particle_smasher_recipe/donkpockets_ascend
 	items = list(/obj/item/reagent_containers/food/snacks/donkpocket)
-	reagents = list("phoron" = 120)
+	reagents = list(REAGENT_ID_PHORON = 120)
 
 	recipe_type = PS_RESULT_ITEM
 

code/modules/power/supermatter/supermatter.dm

@@ -344,7 +344,7 @@
 		damage = max( damage + min( ( (removed.temperature - CRITICAL_TEMPERATURE) / 150 ), damage_inc_limit ) , 0 )
 		//Ok, 100% oxygen atmosphere = best reaction
 		//Maxes out at 100% oxygen pressure
-		oxygen = max(min((removed.gas["oxygen"] - (removed.gas["nitrogen"] * NITROGEN_RETARDATION_FACTOR)) / removed.total_moles, 1), 0)
+		oxygen = max(min((removed.gas[GAS_O2] - (removed.gas[GAS_N2] * NITROGEN_RETARDATION_FACTOR)) / removed.total_moles, 1), 0)
 
 		//calculate power gain for oxygen reaction
 		var/temp_factor
@@ -368,8 +368,8 @@
 
 		//Release reaction gasses
 		var/heat_capacity = removed.heat_capacity()
-		removed.adjust_multi("phoron", max(device_energy / PHORON_RELEASE_MODIFIER, 0), \
-		                     "oxygen", max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0))
+		removed.adjust_multi(GAS_PHORON, max(device_energy / PHORON_RELEASE_MODIFIER, 0), \
+		                     GAS_O2, max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0))
 
 		var/thermal_power = THERMAL_RELEASE_MODIFIER * device_energy
 		if (debug)

code/modules/projectiles/guns/magnetic/bore.dm

@@ -240,7 +240,7 @@
 	mat_storage = max(mat_storage - fuel_used, 0)
 	var/turf/T = get_turf(src)
 	if(T)
-		T.assume_gas("carbon_dioxide", fuel_used * 0.01, T0C+200)
+		T.assume_gas(GAS_CO2, fuel_used * 0.01, T0C+200)
 
 /obj/item/gun/magnetic/matfed/phoronbore/proc/toggle_generator(mob/living/user)
 	if(!generator_state && !mat_storage)

code/modules/projectiles/guns/magnetic/gasthrower.dm

@@ -34,10 +34,10 @@
 
 	var/turf/T = get_turf(src)
 
-	var/phoron_amt = Tank.air_contents.gas["phoron"]
-	var/co2_amt = Tank.air_contents.gas["carbon_dioxide"]
-	var/oxy_amt = Tank.air_contents.gas["oxygen"]
-	var/n2o_amt = Tank.air_contents.gas["nitrous_oxide"]
+	var/phoron_amt = Tank.air_contents.gas[GAS_PHORON]
+	var/co2_amt = Tank.air_contents.gas[GAS_CO2]
+	var/oxy_amt = Tank.air_contents.gas[GAS_O2]
+	var/n2o_amt = Tank.air_contents.gas[GAS_N2O]
 
 	if(isnull(co2_amt))
 		co2_amt = 0

code/modules/projectiles/guns/magnetic/magnetic.dm

@@ -271,13 +271,13 @@
 	if(loaded) //Safety.
 		if(istype(loaded, /obj/item/fuel_assembly))
 			var/obj/item/fuel_assembly/rod = loaded
-			if(rod.fuel_type == "composite" || rod.fuel_type == "deuterium") //Safety check for rods spawned in without a fueltype.
+			if(rod.fuel_type == MAT_COMPOSITE || rod.fuel_type == MAT_DEUTERIUM) //Safety check for rods spawned in without a fueltype.
 				projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod
-			else if(rod.fuel_type == "tritium")
+			else if(rod.fuel_type == MAT_TRITIUM)
 				projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/tritium
-			else if(rod.fuel_type == "phoron")
+			else if(rod.fuel_type == MAT_PHORON)
 				projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/phoron
-			else if(rod.fuel_type == "supermatter")
+			else if(rod.fuel_type == MAT_SUPERMATTER)
 				projectile_type = /obj/item/projectile/bullet/magnetic/fuelrod/supermatter
 				visible_message(span_danger("The barrel of \the [src] glows a blinding white!"))
 				spawn(5)

code/modules/random_map/noise/ore.dm

@@ -59,7 +59,7 @@
 				T.resources["uranium"] =  rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
 				T.resources["marble"] =   rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
 				T.resources["diamond"] =  0
-				T.resources["phoron"] =   0
+				T.resources[ORE_PHORON] =   0
 				T.resources["platinum"] =   0
 				T.resources["mhydrogen"] = 0
 				T.resources["verdantium"] = 0
@@ -67,7 +67,7 @@
 				//T.resources["copper"] =   rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
 				//T.resources["tin"] =      rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
 				//T.resources["bauxite"] =  rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
-				T.resources["rutile"] =   0
+				T.resources[ORE_RUTILE] =   0
 				//T.resources["void opal"] = 0
 				//T.resources["quartz"] = 0
 				//T.resources["painite"] = 0
@@ -75,7 +75,7 @@
 				T.resources["gold"] =     rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
 				T.resources["silver"] =   rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
 				T.resources["uranium"] =  rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
-				T.resources["phoron"] =   rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
+				T.resources[ORE_PHORON] =   rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
 				T.resources["platinum"] =   rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
 				T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX)
 				T.resources["lead"] =     rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
@@ -86,7 +86,7 @@
 				//T.resources["copper"] =   0
 				//T.resources["tin"] =      rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX)
 				//T.resources["bauxite"] =  0
-				T.resources["rutile"] =   0
+				T.resources[ORE_RUTILE] =   0
 				//T.resources["void opal"] = 0
 				//T.resources["quartz"] = 0
 				//T.resources["painite"] = 0
@@ -94,7 +94,7 @@
 				T.resources["uranium"] =  rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
 				T.resources["diamond"] =  rand(RESOURCE_LOW_MIN,  RESOURCE_LOW_MAX)
 				T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX)
-				T.resources["phoron"] =   rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
+				T.resources[ORE_PHORON] =   rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
 				T.resources["platinum"] =   rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX)
 				T.resources["mhydrogen"] = rand(RESOURCE_MID_MIN,  RESOURCE_MID_MAX)
 				T.resources["marble"] =   rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX)
@@ -105,7 +105,7 @@
 				//T.resources["copper"] =   0
 				//T.resources["tin"] =      0
 				//T.resources["bauxite"] =  0
-				T.resources["rutile"] =   0
+				T.resources[ORE_RUTILE] =   0
 				//T.resources["void opal"] = 0
 				//T.resources["quartz"] = 0
 				//T.resources["painite"] = 0

code/modules/reagents/machinery/dispenser/cartridge_presets.dm

@@ -18,9 +18,9 @@
 /obj/item/reagent_containers/chem_disp_cartridge/carbon
 	spawn_reagent = "carbon"
 /obj/item/reagent_containers/chem_disp_cartridge/nitrogen
-	spawn_reagent = "nitrogen"
+	spawn_reagent = REAGENT_ID_NITROGEN
 /obj/item/reagent_containers/chem_disp_cartridge/oxygen
-	spawn_reagent = "oxygen"
+	spawn_reagent = REAGENT_ID_OXYGEN
 /obj/item/reagent_containers/chem_disp_cartridge/fluorine
 	spawn_reagent = "fluorine"
 /obj/item/reagent_containers/chem_disp_cartridge/sodium

code/modules/reagents/machinery/dispenser/dispenser2_energy.dm

@@ -29,7 +29,7 @@
 
 /obj/machinery/chemical_dispenser
 	dispense_reagents = list(
-		"hydrogen", "lithium", "carbon", "nitrogen", "oxygen", "fluorine", "sodium",
+		"hydrogen", "lithium", "carbon", REAGENT_ID_NITROGEN, REAGENT_ID_OXYGEN, "fluorine", "sodium",
 		"aluminum", "silicon", "phosphorus", "sulfur", "chlorine", "potassium", "iron",
 		"copper", "mercury", "radium", "water", "ethanol", "sugar", "sacid", "tungsten",
 		"calcium"

code/modules/reagents/machinery/grinder.dm

@@ -1,11 +1,11 @@
 // Don't need a new list for every grinder in the game
 var/global/list/sheet_reagents = list( //have a number of reagents divisible by REAGENTS_PER_SHEET (default 20) unless you like decimals.
-	/obj/item/stack/material/plastic = list("carbon","carbon","oxygen","chlorine","sulfur"),
+	/obj/item/stack/material/plastic = list("carbon","carbon",REAGENT_ID_OXYGEN,"chlorine","sulfur"),
 	/obj/item/stack/material/copper = list("copper"),
-	/obj/item/stack/material/wood = list("carbon","woodpulp","nitrogen","potassium","sodium"),
-	/obj/item/stack/material/stick = list("carbon","woodpulp","nitrogen","potassium","sodium"),
-	/obj/item/stack/material/log = list("carbon","woodpulp","nitrogen","potassium","sodium"),
-	/obj/item/stack/material/algae = list("carbon","nitrogen","nitrogen","phosphorus","phosphorus"),
+	/obj/item/stack/material/wood = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"),
+	/obj/item/stack/material/stick = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"),
+	/obj/item/stack/material/log = list("carbon","woodpulp",REAGENT_ID_NITROGEN,"potassium","sodium"),
+	/obj/item/stack/material/algae = list("carbon",REAGENT_ID_NITROGEN,REAGENT_ID_NITROGEN,"phosphorus","phosphorus"),
 	/obj/item/stack/material/graphite = list("carbon"),
 	/obj/item/stack/material/aluminium = list("aluminum"), // The material is aluminium, but the reagent is aluminum...
 	/obj/item/stack/material/glass/reinforced = list("silicon","silicon","silicon","iron","carbon"),
@@ -14,13 +14,13 @@ var/global/list/sheet_reagents = list( //have a number of reagents divisible by
 	/obj/item/stack/material/fiber = list("carbon","carbon","carbon","protein","sodium"),
 	/obj/item/stack/material/fur = list("carbon","carbon","carbon","sulfur","sodium"),
 	/obj/item/stack/material/deuterium = list("hydrogen"),
-	/obj/item/stack/material/glass/phoronrglass = list("silicon","silicon","silicon","phoron","phoron"),
+	/obj/item/stack/material/glass/phoronrglass = list("silicon","silicon","silicon",REAGENT_ID_PHORON,REAGENT_ID_PHORON),
 	/obj/item/stack/material/diamond = list("carbon"),
 	/obj/item/stack/material/durasteel = list("iron","iron","carbon","carbon","platinum"),
 	/obj/item/stack/material/wax = list("ethanol","triglyceride"),
 	/obj/item/stack/material/iron = list("iron"),
 	/obj/item/stack/material/uranium = list("uranium"),
-	/obj/item/stack/material/phoron = list("phoron"),
+	/obj/item/stack/material/phoron = list(REAGENT_ID_PHORON),
 	/obj/item/stack/material/gold = list("gold"),
 	/obj/item/stack/material/silver = list("silver"),
 	/obj/item/stack/material/platinum = list("platinum"),
@@ -28,7 +28,7 @@ var/global/list/sheet_reagents = list( //have a number of reagents divisible by
 	/obj/item/stack/material/steel = list("iron", "carbon"),
 	/obj/item/stack/material/plasteel = list("iron", "iron", "carbon", "carbon", "platinum"), //8 iron, 8 carbon, 4 platinum,
 	/obj/item/stack/material/snow = list("water"),
-	/obj/item/stack/material/sandstone = list("silicon", "oxygen"),
+	/obj/item/stack/material/sandstone = list("silicon", REAGENT_ID_OXYGEN),
 	/obj/item/stack/material/glass = list("silicon"),
 	/obj/item/stack/material/glass/phoronglass = list("platinum", "silicon", "silicon", "silicon"), //5 platinum, 15 silicon,
 	/obj/item/stack/material/supermatter = list("supermatter")
@@ -37,7 +37,7 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R
 	/obj/item/ore/glass = list("silicon"),
 	/obj/item/ore/iron = list("iron"),
 	/obj/item/ore/coal = list("carbon"),
-	/obj/item/ore/phoron = list("phoron"),
+	/obj/item/ore/phoron = list(REAGENT_ID_PHORON),
 	/obj/item/ore/silver = list("silver"),
 	/obj/item/ore/gold = list("gold"),
 	/obj/item/ore/marble = list("silicon","aluminum","aluminum","sodium","calcium"), // Some nice variety here
@@ -46,8 +46,8 @@ var/global/list/ore_reagents = list( //have a number of reageents divisible by R
 	/obj/item/ore/osmium = list("platinum"), // should contain osmium
 	/obj/item/ore/lead = list("lead"),
 	/obj/item/ore/hydrogen = list("hydrogen"),
-	/obj/item/ore/verdantium = list("radium","phoron","nitrogen","phosphorus","sodium"), // Some fun stuff to be useful with
-	/obj/item/ore/rutile = list("tungsten","oxygen") // Should be titanium
+	/obj/item/ore/verdantium = list("radium",REAGENT_ID_PHORON,REAGENT_ID_NITROGEN,"phosphorus","sodium"), // Some fun stuff to be useful with
+	/obj/item/ore/rutile = list("tungsten",REAGENT_ID_OXYGEN) // Should be titanium
 )
 
 /obj/machinery/reagentgrinder

code/modules/reagents/reactions/distilling/distilling.dm

@@ -53,7 +53,7 @@
 	name = "Distilling Biomass"
 	id = "distill_biomass"
 	result = "biomass"
-	required_reagents = list("blood" = 1, "sugar" = 1, "phoron" = 0.5)
+	required_reagents = list("blood" = 1, "sugar" = 1, REAGENT_ID_PHORON = 0.5)
 	result_amount = 1 // 40 units per sheet, requires actually using the machine, and having blood to spare.
 
 	temp_range = list(T20C + 80, T20C + 130)
@@ -156,7 +156,7 @@
 	name = "Distilling Brute Juice"
 	id = "distill_brutejuice"
 	result = "berserkmed"
-	required_reagents = list("biomass" = 1, "hyperzine" = 3, "synaptizine" = 2, "phoron" = 1)
+	required_reagents = list("biomass" = 1, "hyperzine" = 3, "synaptizine" = 2, REAGENT_ID_PHORON = 1)
 	result_amount = 3
 
 	temp_range = list(T0C + 600, T0C + 700)
@@ -209,7 +209,7 @@
 	required_reagents = list("lichpowder" = 1, "cryoxadone" = 1, "carthatoline" = 1)
 	result_amount = 2
 
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 
 	reaction_rate = HALF_LIFE(20)
 

code/modules/reagents/reactions/instant/drinks.dm

@@ -267,7 +267,7 @@
 	name = "Toxins Special"
 	id = "phoronspecial"
 	result = "phoronspecial"
-	required_reagents = list("rum" = 2, "vermouth" = 2, "phoron" = 2)
+	required_reagents = list("rum" = 2, "vermouth" = 2, REAGENT_ID_PHORON = 2)
 	result_amount = 6
 
 /decl/chemical_reaction/instant/drinks/beepsky_smash
@@ -1001,7 +1001,7 @@
 	name = "Vox's Delight"
 	id = "voxdelight"
 	result = "voxdelight"
-	required_reagents = list("phoron" = 3, "fuel" = 1, "water" = 1)
+	required_reagents = list(REAGENT_ID_PHORON = 3, "fuel" = 1, "water" = 1)
 	result_amount = 4
 
 /decl/chemical_reaction/instant/drinks/screamingviking
@@ -1029,7 +1029,7 @@
 	name = "Robustin"
 	id = "robustin"
 	result = "robustin"
-	required_reagents = list("antifreeze" = 1, "phoron" = 1, "fuel" = 1, "vodka" = 1)
+	required_reagents = list("antifreeze" = 1, REAGENT_ID_PHORON = 1, "fuel" = 1, "vodka" = 1)
 	result_amount = 4
 
 /decl/chemical_reaction/instant/drinks/virginsip

code/modules/reagents/reactions/instant/drinks_vr.dm

@@ -46,7 +46,7 @@
 	name = "Unsweetened Tea"
 	id = "unsweettea"
 	result = "unsweettea"
-	required_reagents = list("sweettea" = 3, "phoron" = 1)
+	required_reagents = list("sweettea" = 3, REAGENT_ID_PHORON = 1)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/drinks/galacticpanic
@@ -152,7 +152,7 @@
 	name = "Redspace Flush"
 	id = "redspaceflush"
 	result = "redspaceflush"
-	required_reagents = list("rum" = 2, "whiskey" = 2, "blood" =1, "phoron" =1)
+	required_reagents = list("rum" = 2, "whiskey" = 2, "blood" =1, REAGENT_ID_PHORON =1)
 	result_amount = 6
 
 /decl/chemical_reaction/instant/drinks/graveyard

code/modules/reagents/reactions/instant/instant.dm

@@ -7,36 +7,36 @@
 	name = "Inaprovaline"
 	id = "inaprovaline"
 	result = "inaprovaline"
-	required_reagents = list("oxygen" = 1, "carbon" = 1, "sugar" = 1)
+	required_reagents = list(REAGENT_ID_OXYGEN = 1, "carbon" = 1, "sugar" = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/dylovene
 	name = "Dylovene"
 	id = "anti_toxin"
 	result = "anti_toxin"
-	required_reagents = list("silicon" = 1, "potassium" = 1, "nitrogen" = 1)
+	required_reagents = list("silicon" = 1, "potassium" = 1, REAGENT_ID_NITROGEN = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/carthatoline
 	name = "Carthatoline"
 	id = "carthatoline"
 	result = "carthatoline"
-	required_reagents = list("anti_toxin" = 1, "carbon" = 2, "phoron" = 0.1)
-	catalysts = list("phoron" = 1)
+	required_reagents = list("anti_toxin" = 1, "carbon" = 2, REAGENT_ID_PHORON = 0.1)
+	catalysts = list(REAGENT_ID_PHORON = 1)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/paracetamol
 	name = "Paracetamol"
 	id = "paracetamol"
 	result = "paracetamol"
-	required_reagents = list("inaprovaline" = 1, "nitrogen" = 1, "water" = 1)
+	required_reagents = list("inaprovaline" = 1, REAGENT_ID_NITROGEN = 1, "water" = 1)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/tramadol
 	name = "Tramadol"
 	id = "tramadol"
 	result = "tramadol"
-	required_reagents = list("paracetamol" = 1, "ethanol" = 1, "oxygen" = 1)
+	required_reagents = list("paracetamol" = 1, "ethanol" = 1, REAGENT_ID_OXYGEN = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/oxycodone
@@ -44,7 +44,7 @@
 	id = "oxycodone"
 	result = "oxycodone"
 	required_reagents = list("ethanol" = 1, "tramadol" = 1)
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 
 /decl/chemical_reaction/instant/sterilizine
@@ -58,7 +58,7 @@
 	name = "Silicate"
 	id = "silicate"
 	result = "silicate"
-	required_reagents = list("aluminum" = 1, "silicon" = 1, "oxygen" = 1)
+	required_reagents = list("aluminum" = 1, "silicon" = 1, REAGENT_ID_OXYGEN = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/mutagen
@@ -69,17 +69,17 @@
 	result_amount = 3
 
 /decl/chemical_reaction/instant/water
-	name = "Water"
-	id = "water"
-	result = "water"
-	required_reagents = list("oxygen" = 1, "hydrogen" = 2)
+	name = REAGENT_WATER
+	id = REAGENT_ID_WATER
+	result = REAGENT_ID_WATER
+	required_reagents = list(REAGENT_ID_OXYGEN = 1, "hydrogen" = 2)
 	result_amount = 1
 
 /decl/chemical_reaction/instant/thermite
 	name = "Thermite"
 	id = "thermite"
 	result = "thermite"
-	required_reagents = list("aluminum" = 1, "iron" = 1, "oxygen" = 1)
+	required_reagents = list("aluminum" = 1, "iron" = 1, REAGENT_ID_OXYGEN = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/bliss
@@ -93,7 +93,7 @@
 	name = "Space Lube"
 	id = "lube"
 	result = "lube"
-	required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
+	required_reagents = list("water" = 1, "silicon" = 1, REAGENT_ID_OXYGEN = 1)
 	result_amount = 4
 
 /decl/chemical_reaction/instant/pacid
@@ -128,7 +128,7 @@
 	name = "Impedrezene"
 	id = "impedrezene"
 	result = "impedrezene"
-	required_reagents = list("mercury" = 1, "oxygen" = 1, "sugar" = 1)
+	required_reagents = list("mercury" = 1, REAGENT_ID_OXYGEN = 1, "sugar" = 1)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/kelotane
@@ -144,15 +144,15 @@
 	id = "peridaxon"
 	result = "peridaxon"
 	required_reagents = list("bicaridine" = 2, "clonexadone" = 2)
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/osteodaxon
 	name = "Osteodaxon"
 	id = "osteodaxon"
 	result = "osteodaxon"
-	required_reagents = list("bicaridine" = 2, "phoron" = 0.1, "carpotoxin" = 1)
-	catalysts = list("phoron" = 5)
+	required_reagents = list("bicaridine" = 2, REAGENT_ID_PHORON = 0.1, "carpotoxin" = 1)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	inhibitors = list("clonexadone" = 1) // Messes with cryox
 	result_amount = 2
 
@@ -160,8 +160,8 @@
 	name = "Respirodaxon"
 	id = "respirodaxon"
 	result = "respirodaxon"
-	required_reagents = list("dexalinp" = 2, "biomass" = 2, "phoron" = 1)
-	catalysts = list("phoron" = 5)
+	required_reagents = list("dexalinp" = 2, "biomass" = 2, REAGENT_ID_PHORON = 1)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	inhibitors = list("dexalin" = 1)
 	result_amount = 2
 
@@ -170,7 +170,7 @@
 	id = "gastirodaxon"
 	result = "gastirodaxon"
 	required_reagents = list("carthatoline" = 1, "biomass" = 2, "tungsten" = 2)
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	inhibitors = list("lithium" = 1)
 	result_amount = 3
 
@@ -179,7 +179,7 @@
 	id = "hepanephrodaxon"
 	result = "hepanephrodaxon"
 	required_reagents = list("carthatoline" = 2, "biomass" = 2, "lithium" = 1)
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	inhibitors = list("tungsten" = 1)
 	result_amount = 2
 
@@ -188,7 +188,7 @@
 	id = "cordradaxon"
 	result = "cordradaxon"
 	required_reagents = list("potassium_chlorophoride" = 1, "biomass" = 2, "bicaridine" = 2)
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	inhibitors = list("clonexadone" = 1)
 	result_amount = 2
 
@@ -204,14 +204,14 @@
 	id = "leporazine"
 	result = "leporazine"
 	required_reagents = list("silicon" = 1, "copper" = 1)
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/cryptobiolin
 	name = "Cryptobiolin"
 	id = "cryptobiolin"
 	result = "cryptobiolin"
-	required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1)
+	required_reagents = list("potassium" = 1, REAGENT_ID_OXYGEN = 1, "sugar" = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/tricordrazine
@@ -225,15 +225,15 @@
 	name = "Alkysine"
 	id = "alkysine"
 	result = "alkysine"
-	required_reagents = list("chlorine" = 1, "nitrogen" = 1, "anti_toxin" = 1)
+	required_reagents = list("chlorine" = 1, REAGENT_ID_NITROGEN = 1, "anti_toxin" = 1)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/dexalin
 	name = "Dexalin"
 	id = "dexalin"
 	result = "dexalin"
-	required_reagents = list("oxygen" = 2, "phoron" = 0.1)
-	catalysts = list("phoron" = 1)
+	required_reagents = list(REAGENT_ID_OXYGEN = 2, REAGENT_ID_PHORON = 0.1)
+	catalysts = list(REAGENT_ID_PHORON = 1)
 	inhibitors = list("water" = 1) // Messes with cryox
 	result_amount = 1
 
@@ -241,7 +241,7 @@
 	name = "Dermaline"
 	id = "dermaline"
 	result = "dermaline"
-	required_reagents = list("oxygen" = 1, "phosphorus" = 1, "kelotane" = 1)
+	required_reagents = list(REAGENT_ID_OXYGEN = 1, "phosphorus" = 1, "kelotane" = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/dexalinp
@@ -292,15 +292,15 @@
 	name = "Cryoxadone"
 	id = "cryoxadone"
 	result = "cryoxadone"
-	required_reagents = list("dexalin" = 1, "water" = 1, "oxygen" = 1)
+	required_reagents = list("dexalin" = 1, "water" = 1, REAGENT_ID_OXYGEN = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/clonexadone
 	name = "Clonexadone"
 	id = "clonexadone"
 	result = "clonexadone"
-	required_reagents = list("cryoxadone" = 1, "sodium" = 1, "phoron" = 0.1)
-	catalysts = list("phoron" = 5)
+	required_reagents = list("cryoxadone" = 1, "sodium" = 1, REAGENT_ID_PHORON = 0.1)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/mortiferin
@@ -309,7 +309,7 @@
 	result = "mortiferin"
 	required_reagents = list("cryptobiolin" = 1, "clonexadone" = 1, "corophizine" = 1)
 	result_amount = 2
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 
 /decl/chemical_reaction/instant/spaceacillin
 	name = "Spaceacillin"
@@ -322,8 +322,8 @@
 	name = "Corophizine"
 	id = "corophizine"
 	result = "corophizine"
-	required_reagents = list("spaceacillin" = 1, "carbon" = 1, "phoron" = 0.1)
-	catalysts = list("phoron" = 5)
+	required_reagents = list("spaceacillin" = 1, "carbon" = 1, REAGENT_ID_PHORON = 0.1)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/immunosuprizine
@@ -331,7 +331,7 @@
 	id = "immunosuprizine"
 	result = "immunosuprizine"
 	required_reagents = list("corophizine" = 1, "tungsten" = 1, "sacid" = 1)
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/imidazoline
@@ -345,14 +345,14 @@
 	name = "Ethylredoxrazine"
 	id = "ethylredoxrazine"
 	result = "ethylredoxrazine"
-	required_reagents = list("oxygen" = 1, "anti_toxin" = 1, "carbon" = 1)
+	required_reagents = list(REAGENT_ID_OXYGEN = 1, "anti_toxin" = 1, "carbon" = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/calciumcarbonate
 	name = "Calcium Carbonate"
 	id = "calciumcarbonate"
 	result = "calciumcarbonate"
-	required_reagents = list("oxygen" = 3, "calcium" = 1, "carbon" = 1)
+	required_reagents = list(REAGENT_ID_OXYGEN = 3, "calcium" = 1, "carbon" = 1)
 	result_amount = 2
 
 /decl/chemical_reaction/instant/soporific
@@ -381,7 +381,7 @@
 	name = "Potassium Chlorophoride"
 	id = "potassium_chlorophoride"
 	result = "potassium_chlorophoride"
-	required_reagents = list("potassium_chloride" = 1, "phoron" = 1, "chloralhydrate" = 1)
+	required_reagents = list("potassium_chloride" = 1, REAGENT_ID_PHORON = 1, "chloralhydrate" = 1)
 	result_amount = 4
 
 /decl/chemical_reaction/instant/zombiepowder
@@ -425,8 +425,8 @@
 	name = "Ammonia"
 	id = "ammonia"
 	result = "ammonia"
-	required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
-	inhibitors = list("phoron" = 1) // Messes with lexorin
+	required_reagents = list("hydrogen" = 3, REAGENT_ID_NITROGEN = 1)
+	inhibitors = list(REAGENT_ID_PHORON = 1) // Messes with lexorin
 	result_amount = 3
 
 /decl/chemical_reaction/instant/diethylamine
@@ -490,14 +490,14 @@
 	id = "condensedcapsaicin"
 	result = "condensedcapsaicin"
 	required_reagents = list("capsaicin" = 2)
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 
 /decl/chemical_reaction/instant/coolant
 	name = "Coolant"
 	id = "coolant"
 	result = "coolant"
-	required_reagents = list("tungsten" = 1, "oxygen" = 1, "water" = 1)
+	required_reagents = list("tungsten" = 1, REAGENT_ID_OXYGEN = 1, "water" = 1)
 	result_amount = 3
 	log_is_important = 1
 
@@ -512,7 +512,7 @@
 	name = "Lexorin"
 	id = "lexorin"
 	result = "lexorin"
-	required_reagents = list("phoron" = 1, "hydrogen" = 1, "nitrogen" = 1)
+	required_reagents = list(REAGENT_ID_PHORON = 1, "hydrogen" = 1, REAGENT_ID_NITROGEN = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/methylphenidate
@@ -533,7 +533,7 @@
 	name = "Paroxetine"
 	id = "paroxetine"
 	result = "paroxetine"
-	required_reagents = list("mindbreaker" = 1, "oxygen" = 1, "inaprovaline" = 1)
+	required_reagents = list("mindbreaker" = 1, REAGENT_ID_OXYGEN = 1, "inaprovaline" = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/neurotoxin
@@ -568,7 +568,7 @@
 /decl/chemical_reaction/instant/solidification/phoron
 	name = "Solid Phoron"
 	id = "solidphoron"
-	required_reagents = list("frostoil" = 5, "phoron" = REAGENTS_PER_SHEET)
+	required_reagents = list("frostoil" = 5, REAGENT_ID_PHORON = REAGENTS_PER_SHEET)
 	sheet_to_give = /obj/item/stack/material/phoron
 
 
@@ -802,13 +802,13 @@
 	name = "Napalm"
 	id = "napalm"
 	result = null
-	required_reagents = list("aluminum" = 1, "phoron" = 1, "sacid" = 1 )
+	required_reagents = list("aluminum" = 1, REAGENT_ID_PHORON = 1, "sacid" = 1 )
 	result_amount = 1
 
 /decl/chemical_reaction/instant/napalm/on_reaction(var/datum/reagents/holder, var/created_volume)
 	var/turf/location = get_turf(holder.my_atom.loc)
 	for(var/turf/simulated/floor/target_tile in range(0,location))
-		target_tile.assume_gas("volatile_fuel", created_volume, 400+T0C)
+		target_tile.assume_gas(GAS_VOLATILE_FUEL, created_volume, 400+T0C)
 		spawn (0) target_tile.hotspot_expose(700, 400)
 	holder.del_reagent("napalm")
 	return
@@ -1178,8 +1178,8 @@
 	name = "Hydrophoron"
 	id = "hydrophoron"
 	result = "hydrophoron"
-	required_reagents = list("hydrogen" = 1, "phoron" = 1)
-	inhibitors = list("nitrogen" = 1) //So it doesn't mess with lexorin
+	required_reagents = list("hydrogen" = 1, REAGENT_ID_PHORON = 1)
+	inhibitors = list(REAGENT_ID_NITROGEN = 1) //So it doesn't mess with lexorin
 	result_amount = 2
 
 /decl/chemical_reaction/instant/deuterium
@@ -1209,7 +1209,7 @@
 	id = "malish-qualem"
 	result = "malish-qualem"
 	required_reagents = list("immunosuprizine" = 1, "qerr_quem" = 1, "inaprovaline" = 1)
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	result_amount = 2
 
 // Biomass, for cloning and bioprinters
@@ -1217,7 +1217,7 @@
 	name = "Biomass"
 	id = "biomass"
 	result = "biomass"
-	required_reagents = list("protein" = 1, "sugar" = 1, "phoron" = 1)
+	required_reagents = list("protein" = 1, "sugar" = 1, REAGENT_ID_PHORON = 1)
 	result_amount = 1	// Roughly 20u per phoron sheet
 
 // Neutralization.

code/modules/reagents/reactions/instant/instant_vr.dm

@@ -5,8 +5,8 @@
 	name = "sizeoxadone"
 	id = "sizeoxadone"
 	result = "sizeoxadone"
-	required_reagents = list("clonexadone" = 1, "tramadol" = 3, "phoron" = 1)
-	catalysts = list("phoron" = 5)
+	required_reagents = list("clonexadone" = 1, "tramadol" = 3, REAGENT_ID_PHORON = 1)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	result_amount = 5
 
 /decl/chemical_reaction/instant/macrocillin
@@ -54,7 +54,7 @@
 	id = "amorphorovir"
 	result = "amorphorovir"
 	required_reagents = list("cryptobiolin" = 30, "biomass" = 30, "hyperzine" = 20)
-	catalysts = list("phoron" = 5)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 
 /decl/chemical_reaction/instant/androrovir
@@ -152,15 +152,15 @@
 	name = "Vermicetol"
 	id = "vermicetol"
 	result = "vermicetol"
-	required_reagents = list("bicaridine" = 2, "shockchem" = 1, "phoron" = 0.1)
-	catalysts = list("phoron" = 5)
+	required_reagents = list("bicaridine" = 2, "shockchem" = 1, REAGENT_ID_PHORON = 0.1)
+	catalysts = list(REAGENT_ID_PHORON = 5)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/prussian_blue
 	name = "Prussian Blue"
 	id = "prussian_blue"
 	result = "prussian_blue"
-	required_reagents = list("carbon" = 3, "iron" = 1, "nitrogen" = 3)
+	required_reagents = list("carbon" = 3, "iron" = 1, REAGENT_ID_NITROGEN = 3)
 	result_amount = 7
 
 /decl/chemical_reaction/instant/lipozilase
@@ -205,5 +205,5 @@
 	name = "Advanced Mutation Toxin"
 	id = "advmutationtoxin2"
 	result = "advmutationtoxin"
-	required_reagents = list("phoron" = 15, "slimejelly" = 15, "mutationtoxin" = 15) //In case a xenobiologist wants to become a fully fledged slime person.
-	result_amount = 1
+	required_reagents = list(REAGENT_ID_PHORON = 15, "slimejelly" = 15, "mutationtoxin" = 15) //In case a xenobiologist wants to become a fully fledged slime person.
+	result_amount = 1

code/modules/reagents/reactions/instant/virology.dm

@@ -16,7 +16,7 @@
 	name = "phoronic virus food"
 	id = "phoronvirusfood"
 	result = "phoronvirusfood"
-	required_reagents = list("phoron" = 1, "virusfood" = 1)
+	required_reagents = list(REAGENT_ID_PHORON = 1, "virusfood" = 1)
 	result_amount = 1
 
 /decl/chemical_reaction/instant/virus_food_phoron_adranol
@@ -65,7 +65,7 @@
 /decl/chemical_reaction/instant/mix_virus/mix_virus_3
 	name = "Mix Virus 3"
 	id = "mixvirus3"
-	required_reagents = list("phoron" = 1)
+	required_reagents = list(REAGENT_ID_PHORON = 1)
 	level_min = 4
 	level_max = 6
 

code/modules/reagents/reagents/core.dm

@@ -205,15 +205,15 @@
 #define WATER_LATENT_HEAT 19000 // How much heat is removed when applied to a hot turf, in J/unit (19000 makes 120 u of water roughly equivalent to 4L)
 
 /datum/reagent/water
-	name = "Water"
-	id = "water"
-	taste_description = "water"
+	name = REAGENT_WATER
+	id = REAGENT_ID_WATER
+	taste_description = REAGENT_ID_WATER
 	description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
 	reagent_state = LIQUID
 	color = "#0064C877"
 	metabolism = REM * 10
 
-	glass_name = "water"
+	glass_name = REAGENT_ID_WATER
 	glass_desc = "The father of all refreshments."
 
 /datum/reagent/water/touch_turf(var/turf/simulated/T)

code/modules/reagents/reagents/dispenser.dm

@@ -274,16 +274,16 @@
 		M.adjustBrainLoss(0.5 * removed)
 
 /datum/reagent/nitrogen
-	name = "Nitrogen"
-	id = "nitrogen"
+	name = REAGENT_NITROGEN
+	id = REAGENT_ID_NITROGEN
 	description = "A colorless, odorless, tasteless gas."
 	taste_mult = 0 //no taste
 	reagent_state = GAS
 	color = "#808080"
 
 /datum/reagent/oxygen
-	name = "Oxygen"
-	id = "oxygen"
+	name = REAGENT_OXYGEN
+	id = REAGENT_ID_OXYGEN
 	description = "A colorless, odorless gas."
 	taste_mult = 0
 	reagent_state = GAS

code/modules/reagents/reagents/toxins.dm

@@ -109,9 +109,9 @@
 	if(!istype(T))
 		return
 	..()
-	T.assume_gas("phoron", CEILING(volume/2, 1), T20C)
+	T.assume_gas(GAS_PHORON, CEILING(volume/2, 1), T20C)
 	for(var/turf/simulated/floor/target_tile in range(0,T))
-		target_tile.assume_gas("phoron", volume/2, 400+T0C)
+		target_tile.assume_gas(GAS_PHORON, volume/2, 400+T0C)
 		spawn (0) target_tile.hotspot_expose(700, 400)
 	remove_self(volume)
 
@@ -125,22 +125,22 @@
 				M.IgniteMob()
 
 /datum/reagent/toxin/lead
-	name = "lead"
-	id = "lead"
+	name = REAGENT_LEAD
+	id = REAGENT_ID_LEAD
 	description = "Elemental Lead."
 	color = "#273956"
 	strength = 4
 
 /datum/reagent/toxin/spidertoxin
-	name = "Spidertoxin"
-	id = "spidertoxin"
+	name = REAGENT_SPIDERTOXIN
+	id = REAGENT_ID_SPIDERTOXIN
 	description = "A liquifying toxin produced by giant spiders."
 	color = "#2CE893"
 	strength = 5
 
 /datum/reagent/toxin/phoron
-	name = "Phoron"
-	id = "phoron"
+	name = REAGEMT_PHORON
+	id = REAGENT_ID_PHORON
 	description = "Phoron in its liquid form."
 	taste_mult = 1.5
 	reagent_state = LIQUID
@@ -175,7 +175,7 @@
 	..()
 	if(!istype(T))
 		return
-	T.assume_gas("volatile_fuel", amount, T20C)
+	T.assume_gas(GAS_VOLATILE_FUEL, amount, T20C)
 	remove_self(amount)
 
 /datum/reagent/toxin/cyanide //Fast and Lethal

code/modules/resleeving/infocore_records.dm

@@ -88,7 +88,7 @@
 	var/sizemult
 	var/weight
 	var/aflags
-	var/breath_type = "oxygen"
+	var/breath_type = GAS_O2
 
 /datum/transhuman/body_record/New(var/copyfrom, var/add_to_db = 0, var/ckeylock = 0)
 	..()

code/modules/resleeving/machines.dm

@@ -74,10 +74,10 @@
 			I.digitize()
 
 	//Give breathing equipment if needed
-	if(current_project.breath_type != "oxygen")
+	if(current_project.breath_type != GAS_O2)
 		H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
 		var/obj/item/tank/tankpath
-		if(current_project.breath_type == "phoron")
+		if(current_project.breath_type == GAS_PHORON)
 			tankpath = /obj/item/tank/vox
 		else
 			tankpath = text2path("/obj/item/tank/" + current_project.breath_type)

code/modules/shuttles/shuttles_web.dm

@@ -458,17 +458,17 @@
 	var/total_moles = environment.total_moles
 
 	if(total_moles)
-		var/o2_level = environment.gas["oxygen"]/total_moles
-		var/n2_level = environment.gas["nitrogen"]/total_moles
-		var/co2_level = environment.gas["carbon_dioxide"]/total_moles
-		var/phoron_level = environment.gas["phoron"]/total_moles
+		var/o2_level = environment.gas[GAS_O2]/total_moles
+		var/n2_level = environment.gas[GAS_N2]/total_moles
+		var/co2_level = environment.gas[GAS_CO2]/total_moles
+		var/phoron_level = environment.gas[GAS_PHORON]/total_moles
 		var/unknown_level =  1-(o2_level+n2_level+co2_level+phoron_level)
 		aircontents = list(\
 			"pressure" = "[round(pressure,0.1)]",\
-			"nitrogen" = "[round(n2_level*100,0.1)]",\
-			"oxygen" = "[round(o2_level*100,0.1)]",\
-			"carbon_dioxide" = "[round(co2_level*100,0.1)]",\
-			"phoron" = "[round(phoron_level*100,0.01)]",\
+			GAS_N2 = "[round(n2_level*100,0.1)]",\
+			GAS_O2 = "[round(o2_level*100,0.1)]",\
+			GAS_CO2 = "[round(co2_level*100,0.1)]",\
+			GAS_PHORON = "[round(phoron_level*100,0.01)]",\
 			"other" = "[round(unknown_level, 0.01)]",\
 			"temp" = "[round(environment.temperature-T0C,0.1)]",\
 			"reading" = TRUE\

code/modules/tgui/modules/supermatter_monitor.dm

@@ -57,10 +57,10 @@
 		data["SM_EPR"] = active.get_epr()
 		//data["SM_EPR"] = active.get_epr()
 		if(air.total_moles)
-			data["SM_gas_O2"] = round(100*air.gas["oxygen"]/air.total_moles,0.01)
-			data["SM_gas_CO2"] = round(100*air.gas["carbon_dioxide"]/air.total_moles,0.01)
-			data["SM_gas_N2"] = round(100*air.gas["nitrogen"]/air.total_moles,0.01)
-			data["SM_gas_PH"] = round(100*air.gas["phoron"]/air.total_moles,0.01)
+			data["SM_gas_O2"] = round(100*air.gas[GAS_O2]/air.total_moles,0.01)
+			data["SM_gas_CO2"] = round(100*air.gas[GAS_CO2]/air.total_moles,0.01)
+			data["SM_gas_N2"] = round(100*air.gas[GAS_N2]/air.total_moles,0.01)
+			data["SM_gas_PH"] = round(100*air.gas[GAS_PHORON]/air.total_moles,0.01)
 			data["SM_gas_N2O"] = round(100*air.gas["sleeping_agent"]/air.total_moles,0.01)
 		else
 			data["SM_gas_O2"] = 0
@@ -105,4 +105,4 @@
 			. = TRUE
 
 /datum/tgui_module/supermatter_monitor/ntos
-	ntos = TRUE
+	ntos = TRUE

code/modules/vore/eating/living_vr.dm

@@ -791,8 +791,8 @@
 /datum/gas_mixture/belly_air/New()
     . = ..()
     gas = list(
-        "oxygen" = 21,
-        "nitrogen" = 79)
+        GAS_O2 = 21,
+        GAS_N2 = 79)
 
 /datum/gas_mixture/belly_air/vox
     volume = 2500
@@ -802,7 +802,7 @@
 /datum/gas_mixture/belly_air/vox/New()
     . = ..()
     gas = list(
-        "phoron" = 100)
+        GAS_PHORON = 100)
 
 /datum/gas_mixture/belly_air/zaddat
     volume = 2500
@@ -812,7 +812,7 @@
 /datum/gas_mixture/belly_air/zaddat/New()
     . = ..()
     gas = list(
-        "oxygen" = 100)
+        GAS_O2 = 100)
 
 /datum/gas_mixture/belly_air/nitrogen_breather
     volume = 2500
@@ -822,7 +822,7 @@
 /datum/gas_mixture/belly_air/nitrogen_breather/New()
     . = ..()
     gas = list(
-        "nitrogen" = 100)
+        GAS_N2 = 100)
 
 
 /mob/living/proc/feed_grabbed_to_self_falling_nom(var/mob/living/user, var/mob/living/prey)

code/modules/xenoarcheaology/effect_master.dm

@@ -302,7 +302,7 @@
 			else if(W.reagents.has_reagent("sacid", 1) || W.reagents.has_reagent("pacid", 1) || W.reagents.has_reagent("diethylamine", 1))
 				if(my_effect.trigger == TRIGGER_ACID)
 					my_effect.ToggleActivate()
-			else if(W.reagents.has_reagent("phoron", 1) || W.reagents.has_reagent("thermite", 1))
+			else if(W.reagents.has_reagent(REAGENT_ID_PHORON, 1) || W.reagents.has_reagent("thermite", 1))
 				if(my_effect.trigger == TRIGGER_VOLATILE)
 					my_effect.ToggleActivate()
 			else if(W.reagents.has_reagent("toxin", 1) || W.reagents.has_reagent("cyanide", 1) || W.reagents.has_reagent("amatoxin", 1) || W.reagents.has_reagent("neurotoxin", 1))
@@ -329,7 +329,7 @@
 
 	var/list/water = list("hydrogen", "water")
 	var/list/acid = list("sacid", "pacid", "diethylamine")
-	var/list/volatile = list("phoron","thermite")
+	var/list/volatile = list(REAGENT_ID_PHORON,"thermite")
 	var/list/toxic = list("toxin","cyanide","amatoxin","neurotoxin")
 
 	for(var/datum/artifact_effect/my_effect in my_effects)
@@ -387,13 +387,13 @@
 		else if(env.temperature > 375)
 			trigger_hot = 1
 
-		if(env.gas["phoron"] >= 10)
+		if(env.gas[GAS_PHORON] >= 10)
 			trigger_phoron = 1
-		if(env.gas["oxygen"] >= 10)
+		if(env.gas[GAS_O2] >= 10)
 			trigger_oxy = 1
-		if(env.gas["carbon_dioxide"] >= 10)
+		if(env.gas[GAS_CO2] >= 10)
 			trigger_co2 = 1
-		if(env.gas["nitrogen"] >= 10)
+		if(env.gas[GAS_N2] >= 10)
 			trigger_nitro = 1
 
 	for(var/datum/artifact_effect/my_effect in my_effects)

code/modules/xenoarcheaology/effects/gasco2.dm

@@ -13,11 +13,11 @@
 	if(holder)
 		var/turf/holder_loc = holder.loc
 		if(istype(holder_loc))
-			holder_loc.assume_gas("carbon_dioxide", rand(2, 15))
+			holder_loc.assume_gas(GAS_CO2, rand(2, 15))
 
 /datum/artifact_effect/gasco2/DoEffectAura()
 	var/atom/holder = get_master_holder()
 	if(holder)
 		var/turf/holder_loc = holder.loc
 		if(istype(holder_loc))
-			holder_loc.assume_gas("carbon_dioxide", pick(0, 0, 0.1, rand()))
+			holder_loc.assume_gas(GAS_CO2, pick(0, 0, 0.1, rand()))

code/modules/xenoarcheaology/effects/gasnitro.dm

@@ -13,11 +13,11 @@
 	if(holder)
 		var/turf/holder_loc = holder.loc
 		if(istype(holder_loc))
-			holder_loc.assume_gas("nitrogen", rand(2, 15))
+			holder_loc.assume_gas(GAS_N2, rand(2, 15))
 
 /datum/artifact_effect/gasnitro/DoEffectAura()
 	var/atom/holder = get_master_holder()
 	if(holder)
 		var/turf/holder_loc = holder.loc
 		if(istype(holder_loc))
-			holder_loc.assume_gas("nitrogen", pick(0, 0, 0.1, rand()))
+			holder_loc.assume_gas(GAS_N2, pick(0, 0, 0.1, rand()))

code/modules/xenoarcheaology/effects/gasoxy.dm

@@ -11,11 +11,11 @@
 	if(holder)
 		var/turf/holder_loc = holder.loc
 		if(istype(holder_loc))
-			holder_loc.assume_gas("oxygen", rand(2, 15))
+			holder_loc.assume_gas(GAS_O2, rand(2, 15))
 
 /datum/artifact_effect/gasoxy/DoEffectAura()
 	var/atom/holder = get_master_holder()
 	if(holder)
 		var/turf/holder_loc = holder.loc
 		if(istype(holder_loc))
-			holder_loc.assume_gas("oxygen", pick(0, 0, 0.1, rand()))
+			holder_loc.assume_gas(GAS_O2, pick(0, 0, 0.1, rand()))

code/modules/xenoarcheaology/effects/gasphoron.dm

@@ -13,11 +13,11 @@
 	if(holder)
 		var/turf/holder_loc = holder.loc
 		if(istype(holder_loc))
-			holder_loc.assume_gas("phoron", rand(2, 15))
+			holder_loc.assume_gas(GAS_PHORON, rand(2, 15))
 
 /datum/artifact_effect/gasphoron/DoEffectAura()
 	var/atom/holder = get_master_holder()
 	if(holder)
 		var/turf/holder_loc = holder.loc
 		if(istype(holder_loc))
-			holder_loc.assume_gas("phoron", pick(0, 0, 0.1, rand()))
+			holder_loc.assume_gas(GAS_PHORON, pick(0, 0, 0.1, rand()))

code/modules/xenoarcheaology/effects/gassleeping.dm

@@ -11,11 +11,11 @@
 	if(holder)
 		var/turf/holder_loc = holder.loc
 		if(istype(holder_loc))
-			holder_loc.assume_gas("nitrous_oxide", rand(2, 15))
+			holder_loc.assume_gas(GAS_N2O, rand(2, 15))
 
 /datum/artifact_effect/gassleeping/DoEffectAura()
 	var/atom/holder = get_master_holder()
 	if(holder)
 		var/turf/holder_loc = holder.loc
 		if(istype(holder_loc))
-			holder_loc.assume_gas("nitrous_oxide", pick(0, 0, 0.1, rand()))
+			holder_loc.assume_gas(GAS_N2O, pick(0, 0, 0.1, rand()))

code/modules/xenoarcheaology/finds/finds_defines.dm

@@ -2,12 +2,12 @@ var/global/list/responsive_carriers = list(
 	"carbon",
 	"potassium",
 	"hydrogen",
-	"nitrogen",
+	REAGENT_ID_NITROGEN,
 	"mercury",
 	"iron",
 	"chlorine",
 	"phosphorus",
-	"phoron")
+	REAGENT_ID_PHORON)
 
 var/global/list/finds_as_strings = list(
 	"Trace organic cells",
@@ -27,12 +27,12 @@ var/global/list/finds_as_strings = list(
 		if(ARCHAEO_COIN, ARCHAEO_KNIFE, ARCHAEO_TOOL, ARCHAEO_METAL, ARCHAEO_CLAYMORE, ARCHAEO_RODS, ARCHAEO_KATANA, ARCHAEO_LASER, ARCHAEO_GUN)
 			return "iron"
 		if(ARCHAEO_CRYSTAL, ARCHAEO_SHARD, ARCHAEO_SOULSTONE)
-			return "nitrogen"
+			return REAGENT_ID_NITROGEN
 		if(ARCHAEO_CULTBLADE, ARCHAEO_TELEBEACON, ARCHAEO_CULTROBES, ARCHAEO_STOCKPARTS)
 			return "potassium"
 		if(ARCHAEO_FOSSIL, ARCHAEO_SHELL, ARCHAEO_PLANT, ARCHAEO_REMAINS_HUMANOID, ARCHAEO_REMAINS_ROBOT, ARCHAEO_REMAINS_XENO, ARCHAEO_GASMASK)
 			return "carbon"
-	return "phoron"
+	return REAGENT_ID_PHORON
 
 /proc/get_random_digsite_type()
 	return pick(100;DIGSITE_GARDEN, 95;DIGSITE_ANIMAL, 90;DIGSITE_HOUSE, 85;DIGSITE_TECHNICAL,  85;DIGSITE_MIDDEN, 80;DIGSITE_TEMPLE, 75;DIGSITE_WAR)

code/modules/xenobio/items/extracts.dm

@@ -73,7 +73,7 @@
 	name = "Slime Spawn"
 	id = "m_spawn"
 	result = null
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/grey
 
@@ -128,7 +128,7 @@
 /decl/chemical_reaction/instant/slime/metal_metamorphic
 	name = "Slime Metal"
 	id = "m_metal"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result = "metamorphic"
 	result_amount = REAGENTS_PER_SHEET // Makes enough to make one sheet of any metal.
 	required = /obj/item/slime_extract/metal
@@ -185,8 +185,8 @@
 /decl/chemical_reaction/instant/metamorphic/phoron
 	name = "Morph into Phoron"
 	id = "morph_phoron"
-	required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, "phoron" = REAGENTS_PER_SHEET)
-	result = "phoron"
+	required_reagents = list("metamorphic" = REAGENTS_PER_SHEET, REAGENT_ID_PHORON = REAGENTS_PER_SHEET)
+	result = REAGENT_ID_PHORON
 
 
 // Creates 'alloys' which can be finalized with frost oil.
@@ -264,7 +264,7 @@
 	name = "Slime Frost Oil"
 	id = "m_frostoil"
 	result = "frostoil"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 20
 	required = /obj/item/slime_extract/blue
 
@@ -296,7 +296,7 @@
 /decl/chemical_reaction/instant/slime/purple_steroid
 	name = "Slime Steroid"
 	id = "m_steroid"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/purple
 
@@ -318,7 +318,7 @@
 /decl/chemical_reaction/instant/slime/orange_fire
 	name = "Slime Fire"
 	id = "m_fire"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/orange
 
@@ -333,8 +333,8 @@
 				return
 
 			for(var/turf/simulated/target_turf in view(2, T))
-				target_turf.assume_gas("volatile_fuel", 33, 1500+T0C)
-				target_turf.assume_gas("oxygen", 66, 1500+T0C)
+				target_turf.assume_gas(GAS_VOLATILE_FUEL, 33, 1500+T0C)
+				target_turf.assume_gas(GAS_O2, 66, 1500+T0C)
 				spawn(0)
 					target_turf.hotspot_expose(1500+T0C, 400)
 
@@ -373,7 +373,7 @@
 /decl/chemical_reaction/instant/slime/yellow_battery
 	name = "Slime Cell"
 	id = "m_cell"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/yellow
 
@@ -407,7 +407,7 @@
 	name = "Slime Gold"
 	id = "m_gold"
 	result = "gold"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 5
 	required = /obj/item/slime_extract/gold
 
@@ -426,7 +426,7 @@
 	name = "Slime Silver"
 	id = "m_silver"
 	result = "silver"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 5
 	required = /obj/item/slime_extract/silver
 
@@ -445,7 +445,7 @@
 /decl/chemical_reaction/instant/slime/dark_purple_phoron
 	name = "Slime Phoron"
 	id = "m_phoron_harvest"
-	result = "phoron"
+	result = REAGENT_ID_PHORON
 	required_reagents = list("water" = 5)
 	result_amount = REAGENTS_PER_SHEET * 2
 	required = /obj/item/slime_extract/dark_purple
@@ -467,7 +467,7 @@
 /decl/chemical_reaction/instant/slime/dark_blue_cold_snap
 	name = "Slime Cold Snap"
 	id = "m_cold_snap"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/dark_blue
 
@@ -585,7 +585,7 @@
 /decl/chemical_reaction/instant/slime/red_mutation
 	name = "Slime Mutation"
 	id = "m_mutation"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/red
 
@@ -606,7 +606,7 @@
 	name = "Slime Uranium"
 	id = "m_uranium"
 	result = "uranium"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 5
 	required = /obj/item/slime_extract/green
 
@@ -635,7 +635,7 @@
 	name = "Slime Bone Med"
 	id = "m_bone_fixer"
 	result = "slime_bone_fixer"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 30
 	required = /obj/item/slime_extract/pink
 
@@ -735,7 +735,7 @@
 /decl/chemical_reaction/instant/slime/bluespace_greater
 	name = "Slime Greater Tele"
 	id = "m_tele_lesser"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/bluespace
 
@@ -757,7 +757,7 @@
 /decl/chemical_reaction/instant/slime/cerulean_enhancer
 	name = "Slime Enhancer"
 	id = "m_enhancer"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/cerulean
 
@@ -779,7 +779,7 @@
 /decl/chemical_reaction/instant/slime/amber_slimefood
 	name = "Slime Feeding"
 	id = "m_slime_food"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/amber
 
@@ -814,7 +814,7 @@
 /decl/chemical_reaction/instant/slime/sapphire_promethean
 	name = "Slime Promethean"
 	id = "m_promethean"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/sapphire
 
@@ -835,7 +835,7 @@
 /decl/chemical_reaction/instant/slime/ruby_swole
 	name = "Slime Strength"
 	id = "m_strength"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/ruby
 
@@ -884,7 +884,7 @@
 /decl/chemical_reaction/instant/slime/emerald_fast
 	name = "Slime Agility"
 	id = "m_agility"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/emerald
 
@@ -933,7 +933,7 @@
 /decl/chemical_reaction/instant/slime/light_pink_friendship
 	name = "Slime Friendship"
 	id = "m_friendship"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/light_pink
 
@@ -957,7 +957,7 @@
 /decl/chemical_reaction/instant/slime/rainbow_random_slime
 	name = "Slime Random Slime"
 	id = "m_rng_slime"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/rainbow
 

code/modules/xenobio/items/extracts_vr.dm

@@ -80,7 +80,7 @@
 	name = "Slime Spawn"
 	id = "m_grey_spawn"
 	result = null
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/grey
 
@@ -128,7 +128,7 @@
 	name = "Slime Basic Construction Materials"
 	id = "m_metal_basic"
 	result = null
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/metal
 
@@ -194,7 +194,7 @@
 	name = "Slime Frost Oil"
 	id = "m_blue_frostoil"
 	result = "frostoil"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 30
 	required = /obj/item/slime_extract/blue
 
@@ -268,7 +268,7 @@
 /decl/chemical_reaction/instant/slime/purple_steroid
 	name = "Slime Steroid"
 	id = "m_purple_steroid"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/purple
 
@@ -327,7 +327,7 @@
 /decl/chemical_reaction/instant/slime/orange_fire
 	name = "Slime Fire"
 	id = "m_orange_fire"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/orange
 
@@ -342,8 +342,8 @@
 				return
 
 			for(var/turf/simulated/target_turf in view(2, T))
-				target_turf.assume_gas("volatile_fuel", 33, 1500+T0C)
-				target_turf.assume_gas("oxygen", 66, 1500+T0C)
+				target_turf.assume_gas(GAS_VOLATILE_FUEL, 33, 1500+T0C)
+				target_turf.assume_gas(GAS_O2, 66, 1500+T0C)
 				spawn(0)
 					target_turf.hotspot_expose(1500+T0C, 400)
 
@@ -448,7 +448,7 @@
 /decl/chemical_reaction/instant/slime/yellow_lightning
 	name = "Slime Lightning"
 	id = "m_yellow_lightning"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/yellow
 
@@ -518,7 +518,7 @@
 /decl/chemical_reaction/instant/slime/gold_random_mobs
 	name = "Slime Random Mobs"
 	id = "m_gold_random_mobs"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/gold
 
@@ -602,7 +602,7 @@
 /decl/chemical_reaction/instant/slime/silver_materials_basic
 	name = "Slime Basic Science Materials"
 	id = "m_silver_basic"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/silver
 
@@ -676,7 +676,7 @@
 /decl/chemical_reaction/instant/slime/dark_purple_phoron
 	name = "Slime Phoron"
 	id = "m_darkpurple_phoron"
-	result = "phoron"
+	result = REAGENT_ID_PHORON
 	required_reagents = list("water" = 5)
 	result_amount = 30
 	required = /obj/item/slime_extract/dark_purple
@@ -705,7 +705,7 @@
 /decl/chemical_reaction/instant/slime/dark_blue_cold_snap
 	name = "Slime Cold Snap"
 	id = "m_darkblue_coldsnap"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/dark_blue
 
@@ -834,7 +834,7 @@
 /decl/chemical_reaction/instant/slime/red_mutation
 	name = "Slime Mutation"
 	id = "m_red_mutation"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/red
 
@@ -913,7 +913,7 @@
 /decl/chemical_reaction/instant/slime/green_radpulse
 	name = "Slime Radiation Pulse"
 	id = "m_green_radpulse"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/green
 
@@ -975,7 +975,7 @@
 	name = "Slime Bone Med"
 	id = "m_pink_bone_fixer"
 	result = "slime_bone_fixer"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 30
 	required = /obj/item/slime_extract/pink
 
@@ -1033,7 +1033,7 @@
 	name = "Slime Fuel"
 	id = "m_oil_fuel"
 	result = "fuel"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 30
 	required = /obj/item/slime_extract/oil
 
@@ -1101,7 +1101,7 @@
 /decl/chemical_reaction/instant/slime/bluespace_crystals
 	name = "Slime Bluespace Crystals"
 	id = "m_bs_crystals"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/bluespace
 
@@ -1175,7 +1175,7 @@
 /decl/chemical_reaction/instant/slime/cerulean_enhancer
 	name = "Slime Enhancer"
 	id = "m_cerulean_enhancer"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/cerulean
 
@@ -1235,7 +1235,7 @@
 /decl/chemical_reaction/instant/slime/amber_slimefood
 	name = "Slime Feeding"
 	id = "m_amber_slime_food"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/amber
 
@@ -1304,7 +1304,7 @@
 /decl/chemical_reaction/instant/slime/sapphire_promethean
 	name = "Slime Promethean"
 	id = "m_sapphire_promethean"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/sapphire
 
@@ -1365,7 +1365,7 @@
 /decl/chemical_reaction/instant/slime/ruby_swole
 	name = "Slime Strength"
 	id = "m_ruby_strength"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/ruby
 
@@ -1454,7 +1454,7 @@
 /decl/chemical_reaction/instant/slime/emerald_agility
 	name = "Slime Agility"
 	id = "m_emerald_agility"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/emerald
 
@@ -1542,7 +1542,7 @@
 /decl/chemical_reaction/instant/slime/light_pink_friendship
 	name = "Slime Friendship"
 	id = "m_lightpink_friendship"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/light_pink
 
@@ -1602,7 +1602,7 @@
 /decl/chemical_reaction/instant/slime/rainbow_random_slime
 	name = "Slime Random Slime"
 	id = "m_rainow_random_slime"
-	required_reagents = list("phoron" = 5)
+	required_reagents = list(REAGENT_ID_PHORON = 5)
 	result_amount = 1
 	required = /obj/item/slime_extract/rainbow
 

code/modules/xenobio2/_xeno_setup.dm

@@ -60,7 +60,7 @@ var/global/list/xenoChemList = list("mutationtoxin",
 						"lexorin",
 						"pacid",
 						"cyanide",
-						"phoron",
+						REAGENT_ID_PHORON,
 						"plasticide",
 						"amatoxin",
 						"carbon",
@@ -212,5 +212,3 @@ var/global/list/xenoChemList = list("mutationtoxin",
 	var/genetype	//Label for specifying what gene is used.
 	var/list/values	//What's going to be put into specific traits
 	var/list/chems
-
-

code/modules/xenobio2/mob/slime/slime.dm

@@ -68,7 +68,7 @@ Slime definitions, Life and New live here.
 						"fuel" = list("toxic" = 0.4),
 						"toxin" = list("toxic" = 0.5),
 						"carpotoxin" = list("toxic" = 1, "mut" = 1.5),
-						"phoron" = list("toxic" = 1.5, "mut" = 0.03),
+						REAGENT_ID_PHORON = list("toxic" = 1.5, "mut" = 0.03),
 						"virusfood" = list("nutr" = 1.5, "mut" = 0.32),
 						"cyanide" = list("toxic" = 3.5),
 						"slimejelly" = list("nutr" = 0.5),