Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

code/game/objects/structures/barricades.dm

@@ -13,7 +13,7 @@
 /obj/structure/barricade/New(var/newloc, var/material_name)
 	..(newloc)
 	if(!material_name)
-		material_name = "wood"
+		material_name = MAT_WOOD
 	material = get_material_by_name("[material_name]")
 	if(!material)
 		qdel(src)
@@ -72,7 +72,7 @@
 
 /obj/structure/barricade/attack_generic(var/mob/user, var/damage, var/attack_verb)
 	visible_message(span_danger("[user] [attack_verb] the [src]!"))
-	if(material == get_material_by_name("resin"))
+	if(material == get_material_by_name(MAT_RESIN))
 		playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
 	else if(material == (get_material_by_name(MAT_CLOTH) || get_material_by_name(MAT_SYNCLOTH)))
 		playsound(src, 'sound/items/drop/clothing.ogg', 100, 1)
@@ -118,7 +118,7 @@
 
 /obj/structure/barricade/sandbag/New(var/newloc, var/material_name)
 	if(!material_name)
-		material_name = "cloth"
+		material_name = MAT_CLOTH
 	..(newloc, material_name)
 	material = get_material_by_name("[material_name]")
 	if(!material)

code/game/objects/structures/bonfire.dm

@@ -150,7 +150,7 @@
 
 /obj/structure/bonfire/proc/check_oxygen()
 	var/datum/gas_mixture/G = loc.return_air()
-	if(G.gas["oxygen"] < 1)
+	if(G.gas[GAS_O2] < 1)
 		return FALSE
 	return TRUE
 
@@ -345,7 +345,7 @@
 
 /obj/structure/fireplace/proc/check_oxygen()
 	var/datum/gas_mixture/G = loc.return_air()
-	if(G.gas["oxygen"] < 1)
+	if(G.gas[GAS_O2] < 1)
 		return FALSE
 	return TRUE
 

code/game/objects/structures/crates_lockers/closets/coffin.dm

@@ -149,7 +149,7 @@
 	return PROJECTILE_CONTINUE	// It's a hole in the ground, doesn't usually stop or even care about bullets
 
 /obj/structure/closet/grave/return_air_for_internal_lifeform(var/mob/living/L)
-	var/gasid = "carbon_dioxide"
+	var/gasid = GAS_CO2
 	if(ishuman(L))
 		var/mob/living/carbon/human/H = L
 		if(H.species && H.species.exhale_type)

code/game/objects/structures/door_assembly.dm

@@ -267,7 +267,7 @@
 		var/material_name = S.get_material_name()
 		if (S)
 			if (S.get_amount() >= 1)
-				if(material_name == "rglass")
+				if(material_name == MAT_RGLASS)
 					playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
 					user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.")
 					if(do_after(user, 4 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) && !glass)
@@ -276,7 +276,7 @@
 							glass = 1
 				else if(material_name)
 					// Ugly hack, will suffice for now. Need to fix it upstream as well, may rewrite mineral walls. ~Z
-					if(!(material_name in list("gold", "silver", "diamond", "uranium", "phoron", "sandstone")))
+					if(!(material_name in list(MAT_GOLD, MAT_SILVER, MAT_DIAMOND, MAT_URANIUM, MAT_PHORON, MAT_SANDSTONE)))
 						to_chat(user, "You cannot make an airlock out of that material.")
 						return
 					if(S.get_amount() >= 2)

code/game/objects/structures/droppod.dm

@@ -141,5 +141,5 @@
 /datum/gas_mixture/pod_air/New()
     . = ..()
     gas = list(
-        "oxygen" = 21,
-        "nitrogen" = 79)
+        GAS_O2 = 21,
+        GAS_N2 = 79)

code/game/objects/structures/ghost_pods/event_vr.dm

@@ -105,10 +105,12 @@
 	var/mob/living/simple_mob/newPred = new mobtype(get_turf(src))
 	qdel(newPred.ai_holder)
 	newPred.ai_holder = null
+	newPred.voremob_loaded = TRUE // On-demand belly loading.
+	newPred.init_vore() // On-demand belly loading.
 	//newPred.movement_cooldown = 0			// The "needless artificial speed cap" exists for a reason
 	if(M.mind)
 		M.mind.transfer_to(newPred)
-	to_chat(M, span_notice("You are " + span_bold(newPred) + ", somehow having gotten aboard the station in search of food. \
+	to_chat(M, span_notice("You are " + span_bold("[newPred]") + ", somehow having gotten aboard the station in search of food. \
 	You are wary of environment around you, but you do feel rather peckish. Stick around dark, secluded places to avoid danger or, \
 	if you are cute enough, try to make friends with this place's inhabitants."))
 	to_chat(M, span_critical("Please be advised, this role is NOT AN ANTAGONIST."))
@@ -142,6 +144,8 @@
 		return
 
 	var/mob/living/simple_mob/vore/morph/newMorph = new /mob/living/simple_mob/vore/morph(get_turf(src))
+	newMorph.voremob_loaded = TRUE // On-demand belly loading.
+	newMorph.init_vore() // On-demand belly loading.
 	if(M.mind)
 		M.mind.transfer_to(newMorph)
 	to_chat(M, span_notice("You are a " + span_bold("Morph") + ", somehow having gotten aboard the station in your wandering. \

code/game/objects/structures/girders.dm

@@ -363,7 +363,7 @@
 	max_health = 225
 	health = 225
 	cover = 60
-	girder_material = "resin"
+	girder_material = MAT_RESIN
 
 /obj/structure/girder/rcd_values(mob/living/user, obj/item/rcd/the_rcd, passed_mode)
 	var/turf/simulated/T = get_turf(src)

code/game/objects/structures/gravemarker.dm

@@ -22,7 +22,7 @@
 /obj/structure/gravemarker/New(var/newloc, var/material_name)
 	..(newloc)
 	if(!material_name)
-		material_name = "wood"
+		material_name = MAT_WOOD
 	material = get_material_by_name("[material_name]")
 	if(!material)
 		qdel(src)

code/game/objects/structures/medical_stand_vr.dm

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

code/game/objects/structures/safe.dm

@@ -77,12 +77,12 @@ FLOOR SAFES
 /obj/structure/safe/attack_hand(mob/user as mob)
 	user.set_machine(src)
 	var/dat = "<center>"
-	dat += "<a href='?src=\ref[src];open=1'>[open ? "Close" : "Open"] [src]</a> | <a href='?src=\ref[src];decrement=1'>-</a> [dial * 5] <a href='?src=\ref[src];increment=1'>+</a>"
+	dat += "<a href='byond://?src=\ref[src];open=1'>[open ? "Close" : "Open"] [src]</a> | <a href='byond://?src=\ref[src];decrement=1'>-</a> [dial * 5] <a href='byond://?src=\ref[src];increment=1'>+</a>"
 	if(open)
 		dat += "<table>"
 		for(var/i = contents.len, i>=1, i--)
 			var/obj/item/P = contents[i]
-			dat += "<tr><td><a href='?src=\ref[src];retrieve=\ref[P]'>[P.name]</a></td></tr>"
+			dat += "<tr><td><a href='byond://?src=\ref[src];retrieve=\ref[P]'>[P.name]</a></td></tr>"
 		dat += "</table></center>"
 	user << browse("<html><head><title>[name]</title></head><body>[dat]</body></html>", "window=safe;size=350x300")
 

code/game/objects/structures/simple_doors.dm

@@ -107,7 +107,7 @@
 		if(locked && state == 0)
 			to_chat(M,span_warning("It's locked!"))
 			return
-		if(world.time - user.last_bumped <= 60)
+		if(world.time - last_bumped <= 60)
 			return
 		if(M.client)
 			if(iscarbon(M))
@@ -177,7 +177,7 @@
 	else if(istype(W,/obj/item) && breakable) //not sure, can't not just weapons get passed to this proc?
 		hardness -= W.force/10
 		visible_message(span_danger("[user] hits [src] with [W]!"))
-		if(material == get_material_by_name("resin"))
+		if(material == get_material_by_name(MAT_RESIN))
 			playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
 		else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD) || get_material_by_name(MAT_HARDWOOD)))
 			playsound(src, 'sound/effects/woodcutting.ogg', 100, 1)
@@ -202,7 +202,7 @@
 
 /obj/structure/simple_door/attack_generic(var/mob/user, var/damage, var/attack_verb)
 	visible_message(span_danger("[user] [attack_verb] the [src]!"))
-	if(material == get_material_by_name("resin"))
+	if(material == get_material_by_name(MAT_RESIN))
 		playsound(src, 'sound/effects/attackblob.ogg', 100, 1)
 	else if(material == (get_material_by_name(MAT_WOOD) || get_material_by_name(MAT_SIFWOOD) || get_material_by_name(MAT_HARDWOOD)))
 		playsound(src, 'sound/effects/woodcutting.ogg', 100, 1)
@@ -242,25 +242,25 @@
 	SSradiation.radiate(src, round(material.radioactivity/3))
 
 /obj/structure/simple_door/iron/Initialize(mapload,var/material_name)
-	..(mapload, material_name || "iron")
+	..(mapload, material_name || MAT_IRON)
 
 /obj/structure/simple_door/silver/Initialize(mapload,var/material_name)
-	..(mapload, material_name || "silver")
+	..(mapload, material_name || MAT_SILVER)
 
 /obj/structure/simple_door/gold/Initialize(mapload,var/material_name)
-	..(mapload, material_name || "gold")
+	..(mapload, material_name || MAT_GOLD)
 
 /obj/structure/simple_door/uranium/Initialize(mapload,var/material_name)
-	..(mapload, material_name || "uranium")
+	..(mapload, material_name || MAT_URANIUM)
 
 /obj/structure/simple_door/sandstone/Initialize(mapload,var/material_name)
-	..(mapload, material_name || "sandstone")
+	..(mapload, material_name || MAT_SANDSTONE)
 
 /obj/structure/simple_door/phoron/Initialize(mapload,var/material_name)
-	..(mapload, material_name || "phoron")
+	..(mapload, material_name || MAT_PHORON)
 
 /obj/structure/simple_door/diamond/Initialize(mapload,var/material_name)
-	..(mapload, material_name || "diamond")
+	..(mapload, material_name || MAT_DIAMOND)
 
 /obj/structure/simple_door/wood/Initialize(mapload,var/material_name)
 	..(mapload, material_name || MAT_WOOD)
@@ -273,10 +273,10 @@
 	..(mapload, material_name || MAT_SIFWOOD)
 
 /obj/structure/simple_door/resin/Initialize(mapload,var/material_name)
-	..(mapload, material_name || "resin")
+	..(mapload, material_name || MAT_RESIN)
 
 /obj/structure/simple_door/cult/Initialize(mapload,var/material_name)
-	..(mapload, material_name || "cult")
+	..(mapload, material_name || MAT_CULT)
 
 /obj/structure/simple_door/cult/TryToSwitchState(atom/user)
 	if(isliving(user))

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -104,7 +104,7 @@
 			return
 		var/padding_type //This is awful but it needs to be like this until tiles are given a material var.
 		if(istype(W,/obj/item/stack/tile/carpet))
-			padding_type = "carpet"
+			padding_type = MAT_CARPET
 		else if(istype(W,/obj/item/stack/material))
 			var/obj/item/stack/material/M = W
 			if(M.material && (M.material.flags & MATERIAL_PADDING))
@@ -200,10 +200,10 @@
 	base_icon = "psychbed"
 
 /obj/structure/bed/psych/New(var/newloc)
-	..(newloc,"wood","leather")
+	..(newloc,MAT_WOOD,MAT_LEATHER)
 
 /obj/structure/bed/padded/New(var/newloc)
-	..(newloc,"plastic","cotton")
+	..(newloc,MAT_PLASTIC,MAT_COTTON)
 
 /obj/structure/bed/double
 	name = "double bed"
@@ -211,7 +211,7 @@
 	base_icon = "doublebed"
 
 /obj/structure/bed/double/padded/New(var/newloc)
-	..(newloc,"wood","cotton")
+	..(newloc,MAT_WOOD,MAT_COTTON)
 
 /obj/structure/bed/double/post_buckle_mob(mob/living/M as mob)
 	if(M.buckled == src)

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -131,34 +131,34 @@
 	..(newloc, MAT_STEEL, MAT_LEATHER)
 
 /obj/structure/bed/chair/comfy/red/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "carpet")
+	..(newloc, MAT_STEEL, MAT_CARPET)
 
 /obj/structure/bed/chair/comfy/teal/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "teal")
+	..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
 
 /obj/structure/bed/chair/comfy/black/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "black")
+	..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
 
 /obj/structure/bed/chair/comfy/green/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "green")
+	..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
 
 /obj/structure/bed/chair/comfy/purp/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "purple")
+	..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
 
 /obj/structure/bed/chair/comfy/blue/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "blue")
+	..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
 
 /obj/structure/bed/chair/comfy/beige/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "beige")
+	..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
 
 /obj/structure/bed/chair/comfy/lime/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "lime")
+	..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
 
 /obj/structure/bed/chair/comfy/yellow/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "yellow")
+	..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
 
 /obj/structure/bed/chair/comfy/orange/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "orange")
+	..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
 
 /obj/structure/bed/chair/comfy/rounded
 	name = "rounded chair"
@@ -170,34 +170,34 @@
 	..(newloc, MAT_STEEL, MAT_LEATHER)
 
 /obj/structure/bed/chair/comfy/rounded/red/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "carpet")
+	..(newloc, MAT_STEEL, MAT_CARPET)
 
 /obj/structure/bed/chair/comfy/rounded/teal/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "teal")
+	..(newloc, MAT_STEEL, MAT_CLOTH_TEAL)
 
 /obj/structure/bed/chair/comfy/rounded/black/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "black")
+	..(newloc, MAT_STEEL, MAT_CLOTH_BLACK)
 
 /obj/structure/bed/chair/comfy/rounded/green/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "green")
+	..(newloc, MAT_STEEL, MAT_CLOTH_GREEN)
 
 /obj/structure/bed/chair/comfy/rounded/purple/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "purple")
+	..(newloc, MAT_STEEL, MAT_CLOTH_PURPLE)
 
 /obj/structure/bed/chair/comfy/rounded/blue/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "blue")
+	..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
 
 /obj/structure/bed/chair/comfy/rounded/beige/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "beige")
+	..(newloc, MAT_STEEL, MAT_CLOTH_BEIGE)
 
 /obj/structure/bed/chair/comfy/rounded/lime/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "lime")
+	..(newloc, MAT_STEEL, MAT_CLOTH_LIME)
 
 /obj/structure/bed/chair/comfy/rounded/yellow/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "yellow")
+	..(newloc, MAT_STEEL, MAT_CLOTH_YELLOW)
 
 /obj/structure/bed/chair/comfy/rounded/orange/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "orange")
+	..(newloc, MAT_STEEL, MAT_CLOTH_ORANGE)
 
 /obj/structure/bed/chair/office
 	anchored = FALSE
@@ -278,7 +278,7 @@
 	..()
 
 /obj/structure/bed/chair/wood/New(var/newloc)
-	..(newloc, "wood")
+	..(newloc, MAT_WOOD)
 
 /obj/structure/bed/chair/wood/wings
 	icon_state = "wooden_chair_wings"
@@ -292,7 +292,7 @@
 	base_icon = "sofamiddle"
 	icon_state = "sofamiddle"
 	applies_material_colour = 1
-	var/sofa_material = "carpet"
+	var/sofa_material = MAT_CARPET
 	var/corner_piece = FALSE
 
 /obj/structure/bed/chair/sofa/update_icon()
@@ -300,7 +300,7 @@
 		var/datum/material/color_material = get_material_by_name(sofa_material)
 		color = color_material.icon_colour
 
-		if(sofa_material == "carpet")
+		if(sofa_material == MAT_CARPET)
 			name = "red [initial(name)]"
 		else
 			name = "[sofa_material] [initial(name)]"
@@ -415,37 +415,37 @@
 //color variations
 //Middle sofas first
 /obj/structure/bed/chair/sofa
-	sofa_material = "carpet"
+	sofa_material = MAT_CARPET
 
 /obj/structure/bed/chair/sofa/brown
-	sofa_material = "leather"
+	sofa_material = MAT_LEATHER
 
 /obj/structure/bed/chair/sofa/teal
-	sofa_material = "teal"
+	sofa_material = MAT_CLOTH_TEAL
 
 /obj/structure/bed/chair/sofa/black
-	sofa_material = "black"
+	sofa_material = MAT_CLOTH_BLACK
 
 /obj/structure/bed/chair/sofa/green
-	sofa_material = "green"
+	sofa_material = MAT_CLOTH_GREEN
 
 /obj/structure/bed/chair/sofa/purp
-	sofa_material = "purple"
+	sofa_material = MAT_CLOTH_PURPLE
 
 /obj/structure/bed/chair/sofa/blue
-	sofa_material = "blue"
+	sofa_material = MAT_CLOTH_BLUE
 
 /obj/structure/bed/chair/sofa/beige
-	sofa_material = "beige"
+	sofa_material = MAT_CLOTH_BEIGE
 
 /obj/structure/bed/chair/sofa/lime
-	sofa_material = "lime"
+	sofa_material = MAT_CLOTH_LIME
 
 /obj/structure/bed/chair/sofa/yellow
-	sofa_material = "yellow"
+	sofa_material = MAT_CLOTH_YELLOW
 
 /obj/structure/bed/chair/sofa/orange
-	sofa_material = "orange"
+	sofa_material = MAT_CLOTH_ORANGE
 
 //sofa directions
 
@@ -459,91 +459,91 @@
 	icon_state = "sofacorner"
 
 /obj/structure/bed/chair/sofa/left/brown
-	sofa_material = "leather"
+	sofa_material = MAT_LEATHER
 
 /obj/structure/bed/chair/sofa/right/brown
-	sofa_material = "leather"
+	sofa_material = MAT_LEATHER
 
 /obj/structure/bed/chair/sofa/corner/brown
-	sofa_material = "leather"
+	sofa_material = MAT_LEATHER
 
 /obj/structure/bed/chair/sofa/left/teal
-	sofa_material = "teal"
+	sofa_material = MAT_CLOTH_TEAL
 
 /obj/structure/bed/chair/sofa/right/teal
-	sofa_material = "teal"
+	sofa_material = MAT_CLOTH_TEAL
 
 /obj/structure/bed/chair/sofa/corner/teal
-	sofa_material = "teal"
+	sofa_material = MAT_CLOTH_TEAL
 
 /obj/structure/bed/chair/sofa/left/black
-	sofa_material = "black"
+	sofa_material = MAT_CLOTH_BLACK
 
 /obj/structure/bed/chair/sofa/right/black
-	sofa_material = "black"
+	sofa_material = MAT_CLOTH_BLACK
 
 /obj/structure/bed/chair/sofa/corner/black
-	sofa_material = "black"
+	sofa_material = MAT_CLOTH_BLACK
 
 /obj/structure/bed/chair/sofa/left/green
-	sofa_material = "green"
+	sofa_material = MAT_CLOTH_GREEN
 
 /obj/structure/bed/chair/sofa/right/green
-	sofa_material = "green"
+	sofa_material = MAT_CLOTH_GREEN
 
 /obj/structure/bed/chair/sofa/corner/green
-	sofa_material = "green"
+	sofa_material = MAT_CLOTH_GREEN
 
 /obj/structure/bed/chair/sofa/left/purp
-	sofa_material = "purple"
+	sofa_material = MAT_CLOTH_PURPLE
 
 /obj/structure/bed/chair/sofa/right/purp
-	sofa_material = "purple"
+	sofa_material = MAT_CLOTH_PURPLE
 
 /obj/structure/bed/chair/sofa/corner/purp
-	sofa_material = "purple"
+	sofa_material = MAT_CLOTH_PURPLE
 
 /obj/structure/bed/chair/sofa/left/blue
-	sofa_material = "blue"
+	sofa_material = MAT_CLOTH_BLUE
 
 /obj/structure/bed/chair/sofa/right/blue
-	sofa_material = "blue"
+	sofa_material = MAT_CLOTH_BLUE
 
 /obj/structure/bed/chair/sofa/corner/blue
-	sofa_material = "blue"
+	sofa_material = MAT_CLOTH_BLUE
 
 /obj/structure/bed/chair/sofa/left/beige
-	sofa_material = "beige"
+	sofa_material = MAT_CLOTH_BEIGE
 
 /obj/structure/bed/chair/sofa/right/beige
-	sofa_material = "beige"
+	sofa_material = MAT_CLOTH_BEIGE
 
 /obj/structure/bed/chair/sofa/corner/beige
-	sofa_material = "beige"
+	sofa_material = MAT_CLOTH_BEIGE
 
 /obj/structure/bed/chair/sofa/left/lime
-	sofa_material = "lime"
+	sofa_material = MAT_CLOTH_LIME
 
 /obj/structure/bed/chair/sofa/right/lime
-	sofa_material = "lime"
+	sofa_material = MAT_CLOTH_LIME
 
 /obj/structure/bed/chair/sofa/corner/lime
-	sofa_material = "lime"
+	sofa_material = MAT_CLOTH_LIME
 
 /obj/structure/bed/chair/sofa/left/yellow
-	sofa_material = "yellow"
+	sofa_material = MAT_CLOTH_YELLOW
 
 /obj/structure/bed/chair/sofa/right/yellow
-	sofa_material = "yellow"
+	sofa_material = MAT_CLOTH_YELLOW
 
 /obj/structure/bed/chair/sofa/corner/yellow
-	sofa_material = "yellow"
+	sofa_material = MAT_CLOTH_YELLOW
 
 /obj/structure/bed/chair/sofa/left/orange
-	sofa_material = "orange"
+	sofa_material = MAT_CLOTH_ORANGE
 
 /obj/structure/bed/chair/sofa/right/orange
-	sofa_material = "orange"
+	sofa_material = MAT_CLOTH_ORANGE
 
 /obj/structure/bed/chair/sofa/corner/orange
-	sofa_material = "orange"
+	sofa_material = MAT_CLOTH_ORANGE

code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm

@@ -123,34 +123,34 @@
 	buckle_movable = 1
 
 /obj/structure/bed/chair/bay/chair/padded/red/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "carpet")
+	..(newloc, new_material, MAT_CARPET)
 
 /obj/structure/bed/chair/bay/chair/padded/brown/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "leather")
+	..(newloc, new_material, MAT_LEATHER)
 
 /obj/structure/bed/chair/bay/chair/padded/teal/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "teal")
+	..(newloc, new_material, MAT_CLOTH_TEAL)
 
 /obj/structure/bed/chair/bay/chair/padded/black/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "black")
+	..(newloc, new_material, MAT_CLOTH_BLACK)
 
 /obj/structure/bed/chair/bay/chair/padded/green/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "green")
+	..(newloc, new_material, MAT_CLOTH_GREEN)
 
 /obj/structure/bed/chair/bay/chair/padded/purple/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "purple")
+	..(newloc, new_material, MAT_CLOTH_PURPLE)
 
 /obj/structure/bed/chair/bay/chair/padded/blue/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "blue")
+	..(newloc, new_material, MAT_CLOTH_BLUE)
 
 /obj/structure/bed/chair/bay/chair/padded/beige/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "beige")
+	..(newloc, new_material, MAT_CLOTH_BEIGE)
 
 /obj/structure/bed/chair/bay/chair/padded/lime/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "lime")
+	..(newloc, new_material, MAT_CLOTH_LIME)
 
 /obj/structure/bed/chair/bay/chair/padded/yellow/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "yellow")
+	..(newloc, new_material, MAT_CLOTH_YELLOW)
 
 /obj/structure/bed/chair/bay/comfy
 	name = "comfy mounted chair"
@@ -159,34 +159,34 @@
 	base_icon = "bay_comfychair"
 
 /obj/structure/bed/chair/bay/comfy/red/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "carpet")
+	..(newloc, new_material, MAT_CARPET)
 
 /obj/structure/bed/chair/bay/comfy/brown/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "leather")
+	..(newloc, new_material, MAT_LEATHER)
 
 /obj/structure/bed/chair/bay/comfy/teal/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "teal")
+	..(newloc, new_material, MAT_CLOTH_TEAL)
 
 /obj/structure/bed/chair/bay/comfy/black/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "black")
+	..(newloc, new_material, MAT_CLOTH_BLACK)
 
 /obj/structure/bed/chair/bay/comfy/green/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "green")
+	..(newloc, new_material, MAT_CLOTH_GREEN)
 
 /obj/structure/bed/chair/bay/comfy/purple/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "purple")
+	..(newloc, new_material, MAT_CLOTH_PURPLE)
 
 /obj/structure/bed/chair/bay/comfy/blue/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "blue")
+	..(newloc, new_material, MAT_CLOTH_BLUE)
 
 /obj/structure/bed/chair/bay/comfy/beige/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "beige")
+	..(newloc, new_material, MAT_CLOTH_BEIGE)
 
 /obj/structure/bed/chair/bay/comfy/lime/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "lime")
+	..(newloc, new_material, MAT_CLOTH_LIME)
 
 /obj/structure/bed/chair/bay/comfy/yellow/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, new_material, "yellow")
+	..(newloc, new_material, MAT_CLOTH_YELLOW)
 
 /obj/structure/bed/chair/bay/comfy/captain
 	name = "captain chair"
@@ -202,7 +202,7 @@
 	add_overlay(I)
 
 /obj/structure/bed/chair/bay/comfy/captain/New(var/newloc, var/new_material, var/new_padding_material)
-	..(newloc, MAT_STEEL, "blue")
+	..(newloc, MAT_STEEL, MAT_CLOTH_BLUE)
 
 /obj/structure/bed/chair/bay/shuttle
 	name = "shuttle seat"
@@ -211,7 +211,7 @@
 	icon_state = "shuttle_chair_preview"
 	buckle_movable = 0
 	var/buckling_sound = 'sound/effects/metal_close.ogg'
-	var/padding = "blue"
+	var/padding = MAT_CLOTH_BLUE
 
 /obj/structure/bed/chair/bay/shuttle/New(var/newloc, var/new_material, var/new_padding_material)
 	..(newloc, MAT_STEEL, padding)

code/game/objects/structures/stool_bed_chair_nest/stools.dm

@@ -32,7 +32,7 @@ var/global/list/stool_cache = list() //haha stool
 	update_icon()
 
 /obj/item/stool/padded/New(var/newloc, var/new_material)
-	..(newloc, "steel", "carpet")
+	..(newloc, MAT_STEEL, MAT_CARPET)
 
 /obj/item/stool/update_icon()
 	// Prep icon.
@@ -125,7 +125,7 @@ var/global/list/stool_cache = list() //haha stool
 			return
 		var/padding_type //This is awful but it needs to be like this until tiles are given a material var.
 		if(istype(W,/obj/item/stack/tile/carpet))
-			padding_type = "carpet"
+			padding_type = MAT_CARPET
 		else if(istype(W,/obj/item/stack/material))
 			var/obj/item/stack/material/M = W
 			if(M.material && (M.material.flags & MATERIAL_PADDING))

code/game/objects/structures/stool_bed_chair_nest/stools_vr.dm

@@ -15,4 +15,4 @@
 	icon_state = "bar_stool_padded_preview" //set for the map
 
 /obj/item/stool/baystool/padded/New(var/newloc, var/new_material)
-	..(newloc, "steel", "carpet")
+	..(newloc, MAT_STEEL, MAT_CARPET)

code/game/objects/structures/tank_dispenser.dm

@@ -57,7 +57,7 @@
 /obj/structure/dispenser/tgui_data(mob/user)
 	var/list/data = list()
 	data["oxygen"] = oxygentanks
-	data["plasma"] = phorontanks
+	data["phoron"] = phorontanks
 
 	return data
 
@@ -102,7 +102,7 @@
 	if(..())
 		return
 	switch(action)
-		if("plasma")
+		if("phoron")
 			var/obj/item/tank/phoron/tank = locate() in src
 			if(tank && Adjacent(ui.user))
 				ui.user.put_in_hands(tank)

code/game/objects/structures/transit_tubes.dm

@@ -81,7 +81,7 @@
 /obj/structure/transit_tube_pod/New(loc)
 	..(loc)
 
-	air_contents.adjust_multi("oxygen", MOLES_O2STANDARD * 2, "nitrogen", MOLES_N2STANDARD)
+	air_contents.adjust_multi(GAS_O2, MOLES_O2STANDARD * 2, GAS_N2, MOLES_N2STANDARD)
 	air_contents.temperature = T20C
 
 	// Give auto tubes time to align before trying to start moving

code/game/objects/structures/under_wardrobe.dm

@@ -17,11 +17,11 @@
 	for(var/datum/category_group/underwear/UWC in global_underwear.categories)
 		var/datum/category_item/underwear/UWI = H.all_underwear[UWC.name]
 		var/item_name = UWI ? UWI.name : "None"
-		dat += "[UWC.name]: <a href='?src=\ref[src];change_underwear=[UWC.name]'>[item_name]</a>"
+		dat += "[UWC.name]: <a href='byond://?src=\ref[src];change_underwear=[UWC.name]'>[item_name]</a>"
 		if(UWI)
 			for(var/datum/gear_tweak/gt in UWI.tweaks)
-				dat += " <a href='?src=\ref[src];underwear=[UWC.name];tweak=\ref[gt]'>[gt.get_contents(get_metadata(H, UWC.name, gt))]</a>"
-		dat += " <a href='?src=\ref[src];remove_underwear=[UWC.name]'>(Remove)</a><br>"
+				dat += " <a href='byond://?src=\ref[src];underwear=[UWC.name];tweak=\ref[gt]'>[gt.get_contents(get_metadata(H, UWC.name, gt))]</a>"
+		dat += " <a href='byond://?src=\ref[src];remove_underwear=[UWC.name]'>(Remove)</a><br>"
 
 	dat = jointext(dat,null)
 	H << browse(dat, "window=wardrobe;size=400x200")

code/game/objects/structures/watercloset.dm

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