Adds Napalm as a reagent and merges old napalm into Phlog. Fixes some foam stuff.

code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm

@@ -368,6 +368,14 @@
 	required_reagents = list("phosphorus" = 1, "sacid" = 1, "stable_plasma" = 1)
 	result_amount = 3
 
+/datum/chemical_reaction/phlogiston/on_reaction(var/datum/reagents/holder, var/created_volume)
+	if(holder.has_reagent("stabilizing_agent"))
+		return
+	var/turf/simulated/T = get_turf(holder.my_atom)
+	if(istype(T))
+		T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, created_volume)
+	return
+
 /datum/reagent/goonchem/phlogiston/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom
 	M.adjust_fire_stacks(1)
@@ -376,6 +384,31 @@
 	..()
 	return
 
+/datum/reagent/goonchem/napalm
+	name = "Napalm"
+	id = "napalm"
+	description = "Very flammable."
+	reagent_state = LIQUID
+	color = "#FF9999" // rgb: 96, 165, 132
+
+/datum/reagent/goonchem/napalm/on_mob_life(var/mob/living/M as mob)
+	if(!M) M = holder.my_atom
+	M.adjust_fire_stacks(1)
+	..()
+	return
+
+/datum/reagent/goonchem/napalm/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+	if(method == TOUCH && ishuman(M))
+		M.adjust_fire_stacks(7)
+		return
+
+/datum/chemical_reaction/napalm
+	name = "Napalm"
+	id = "napalm"
+	result = null
+	required_reagents = list("aluminium" = 1, "plasma" = 1, "sacid" = 1 )
+	result_amount = 1
+
 datum/reagent/goonchem/cryostylane
 	name = "Cryostylane"
 	id = "cryostylane"

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm

@@ -271,7 +271,8 @@ datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume)
 
 datum/reagent/water/reaction_obj(var/obj/O, var/volume)
 	src = null
-	O.color = initial(O.color)
+	if(!istype(O, /obj/effect))
+		O.color = initial(O.color)
 	if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube))
 		var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
 		if(!cube.wrapped)
@@ -681,7 +682,8 @@ datum/reagent/space_cleaner/reaction_obj(var/obj/O, var/volume)
 	else
 		if(O)
 			O.clean_blood()
-			O.color = initial(O.color)
+			if(!istype(O, /obj/effect))
+				O.color = initial(O.color)
 
 datum/reagent/space_cleaner/reaction_turf(var/turf/T, var/volume)
 	if(volume >= 1)

code/modules/reagents/Chemistry-Recipes.dm

@@ -186,19 +186,6 @@ silicate
 	required_reagents = list("water" = 1, "sodium" = 1, "chlorine" = 1)
 	result_amount = 3
 
-/datum/chemical_reaction/napalm
-	name = "Napalm"
-	id = "napalm"
-	result = null
-	required_reagents = list("aluminium" = 1, "plasma" = 1, "sacid" = 1 )
-	result_amount = 1
-/datum/chemical_reaction/napalm/on_reaction(var/datum/reagents/holder, var/created_volume)
-	var/turf/simulated/T = get_turf(holder.my_atom)
-	if(istype(T))
-		T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, created_volume)
-	holder.del_reagent(id)
-	return
-
 /datum/chemical_reaction/chloralhydrate
 	name = "Chloral Hydrate"
 	id = "chloralhydrate"