[MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611)

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>

code/ATMOSPHERICS/components/binary_devices/algae_generator_vr.dm

@@ -30,8 +30,8 @@
 	var/ui_error = null // For error messages to show up in nano ui.
 
 	var/datum/gas_mixture/internal = new()
-	var/const/input_gas = "carbon_dioxide"
-	var/const/output_gas = "oxygen"
+	var/const/input_gas = GAS_CO2
+	var/const/output_gas = GAS_O2
 
 /obj/machinery/atmospherics/binary/algae_farm/filled
 	stored_material = list(MAT_ALGAE = 10000, MAT_GRAPHITE = 0)

code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm

@@ -14,7 +14,7 @@
 //--------------------------------------------
 // Omni port datum
 //
-// Used by omni devices to manage connections 
+// Used by omni devices to manage connections
 //  to other atmospheric objects.
 //--------------------------------------------
 /datum/omni_port
@@ -70,10 +70,10 @@
 			string = "East"
 		if(WEST)
 			string = "West"
-	
+
 	if(!capitalize && string)
 		string = lowertext(string)
-	
+
 	return string
 
 //returns a direction flag based on the string passed to it
@@ -94,16 +94,15 @@
 
 /proc/mode_to_gasid(var/mode)
 	switch(mode)
-		if(ATM_O2) 
-			return "oxygen"
-		if(ATM_N2) 
-			return "nitrogen"
-		if(ATM_CO2) 
-			return "carbon_dioxide"
-		if(ATM_P) 
-			return "phoron"
-		if(ATM_N2O) 
-			return "nitrous_oxide"
+		if(ATM_O2)
+			return GAS_O2
+		if(ATM_N2)
+			return GAS_N2
+		if(ATM_CO2)
+			return GAS_CO2
+		if(ATM_P)
+			return GAS_PHORON
+		if(ATM_N2O)
+			return GAS_N2O
 		else
 			return null
-	

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -44,15 +44,15 @@
 
 	switch(filter_type)
 		if(0) //removing hydrocarbons
-			filtered_out = list("phoron")
+			filtered_out = list(GAS_PHORON)
 		if(1) //removing O2
-			filtered_out = list("oxygen")
+			filtered_out = list(GAS_O2)
 		if(2) //removing N2
-			filtered_out = list("nitrogen")
+			filtered_out = list(GAS_N2)
 		if(3) //removing CO2
-			filtered_out = list("carbon_dioxide")
+			filtered_out = list(GAS_CO2)
 		if(4)//removing N2O
-			filtered_out = list("nitrous_oxide")
+			filtered_out = list(GAS_N2O)
 
 	air1.volume = ATMOS_DEFAULT_VOLUME_FILTER
 	air2.volume = ATMOS_DEFAULT_VOLUME_FILTER
@@ -205,16 +205,16 @@
 			filtered_out.Cut()	//no need to create new lists unnecessarily
 			switch(filter_type)
 				if(0) //removing hydrocarbons
-					filtered_out += "phoron"
+					filtered_out += GAS_PHORON
 					filtered_out += "oxygen_agent_b"
 				if(1) //removing O2
-					filtered_out += "oxygen"
+					filtered_out += GAS_O2
 				if(2) //removing N2
-					filtered_out += "nitrogen"
+					filtered_out += GAS_N2
 				if(3) //removing CO2
-					filtered_out += "carbon_dioxide"
+					filtered_out += GAS_CO2
 				if(4)//removing N2O
-					filtered_out += "nitrous_oxide"
+					filtered_out += GAS_N2O
 
 	add_fingerprint(ui.user)
 	update_icon()

code/ATMOSPHERICS/components/unary/vent_scrubber.dm

@@ -20,7 +20,7 @@
 
 	var/hibernate = 0 //Do we even process?
 	var/scrubbing = 1 //0 = siphoning, 1 = scrubbing
-	var/list/scrubbing_gas = list("carbon_dioxide", "phoron")
+	var/list/scrubbing_gas = list(GAS_CO2, GAS_PHORON)
 
 	var/panic = 0 //is this scrubber panicked?
 
@@ -109,12 +109,12 @@
 		"power" = use_power,
 		"scrubbing" = scrubbing,
 		"panic" = panic,
-		"filter_o2" = ("oxygen" in scrubbing_gas),
-		"filter_n2" = ("nitrogen" in scrubbing_gas),
-		"filter_co2" = ("carbon_dioxide" in scrubbing_gas),
-		"filter_phoron" = ("phoron" in scrubbing_gas),
-		"filter_n2o" = ("nitrous_oxide" in scrubbing_gas),
-		"filter_fuel" = ("volatile_fuel" in scrubbing_gas),
+		"filter_o2" = (GAS_O2 in scrubbing_gas),
+		"filter_n2" = (GAS_N2 in scrubbing_gas),
+		"filter_co2" = (GAS_CO2 in scrubbing_gas),
+		"filter_phoron" = (GAS_PHORON in scrubbing_gas),
+		"filter_n2o" = (GAS_N2O in scrubbing_gas),
+		"filter_fuel" = (GAS_VOLATILE_FUEL in scrubbing_gas),
 		"sigtype" = "status"
 	)
 	if(!initial_loc.air_scrub_names[id_tag])
@@ -216,35 +216,35 @@
 
 	var/list/toggle = list()
 
-	if(!isnull(signal.data["o2_scrub"]) && text2num(signal.data["o2_scrub"]) != ("oxygen" in scrubbing_gas))
-		toggle += "oxygen"
+	if(!isnull(signal.data["o2_scrub"]) && text2num(signal.data["o2_scrub"]) != (GAS_O2 in scrubbing_gas))
+		toggle += GAS_O2
 	else if(signal.data["toggle_o2_scrub"])
-		toggle += "oxygen"
+		toggle += GAS_O2
 
-	if(!isnull(signal.data["n2_scrub"]) && text2num(signal.data["n2_scrub"]) != ("nitrogen" in scrubbing_gas))
-		toggle += "nitrogen"
+	if(!isnull(signal.data["n2_scrub"]) && text2num(signal.data["n2_scrub"]) != (GAS_N2 in scrubbing_gas))
+		toggle += GAS_N2
 	else if(signal.data["toggle_n2_scrub"])
-		toggle += "nitrogen"
+		toggle += GAS_N2
 
-	if(!isnull(signal.data["co2_scrub"]) && text2num(signal.data["co2_scrub"]) != ("carbon_dioxide" in scrubbing_gas))
-		toggle += "carbon_dioxide"
+	if(!isnull(signal.data["co2_scrub"]) && text2num(signal.data["co2_scrub"]) != (GAS_CO2 in scrubbing_gas))
+		toggle += GAS_CO2
 	else if(signal.data["toggle_co2_scrub"])
-		toggle += "carbon_dioxide"
+		toggle += GAS_CO2
 
-	if(!isnull(signal.data["tox_scrub"]) && text2num(signal.data["tox_scrub"]) != ("phoron" in scrubbing_gas))
-		toggle += "phoron"
+	if(!isnull(signal.data["tox_scrub"]) && text2num(signal.data["tox_scrub"]) != (GAS_PHORON in scrubbing_gas))
+		toggle += GAS_PHORON
 	else if(signal.data["toggle_tox_scrub"])
-		toggle += "phoron"
+		toggle += GAS_PHORON
 
-	if(!isnull(signal.data["n2o_scrub"]) && text2num(signal.data["n2o_scrub"]) != ("nitrous_oxide" in scrubbing_gas))
-		toggle += "nitrous_oxide"
+	if(!isnull(signal.data["n2o_scrub"]) && text2num(signal.data["n2o_scrub"]) != (GAS_N2O in scrubbing_gas))
+		toggle += GAS_N2O
 	else if(signal.data["toggle_n2o_scrub"])
-		toggle += "nitrous_oxide"
+		toggle += GAS_N2O
 
-	if(!isnull(signal.data["fuel_scrub"]) && text2num(signal.data["fuel_scrub"]) != ("volatile_fuel" in scrubbing_gas))
-		toggle += "volatile_fuel"
+	if(!isnull(signal.data["fuel_scrub"]) && text2num(signal.data["fuel_scrub"]) != (GAS_VOLATILE_FUEL in scrubbing_gas))
+		toggle += GAS_VOLATILE_FUEL
 	else if(signal.data["toggle_fuel_scrub"])
-		toggle += "volatile_fuel"
+		toggle += GAS_VOLATILE_FUEL
 
 	scrubbing_gas ^= toggle
 

code/ATMOSPHERICS/components/unary/vent_scrubber_vr.dm

@@ -1,2 +1,2 @@
 /obj/machinery/atmospherics/unary/vent_scrubber
-	scrubbing_gas = list("carbon_dioxide", "phoron")
+	scrubbing_gas = list(GAS_CO2, GAS_PHORON)

code/ATMOSPHERICS/pipes/tank.dm

@@ -79,8 +79,8 @@
 	air_temporary.volume = volume
 	air_temporary.temperature = T20C
 
-	air_temporary.adjust_multi("oxygen",  (start_pressure*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature), \
-	                           "nitrogen",(start_pressure*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+	air_temporary.adjust_multi(GAS_O2,  (start_pressure*O2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature), \
+	                           GAS_N2,(start_pressure*N2STANDARD)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
 
 
 	. = ..()
@@ -95,7 +95,7 @@
 	air_temporary.volume = volume
 	air_temporary.temperature = T20C
 
-	air_temporary.adjust_gas("oxygen", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+	air_temporary.adjust_gas(GAS_O2, (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
 
 	. = ..()
 	icon_state = "o2"
@@ -110,7 +110,7 @@
 	air_temporary.volume = volume
 	air_temporary.temperature = T20C
 
-	air_temporary.adjust_gas("nitrogen", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+	air_temporary.adjust_gas(GAS_N2, (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
 
 	. = ..()
 	icon_state = "n2"
@@ -124,7 +124,7 @@
 	air_temporary.volume = volume
 	air_temporary.temperature = T20C
 
-	air_temporary.adjust_gas("carbon_dioxide", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+	air_temporary.adjust_gas(GAS_CO2, (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
 
 	. = ..()
 	icon_state = "co2"
@@ -139,7 +139,7 @@
 	air_temporary.volume = volume
 	air_temporary.temperature = T20C
 
-	air_temporary.adjust_gas("phoron", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+	air_temporary.adjust_gas(GAS_PHORON, (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
 
 	. = ..()
 	icon_state = "phoron"
@@ -153,7 +153,7 @@
 	air_temporary.volume = volume
 	air_temporary.temperature = T0C
 
-	air_temporary.adjust_gas("nitrous_oxide", (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
+	air_temporary.adjust_gas(GAS_N2O, (start_pressure)*(air_temporary.volume)/(R_IDEAL_GAS_EQUATION*air_temporary.temperature))
 
 	. = ..()
 	icon_state = "n2o"

code/ZAS/Fire.dm

@@ -301,7 +301,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin
 		//remove_by_flag() and adjust_gas() handle the group_multiplier for us.
 		remove_by_flag(XGM_GAS_OXIDIZER, used_oxidizers)
 		remove_by_flag(XGM_GAS_FUEL, used_gas_fuel)
-		adjust_gas("carbon_dioxide", used_oxidizers)
+		adjust_gas(GAS_CO2, used_oxidizers)
 
 		if(zone)
 			zone.remove_liquidfuel(used_liquid_fuel, !check_combustability())

code/ZAS/Phoron.dm

@@ -99,7 +99,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
 		return
 
 	//Burn skin if exposed.
-	if(vsc.plc.SKIN_BURNS && (species.breath_type != "phoron"))
+	if(vsc.plc.SKIN_BURNS && (species.breath_type != GAS_PHORON))
 		if(!pl_head_protected() || !pl_suit_protected())
 			burn_skin(0.75)
 			if(prob(20))
@@ -107,7 +107,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
 			updatehealth()
 
 	//Burn eyes if exposed.
-	if(vsc.plc.EYE_BURNS && species.breath_type && (species.breath_type != "phoron"))		//VOREStation Edit: those who don't breathe
+	if(vsc.plc.EYE_BURNS && species.breath_type && (species.breath_type != GAS_PHORON))		//VOREStation Edit: those who don't breathe
 		var/burn_eyes = 1
 
 		//Check for protective glasses
@@ -131,7 +131,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
 			burn_eyes()
 
 	//Genetic Corruption
-	if(vsc.plc.GENETIC_CORRUPTION && (species.breath_type != "phoron"))
+	if(vsc.plc.GENETIC_CORRUPTION && (species.breath_type != GAS_PHORON))
 		if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION)
 			randmutb(src)
 			to_chat(src, span_danger("High levels of toxins cause you to spontaneously mutate!"))

code/ZAS/Turf.dm

@@ -282,7 +282,7 @@
 	//Create gas mixture to hold data for passing
 	var/datum/gas_mixture/GM = new
 
-	GM.adjust_multi("oxygen", oxygen, "carbon_dioxide", carbon_dioxide, "nitrogen", nitrogen, "phoron", phoron)
+	GM.adjust_multi(GAS_O2, oxygen, GAS_CO2, carbon_dioxide, GAS_N2, nitrogen, GAS_PHORON, phoron)
 	GM.temperature = temperature
 
 	return GM
@@ -292,10 +292,10 @@
 
 	var/sum = oxygen + carbon_dioxide + nitrogen + phoron
 	if(sum>0)
-		GM.gas["oxygen"] = (oxygen/sum)*amount
-		GM.gas["carbon_dioxide"] = (carbon_dioxide/sum)*amount
-		GM.gas["nitrogen"] = (nitrogen/sum)*amount
-		GM.gas["phoron"] = (phoron/sum)*amount
+		GM.gas[GAS_O2] = (oxygen/sum)*amount
+		GM.gas[GAS_CO2] = (carbon_dioxide/sum)*amount
+		GM.gas[GAS_N2] = (nitrogen/sum)*amount
+		GM.gas[GAS_PHORON] = (phoron/sum)*amount
 
 	GM.temperature = temperature
 	GM.update_values()
@@ -338,7 +338,7 @@
 /turf/proc/make_air()
 	air = new/datum/gas_mixture
 	air.temperature = temperature
-	air.adjust_multi("oxygen", oxygen, "carbon_dioxide", carbon_dioxide, "nitrogen", nitrogen, "phoron", phoron)
+	air.adjust_multi(GAS_O2, oxygen, GAS_CO2, carbon_dioxide, GAS_N2, nitrogen, GAS_PHORON, phoron)
 	air.group_multiplier = 1
 	air.volume = CELL_VOLUME
 

code/ZAS/Zone.dm

@@ -172,7 +172,7 @@ Class Procs:
 	for(var/g in air.gas)
 		to_chat(M, "[gas_data.name[g]]: [air.gas[g]]")
 	to_chat(M, "P: [air.return_pressure()] kPa V: [air.volume]L T: [air.temperature]°K ([air.temperature - T0C]°C)")
-	to_chat(M, "O2 per N2: [(air.gas["nitrogen"] ? air.gas["oxygen"]/air.gas["nitrogen"] : "N/A")] Moles: [air.total_moles]")
+	to_chat(M, "O2 per N2: [(air.gas[GAS_N2] ? air.gas[GAS_O2]/air.gas[GAS_N2] : "N/A")] Moles: [air.total_moles]")
 	to_chat(M, "Simulated: [contents.len] ([air.group_multiplier])")
 	//to_chat(M, "Unsimulated: [unsimulated_contents.len]")
 	//to_chat(M, "Edges: [edges.len]")

code/__defines/_fruits.dm

@@ -0,0 +1,159 @@
+#define PLANT_AMBROSIA "ambrosia"
+#define PLANT_APPLE "apple"
+#define PLANT_BANANA "banana"
+#define PLANT_BERRIES "berries"
+#define PLANT_CABBAGE "cabbage"
+#define PLANT_CARROT "carrot"
+#define PLANT_CELERY "celery"
+#define PLANT_CHERRY "cherry"
+#define PLANT_CHILI "chili"
+#define PLANT_COCOA "cocoa"
+#define PLANT_CORN "corn"
+#define PLANT_DURIAN "durian"
+#define PLANT_EGGPLANT "eggplant"
+#define PLANT_GRAPES "grapes"
+#define PLANT_GREENGRAPES "greengrapes"
+#define PLANT_HAREBELLS "harebells"
+#define PLANT_LAVENDER "lavender"
+#define PLANT_LEMON "lemon"
+#define PLANT_LETTUCE "lettuce"
+#define PLANT_LIME "lime"
+#define PLANT_ONION "onion"
+#define PLANT_ORANGE "orange"
+#define PLANT_PEANUT "peanut"
+#define PLANT_POPPIES "poppies"
+#define PLANT_POTATO "potato"
+#define PLANT_PUMPKIN "pumpkin"
+#define PLANT_RICE "rice"
+#define PLANT_ROSE "rose"
+#define PLANT_RHUBARB "rhubarb"
+#define PLANT_SOYBEAN "soybean"
+#define PLANT_SPINEAPPLE "spineapple"
+#define PLANT_SUGARCANE "sugarcane"
+#define PLANT_SUNFLOWERS "sunflowers"
+#define PLANT_TOMATO "tomato"
+#define PLANT_VANILLA "vanilla"
+#define PLANT_WATERMELON "watermelon"
+#define PLANT_WHEAT "wheat"
+#define PLANT_WHITEBEET "whitebeet"
+#define PLANT_DIONA "diona"
+#define PLANT_GHOSTCHILI "ghostchili"
+#define PLANT_PLASTIC "plastic"
+#define PLANT_SHAND "shand"
+#define PLANT_MTEAR "mtear"
+#define PLANT_GLOWBERRIES "glowberries"
+#define PLANT_PEPPERCORNS "peppercorns"
+#define PLANT_BLOODTOMATO "bloodtomato"
+#define PLANT_KILLERTOMATO "killertomato"
+#define PLANT_BLUETOMATO "bluetomato"
+#define PLANT_BLUESPACETOMATO "bluespacetomato"
+#define PLANT_ICECHILI "icechili"
+#define PLANT_REISHI "reishi"
+#define PLANT_AMANITA "amanita"
+#define PLANT_DESTROYINGANGEL "destroyingangel"
+#define PLANT_LIBERTYCAP "libertycap"
+#define PLANT_MUSHROOMS "mushrooms"
+#define PLANT_TOWERCAP "towercap"
+#define PLANT_REDCAP "redcap"
+#define PLANT_GLOWSHROOM "glowshroom"
+#define PLANT_PLUMPHELMET "plumphelmet"
+#define PLANT_SPORESHROOM "sporeshroom"
+#define PLANT_NETTLE "nettle"
+#define PLANT_DEATHNETTLE "deathnettle"
+#define PLANT_WEEDS "weeds"
+#define PLANT_MOLD "mold"
+#define PLANT_POISONAPPLE "poisonapple"
+#define PLANT_GOLDAPPLE "goldapple"
+#define PLANT_AMBROSIADEUS "ambrosiadeus"
+#define PLANT_AMBROSIAGAIA "ambrosiagaia"
+#define PLANT_AMBROSIAINFERNUS "ambrosiainfernus"
+#define PLANT_POISONBERRIES "poisonberries"
+#define PLANT_DEATHBERRIES "deathberries"
+#define PLANT_GRASS "grass"
+#define PLANT_CARPET "carpet"
+#define PLANT_TOBACCO "tobacco"
+#define PLANT_KUDZU "kudzu"
+#define PLANT_JURLMAH "jurlmah"
+#define PLANT_AMAURI "amauri"
+#define PLANT_GELTHI "gelthi"
+#define PLANT_VALE "vale"
+#define PLANT_SURIK "surik"
+#define PLANT_TELRIIS "telriis"
+#define PLANT_THAADRA "thaadra"
+#define PLANT_WHITEWABBACK "whitewabback"
+#define PLANT_BLACKWABBACK "blackwabback"
+#define PLANT_WILDWABBACK "wildwabback"
+#define PLANT_SIFLETTUCE "siflettuce"
+#define PLANT_EGG_PLANT "egg-plant"
+#define PLANT_PINEAPPLE "pineapple"
+#define PLANT_BLOODROSE "bloodrose"
+#define PLANT_GNOMES "gnomes"
+#define PLANT_SIFBULB "sifbulb"
+#define PLANT_WURMWOAD "wurmwoad"
+#define PLANT_MICROM "microm"
+#define PLANT_MEGAM "megam"
+
+// CHompAdd Start
+#define PLANT_VOLTATO "voltato"
+#define PLANT_SOLARFLOWER "solarflower"
+#define PLANT_SOULFLOWER "soulflower"
+#define PLANT_MILKDEW "milkdew"
+#define PLANT_SAPBEAN "sapbean"
+#define PLANT_ORANGESAPBEAN "orangesapbean"
+#define PLANT_PURPLESAPBEAN "purplesapbean"
+#define PLANT_BLUESAPBEAN "bluesapbean"
+#define PLANT_BLACKSAPBEAN "blacksapbean"
+#define PLANT_MEATWHEAT "meatwheat"
+#define PLANT_TEA "tea"
+#define PLANT_PITCHERPLANT "pitcher plant"
+#define PLANT_NULLHARDLIGHT "Type NULL Hardlight Generator"
+#define PLANT_CINNAMON "cinnamon"
+#define PLANT_GARDENIA "gardenia"
+#define PLANT_CHERRYBOMB "cherrybomb"
+#define PLANT_NUCLEARORANGE "nuclearorange"
+#define PLANT_LIVEWIREORANGE "livewireorange"
+// CHOMPAdd End
+
+GLOBAL_LIST_INIT(acceptable_fruit_types, list(
+											PLANT_AMBROSIA,
+											PLANT_APPLE,
+											PLANT_BANANA,
+											PLANT_BERRIES,
+											PLANT_CABBAGE,
+											PLANT_CARROT,
+											PLANT_CELERY,
+											PLANT_CHERRY,
+											PLANT_CHILI,
+											PLANT_COCOA,
+											PLANT_CORN,
+											PLANT_DURIAN,
+											PLANT_EGGPLANT,
+											PLANT_GRAPES,
+											PLANT_GRASS, // CHOMPAdd
+											PLANT_GREENGRAPES,
+											PLANT_HAREBELLS,
+											PLANT_LAVENDER,
+											PLANT_LEMON,
+											PLANT_LETTUCE,
+											PLANT_LIME,
+											PLANT_ONION,
+											PLANT_ORANGE,
+											PLANT_PEANUT,
+											PLANT_POPPIES,
+											PLANT_POTATO,
+											PLANT_PUMPKIN,
+											PLANT_REISHI, // CHOMPAdd
+											PLANT_RICE,
+											PLANT_ROSE,
+											PLANT_RHUBARB,
+											PLANT_SHAND, // CHOMPAdd
+											PLANT_SOYBEAN,
+											PLANT_SPINEAPPLE,
+											PLANT_SUGARCANE,
+											PLANT_SUNFLOWERS,
+											PLANT_TOMATO,
+											PLANT_TOWERCAP, // CHOMPAdd
+											PLANT_VANILLA,
+											PLANT_WATERMELON,
+											PLANT_WHEAT,
+											PLANT_WHITEBEET))

code/__defines/_reagents_ch.dm

@@ -0,0 +1,285 @@
+// Gas
+#define REAGENT_MIASMA "Miasma"
+#define REAGENT_ID_MIASMA "miasma"
+
+// Drugs
+#define REAGENT_CLEANSINGAGENT "Cleansing Agent"
+#define REAGENT_ID_CLEANSINGAGENT "cleansingagent"
+#define REAGENT_PURIFYINGAGENT "Purifying Agent"
+#define REAGENT_ID_PURIFYINGAGENT "purifyingagent"
+#define REAGENT_BURNCARD "Burning Bicaridine"
+#define REAGENT_ID_BURNCARD "burncard"
+#define REAGENT_FLAMECURE "Flame Cure"
+#define REAGENT_ID_FLAMECURE "flamecure"
+#define REAGENT_NEOTANE "Neo Kelotane"
+#define REAGENT_ID_NEOTANE "neotane"
+#define REAGENT_BLOODSEALER "Blood Sealer"
+#define REAGENT_ID_BLOODSEALER "bloodsealer"
+#define REAGENT_LIVINGAGENT "Living Agent"
+#define REAGENT_ID_LIVINGAGENT "livingagent"
+#define REAGENT_PERFORMANCEPEAKER "Performance Peaker"
+#define REAGENT_ID_PERFORMANCEPEAKER "performancepeaker"
+#define REAGENT_SOULDEW "Soul Dew"
+#define REAGENT_ID_SOULDEW "souldew"
+#define REAGENT_QUADCORD "Quadcord"
+#define REAGENT_ID_QUADCORD "quadcord"
+#define REAGENT_JUGGERNOG "Juggernog"
+#define REAGENT_ID_JUGGERNOG "juggernog"
+#define REAGENT_CUREA "Curea"
+#define REAGENT_ID_CUREA "curea"
+#define REAGENT_LIQUIDHEALER "Liquid Healer"
+#define REAGENT_ID_LIQUIDHEALER "liquidhealer"
+#define REAGENT_PHOENIXBREATH "Phoenix Breath"
+#define REAGENT_ID_PHOENIXBREATH "phoenixbreath"
+#define REAGENT_DRYAGENT "Dry Agent"
+#define REAGENT_ID_DRYAGENT "dryagent"
+#define REAGENT_APHRODISIAC "Aphrodisiac"
+#define REAGENT_ID_APHRODISIAC "aphrodisiac"
+#define REAGENT_SORBITOL "Sorbitol"
+#define REAGENT_ID_SORBITOL "sorbitol"
+#define REAGENT_CONCENTRATEDRADIUM "Concentrated Radium"
+#define REAGENT_ID_CONCENTRATEDRADIUM "concentrated_radium"
+#define REAGENT_CLARIDYL "Claridyl Natural Remedy"
+#define REAGENT_ID_CLARIDYL "claridyl"
+#define REAGENT_DYLOTEANE "The Anti-Irish"
+#define REAGENT_ID_DYLOTEANE "dyloteane"
+#define REAGENT_BLOODBURN "Bloodburn"
+#define REAGENT_ID_BLOODBURN "bloodburn"
+#define REAGENT_EDEN "Eden"
+#define REAGENT_ID_EDEN "eden"
+#define REAGENT_EDENSNAKE "Tainted Eden"
+#define REAGENT_ID_EDENSNAKE "eden_snake"
+#define REAGENT_TERCOZOLAM "Tercozolam"
+#define REAGENT_ID_TERCOZOLAM "tercozolam"
+#define REAGENT_HANNOA "Hannoa"
+#define REAGENT_ID_HANNOA "hannoa"
+#define REAGENT_BULLVALENE "bullvalene"
+#define REAGENT_ID_BULLVALENE "bullvalene"
+#define REAGENT_SERAZINE "Serazine"
+#define REAGENT_ID_SERAZINE "serazine"
+#define REAGENT_ALIZENE "Alizene"
+#define REAGENT_ID_ALIZENE "alizene"
+
+// Does not exist?
+#define REAGENT_ID_SPACEDRUGS "space_drugs"
+#define REAGENT_ID_HOTWATER "hotwater"
+#define REAGENT_ID_BURBON "burbon"
+
+// Food & Drinks
+#define REAGENT_GELATIN "Gelatin"
+#define REAGENT_ID_GELATIN "gelatin"
+#define REAGENT_SNAPS "Akvavit"
+#define REAGENT_ID_SNAPS "snaps"
+#define REAGENT_MATCHALATTE "Matcha latte"
+#define REAGENT_ID_MATCHALATTE "matcha_latte"
+#define REAGENT_TEALEAVESGREEN  "Green tea leaves"
+#define REAGENT_ID_TEALEAVESGREEN "tealeavesgreen"
+#define REAGENT_BLONDIEMIX "Blondie Mix"
+#define REAGENT_ID_BLONDIEMIX "blondiemix"
+#define REAGENT_CINNAMONPOWDER "ground cinnamon"
+#define REAGENT_ID_CINNAMONPOWDER "cinnamonpowder"
+#define REAGENT_CHERRYTEA "Cherry Tea"
+#define REAGENT_ID_CHERRYTEA "cherrytea"
+#define REAGENT_WATERMELONTEA "Watermelon Tea"
+#define REAGENT_ID_WATERMELONTEA "watermelontea"
+#define REAGENT_SLIMEDRINK "Slime"
+#define REAGENT_ID_SLIMEDRINK "slimedrink"
+#define REAGENT_SPIDERDRINK "Brimming glass of spiders"
+#define REAGENT_ID_SPIDERDRINK "spiderdrink"
+#define REAGENT_BLUETRAIN "blue train"
+#define REAGENT_ID_BLUETRAIN "bluetrain"
+#define REAGENT_LOWPOWER "The low power"
+#define REAGENT_ID_LOWPOWER "lowpower"
+#define REAGENT_HIGHPOWER "The High power"
+#define REAGENT_ID_HIGHPOWER "highpower"
+#define REAGENT_JACKBREW "Rush hour"
+#define REAGENT_ID_JACKBREW "jackbrew"
+#define REAGENT_BOOKWYRM "Bookwyrm's bite"
+#define REAGENT_ID_BOOKWYRM "bookwyrm"
+#define REAGENT_FLAPPER "Flapper"
+#define REAGENT_ID_FLAPPER "flapper"
+#define REAGENT_OILSLIDE "Oil slide"
+#define REAGENT_ID_OILSLIDE "oilslide"
+#define REAGENT_SITONMYFACE "Sit on my face"
+#define REAGENT_ID_SITONMYFACE "sitonmyface"
+#define REAGENT_HACHI "Hachi"
+#define REAGENT_ID_HACHI "hachi"
+#define REAGENT_FRESHTEA "Green tea"
+#define REAGENT_ID_FRESHTEA "freshtea"
+#define REAGENT_ID_FRESHTEAGREEN "freshteagreen"
+#define REAGENT_TEAMUSH "Tea mush"
+#define REAGENT_ID_TEAMUSH "teamush"
+#define REAGENT_INSTANTTEAPOWDERGREEN "Instant green tea powder"
+#define REAGENT_ID_INSTANTTEAPOWDERGREEN "instantteapowdergreen"
+#define REAGENT_INSTANTTEAGREEN "Instant green tea"
+#define REAGENT_ID_INSTANTTEAGREEN "instantteagreen"
+#define REAGENT_MATCHAPOWDER "Matcha powder"
+#define REAGENT_ID_MATCHAPOWDER "matchapowder"
+#define REAGENT_MATCHA "Matcha"
+#define REAGENT_ID_MATCHA "matcha"
+#define REAGENT_BUBBLETEAWATERMELON "Watermelon bubble tea"
+#define REAGENT_ID_BUBBLETEAWATERMELON "bubbleteawatermelon"
+#define REAGENT_BUBBLETEASTRAWBERRY "Strawberry bubble tea"
+#define REAGENT_ID_BUBBLETEASTRAWBERRY "bubbleteastrawberry"
+#define REAGENT_BUBBLETEACHERRY "Cherry bubble tea"
+#define REAGENT_ID_BUBBLETEACHERRY "bubbleteacherry"
+#define REAGENT_BUBBLETEACOFFEE "Coffee bubble tea"
+#define REAGENT_ID_BUBBLETEACOFFEE "bubbleteacoffee"
+#define REAGENT_BUBBLETEABANANA "Banana bubble tea"
+#define REAGENT_ID_BUBBLETEABANANA "bubbleteabanana"
+#define REAGENT_HORCHATA "Horchata"
+#define REAGENT_ID_HORCHATA "horchata"
+#define REAGENT_NARSOUR "Nar'Sour"
+#define REAGENT_ID_NARSOUR "narsour"
+#define REAGENT_COGCHAMP "CogChamp"
+#define REAGENT_ID_COGCHAMP "cogchamp"
+#define REAGENT_ARACHNIDSLAMMER "Arachnid Slammer"
+#define REAGENT_ID_ARACHNIDSLAMMER "arachnidslammer"
+#define REAGENT_INFUSEDARACHNIDSLAMMER "Infused Arachnid Slammer"
+#define REAGENT_ID_INFUSEDARACHNIDSLAMMER "infusedarachnidslammer"
+#define REAGENT_ENRAGEDARACHNIDSLAMMER "Enraged Arachnid Slammer"
+#define REAGENT_ID_ENRAGEDARACHNIDSLAMMER "enragedarachnidslammer"
+#define REAGENT_PILK "Pilk"
+#define REAGENT_ID_PILK "pilk"
+#define REAGENT_FETCHINGFIZZ "Fetching Fizz"
+#define REAGENT_ID_FETCHINGFIZZ "fetching_fizz"
+#define REAGENT_HEARTYPUNCH "Hearty Punch"
+#define REAGENT_ID_HEARTYPUNCH "hearty_punch"
+#define REAGENT_SQUIRTCIDER "Squirt Cider"
+#define REAGENT_ID_SQUIRTCIDER "squirt_cider"
+#define REAGENT_FRINGEWEAVER "Fringe Weaver"
+#define REAGENT_ID_FRINGEWEAVER "fringe_weaver"
+#define REAGENT_CREVICESPIKE "Crevice Spike"
+#define REAGENT_ID_CREVICESPIKE "crevice_spike"
+#define REAGENT_DUPLEX "Duplex"
+#define REAGENT_ID_DUPLEX "duplex"
+#define REAGENT_MAUNALOA "Mauna Loa"
+#define REAGENT_ID_MAUNALOA "mauna_loa"
+#define REAGENT_HIVEMINDERASER "Hivemind Eraser"
+#define REAGENT_ID_HIVEMINDERASER "hiveminderaser"
+#define REAGENT_STRAWBERRYLOVEPOTION "Strawberry Love Potion"
+#define REAGENT_ID_STRAWBERRYLOVEPOTION "strawberrylovepotion"
+#define REAGENT_WORMBLOOD "Worm Blood"
+#define REAGENT_ID_WORMBLOOD "wormblood"
+
+
+// Modifiers
+#define REAGENT_ENERGYBOOSTER "Energy Booster"
+#define REAGENT_ID_ENERGYBOOSTER "energybooster"
+#define REAGENT_OCEANICCURE "Oceanic Cure"
+#define REAGENT_ID_OCEANICCURE "oceaniccure"
+#define REAGENT_DEATHCLAWMUTAGEN "Deathclaw Mutagen"
+#define REAGENT_ID_DEATHCLAWMUTAGEN "deathclawmutagen"
+#define REAGENT_SENSEENHANCER "Sense Enhancer"
+#define REAGENT_ID_SENSEENHANCER "senseenhancer"
+#define REAGENT_HEATNULLIFER "Heat Nullifer"
+#define REAGENT_ID_HEATNULLIFER "heatnullifer"
+
+
+// Other
+#define REAGENT_PURPLESAP "purplesap"
+#define REAGENT_ID_PURPLESAP "Purple sap"
+#define REAGENT_BLUESAP "Blue Sap"
+#define REAGENT_ID_BLUESAP "bluesap"
+#define REAGENT_ORANGESAP "Orange sap"
+#define REAGENT_ID_ORANGESAP "orangesap"
+#define REAGENT_NITRATE "Nitrate"
+#define REAGENT_ID_NITRATE "nitrate"
+#define REAGENT_ALUMINUMNITRATE "Aluminum Nitrate"
+#define REAGENT_ID_ALUMINUMNITRATE "aluminum_nitrate"
+#define REAGENT_SPIDEREGG "spider eggs"
+#define REAGENT_ID_SPIDEREGG "spideregg"
+#define REAGENT_PITCHERNECTAR "Pitcher Nectar"
+#define REAGENT_ID_PITCHERNECTAR "pitcher_nectar"
+#define REAGENT_BENZILATE  "Odd Goo"
+#define REAGENT_ID_BENZILATE "benzilate"
+#define REAGENT_PHENETHYLAMINE "Phenethylamine"
+#define REAGENT_ID_PHENETHYLAMINE "phenethylamine"
+
+
+// Phoronreagents
+#define REAGENT_TARTRATE "Chlorified Tartrate"
+#define REAGENT_ID_TARTRATE "tartrate"
+#define REAGENT_BICORDRAZINE "Bicordrazine"
+#define REAGENT_ID_BICORDRAZINE "bicordrazine"
+#define REAGENT_GENEDRAZINE "Genedrazine"
+#define REAGENT_ID_GENEDRAZINE "genedrazine"
+#define REAGENT_LACERTUSOL "Lacertusol"
+#define REAGENT_ID_LACERTUSOL "lacertusol"
+#define REAGENT_MUTAGENX "Extreme Mutagen"
+#define REAGENT_ID_MUTAGENX "mutagen_x"
+#define REAGENT_UNKNOWN "Unanalyzed Reagent"
+#define REAGENT_ID_UNKNOWN "unknown"
+#define REAGENT_AMORAPOTIO "Amorapotio"
+#define REAGENT_ID_AMORAPOTIO "amorapotio"
+#define REAGENT_NASTY "Nasty"
+#define REAGENT_ID_NASTY "nasty"
+#define REAGENT_BABELIZINE "Babelizine"
+#define REAGENT_ID_BABELIZINE "babelizine"
+#define REAGENT_CALCISOL "Calcisol"
+#define REAGENT_ID_CALCISOL "calcisol"
+#define REAGENT_MALAXITOL "Malaxitol"
+#define REAGENT_ID_MALAXITOL "malaxitol"
+#define REAGENT_PARALITOL "Paralitol"
+#define REAGENT_ID_PARALITOL "paralitol"
+#define REAGENT_DOLORAN "Doloran"
+#define REAGENT_ID_DOLORAN "doloran"
+#define REAGENT_FULGURACIN "Fulguracin"
+#define REAGENT_ID_FULGURACIN "fulguracin"
+#define REAGENT_MORTEMOL "Mortemol"
+#define REAGENT_ID_MORTEMOL "mortemol"
+#define REAGENT_TEGOXANE "Tegoxane"
+#define REAGENT_ID_TEGOXANE "tegoxane"
+#define REAGENT_EXPULSICOL "Expulsicol"
+#define REAGENT_ID_EXPULSICOL "expulsicol"
+#define REAGENT_OCULUSOSONE "Oculusosone"
+#define REAGENT_ID_OCULUSOSONE "oculusosone"
+#define REAGENT_DESTITUTIONECAM "Destitutionecam"
+#define REAGENT_ID_DESTITUTIONECAM "destitutionecam"
+#define REAGENT_SAPOFORMATOR "Sapoformator"
+#define REAGENT_ID_SAPOFORMATOR "sapoformator"
+#define REAGENT_RADX "Rad-X"
+#define REAGENT_ID_RADX "rad_x"
+#define REAGENT_CALORAN "Caloran"
+#define REAGENT_ID_CALORAN "caloran"
+#define REAGENT_THESTUFF "The Stuff"
+#define REAGENT_ID_THESTUFF "the_stuff"
+#define REAGENT_FRIOLINE "Frioline"
+#define REAGENT_ID_FRIOLINE "frioline"
+#define REAGENT_LUXITOL "Luxitol"
+#define REAGENT_ID_LUXITOL "luxitol"
+#define REAGENT_LIQUIDSKIN "Liquid Skin"
+#define REAGENT_ID_LIQUIDSKIN "liquid_skin"
+#define REAGENT_ENERGIZEDPHORON "Energized Phoron"
+#define REAGENT_ID_ENERGIZEDPHORON "energized_phoron"
+#define REAGENT_INDUROMOL "Induromol"
+#define REAGENT_ID_INDUROMOL "induromol"
+#define REAGENT_OBSCURITOL "Obscuritol"
+#define REAGENT_ID_OBSCURITOL "obscuritol"
+#define REAGENT_OXYPHOROMIN "Oxyphoromin"
+#define REAGENT_ID_OXYPHOROMIN "oxyphoromin"
+#define REAGENT_LIQUIDBLUESPACE "Liquid Bluespace"
+#define REAGENT_ID_LIQUIDBLUESPACE "liquid_bluespace"
+#define REAGENT_GASEOUSDEATH "Gaseous Death"
+#define REAGENT_ID_GASEOUSDEATH "gaseous_death"
+#define REAGENT_OCCAECOSONE "Occaecosone"
+#define REAGENT_ID_OCCAECOSONE "occaecosone"
+#define REAGENT_IGNISOL "Ignisol"
+#define REAGENT_ID_IGNISOL "ignisol"
+#define REAGENT_PHORONICACID "Phoronic acid"
+#define REAGENT_ID_PHORONICACID "phoronic_acid"
+#define REAGENT_NOCTURNOL "Nocturnal"
+#define REAGENT_ID_NOCTURNOL "nocturnol"
+
+
+// Toxins
+#define REAGENT_DIETSTOMACID "Diluted digestive acid"
+#define REAGENT_ID_DIETSTOMACID "diet_stomacid"
+#define REAGENT_DEATHBLOOD "Irradiating Blood"
+#define REAGENT_ID_DEATHBLOOD "deathblood"
+#define REAGENT_LIQUIDFIRE "Liquid Fire"
+#define REAGENT_ID_LIQUIDFIRE "liquidfire"
+#define REAGENT_NEOLIQUIDFIRE "Neon Liquid Fire"
+#define REAGENT_ID_NEOLIQUIDFIRE "neoliquidfire"
+#define REAGENT_LIQUIDLIFE "Liquid Life"
+#define REAGENT_ID_LIQUIDLIFE "liquidlife"

code/__defines/chemistry.dm

@@ -50,10 +50,10 @@
 #define ANTIBIO_SUPER	3
 
 // Chemistry lists.
-var/list/tachycardics  = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") // Increase heart rate.
-var/list/bradycardics  = list("neurotoxin", "cryoxadone", "clonexadone", "bliss", "stoxin", "ambrosia_extract")   // Decrease heart rate.
-var/list/heartstopper  = list("potassium_chlorophoride", "zombiepowder") // This stops the heart.
-var/list/cheartstopper = list("potassium_chloride")                       // This stops the heart when overdose is met. -- c = conditional
+var/list/tachycardics  = list(REAGENT_ID_COFFEE, REAGENT_ID_INAPROVALINE, REAGENT_ID_HYPERZINE, REAGENT_ID_NITROGLYCERIN,REAGENT_ID_THIRTEENLOKO, REAGENT_ID_NICOTINE) // Increase heart rate.
+var/list/bradycardics  = list(REAGENT_ID_NEUROTOXIN, REAGENT_ID_CRYOXADONE, REAGENT_ID_CLONEXADONE, REAGENT_ID_BLISS, REAGENT_ID_STOXIN, REAGENT_ID_AMBROSIAEXTRACT)   // Decrease heart rate.
+var/list/heartstopper  = list(REAGENT_ID_POTASSIUMCHLOROPHORIDE, REAGENT_ID_ZOMBIEPOWDER) // This stops the heart.
+var/list/cheartstopper = list(REAGENT_ID_POTASSIUMCHLORIDE)                       // This stops the heart when overdose is met. -- c = conditional
 
 #define MAX_PILL_SPRITE 24 //max icon state of the pill sprites
 #define MAX_BOTTLE_SPRITE 4 //max icon state of the pill sprites

code/__defines/materials.dm

@@ -5,7 +5,7 @@
 #define MAT_GLASS			"glass"
 #define MAT_RGLASS			"rglass"
 #define MAT_PGLASS			"borosilicate glass"
-#define MAT_RPGLASS         "reinforced borosilicate glass"
+#define MAT_RPGLASS			"reinforced borosilicate glass"
 #define MAT_SILVER			"silver"
 #define MAT_GOLD			"gold"
 #define MAT_URANIUM			"uranium"
@@ -18,7 +18,7 @@
 #define MAT_LOG				"log"
 #define MAT_SIFWOOD			"alien wood"
 #define MAT_SIFLOG			"alien log"
-#define MAT_HARDWOOD			"hardwood"
+#define MAT_HARDWOOD		"hardwood"
 #define MAT_HARDLOG			"hardwood log"
 #define MAT_STEELHULL		"steel hull"
 #define MAT_PLASTEEL		"plasteel"
@@ -35,12 +35,10 @@
 #define MAT_METALHYDROGEN	"mhydrogen"
 #define MAT_OSMIUM			"osmium"
 #define MAT_GRAPHITE		"graphite"
-#define MAT_LEATHER			"leather"
 #define MAT_CHITIN			"chitin"
-#define MAT_CLOTH			"cloth"
+#define MAT_ALIENCHITIN		"alien chitin"
+#define MAT_ALIENCLAW		"alien claw"
 #define MAT_FUR				"fur"
-#define MAT_SYNCLOTH		"syncloth"
-#define MAT_FIBERS			"fibers"
 #define MAT_COPPER			"copper"
 #define MAT_QUARTZ			"quartz"
 #define MAT_TIN				"tin"
@@ -48,15 +46,41 @@
 #define MAT_ALUMINIUM		"aluminium"
 #define MAT_BRONZE			"bronze"
 #define MAT_PAINITE			"painite"
-#define MAT_BOROSILICATE	"borosilicate glass"
 #define MAT_SANDSTONE		"sandstone"
-#define MAT_FLINT           "flint"
+#define MAT_FLINT			"flint"
 #define MAT_PLATINUM		"platinum"
 #define MAT_TRITIUM			"tritium"
 #define MAT_DEUTERIUM		"deuterium"
 #define MAT_CONCRETE		"concrete"
 #define MAT_PLASTEELREBAR	"plasteel rebar"
 #define MAT_GRASS			"grass"
+#define MAT_RESIN			"resin"
+#define MAT_CULT			"cult"
+#define MAT_CULT2			"cult2"
+#define MAT_ALIENALLOY		"alienalloy"
+#define MAT_COMPOSITE		"composite"
+#define MAT_BIOMASS			"biomass"
+#define MAT_WEEDEXTRACT		"weed extract"
+#define MAT_CARDBOARD		"cardboard"
+#define MAT_COTTON			"cotton"
+
+// cloth materials
+#define MAT_WOOL			"wool"
+#define MAT_FIBERS			"fibers"
+#define MAT_LEATHER			"leather"
+#define MAT_CLOTH			"cloth"
+#define MAT_SYNCLOTH		"syncloth"
+// # define MAT_CARPET			"carpet" // CHOMPRemove
+// colours
+#define MAT_CLOTH_TEAL		"teal"
+#define MAT_CLOTH_BLACK		"black"
+#define MAT_CLOTH_GREEN		"green"
+#define MAT_CLOTH_PURPLE	"purple"
+#define MAT_CLOTH_BLUE		"blue"
+#define MAT_CLOTH_BEIGE		"beige"
+#define MAT_CLOTH_LIME		"lime"
+#define MAT_CLOTH_YELLOW	"yellow"
+#define MAT_CLOTH_ORANGE	"orange"
 
 
 #define DEFAULT_TABLE_MATERIAL MAT_PLASTIC

code/__defines/ores.dm

@@ -0,0 +1,20 @@
+#define ORE_MARBLE "marble"
+#define ORE_QUARTZ "quartz"
+#define ORE_COPPER "copper"
+#define ORE_TIN "tin"
+#define ORE_BAUXITE "bauxite"
+#define ORE_URANIUM "uranium"
+#define ORE_PLATINUM "platinum"
+#define ORE_HEMATITE "hematite"
+#define ORE_RUTILE "rutile"
+#define ORE_CARBON "carbon"
+#define ORE_DIAMOND "diamond"
+#define ORE_GOLD "gold"
+#define ORE_SILVER "silver"
+#define ORE_PHORON "phoron"
+#define ORE_LEAD "lead"
+#define ORE_VOPAL "void opal"
+#define ORE_VERDANTIUM "verdantium"
+#define ORE_PAINITE "painite"
+#define ORE_MHYDROGEN "mhydrogen"
+#define ORE_SAND "sand"

code/__defines/plants.dm

@@ -106,9 +106,9 @@ GLOBAL_LIST_INIT(plant_item_products, list(
 	))
 
 GLOBAL_LIST_INIT(forbidden_plant_growth_sprites, list(
-	"gnomes"
+	PLANT_GNOMES
 	))
 
 GLOBAL_LIST_INIT(forbidden_plant_product_sprites, list(
-	"gnomes"
-	))
+	PLANT_GNOMES
+	))

code/_onclick/hud/screen_objects.dm

@@ -347,7 +347,7 @@
 						else
 							var/list/nicename = null
 							var/list/tankcheck = null
-							var/breathes = "oxygen"    //default, we'll check later
+							var/breathes = GAS_O2    //default, we'll check later
 							var/list/contents = list()
 							var/from = "on"
 
@@ -376,30 +376,30 @@
 										continue					//in it, so we're going to believe the tank is what it says it is
 									switch(breathes)
 																		//These tanks we're sure of their contents
-										if("nitrogen") 							//So we're a bit more picky about them.
+										if(GAS_N2) 							//So we're a bit more picky about them.
 
-											if(t.air_contents.gas["nitrogen"] && !t.air_contents.gas["oxygen"])
-												contents.Add(t.air_contents.gas["nitrogen"])
+											if(t.air_contents.gas[GAS_N2] && !t.air_contents.gas[GAS_O2])
+												contents.Add(t.air_contents.gas[GAS_N2])
 											else
 												contents.Add(0)
 
-										if ("oxygen")
-											if(t.air_contents.gas["oxygen"] && !t.air_contents.gas["phoron"])
-												contents.Add(t.air_contents.gas["oxygen"])
+										if (GAS_O2)
+											if(t.air_contents.gas[GAS_O2] && !t.air_contents.gas[GAS_PHORON])
+												contents.Add(t.air_contents.gas[GAS_O2])
 											else
 												contents.Add(0)
 
 										// No races breath this, but never know about downstream servers.
 										if ("carbon dioxide")
-											if(t.air_contents.gas["carbon_dioxide"] && !t.air_contents.gas["phoron"])
-												contents.Add(t.air_contents.gas["carbon_dioxide"])
+											if(t.air_contents.gas[GAS_CO2] && !t.air_contents.gas[GAS_PHORON])
+												contents.Add(t.air_contents.gas[GAS_CO2])
 											else
 												contents.Add(0)
 
 										// And here's for the Vox
-										if ("phoron")
-											if(t.air_contents.gas["phoron"] && !t.air_contents.gas["oxygen"])
-												contents.Add(t.air_contents.gas["phoron"])
+										if (GAS_PHORON)
+											if(t.air_contents.gas[GAS_PHORON] && !t.air_contents.gas[GAS_O2])
+												contents.Add(t.air_contents.gas[GAS_PHORON])
 											else
 												contents.Add(0)
 
@@ -431,7 +431,7 @@
 								if(C.internals)
 									C.internals.icon_state = "internal1"
 							else
-								to_chat(C, span_notice("You don't have a[breathes=="oxygen" ? "n oxygen" : addtext(" ",breathes)] tank."))
+								to_chat(C, span_notice("You don't have a[breathes==GAS_O2 ? "n " + GAS_O2 : addtext(" ",breathes)] tank."))
 		if("act_intent")
 			usr.a_intent_change("right")
 		if(I_HELP)

code/controllers/subsystems/chemistry.dm

@@ -27,7 +27,7 @@ SUBSYSTEM_DEF(chemistry)
 //Chemical Reactions - Initialises all /decl/chemical_reaction into a list
 // It is filtered into multiple lists within a list.
 // For example:
-// chemical_reactions_by_reagent["phoron"] is a list of all reactions relating to phoron
+// chemical_reactions_by_reagent[REAGENT_ID_PHORON] is a list of all reactions relating to phoron
 // Note that entries in the list are NOT duplicated. So if a reaction pertains to
 // more than one chemical it will still only appear in only one of the sublists.
 /datum/controller/subsystem/chemistry/proc/initialize_chemical_reactions()

code/controllers/subsystems/plants.dm

@@ -110,10 +110,10 @@ SUBSYSTEM_DEF(plants)
 
 	if(survive_on_station)
 		if(seed.consume_gasses)
-			seed.consume_gasses["phoron"] = null
-			seed.consume_gasses["carbon_dioxide"] = null
-		if(seed.chems && !isnull(seed.chems["pacid"]))
-			seed.chems["pacid"] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous.
+			seed.consume_gasses[GAS_PHORON] = null
+			seed.consume_gasses[GAS_CO2] = null
+		if(seed.chems && !isnull(seed.chems[REAGENT_ID_PACID]))
+			seed.chems[REAGENT_ID_PACID] = null // Eating through the hull will make these plants completely inviable, albeit very dangerous.
 			seed.chems -= null // Setting to null does not actually remove the entry, which is weird.
 		seed.set_trait(TRAIT_IDEAL_HEAT,293)
 		seed.set_trait(TRAIT_HEAT_TOLERANCE,20)

code/datums/diseases/_disease.dm

@@ -106,7 +106,7 @@ GLOBAL_LIST_INIT(diseases, subtypesof(/datum/disease))
 	if((spread_flags & SPECIAL || spread_flags & NON_CONTAGIOUS || spread_flags & BLOOD) && !force_spread)
 		return
 
-	if(affected_mob.bloodstr.has_reagent("spaceacillin") || (affected_mob.nutrition > 300 && prob(affected_mob.nutrition/50)))
+	if(affected_mob.bloodstr.has_reagent(REAGENT_ID_SPACEACILLIN) || (affected_mob.nutrition > 300 && prob(affected_mob.nutrition/50)))
 		return
 
 	var/spread_range = 1

code/datums/diseases/advance/advance.dm

@@ -1,10 +1,10 @@
 GLOBAL_LIST_EMPTY(archive_diseases)
 
 GLOBAL_LIST_INIT(advance_cures, list(
-	"sodiumchloride", "sugar", "orangejuice",
-	"spaceacillin", "glucose", "ethanol",
-	"leporazine", "impedrezene", "hepanephrodaxon",
-	"silver", "gold"
+	REAGENT_ID_SODIUMCHLORIDE, REAGENT_ID_SUGAR, REAGENT_ID_ORANGEJUICE,
+	REAGENT_ID_SPACEACILLIN, REAGENT_ID_GLUCOSE, REAGENT_ID_ETHANOL,
+	REAGENT_ID_LEPORAZINE, REAGENT_ID_IMPEDREZENE, REAGENT_ID_HEPANEPHRODAXON,
+	REAGENT_ID_SILVER, REAGENT_ID_GOLD
 ))
 
 /datum/disease/advance

code/datums/diseases/advance/symptoms/oxygen.dm

@@ -29,8 +29,8 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(4, 5)
-				if(M.reagents.get_reagent_amount("dexalin") < 10)
-					M.reagents.add_reagent("dexalin", 10)
+				if(M.reagents.get_reagent_amount(REAGENT_ID_DEXALIN) < 10)
+					M.reagents.add_reagent(REAGENT_ID_DEXALIN, 10)
 			else
 				if(prob(SYMPTOM_ACTIVATION_PROB * 5))
 					to_chat(M, span_notice(pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")))

code/datums/diseases/advance/symptoms/sensory.dm

@@ -32,15 +32,15 @@ Bonus
 		if(A.stage >= 3)
 			M.slurring = max(0, M.slurring-4)
 			M.druggy = max(0, M.druggy-4)
-			M.reagents.remove_reagent("ethanol", 3)
+			M.reagents.remove_reagent(REAGENT_ID_ETHANOL, 3)
 		if(A.stage >= 4)
 			M.drowsyness = max(0, M.drowsyness-4)
-			if(M.reagents.has_reagent("bliss"))
-				M.reagents.del_reagent("bliss")
+			if(M.reagents.has_reagent(REAGENT_ID_BLISS))
+				M.reagents.del_reagent(REAGENT_ID_BLISS)
 			M.hallucination = max(0, M.hallucination-4)
 		if(A.stage >= 5)
-			if(M.reagents.get_reagent_amount("alkysine") < 10)
-				M.reagents.add_reagent("alkysine", 5)
+			if(M.reagents.get_reagent_amount(REAGENT_ID_ALKYSINE) < 10)
+				M.reagents.add_reagent(REAGENT_ID_ALKYSINE, 5)
 
 /datum/symptom/sensory_restoration
 	name = "Sensory Restoration"
@@ -56,8 +56,8 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(4, 5)
-				if(M.reagents.get_reagent_amount("imidazoline") < 10)
-					M.reagents.add_reagent("imidazoline", 5)
+				if(M.reagents.get_reagent_amount(REAGENT_ID_IMIDAZOLINE) < 10)
+					M.reagents.add_reagent(REAGENT_ID_IMIDAZOLINE, 5)
 			else
 				if(prob(SYMPTOM_ACTIVATION_PROB))
 					to_chat(M, span_notice(pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.")))

code/datums/diseases/advance/symptoms/stimulant.dm

@@ -36,8 +36,8 @@ Bonus
 			if(3, 4)
 				L.jitteriness += 10
 			else
-				if(L.reagents.get_reagent_amount("hyperzine" < 10))
-					L.reagents.add_reagent("hyperzine", 5)
+				if(L.reagents.get_reagent_amount(REAGENT_ID_HYPERZINE < 10))
+					L.reagents.add_reagent(REAGENT_ID_HYPERZINE, 5)
 				if(prob(30))
 					L.jitteriness += 15
 	return

code/datums/diseases/anxiety.dm

@@ -4,8 +4,8 @@
 	max_stages = 4
 	spread_text = "On contact"
 	spread_flags = CONTACT_GENERAL
-	cure_text = "Ethanol"
-	cures = list("ethanol")
+	cure_text = REAGENT_ETHANOL
+	cures = list(REAGENT_ID_ETHANOL)
 	agent = "Excess Lepdopticides"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
 	desc = "If left untreated subject will regurgitate butterflies."

code/datums/diseases/beesease.dm

@@ -4,8 +4,8 @@
 	max_stages = 4
 	spread_text = "On contact"
 	spread_flags = CONTACT_GENERAL
-	cure_text = "Sugar"
-	cures = list("sugar")
+	cure_text = REAGENT_SUGAR
+	cures = list(REAGENT_ID_SUGAR)
 	agent = "Apidae Infection"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
 	desc = "If left untreated, subject will regurgitate bees."

code/datums/diseases/brainrot.dm

@@ -3,8 +3,8 @@
 	max_stages = 4
 	spread_text = "On contact"
 	spread_flags = CONTACT_GENERAL
-	cure_text = "Alkysine"
-	cures = list("alkysine")
+	cure_text = REAGENT_ALKYSINE
+	cures = list(REAGENT_ID_ALKYSINE)
 	agent = "Cryptococcus Cosmosis"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	cure_chance = 15

code/datums/diseases/choreomania.dm

@@ -2,8 +2,8 @@
 	name = "Choreomania"
 	max_stages = 3
 	spread_text = "Airborne"
-	cure_text = "Adranol"
-	cures = list("adranol")
+	cure_text = REAGENT_ADRANOL
+	cures = list(REAGENT_ID_ADRANOL)
 	cure_chance = 10
 	agent = "TAP-DAnC3"
 	viable_mobtypes = list(/mob/living/carbon/human)

code/datums/diseases/cold.dm

@@ -3,8 +3,8 @@
 	max_stages = 3
 	spread_text = "Airborne"
 	spread_flags = AIRBORNE
-	cure_text = "Rest & Spaceacillin"
-	cures = list("spaceacillin", "chicken_soup")
+	cure_text = "Rest & " + REAGENT_SPACEACILLIN
+	cures = list(REAGENT_ID_SPACEACILLIN, REAGENT_ID_CHICKENSOUP)
 	needs_all_cures = FALSE
 	agent = "XY-rhinovirus"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)

code/datums/diseases/cold9.dm

@@ -4,8 +4,8 @@
 	max_stages = 3
 	spread_text = "On contact"
 	spread_flags = CONTACT_GENERAL
-	cure_text = "Spaceacillin"
-	cures = list("spaceacillin")
+	cure_text = REAGENT_SPACEACILLIN
+	cures = list(REAGENT_ID_SPACEACILLIN)
 	agent = "ICE9-rhinovirus"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	desc = "If left untreated the subject will slow, as if partly frozen."

code/datums/diseases/fake_gbs.dm

@@ -3,8 +3,8 @@
 	max_stages = 5
 	spread_text = "On contact"
 	spread_flags = CONTACT_GENERAL
-	cure_text = "Adranol & Sulfur"
-	cures = list("adranol", "sulfur")
+	cure_text = REAGENT_ADRANOL + " & " + REAGENT_SULFUR
+	cures = list(REAGENT_ID_ADRANOL, REAGENT_ID_SULFUR)
 	agent = "Gravitokinetic Bipotential SADS-"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
 	desc = "if left untreated death will occur."

code/datums/diseases/flu.dm

@@ -2,8 +2,8 @@
 	name = "The Flu"
 	max_stages = 3
 	spread_text = "Airborne"
-	cure_text = "Spaceacillin"
-	cures = list("spaceacillin", "chicken_soup")
+	cure_text = REAGENT_SPACEACILLIN
+	cures = list(REAGENT_ID_SPACEACILLIN, REAGENT_ID_CHICKENSOUP)
 	needs_all_cures = FALSE
 	cure_chance = 10
 	agent = "H13N1 flu virion"

code/datums/diseases/food_poisoning.dm

@@ -5,8 +5,8 @@
 	spread_text = "Non-Contagious"
 	spread_flags = NON_CONTAGIOUS
 	cure_text = "Sleep"
-	agent = "Salmonella"
-	cures = list("chicken_soup")
+	agent = REAGENT_SALMONELLA
+	cures = list(REAGENT_ID_CHICKENSOUP)
 	cure_chance = 10
 	viable_mobtypes = list(/mob/living/carbon/human)
 	desc = "Nausea, sickness, and vomitting."

code/datums/diseases/gbs.dm

@@ -3,8 +3,8 @@
 	max_stages = 5
 	spread_text = "On contact"
 	spread_flags = CONTACT_GENERAL
-	cure_text = "Adranol & Sulfur"
-	cures = list("adranol", "sulfur")
+	cure_text = REAGENT_ADRANOL + " & " + REAGENT_SULFUR
+	cures = list(REAGENT_ID_ADRANOL, REAGENT_ID_SULFUR)
 	cure_chance = 15
 	agent = "Gravitokinetic Bipotential SADS+"
 	viable_mobtypes = list(/mob/living/carbon/human)
@@ -42,8 +42,8 @@
 	stage_prob = 5
 	spread_text = "Non-contagious"
 	spread_flags = NON_CONTAGIOUS
-	cure_text = "Cryoxadone"
-	cures = list("cryoxadone")
+	cure_text = REAGENT_CRYOXADONE
+	cures = list(REAGENT_ID_CRYOXADONE)
 	cure_chance = 10
 	agent = "gibbis"
 	disease_flags = CURABLE

code/datums/diseases/lycancoughy.dm

@@ -4,8 +4,8 @@
 	max_stages = 4
 	spread_text = "On contact"
 	spread_flags = CONTACT_GENERAL
-	cure_text = "Ethanol"
-	cures = list("ethanol")
+	cure_text = REAGENT_ETHANOL
+	cures = list(REAGENT_ID_ETHANOL)
 	agent = "Excess Snuggles"
 	viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/human/monkey)
 	desc = "If left untreated subject will regurgitate... puppies."

code/datums/diseases/magnitis.dm

@@ -2,8 +2,8 @@
 	name = "Magnitis"
 	max_stages = 4
 	spread_text = "Airbone"
-	cure_text = "Iron"
-	cures = list("iron")
+	cure_text = REAGENT_IRON
+	cures = list(REAGENT_ID_IRON)
 	agent = "Fukkos Miracos"
 	viable_mobtypes = list(/mob/living/carbon/human)
 	permeability_mod = 0.75

code/datums/diseases/roanoake.dm

@@ -4,9 +4,9 @@
 	stage_prob = 2
 	spread_text = "Blood and close contact"
 	spread_flags = BLOOD
-	cure_text = "Spaceacillin"
+	cure_text = REAGENT_SPACEACILLIN
 	agent = "Chimera cells"
-	cures = list("spaceacillin")
+	cures = list(REAGENT_ID_SPACEACILLIN)
 	cure_chance = 10
 	viable_mobtypes = list(/mob/living/carbon/human)
 	desc = "If left untreated, subject will become a xenochimera upon perishing."

code/defines/gases.dm

@@ -1,26 +1,26 @@
 /decl/xgm_gas/oxygen
-	id = "oxygen"
-	name = "Oxygen"
+	id = GAS_O2
+	name = REAGENT_OXYGEN
 	specific_heat = 20	// J/(mol*K)
 	molar_mass = 0.032	// kg/mol
 
 	flags = XGM_GAS_OXIDIZER
 
 /decl/xgm_gas/nitrogen
-	id = "nitrogen"
-	name = "Nitrogen"
+	id = GAS_N2
+	name = REAGENT_NITROGEN
 	specific_heat = 20	// J/(mol*K)
 	molar_mass = 0.028	// kg/mol
 
 /decl/xgm_gas/carbon_dioxide
-	id = "carbon_dioxide"
-	name = "Carbon Dioxide"
+	id = GAS_CO2
+	name = REAGENT_CARBON_DIOXIDE
 	specific_heat = 30	// J/(mol*K)
 	molar_mass = 0.044	// kg/mol
 
 /decl/xgm_gas/phoron
-	id = "phoron"
-	name = "Phoron"
+	id = GAS_PHORON
+	name = REAGENT_ID_PHORON
 
 	//Note that this has a significant impact on TTV yield.
 	//Because it is so high, any leftover phoron soaks up a lot of heat and drops the yield pressure.
@@ -36,19 +36,19 @@
 	flags = XGM_GAS_FUEL | XGM_GAS_CONTAMINANT | XGM_GAS_FUSION_FUEL //R-UST port, adding XGM_GAS_FUSION_FUEL flag.
 
 /decl/xgm_gas/volatile_fuel
-	id = "volatile_fuel"
-	name = "Volatile Fuel"
+	id = GAS_VOLATILE_FUEL
+	name = REAGENT_VOLATILE_FUEL
 	specific_heat = 253	// J/(mol*K)	C8H18 gasoline. Isobaric, but good enough.
 	molar_mass = 0.114	// kg/mol. 		same.
 
 	flags = XGM_GAS_FUEL
 
 /decl/xgm_gas/nitrous_oxide
-	id = "nitrous_oxide"
-	name = "Nitrous Oxide"
+	id = GAS_N2O
+	name = REAGENT_NITROUS_OXIDE
 	specific_heat = 40	// J/(mol*K)
 	molar_mass = 0.044	// kg/mol. N2O
 
 	tile_overlay = "nitrous_oxide"
 	overlay_limit = 1
-	flags = XGM_GAS_OXIDIZER
+	flags = XGM_GAS_OXIDIZER

code/game/gamemodes/changeling/powers/cryo_sting.dm

@@ -22,7 +22,7 @@
 		inject_amount = inject_amount * 1.5
 		to_chat(src, span_notice("We inject extra chemicals."))
 	if(T.reagents)
-		T.reagents.add_reagent("cryotoxin", inject_amount)
+		T.reagents.add_reagent(REAGENT_ID_CRYOTOXIN, inject_amount)
 	feedback_add_details("changeling_powers","CS")
 	remove_verb(src, /mob/proc/changeling_cryo_sting)
 	spawn(3 MINUTES)

code/game/gamemodes/changeling/powers/death_sting.dm

@@ -18,6 +18,6 @@
 	T.silent = 10
 	T.Paralyse(10)
 	T.make_jittery(100)
-	if(T.reagents)	T.reagents.add_reagent("lexorin", 40)
+	if(T.reagents)	T.reagents.add_reagent(REAGENT_ID_LEXORIN, 40)
 	feedback_add_details("changeling_powers","DTHS")
 	return 1

code/game/gamemodes/changeling/powers/epinephrine_overdose.dm

@@ -35,7 +35,7 @@
 	C.SetWeakened(0)
 	C.lying = 0
 	C.update_canmove()
-//	C.reagents.add_reagent("toxin", 10)
+//	C.reagents.add_reagent(REAGENT_ID_TOXIN, 10)
 	C.reagents.add_reagent("epinephrine", 20)
 
 	if(src.mind.changeling.recursive_enhancement)

code/game/gamemodes/cult/cultify/obj.dm

@@ -131,8 +131,8 @@
 	// Make it a wood-reinforced wooden table.
 	// There are cult materials available, but it'd make the table non-deconstructable with how holotables work.
 	// Could possibly use a new material var for holographic-ness?
-	material = get_material_by_name("wood")
-	reinforced = get_material_by_name("wood")
+	material = get_material_by_name(MAT_WOOD)
+	reinforced = get_material_by_name(MAT_WOOD)
 	update_desc()
 	update_connections(1)
 	update_icon()

code/game/gamemodes/newobjective.dm

@@ -1143,30 +1143,30 @@ datum
 				var/target_name
 				New(var/text,var/joba)
 					..()
-					var/list/items = list("Sulphuric acid", "Polytrinic acid", "Space Lube", "Unstable mutagen",\
-					 "Leporazine", "Cryptobiolin", "Lexorin ",\
-					  "Kelotane", "Dexalin", "Tricordrazine")
+					var/list/items = list(REAGENT_SACID, REAGENT_PACID, REAGENT_LUBE, REAGENT_MUTAGEN,\
+					 REAGENT_LEPORAZINE, REAGENT_CRYPTOBIOLIN, REAGENT_LEXORIN,\
+					  REAGENT_KELOTANE, REAGENT_DEXALIN, REAGENT_TRICORDRAZINE)
 					target_name = pick(items)
 					switch(target_name)
-						if("Sulphuric acid")
+						if(REAGENT_SACID)
 							steal_target = /datum/reagent/acid
-						if("Polytrinic acid")
+						if(REAGENT_PACID)
 							steal_target = /datum/reagent/pacid
-						if("Space Lube")
+						if(REAGENT_LUBE)
 							steal_target = /datum/reagent/lube
-						if("Unstable mutagen")
+						if(REAGENT_MUTAGEN)
 							steal_target = /datum/reagent/mutagen
-						if("Leporazine")
+						if(REAGENT_LEPORAZINE)
 							steal_target = /datum/reagent/leporazine
-						if("Cryptobiolin")
+						if(REAGENT_CRYPTOBIOLIN)
 							steal_target =/datum/reagent/cryptobiolin
-						if("Lexorin")
+						if(REAGENT_LEXORIN)
 							steal_target = /datum/reagent/lexorin
-						if("Kelotane")
+						if(REAGENT_KELOTANE)
 							steal_target = /datum/reagent/kelotane
-						if("Dexalin")
+						if(REAGENT_DEXALIN)
 							steal_target = /datum/reagent/dexalin
-						if("Tricordrazine")
+						if(REAGENT_TRICORDRAZINE)
 							steal_target = /datum/reagent/tricordrazine
 
 					explanation_text = "Steal a container filled with [target_name]."

code/game/gamemodes/objective.dm

@@ -501,7 +501,7 @@ var/global/list/all_objectives = list()
 
 			for(var/obj/item/I in all_items) //Check for phoron tanks
 				if(istype(I, steal_target))
-					found_amount += (target_name=="28 moles of phoron (full tank)" ? (I:air_contents:gas["phoron"]) : (I:amount))
+					found_amount += (target_name=="28 moles of phoron (full tank)" ? (I:air_contents:gas[GAS_PHORON]) : (I:amount))
 			return found_amount>=target_amount
 
 		if("50 coins (in bag)")

code/game/gamemodes/technomancer/spells/condensation.dm

@@ -27,7 +27,7 @@
 					if(desired_turf) // This shouldn't fail but...
 						var/obj/effect/effect/water/W = new /obj/effect/effect/water(get_turf(T))
 						W.create_reagents(60)
-						W.reagents.add_reagent(id = "water", amount = 60, data = null, safety = 0)
+						W.reagents.add_reagent(id = REAGENT_ID_WATER, amount = 60, data = null, safety = 0)
 						W.set_color()
 						W.set_up(desired_turf)
 						flick(initial(icon_state),W) // Otherwise pooling causes the animation to stay stuck at the end.
@@ -40,5 +40,5 @@
 			else
 				add_attack_logs(user,hit_atom,"Wetted the floor with [src] at [T.x],[T.y],[T.z]")
 		else if(hit_atom.reagents && !ismob(hit_atom))		//TODO: Something for the scepter
-			hit_atom.reagents.add_reagent(id = "water", amount = 60, data = null, safety = 0)
-		adjust_instability(5)
+			hit_atom.reagents.add_reagent(id = REAGENT_ID_WATER, amount = 60, data = null, safety = 0)
+		adjust_instability(5)

code/game/gamemodes/technomancer/spells/oxygenate.dm

@@ -27,7 +27,7 @@
 	else if(isturf(hit_atom))
 		var/turf/T = hit_atom
 		if(pay_energy(1500))
-			T.assume_gas("oxygen", 200)
-			T.assume_gas("nitrogen", 800)
+			T.assume_gas(GAS_O2, 200)
+			T.assume_gas(GAS_N2, 800)
 			playsound(src, 'sound/effects/spray.ogg', 50, 1, -3)
-			adjust_instability(10)
+			adjust_instability(10)

code/game/machinery/Sleeper.dm

@@ -94,7 +94,7 @@
 	circuit = /obj/item/circuitboard/sleeper
 	var/mob/living/carbon/human/occupant = null
 	var/list/available_chemicals = list()
-	var/list/base_chemicals = list("inaprovaline" = "Inaprovaline", "paracetamol" = "Paracetamol", "anti_toxin" = "Dylovene", "dexalin" = "Dexalin")
+	var/list/base_chemicals = list(REAGENT_ID_INAPROVALINE = REAGENT_INAPROVALINE, REAGENT_ID_PARACETAMOL = REAGENT_PARACETAMOL, REAGENT_ID_ANTITOXIN = REAGENT_ANTITOXIN, REAGENT_ID_DEXALIN = REAGENT_DEXALIN)
 	var/amounts = list(5, 10)
 	var/obj/item/reagent_containers/glass/beaker = null
 	var/filtering = 0
@@ -149,18 +149,18 @@
 
 		if(man_rating >= 4) // Alien tech.
 			var/reag_ID = pickweight(list(
-				"healing_nanites" = 10,
-				"shredding_nanites" = 5,
-				"irradiated_nanites" = 5,
-				"neurophage_nanites" = 2)
+				REAGENT_ID_HEALINGNANITES = 10,
+				REAGENT_ID_SHREDDINGNANITES = 5,
+				REAGENT_ID_IRRADIATEDNANITES = 5,
+				REAGENT_ID_NEUROPHAGENANITES = 2)
 				)
 			new_chemicals[reag_ID] = "Nanite"
 		if(man_rating >= 3) // Anomalous tech.
-			new_chemicals["immunosuprizine"] = "Immunosuprizine"
+			new_chemicals[REAGENT_ID_IMMUNOSUPRIZINE] = REAGENT_IMMUNOSUPRIZINE
 		if(man_rating >= 2) // Tier 3.
-			new_chemicals["spaceacillin"] = "Spaceacillin"
+			new_chemicals[REAGENT_ID_SPACEACILLIN] = REAGENT_SPACEACILLIN
 		if(man_rating >= 1) // Tier 2.
-			new_chemicals["leporazine"] = "Leporazine"
+			new_chemicals[REAGENT_ID_LEPORAZINE] = REAGENT_LEPORAZINE
 
 		if(new_chemicals.len)
 			available_chemicals += new_chemicals
@@ -234,7 +234,7 @@
 		if(ishuman(occupant) && !(NO_BLOOD in occupant.species.flags) && occupant.vessel)
 			occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
 			occupantData["hasBlood"] = 1
-			var/blood_volume = round(occupant.vessel.get_reagent_amount("blood"))
+			var/blood_volume = round(occupant.vessel.get_reagent_amount(REAGENT_ID_BLOOD))
 			occupantData["bloodLevel"] = blood_volume
 			occupantData["bloodMax"] = occupant.species.blood_volume
 			occupantData["bloodPercent"] = round(100*(blood_volume/occupant.species.blood_volume), 0.01) //copy pasta ends here

code/game/machinery/adv_med.dm

@@ -213,7 +213,7 @@
 
 		var/bloodData[0]
 		if(H.vessel)
-			var/blood_volume = round(H.vessel.get_reagent_amount("blood"))
+			var/blood_volume = round(H.vessel.get_reagent_amount(REAGENT_ID_BLOOD))
 			var/blood_max = H.species.blood_volume
 			bloodData["volume"] = blood_volume
 			bloodData["percent"] = round(((blood_volume / blood_max)*100))
@@ -416,7 +416,7 @@
 			dat += "Large growth detected in frontal lobe, possibly cancerous. Surgical removal is recommended.<br>"
 
 		if(occupant.vessel)
-			var/blood_volume = round(occupant.vessel.get_reagent_amount("blood"))
+			var/blood_volume = round(occupant.vessel.get_reagent_amount(REAGENT_ID_BLOOD))
 			var/blood_max = occupant.species.blood_volume
 			var/blood_percent =  blood_volume / blood_max
 			blood_percent *= 100

code/game/machinery/air_alarm.dm

@@ -76,7 +76,7 @@
 	/// red warning minimum value, yellow warning minimum value, yellow warning maximum value, red warning maximum value
 	/// Use code\defines\gases.dm as reference for id/name. Please keep it consistent
 	var/list/TLV = list()
-	var/list/trace_gas = list("nitrous_oxide", "volatile_fuel") //list of other gases that this air alarm is able to detect
+	var/list/trace_gas = list(GAS_N2O, GAS_VOLATILE_FUEL) //list of other gases that this air alarm is able to detect
 
 	var/danger_level = 0
 	var/pressure_dangerlevel = 0
@@ -111,9 +111,9 @@
 /obj/machinery/alarm/server/Initialize(mapload)
 	. = ..()
 	req_access = list(access_rd, access_atmospherics, access_engine_equip)
-	TLV["oxygen"] =			list(-1.0, -1.0,-1.0,-1.0) // Partial pressure, kpa
-	TLV["carbon_dioxide"] = list(-1.0, -1.0,   5,  10) // Partial pressure, kpa
-	TLV["phoron"] =			list(-1.0, -1.0, 0, 0.5) // Partial pressure, kpa
+	TLV[GAS_O2] =			list(-1.0, -1.0,-1.0,-1.0) // Partial pressure, kpa
+	TLV[GAS_CO2] = list(-1.0, -1.0,   5,  10) // Partial pressure, kpa
+	TLV[GAS_PHORON] =			list(-1.0, -1.0, 0, 0.5) // Partial pressure, kpa
 	TLV["other"] =			list(-1.0, -1.0, 0.5, 1.0) // Partial pressure, kpa
 	TLV["pressure"] =		list(0,ONE_ATMOSPHERE*0.10,ONE_ATMOSPHERE*1.40,ONE_ATMOSPHERE*1.60) /* kpa */
 	TLV["temperature"] =	list(20, 40, 140, 160) // K
@@ -149,10 +149,10 @@
 		wires = new(src)
 
 	// breathable air according to human/Life()
-	TLV["oxygen"] =			list(16, 19, 135, 140) // Partial pressure, kpa
-	TLV["nitrogen"] =		list(0, 0, 135, 140) // Partial pressure, kpa
-	TLV["carbon_dioxide"] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa
-	TLV["phoron"] =			list(-1.0, -1.0, 0, 0.5) // Partial pressure, kpa
+	TLV[GAS_O2] =			list(16, 19, 135, 140) // Partial pressure, kpa
+	TLV[GAS_N2] =		list(0, 0, 135, 140) // Partial pressure, kpa
+	TLV[GAS_CO2] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa
+	TLV[GAS_PHORON] =			list(-1.0, -1.0, 0, 0.5) // Partial pressure, kpa
 	TLV["other"] =			list(-1.0, -1.0, 0.5, 1.0) // Partial pressure, kpa
 	TLV["pressure"] =		list(ONE_ATMOSPHERE * 0.80, ONE_ATMOSPHERE * 0.90, ONE_ATMOSPHERE * 1.10, ONE_ATMOSPHERE * 1.20) /* kpa */
 	TLV["temperature"] =	list(T0C - 26, T0C, T0C + 40, T0C + 66) // K
@@ -284,11 +284,11 @@
 	DECLARE_TLV_VALUES
 	LOAD_TLV_VALUES(TLV["pressure"], environment_pressure)
 	pressure_dangerlevel = TEST_TLV_VALUES // not local because it's used in process()
-	LOAD_TLV_VALUES(TLV["oxygen"], environment.gas["oxygen"]*partial_pressure)
+	LOAD_TLV_VALUES(TLV[GAS_O2], environment.gas[GAS_O2]*partial_pressure)
 	var/oxygen_dangerlevel = TEST_TLV_VALUES
-	LOAD_TLV_VALUES(TLV["carbon_dioxide"], environment.gas["carbon_dioxide"]*partial_pressure)
+	LOAD_TLV_VALUES(TLV[GAS_CO2], environment.gas[GAS_CO2]*partial_pressure)
 	var/co2_dangerlevel = TEST_TLV_VALUES
-	LOAD_TLV_VALUES(TLV["phoron"], environment.gas["phoron"]*partial_pressure)
+	LOAD_TLV_VALUES(TLV[GAS_PHORON], environment.gas[GAS_PHORON]*partial_pressure)
 	var/phoron_dangerlevel = TEST_TLV_VALUES
 	LOAD_TLV_VALUES(TLV["temperature"], environment.temperature)
 	var/temperature_dangerlevel = TEST_TLV_VALUES
@@ -654,7 +654,7 @@
 		var/list/selected
 		var/list/thresholds = list()
 
-		var/list/gas_names = list("oxygen", "carbon_dioxide", "phoron", "other")	//Gas ids made to match code\defines\gases.dm
+		var/list/gas_names = list(GAS_O2, GAS_CO2, GAS_PHORON, "other")	//Gas ids made to match code\defines\gases.dm
 		for(var/g in gas_names)
 			thresholds[++thresholds.len] = list("name" = g, "settings" = list())
 			selected = TLV[g]

code/game/machinery/airconditioner_vr.dm

@@ -148,7 +148,7 @@
 			env.merge(removed)
 	var/turf/T = get_turf(src)
 	new /obj/effect/decal/cleanable/liquid_fuel(T, 5)
-	T.assume_gas("volatile_fuel", 5, T20C)
+	T.assume_gas(GAS_VOLATILE_FUEL, 5, T20C)
 	T.hotspot_expose(700,400)
 	var/datum/effect/effect/system/spark_spread/s = new
 	s.set_up(5, 0, T)

code/game/machinery/atmo_control.dm

@@ -44,18 +44,18 @@
 			var/total_moles = air_sample.total_moles
 			if(total_moles > 0)
 				if(output&4)
-					signal.data["oxygen"] = round(100*air_sample.gas["oxygen"]/total_moles,0.1)
+					signal.data[GAS_O2] = round(100*air_sample.gas[GAS_O2]/total_moles,0.1)
 				if(output&8)
-					signal.data["phoron"] = round(100*air_sample.gas["phoron"]/total_moles,0.1)
+					signal.data[GAS_PHORON] = round(100*air_sample.gas[GAS_PHORON]/total_moles,0.1)
 				if(output&16)
-					signal.data["nitrogen"] = round(100*air_sample.gas["nitrogen"]/total_moles,0.1)
+					signal.data[GAS_N2] = round(100*air_sample.gas[GAS_N2]/total_moles,0.1)
 				if(output&32)
-					signal.data["carbon_dioxide"] = round(100*air_sample.gas["carbon_dioxide"]/total_moles,0.1)
+					signal.data[GAS_CO2] = round(100*air_sample.gas[GAS_CO2]/total_moles,0.1)
 			else
-				signal.data["oxygen"] = 0
-				signal.data["phoron"] = 0
-				signal.data["nitrogen"] = 0
-				signal.data["carbon_dioxide"] = 0
+				signal.data[GAS_O2] = 0
+				signal.data[GAS_PHORON] = 0
+				signal.data[GAS_N2] = 0
+				signal.data[GAS_CO2] = 0
 		signal.data["sigtype"]="status"
 		radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA)
 
@@ -399,7 +399,7 @@
 /obj/machinery/computer/general_air_control/fuel_injection/tgui_act(action, params)
 	if(..())
 		return TRUE
-	
+
 	switch(action)
 		if("refresh_status")
 			device_info = null
@@ -452,4 +452,4 @@
 			)
 
 			radio_connection.post_signal(src, signal, radio_filter = RADIO_ATMOSIA)
-			. = TRUE
+			. = TRUE

code/game/machinery/atmoalter/canister.dm

@@ -392,21 +392,21 @@ update_flag
 /obj/machinery/portable_atmospherics/canister/phoron/Initialize() //ChompEDIT New --> Initialize
 	..()
 
-	src.air_contents.adjust_gas("phoron", MolesForPressure())
+	src.air_contents.adjust_gas(GAS_PHORON, MolesForPressure())
 	src.update_icon()
 	return 1
 
 /obj/machinery/portable_atmospherics/canister/oxygen/Initialize() //ChompEDIT New --> Initialize
 	..()
 
-	src.air_contents.adjust_gas("oxygen", MolesForPressure())
+	src.air_contents.adjust_gas(GAS_O2, MolesForPressure())
 	src.update_icon()
 	return 1
 
 /obj/machinery/portable_atmospherics/canister/oxygen/prechilled/Initialize() //ChompEDIT New --> Initialize
 	..()
 
-	src.air_contents.adjust_gas("oxygen", MolesForPressure())
+	src.air_contents.adjust_gas(GAS_O2, MolesForPressure())
 	src.air_contents.temperature = 80
 	src.update_icon()
 	return 1
@@ -414,14 +414,14 @@ update_flag
 /obj/machinery/portable_atmospherics/canister/nitrous_oxide/Initialize() //ChompEDIT New --> Initialize
 	..()
 
-	air_contents.adjust_gas("nitrous_oxide", MolesForPressure())
+	air_contents.adjust_gas(GAS_N2O, MolesForPressure())
 	src.update_icon()
 	return 1
 
 //Dirty way to fill room with gas. However it is a bit easier to do than creating some floor/engine/n2o -rastaf0
 /obj/machinery/portable_atmospherics/canister/nitrous_oxide/roomfiller/Initialize()
 	. = ..()
-	air_contents.gas["nitrous_oxide"] = 9*4000
+	air_contents.gas[GAS_N2O] = 9*4000
 	var/turf/simulated/location = src.loc
 	if (istype(src.loc))
 		location.assume_air(air_contents)
@@ -432,13 +432,13 @@ update_flag
 
 	..()
 
-	src.air_contents.adjust_gas("nitrogen", MolesForPressure())
+	src.air_contents.adjust_gas(GAS_N2, MolesForPressure())
 	src.update_icon()
 	return 1
 
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide/Initialize() //ChompEDIT New --> Initialize
 	..()
-	src.air_contents.adjust_gas("carbon_dioxide", MolesForPressure())
+	src.air_contents.adjust_gas(GAS_CO2, MolesForPressure())
 	src.update_icon()
 	return 1
 
@@ -446,7 +446,7 @@ update_flag
 /obj/machinery/portable_atmospherics/canister/air/Initialize() //ChompEDIT New --> Initialize
 	..()
 	var/list/air_mix = StandardAirMix()
-	src.air_contents.adjust_multi("oxygen", air_mix["oxygen"], "nitrogen", air_mix["nitrogen"])
+	src.air_contents.adjust_multi(GAS_O2, air_mix[GAS_O2], GAS_N2, air_mix[GAS_N2])
 
 	src.update_icon()
 	return 1
@@ -455,19 +455,19 @@ update_flag
 // Special types used for engine setup admin verb, they contain double amount of that of normal canister.
 /obj/machinery/portable_atmospherics/canister/nitrogen/engine_setup/Initialize() //ChompEDIT New --> Initialize
 	..()
-	src.air_contents.adjust_gas("nitrogen", MolesForPressure())
+	src.air_contents.adjust_gas(GAS_N2, MolesForPressure())
 	src.update_icon()
 	return 1
 
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide/engine_setup/Initialize() //ChompEDIT New --> Initialize
 	..()
-	src.air_contents.adjust_gas("carbon_dioxide", MolesForPressure())
+	src.air_contents.adjust_gas(GAS_CO2, MolesForPressure())
 	src.update_icon()
 	return 1
 
 /obj/machinery/portable_atmospherics/canister/phoron/engine_setup/Initialize() //ChompEDIT New --> Initialize
 	..()
-	src.air_contents.adjust_gas("phoron", MolesForPressure())
+	src.air_contents.adjust_gas(GAS_PHORON, MolesForPressure())
 	src.update_icon()
 	return 1
 

code/game/machinery/atmoalter/portable_atmospherics.dm

@@ -50,8 +50,8 @@
 
 /obj/machinery/portable_atmospherics/proc/StandardAirMix()
 	return list(
-		"oxygen" = O2STANDARD * MolesForPressure(),
-		"nitrogen" = N2STANDARD *  MolesForPressure())
+		GAS_O2 = O2STANDARD * MolesForPressure(),
+		GAS_N2 = N2STANDARD *  MolesForPressure())
 
 /obj/machinery/portable_atmospherics/proc/MolesForPressure(var/target_pressure = start_pressure)
 	return (target_pressure * air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature)

code/game/machinery/atmoalter/pump.dm

@@ -26,7 +26,7 @@
 	cell = new/obj/item/cell/apc(src)
 
 	var/list/air_mix = StandardAirMix()
-	src.air_contents.adjust_multi("oxygen", air_mix["oxygen"], "nitrogen", air_mix["nitrogen"])
+	src.air_contents.adjust_multi(GAS_O2, air_mix[GAS_O2], GAS_N2, air_mix[GAS_N2])
 
 /obj/machinery/portable_atmospherics/powered/pump/update_icon()
 	cut_overlays()
@@ -141,7 +141,7 @@
 	data["default_pressure"] = round(initial(target_pressure))
 	data["min_pressure"] = round(pressuremin)
 	data["max_pressure"] = round(pressuremax)
-	
+
 	data["powerDraw"] = round(last_power_draw)
 	data["cellCharge"] = cell ? cell.charge : 0
 	data["cellMaxCharge"] = cell ? cell.maxcharge : 1
@@ -152,7 +152,7 @@
 		data["holding"]["pressure"] = round(holding.air_contents.return_pressure() > 0 ? holding.air_contents.return_pressure() : 0)
 	else
 		data["holding"] = null
-	
+
 	return data
 
 /obj/machinery/portable_atmospherics/powered/pump/tgui_act(action, params)

code/game/machinery/atmoalter/scrubber.dm

@@ -18,7 +18,7 @@
 	var/minrate = 0
 	var/maxrate = 10 * ONE_ATMOSPHERE
 
-	var/list/scrubbing_gas = list("phoron", "carbon_dioxide", "nitrous_oxide", "volatile_fuel")
+	var/list/scrubbing_gas = list(GAS_PHORON, GAS_CO2, GAS_N2O, GAS_VOLATILE_FUEL)
 
 /obj/machinery/portable_atmospherics/powered/scrubber/New()
 	..()

code/game/machinery/biogenerator.dm

@@ -64,16 +64,16 @@
 
 	item_list = list()
 	item_list["Food Items"] = list(
-		BIOGEN_REAGENT("Milk x10", "milk", 10, 20),
-		BIOGEN_REAGENT("Milk x50", "milk", 50, 95),
-		BIOGEN_REAGENT("Cream x10", "cream", 10, 30),
-		BIOGEN_REAGENT("Cream x50", "cream", 50, 120),
+		BIOGEN_REAGENT("Milk x10", REAGENT_ID_MILK, 10, 20),
+		BIOGEN_REAGENT("Milk x50", REAGENT_ID_MILK, 50, 95),
+		BIOGEN_REAGENT("Cream x10", REAGENT_ID_CREAM, 10, 30),
+		BIOGEN_REAGENT("Cream x50", REAGENT_ID_CREAM, 50, 120),
 		BIOGEN_ITEM("Slab of meat", /obj/item/reagent_containers/food/snacks/meat, 1, 50),
 		BIOGEN_ITEM("Slabs of meat x5", /obj/item/reagent_containers/food/snacks/meat, 5, 250),
 	)
 	item_list["Cooking Ingredients"] = list(
-		BIOGEN_REAGENT("Universal Enzyme x10", "enzyme", 10, 30),
-		BIOGEN_REAGENT("Universal Enzyme x50", "enzyme", 50, 120),
+		BIOGEN_REAGENT("Universal Enzyme x10", REAGENT_ID_ENZYME, 10, 30),
+		BIOGEN_REAGENT("Universal Enzyme x50", REAGENT_ID_ENZYME, 50, 120),
 		BIOGEN_ITEM("Nutri-spread", /obj/item/reagent_containers/food/snacks/spreads, 1, 30),
 		BIOGEN_ITEM("Nutri-spread x5", /obj/item/reagent_containers/food/snacks/spreads, 5, 120),
 	)
@@ -274,9 +274,9 @@
 	var/S = 0
 	for(var/obj/item/reagent_containers/food/snacks/grown/I in contents)
 		S += 5
-		if(I.reagents.get_reagent_amount("nutriment") < 0.1)
+		if(I.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) < 0.1)
 			points += 1
-		else points += I.reagents.get_reagent_amount("nutriment") * 10 * eat_eff
+		else points += I.reagents.get_reagent_amount(REAGENT_ID_NUTRIMENT) * 10 * eat_eff
 		qdel(I)
 	if(S)
 		processing = 1

code/game/machinery/bioprinter.dm

@@ -159,7 +159,7 @@
 	if(!can_print(choice, possible_list[choice][2]))
 		return
 
-	container.reagents.remove_reagent("biomass", possible_list[choice][2])
+	container.reagents.remove_reagent(REAGENT_ID_BIOMASS, possible_list[choice][2])
 
 	update_use_power(USE_POWER_ACTIVE)
 	printing = 1
@@ -205,7 +205,7 @@
 	var/biomass_count = 0
 	if(container && container.reagents)
 		for(var/datum/reagent/R in container.reagents.reagent_list)
-			if(R.id == "biomass")
+			if(R.id == REAGENT_ID_BIOMASS)
 				biomass_count += R.volume
 
 	return biomass_count
@@ -298,7 +298,7 @@
 		var/datum/reagent/blood/injected = locate() in S.reagents.reagent_list //Grab some blood
 		if(injected && injected.data)
 			loaded_dna = injected.data
-			S.reagents.remove_reagent("blood", injected.volume)
+			S.reagents.remove_reagent(REAGENT_ID_BLOOD, injected.volume)
 			to_chat(user, span_info("You scan the blood sample into the bioprinter."))
 		return
 	else if(istype(W,/obj/item/reagent_containers/glass))

code/game/machinery/cloning.dm

@@ -195,8 +195,8 @@
 			occupant.adjustBrainLoss(-(CEILING(0.5*heal_rate, 1)))
 
 			//So clones don't die of oxyloss in a running pod.
-			if(occupant.reagents.get_reagent_amount("inaprovaline") < 30)
-				occupant.reagents.add_reagent("inaprovaline", 60)
+			if(occupant.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE) < 30)
+				occupant.reagents.add_reagent(REAGENT_ID_INAPROVALINE, 60)
 			occupant.Sleeping(30)
 			//Also heal some oxyloss ourselves because inaprovaline is so bad at preventing it!!
 			occupant.adjustOxyLoss(-4)
@@ -350,7 +350,7 @@
 	if(LAZYLEN(containers))
 		for(var/obj/item/reagent_containers/glass/G in containers)
 			for(var/datum/reagent/R in G.reagents.reagent_list)
-				if(R.id == "biomass")
+				if(R.id == REAGENT_ID_BIOMASS)
 					biomass_count += R.volume
 
 	return biomass_count
@@ -362,7 +362,7 @@
 		for(var/obj/item/reagent_containers/glass/G in containers)
 			if(to_remove < amount)	//If we have what we need, we can stop. Checked every time we switch beakers
 				for(var/datum/reagent/R in G.reagents.reagent_list)
-					if(R.id == "biomass")		// Finds Biomass
+					if(R.id == REAGENT_ID_BIOMASS)		// Finds Biomass
 						var/need_remove = max(0, amount - to_remove)	//Figures out how much biomass is in this container
 						if(R.volume >= need_remove)						//If we have more than enough in this beaker, only take what we need
 							R.remove_self(need_remove)

code/game/machinery/computer/Operating.dm

@@ -108,7 +108,7 @@
 		if(ishuman(occupant) && !(NO_BLOOD in occupant.species.flags) && occupant.vessel)
 			occupantData["pulse"] = occupant.get_pulse(GETPULSE_TOOL)
 			occupantData["hasBlood"] = 1
-			var/blood_volume = round(occupant.vessel.get_reagent_amount("blood"))
+			var/blood_volume = round(occupant.vessel.get_reagent_amount(REAGENT_ID_BLOOD))
 			occupantData["bloodLevel"] = blood_volume
 			occupantData["bloodMax"] = occupant.species.blood_volume
 			occupantData["bloodPercent"] = round(100*(blood_volume/occupant.species.blood_volume), 0.01) //copy pasta ends here

code/game/machinery/computer/ai_core.dm

@@ -94,7 +94,7 @@
 					icon_state = "2"
 					new /obj/item/stack/cable_coil(loc, 5)
 
-			if(istype(P, /obj/item/stack/material) && P.get_material_name() == "rglass")
+			if(istype(P, /obj/item/stack/material) && P.get_material_name() == MAT_RGLASS)
 				var/obj/item/stack/RG = P
 				if (RG.get_amount() < 2)
 					to_chat(user, span_warning("You need two sheets of glass to put in the glass panel."))

code/game/machinery/computer/arcade.dm

@@ -161,7 +161,7 @@
 				enemy_hp -= attackamt
 				arcade_action(ui.user)
 
-			if("heal")
+			if(XENO_CHEM_HEAL)
 				blocked = 1
 				var/pointamt = rand(1,3)
 				var/healamt = rand(6,8)

code/game/machinery/computer/buildandrepair.dm

@@ -87,7 +87,7 @@
 				var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc )
 				A.amount = 5
 
-			if(istype(P, /obj/item/stack/material) && P.get_material_name() == "glass")
+			if(istype(P, /obj/item/stack/material) && P.get_material_name() == MAT_GLASS)
 				var/obj/item/stack/G = P
 				if (G.get_amount() < 2)
 					to_chat(user, span_warning("You need two sheets of glass to put in the glass panel."))

code/game/machinery/computer/camera.dm

@@ -94,7 +94,7 @@ GLOBAL_LIST_EMPTY(bodycamera_screens) // CHOMPEdit
 
 	var/static/icon/mask = icon('icons/obj/entertainment_monitor.dmi', "mask")
 
-	add_overlay("glass")
+	add_overlay(MAT_GLASS)
 
 	pinboard = SSvis_overlays.add_vis_overlay(src, icon = icon, iconstate = "pinboard", layer = 0.1, add_appearance_flags = KEEP_TOGETHER, add_vis_flags = VIS_INHERIT_ID|VIS_INHERIT_PLANE, unique = TRUE)
 	pinboard.add_filter("screen cutter", 1, alpha_mask_filter(icon = mask))

code/game/machinery/cryo.dm

@@ -218,7 +218,7 @@
 		if(occupant.bodytemperature < T0C)
 			occupant.Sleeping(max(5, (1/occupant.bodytemperature)*2000))
 			occupant.Paralyse(max(5, (1/occupant.bodytemperature)*3000))
-			if(air_contents.gas["oxygen"] > 2)
+			if(air_contents.gas[GAS_O2] > 2)
 				if(occupant.getOxyLoss()) occupant.adjustOxyLoss(-1)
 			else
 				occupant.adjustOxyLoss(-1)
@@ -232,8 +232,8 @@
 				var/heal_brute = occupant.getBruteLoss() ? min(1, 20/occupant.getBruteLoss()) : 0
 				var/heal_fire = occupant.getFireLoss() ? min(1, 20/occupant.getFireLoss()) : 0
 				occupant.heal_organ_damage(heal_brute,heal_fire)
-		var/has_cryo = occupant.reagents.get_reagent_amount("cryoxadone") >= 1
-		var/has_clonexa = occupant.reagents.get_reagent_amount("clonexadone") >= 1
+		var/has_cryo = occupant.reagents.get_reagent_amount(REAGENT_ID_CRYOXADONE) >= 1
+		var/has_clonexa = occupant.reagents.get_reagent_amount(REAGENT_ID_CLONEXADONE) >= 1
 		var/has_cryo_medicine = has_cryo || has_clonexa
 		if(beaker && !has_cryo_medicine)
 			beaker.reagents.trans_to_mob(occupant, 1, CHEM_BLOOD, 10)

code/game/machinery/doors/airlock.dm

@@ -482,23 +482,23 @@
 /obj/machinery/door/airlock/gold
 	name = "Gold Airlock"
 	icon = 'icons/obj/doors/Doorgold.dmi'
-	mineral = "gold"
+	mineral = MAT_GOLD
 
 /obj/machinery/door/airlock/silver
 	name = "Silver Airlock"
 	icon = 'icons/obj/doors/Doorsilver.dmi'
-	mineral = "silver"
+	mineral = MAT_SILVER
 
 /obj/machinery/door/airlock/diamond
 	name = "Diamond Airlock"
 	icon = 'icons/obj/doors/Doordiamond.dmi'
-	mineral = "diamond"
+	mineral = MAT_DIAMOND
 
 /obj/machinery/door/airlock/uranium
 	name = "Uranium Airlock"
 	desc = "And they said I was crazy."
 	icon = 'icons/obj/doors/Dooruranium.dmi'
-	mineral = "uranium"
+	mineral = MAT_URANIUM
 	var/last_event = 0
 	var/rad_power = 7.5
 
@@ -527,7 +527,7 @@
 	name = "Phoron Airlock"
 	desc = "No way this can end badly."
 	icon = 'icons/obj/doors/Doorphoron.dmi'
-	mineral = "phoron"
+	mineral = MAT_PHORON
 
 /obj/machinery/door/airlock/phoron/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)
@@ -539,7 +539,7 @@
 
 /obj/machinery/door/airlock/phoron/proc/PhoronBurn(temperature)
 	for(var/turf/simulated/floor/target_tile in range(2,loc))
-		target_tile.assume_gas("phoron", 35, 400+T0C)
+		target_tile.assume_gas(GAS_PHORON, 35, 400+T0C)
 		spawn (0) target_tile.hotspot_expose(temperature, 400)
 	for(var/turf/simulated/wall/W in range(3,src))
 		W.burn((temperature/4))//Added so that you can't set off a massive chain reaction with a small flame
@@ -551,7 +551,7 @@
 /obj/machinery/door/airlock/sandstone
 	name = "Sandstone Airlock"
 	icon = 'icons/obj/doors/Doorsand.dmi'
-	mineral = "sandstone"
+	mineral = MAT_SANDSTONE
 
 /obj/machinery/door/airlock/science
 	name = "Research Airlock"

code/game/machinery/doors/blast_door.dm

@@ -42,7 +42,7 @@
 
 /obj/machinery/door/blast/Initialize()
 	. = ..()
-	implicit_material = get_material_by_name("plasteel")
+	implicit_material = get_material_by_name(MAT_PLASTEEL)
 
 /obj/machinery/door/blast/get_material()
 	return implicit_material
@@ -183,7 +183,7 @@
 					take_damage(W.force*0.35) //it's a blast door, it should take a while. -Luke
 				return
 
-	else if(istype(C, /obj/item/stack/material) && C.get_material_name() == "plasteel") // Repairing.
+	else if(istype(C, /obj/item/stack/material) && C.get_material_name() == MAT_PLASTEEL) // Repairing.
 		var/amt = CEILING((maxhealth - health)/150, 1)
 		if(!amt)
 			to_chat(user, span_notice("\The [src] is already fully repaired."))

code/game/machinery/doors/door_vr.dm

@@ -42,7 +42,7 @@
 
 // Returns true only if one of the actions unique to reinforcing is done, otherwise false and continuing normal attackby
 /obj/machinery/door/proc/attackby_vr(obj/item/I as obj, mob/user as mob)
-	if(istype(I, /obj/item/stack/material) && I.get_material_name() == "plasteel")
+	if(istype(I, /obj/item/stack/material) && I.get_material_name() == MAT_PLASTEEL)
 		if(heat_proof)
 			to_chat(user, span_warning("\The [src] is already reinforced."))
 			return TRUE

code/game/machinery/doors/firedoor_assembly.dm

@@ -83,7 +83,7 @@
 				return
 		else
 			to_chat(user, span_notice("You need more welding fuel."))
-	else if(istype(C, /obj/item/stack/material) && C.get_material_name() == "rglass" && !glass)
+	else if(istype(C, /obj/item/stack/material) && C.get_material_name() == MAT_RGLASS && !glass)
 		var/obj/item/stack/S = C
 		if (S.get_amount() >= 1)
 			playsound(src, 'sound/items/Crowbar.ogg', 100, 1)

code/game/machinery/frame.dm

@@ -545,7 +545,7 @@
 				state = FRAME_FASTENED
 				new /obj/item/stack/cable_coil(src.loc, 5)
 
-	else if(istype(P, /obj/item/stack/material) && P.get_material_name() == "glass")
+	else if(istype(P, /obj/item/stack/material) && P.get_material_name() == MAT_GLASS)
 		if(state == FRAME_WIRED)
 			if(frame_type.frame_class == FRAME_CLASS_COMPUTER)
 				var/obj/item/stack/G = P

code/game/machinery/iv_drip.dm

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

code/game/machinery/pandemic.dm

@@ -120,7 +120,7 @@
 				return
 			var/obj/item/reagent_containers/glass/bottle/B = create_culture(name)
 			B.desc = "A small bottle. Contains [D.agent] culture in synthblood medium."
-			B.reagents.add_reagent("blood", 20, list("viruses" = list(D)))
+			B.reagents.add_reagent(REAGENT_ID_BLOOD, 20, list("viruses" = list(D)))
 		if("clone_vaccine")
 			if(wait)
 				atom_say("The replicator is not ready yet.")
@@ -146,8 +146,8 @@
 				atom_say("Unable to synthesize requested antibody.")
 				return
 
-			var/obj/item/reagent_containers/glass/bottle/B = create_culture(vaccine_name, "vaccine", 200)
-			B.reagents.add_reagent("vaccine", 15, list(vaccine_type))
+			var/obj/item/reagent_containers/glass/bottle/B = create_culture(vaccine_name, REAGENT_ID_VACCINE, 200)
+			B.reagents.add_reagent(REAGENT_ID_VACCINE, 15, list(vaccine_type))
 		if("eject_beaker")
 			eject_beaker()
 			update_tgui_static_data(ui.user)

code/game/machinery/partslathe_vr.dm

@@ -62,7 +62,7 @@
 	for(var/obj/item/stock_parts/matter_bin/M in component_parts)
 		mb_rating += M.rating
 	storage_capacity[MAT_STEEL] = mb_rating  * 16000
-	storage_capacity["glass"] = mb_rating  * 8000
+	storage_capacity[MAT_GLASS] = mb_rating  * 8000
 	var/T = 0
 	for(var/obj/item/stock_parts/manipulator/M in component_parts)
 		T += M.rating
@@ -212,7 +212,7 @@
 	switch(material)
 		if(MAT_STEEL)
 			mattype = /obj/item/stack/material/steel
-		if("glass")
+		if(MAT_GLASS)
 			mattype = /obj/item/stack/material/glass
 		else
 			return

code/game/mecha/combat/combat.dm

@@ -69,10 +69,10 @@
 							update |= temp.take_damage(0, rand(force/2, force))
 						if("tox")
 							if(H.reagents)
-								if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2)
-									H.reagents.add_reagent("carpotoxin", force)
-								if(H.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
-									H.reagents.add_reagent("cryptobiolin", force)
+								if(H.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2)
+									H.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force)
+								if(H.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2)
+									H.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force)
 						if("halloss")
 							H.stun_effect_act(1, force / 2, BP_TORSO, src)
 						else
@@ -89,10 +89,10 @@
 						M.take_overall_damage(0, rand(force/2, force))
 					if("tox")
 						if(M.reagents)
-							if(M.reagents.get_reagent_amount("carpotoxin") + force < force*2)
-								M.reagents.add_reagent("carpotoxin", force)
-							if(M.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
-								M.reagents.add_reagent("cryptobiolin", force)
+							if(M.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2)
+								M.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force)
+							if(M.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2)
+								M.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force)
 					else
 						return
 				M.updatehealth()

code/game/mecha/equipment/tools/extinguisher.dm

@@ -15,7 +15,7 @@
 	. = ..()
 	reagents = new/datum/reagents(max_water)
 	reagents.my_atom = src
-	reagents.add_reagent("firefoam", max_water) //VOREStation Edit
+	reagents.add_reagent(REAGENT_ID_FIREFOAM, max_water) //VOREStation Edit
 
 /obj/item/mecha_parts/mecha_equipment/tool/extinguisher/action(atom/target) //copypasted from extinguisher. TODO: Rewrite from scratch.
 	if(!action_checks(target) || get_dist(chassis, target)>3) return

code/game/mecha/equipment/tools/generator.dm

@@ -117,11 +117,11 @@
 		return
 	var/datum/gas_mixture/GM = new
 	if(prob(10))
-		T.assume_gas("phoron", 100, 1500+T0C)
+		T.assume_gas(GAS_PHORON, 100, 1500+T0C)
 		T.visible_message("The [src] suddenly disgorges a cloud of heated phoron.")
 		destroy()
 	else
-		T.assume_gas("phoron", 5, istype(T) ? T.air.temperature : T20C)
+		T.assume_gas(GAS_PHORON, 5, istype(T) ? T.air.temperature : T20C)
 		T.visible_message("The [src] suddenly disgorges a cloud of phoron.")
 	T.assume_air(GM)
 	return

code/game/mecha/equipment/tools/sleeper.dm

@@ -236,8 +236,8 @@
 	M.Paralyse(2)
 	M.Weaken(2)
 	M.Stun(2)
-	if(M.reagents.get_reagent_amount("inaprovaline") < 5)
-		M.reagents.add_reagent("inaprovaline", 5)
+	if(M.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE) < 5)
+		M.reagents.add_reagent(REAGENT_ID_INAPROVALINE, 5)
 	chassis.use_power(energy_drain)
 	update_equip_info()
 	return

code/game/mecha/equipment/tools/syringe_gun.dm

@@ -22,7 +22,7 @@
 	. = ..()
 	flags |= NOREACT
 	syringes = new
-	known_reagents = list("inaprovaline"="Inaprovaline","anti_toxin"="Dylovene")
+	known_reagents = list(REAGENT_ID_INAPROVALINE=REAGENT_INAPROVALINE,REAGENT_ID_ANTITOXIN=REAGENT_ANTITOXIN)
 	processed_reagents = new
 	create_reagents(max_volume)
 

code/game/mecha/mecha.dm

@@ -448,7 +448,7 @@
 	cabin_air = new
 	cabin_air.temperature = T20C
 	cabin_air.volume = 200
-	cabin_air.adjust_multi("oxygen", O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature), "nitrogen", N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature))
+	cabin_air.adjust_multi(GAS_O2, O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature), GAS_N2, N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature))
 	return cabin_air
 
 /obj/mecha/proc/add_radio()

code/game/mecha/mecha_parts.dm

@@ -211,42 +211,42 @@
 	name="Phazon Torso"
 	icon_state = "phazon_harness"
 	//construction_time = 300
-	//construction_cost = list(MAT_STEEL=35000,"glass"=10000,"phoron"=20000)
+	//construction_cost = list(MAT_STEEL=35000,MAT_GLASS=10000,MAT_PHORON=20000)
 	origin_tech = list(TECH_DATA = 5, TECH_MATERIAL = 7, TECH_BLUESPACE = 6, TECH_POWER = 6)
 
 /obj/item/mecha_parts/part/phazon_head
 	name="Phazon Head"
 	icon_state = "phazon_head"
 	//construction_time = 200
-	//construction_cost = list(MAT_STEEL=15000,"glass"=5000,"phoron"=10000)
+	//construction_cost = list(MAT_STEEL=15000,MAT_GLASS=5000,MAT_PHORON=10000)
 	origin_tech = list(TECH_DATA = 4, TECH_MATERIAL = 5, TECH_MAGNET = 6)
 
 /obj/item/mecha_parts/part/phazon_left_arm
 	name="Phazon Left Arm"
 	icon_state = "phazon_l_arm"
 	//construction_time = 200
-	//construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
+	//construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
 	origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2)
 
 /obj/item/mecha_parts/part/phazon_right_arm
 	name="Phazon Right Arm"
 	icon_state = "phazon_r_arm"
 	//construction_time = 200
-	//construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
+	//construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
 	origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 2, TECH_MAGNET = 2)
 
 /obj/item/mecha_parts/part/phazon_left_leg
 	name="Phazon Left Leg"
 	icon_state = "phazon_l_leg"
 	//construction_time = 200
-	//construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
+	//construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
 	origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3)
 
 /obj/item/mecha_parts/part/phazon_right_leg
 	name="Phazon Right Leg"
 	icon_state = "phazon_r_leg"
 	//construction_time = 200
-	//construction_cost = list(MAT_STEEL=20000,"phoron"=10000)
+	//construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
 	origin_tech = list(TECH_MATERIAL = 5, TECH_BLUESPACE = 3, TECH_MAGNET = 3)
 
 ///////// Odysseus

code/game/mecha/micro/micro.dm

@@ -56,10 +56,10 @@
 							update |= temp.take_damage(0, rand(force/2, force))
 						if("tox")
 							if(H.reagents)
-								if(H.reagents.get_reagent_amount("carpotoxin") + force < force*2)
-									H.reagents.add_reagent("carpotoxin", force)
-								if(H.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
-									H.reagents.add_reagent("cryptobiolin", force)
+								if(H.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2)
+									H.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force)
+								if(H.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2)
+									H.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force)
 						else
 							return
 					if(update)	H.UpdateDamageIcon()
@@ -74,10 +74,10 @@
 						M.take_overall_damage(0, rand(force/2, force))
 					if("tox")
 						if(M.reagents)
-							if(M.reagents.get_reagent_amount("carpotoxin") + force < force*2)
-								M.reagents.add_reagent("carpotoxin", force)
-							if(M.reagents.get_reagent_amount("cryptobiolin") + force < force*2)
-								M.reagents.add_reagent("cryptobiolin", force)
+							if(M.reagents.get_reagent_amount(REAGENT_ID_CARPOTOXIN) + force < force*2)
+								M.reagents.add_reagent(REAGENT_ID_CARPOTOXIN, force)
+							if(M.reagents.get_reagent_amount(REAGENT_ID_CRYPTOBIOLIN) + force < force*2)
+								M.reagents.add_reagent(REAGENT_ID_CRYPTOBIOLIN, force)
 					else
 						return
 				M.updatehealth()

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

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

code/game/objects/effects/decals/crayon.dm

@@ -40,4 +40,3 @@
 
 	add_janitor_hud_overlay()
 	return
-// CHOMPEdit End

code/game/objects/effects/mines.dm

@@ -170,7 +170,7 @@
 	triggered = TRUE
 	for (var/turf/simulated/floor/target in range(1,src))
 		if(!target.blocks_air)
-			target.assume_gas("nitrous_oxide", 30)
+			target.assume_gas(GAS_N2O, 30)
 	visible_message("\The [src.name] detonates!")
 	spawn(0)
 		qdel(src)
@@ -184,7 +184,7 @@
 	triggered = TRUE
 	for (var/turf/simulated/floor/target in range(1,src))
 		if(!target.blocks_air)
-			target.assume_gas("phoron", 30)
+			target.assume_gas(GAS_PHORON, 30)
 			target.hotspot_expose(1000, CELL_VOLUME)
 	visible_message("\The [src.name] detonates!")
 	spawn(0)

code/game/objects/effects/spawners/bombspawner.dm

@@ -63,14 +63,14 @@
 	OT.master = V
 
 	PT.valve_welded = 1
-	PT.air_contents.gas["phoron"] = phoron_amt
-	PT.air_contents.gas["carbon_dioxide"] = carbon_amt
+	PT.air_contents.gas[GAS_PHORON] = phoron_amt
+	PT.air_contents.gas[GAS_CO2] = carbon_amt
 	PT.air_contents.total_moles = phoron_amt + carbon_amt
 	PT.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE+1
 	PT.air_contents.update_values()
 
 	OT.valve_welded = 1
-	OT.air_contents.gas["oxygen"] = oxygen_amt
+	OT.air_contents.gas[GAS_O2] = oxygen_amt
 	OT.air_contents.total_moles = oxygen_amt
 	OT.air_contents.temperature = PHORON_MINIMUM_BURN_TEMPERATURE+1
 	OT.air_contents.update_values()

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

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

code/game/objects/items/contraband.dm

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

code/game/objects/items/crayons.dm

@@ -127,7 +127,7 @@
 	if(M == user)
 		to_chat(user, "You take a bite of the crayon and swallow it.")
 		user.nutrition += 1
-		user.reagents.add_reagent("crayon_dust",min(5,uses)/3)
+		user.reagents.add_reagent(REAGENT_ID_CRAYONDUST,min(5,uses)/3)
 		if(uses)
 			uses -= 5
 			if(uses <= 0)
@@ -213,7 +213,7 @@
 	if(M == user)
 		to_chat(user, "You take a bite of the marker and swallow it.")
 		user.nutrition += 1
-		user.reagents.add_reagent("marker_ink",6)
+		user.reagents.add_reagent(REAGENT_ID_MARKERINK,6)
 		if(uses)
 			uses -= 5
 			if(uses <= 0)

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

@@ -27,7 +27,7 @@
 		var/obj/item/stack/nanopaste/np = W
 		if((supply.get_free_space() >= efficiency) && np.use(1))
 			to_chat(user, span_notice("You convert some nanopaste into programmed nanites inside \the [src]."))
-			supply.add_reagent(id = "nifrepairnanites", amount = efficiency)
+			supply.add_reagent(id = REAGENT_ID_NIFREPAIRNANITES, amount = efficiency)
 			update_icon()
 		else if(supply.get_free_space() < efficiency)
 			to_chat(user, span_warning("\The [src] is too full. Empty it into a container first."))

code/game/objects/items/devices/communicator/helper.dm

@@ -6,10 +6,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)
 
 			// Label is what the entry is describing

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

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

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

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

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

@@ -66,7 +66,7 @@
 		. += "It has [uses] lights remaining."
 
 /obj/item/lightreplacer/attackby(obj/item/W, mob/user)
-	if(istype(W, /obj/item/stack/material) && W.get_material_name() == "glass" || istype(W, /obj/item/stack/material/cyborg/glass))
+	if(istype(W, /obj/item/stack/material) && W.get_material_name() == MAT_GLASS || istype(W, /obj/item/stack/material/cyborg/glass))
 		var/obj/item/stack/G = W
 		if(uses >= max_uses)
 			to_chat(user, span_warning("[src.name] is full."))

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

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

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

@@ -260,8 +260,8 @@
 	if (M.getCloneLoss())
 		dat += span_warning("Subject appears to have been imperfectly cloned.")
 		dat += "<br>"
-//	if (M.reagents && M.reagents.get_reagent_amount("inaprovaline"))
-//		user.show_message(span_notice("Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."))
+//	if (M.reagents && M.reagents.get_reagent_amount(REAGENT_ID_INAPROVALINE))
+//		user.show_message(span_notice("Bloodstream Analysis located [M.reagents:get_reagent_amount(REAGENT_ID_INAPROVALINE)] units of rejuvenation chemicals."))
 	if (M.has_brain_worms())
 		dat += span_warning("Subject suffering from aberrant brain activity. Recommend further scanning.")
 		dat += "<br>"
@@ -359,7 +359,7 @@
 
 		// Blood level
 		if(M:vessel)
-			var/blood_volume = H.vessel.get_reagent_amount("blood")
+			var/blood_volume = H.vessel.get_reagent_amount(REAGENT_ID_BLOOD)
 			var/blood_percent =  round((blood_volume / H.species.blood_volume)*100)
 			var/blood_type = H.dna.b_type
 			var/blood_reagent = H.species.blood_reagents

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

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

code/game/objects/items/selectable_item_vr.dm

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

code/game/objects/items/stacks/sandbags.dm

@@ -19,7 +19,7 @@
 
 	pass_color = TRUE
 
-	var/bag_material = "cloth"
+	var/bag_material = MAT_CLOTH
 
 /obj/item/stack/sandbags/cyborg
 	name = "sandbag synthesizer"
@@ -130,7 +130,7 @@ var/global/list/datum/stack_recipe/sandbag_recipes = list( \
 
 	pass_color = TRUE
 
-	var/bag_material = "cloth"
+	var/bag_material = MAT_CLOTH
 
 /obj/item/stack/emptysandbag/Initialize(var/ml, var/amt, var/bag_mat)
 	. = ..(ml, amt)

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

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

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

@@ -104,12 +104,12 @@
 /obj/item/clothing/mask/chewable/tobacco/cheap
 	name = "chewing tobacco"
 	desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it tastes less like an ash-tray when you stuff it into your face."
-	filling = list("nicotine" = 2)
+	filling = list(REAGENT_ID_NICOTINE = 2)
 
 /obj/item/clothing/mask/chewable/tobacco/fine
 	name = "deluxe chewing tobacco"
 	desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face."
-	filling = list("nicotine" = 3)
+	filling = list(REAGENT_ID_NICOTINE = 3)
 
 /obj/item/clothing/mask/chewable/tobacco/nico
 	name = "nicotine gum"
@@ -120,7 +120,7 @@
 
 /obj/item/clothing/mask/chewable/tobacco/nico/Initialize()
 	. = ..()
-	reagents.add_reagent("nicotine", 2)
+	reagents.add_reagent(REAGENT_ID_NICOTINE, 2)
 	color = reagents.get_color()
 
 /obj/item/storage/chewables
@@ -215,7 +215,7 @@
 	slot_flags = SLOT_EARS | SLOT_MASK
 	chem_volume = 50
 	chewtime = 300
-	filling = list("sugar" = 2)
+	filling = list(REAGENT_ID_SUGAR = 2)
 
 /obj/item/clothing/mask/chewable/candy/gum
 	name = "chewing gum"
@@ -226,7 +226,7 @@
 
 /obj/item/clothing/mask/chewable/candy/gum/Initialize()
 	. = ..()
-	reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),10)
+	reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),10)
 	color = reagents.get_color()
 	update_icon()
 
@@ -335,7 +335,7 @@
 
 /obj/item/clothing/mask/chewable/candy/lolli/Initialize()
 	. = ..()
-	reagents.add_reagent(pick("banana","berryjuice","grapejuice","lemonjuice","limejuice","orangejuice","watermelonjuice"),20)
+	reagents.add_reagent(pick(REAGENT_ID_BANANA,REAGENT_ID_BERRYJUICE,REAGENT_ID_GRAPEJUICE,REAGENT_ID_LEMONJUICE,REAGENT_ID_LIMEJUICE,REAGENT_ID_ORANGEJUICE,REAGENT_ID_WATERMELONJUICE),20)
 	color = reagents.get_color()
 	update_icon()
 
@@ -359,7 +359,7 @@
 	desc = "A chocolate-coated biscuit stick."
 	icon_state = "pockystick"
 	item_state = "pocky"
-	filling = list("sugar" = 2, "chocolate" = 5)
+	filling = list(REAGENT_ID_SUGAR = 2, REAGENT_ID_CHOCOLATE = 5)
 	type_butt = null
 
 /obj/item/clothing/mask/chewable/candy/pocky/process()