Merge branch 'master' into viro-fix-5

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

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

code/game/objects/effects/mines.dm

@@ -171,7 +171,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)
@@ -185,7 +185,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)