Cleaned the fuck out of smoke.

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/organs/organ_external.dm

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

@@ -130,7 +130,7 @@
 					breath = loc.remove_air(breath_moles)
 
 					// Handle chem smoke effect  -- Doohl
-					for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
+					for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
 						if(smoke.reagents.total_volume)
 							smoke.reagents.reaction(src, INGEST)
 							spawn(5)

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

@@ -103,7 +103,7 @@
 					breath = loc.remove_air(breath_moles)
 
 					// Handle chem smoke effect  -- Doohl
-					for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
+					for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
 						if(smoke.reagents.total_volume)
 							smoke.reagents.reaction(src, INGEST)
 							spawn(5)

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

@@ -393,7 +393,7 @@
 
 					if(!block)
 
-						for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
+						for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
 							if(smoke.reagents.total_volume)
 								smoke.reagents.reaction(src, INGEST)
 								spawn(5)

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

@@ -134,6 +134,7 @@
 				heal_overall_damage(rads,rads)
 				adjustOxyLoss(-(rads))
 				adjustToxLoss(-(rads))
+				updatehealth()
 				return
 
 			if (radiation > 100)
@@ -147,6 +148,7 @@
 					radiation--
 					if(prob(25))
 						adjustToxLoss(1)
+						updatehealth()
 
 				if(50 to 74)
 					radiation -= 2
@@ -156,6 +158,7 @@
 						Weaken(3)
 						src << "\red You feel weak."
 						emote("collapse")
+					updatehealth()
 
 				if(75 to 100)
 					radiation -= 3
@@ -247,6 +250,22 @@
 					var/breath_moles = environment.total_moles()*BREATH_PERCENTAGE
 					breath = loc.remove_air(breath_moles)
 
+					if(istype(wear_mask, /obj/item/clothing/mask/gas))
+						var/obj/item/clothing/mask/gas/G = wear_mask
+						var/datum/gas_mixture/filtered = new
+
+						filtered.copy_from(breath)
+						filtered.toxins *= G.gas_filter_strength
+						for(var/datum/gas/gas in filtered.trace_gases)
+							gas.moles *= G.gas_filter_strength
+						filtered.update_values()
+						loc.assume_air(filtered)
+
+						breath.toxins *= 1 - G.gas_filter_strength
+						for(var/datum/gas/gas in breath.trace_gases)
+							gas.moles *= 1 - G.gas_filter_strength
+						breath.update_values()
+
 					// Handle chem smoke effect  -- Doohl
 					var/block = 0
 					if(wear_mask)
@@ -254,8 +273,7 @@
 							block = 1
 
 					if(!block)
-
-						for(var/obj/effect/effect/chem_smoke/smoke in view(1, src))
+						for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
 							if(smoke.reagents.total_volume)
 								smoke.reagents.reaction(src, INGEST)
 								spawn(5)
@@ -481,9 +499,12 @@
 		else
 			dizziness = max(0, dizziness - 1)
 
+		updatehealth()
+
 		return //TODO: DEFERRED
 
 	proc/handle_regular_status_updates()
+		updatehealth()
 
 		if(stat == DEAD)	//DEAD. BROWN BREAD. SWIMMING WITH THE SPESS CARP
 			blinded = 1

code/modules/mob/living/simple_animal/bees.dm

@@ -92,7 +92,7 @@
 
 		//smoke, water and steam calms us down
 		var/calming = 0
-		var/list/calmers = list(/obj/effect/effect/chem_smoke, \
+		var/list/calmers = list(/obj/effect/effect/smoke/chem, \
 		/obj/effect/effect/water, \
 		/obj/effect/effect/foam, \
 		/obj/effect/effect/steam, \

code/modules/mob/living/simple_animal/hostile/hivebot.dm

@@ -79,7 +79,7 @@
 
 	New()
 		..()
-		var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
+		var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
 		smoke.set_up(5, 0, src.loc)
 		smoke.start()
 		visible_message("\red <B>The [src] warps in!</B>")