I accidentally ALL THE THINGS! But yeah, ZAS is updated.

code/modules/admin/admin_verbs.dm

@@ -144,7 +144,7 @@
 			verbs += /client/proc/voting
 			verbs += /client/proc/hide_verbs
 			verbs += /client/proc/general_report
-			verbs += /client/proc/air_report
+			//verbs += /client/proc/air_report
 			verbs += /client/proc/deadmin_self
 			//verbs += /client/proc/cmd_admin_prison 					--Merged with player panel
 			//verbs += /obj/admins/proc/unprison  						--Merged with player panel
@@ -248,7 +248,7 @@
 //			verbs += /client/proc/mapload
 			verbs += /client/proc/check_words
 			verbs += /client/proc/drop_bomb
-			verbs += /client/proc/kill_airgroup
+			//verbs += /client/proc/kill_airgroup
 			//verbs += /client/proc/cmd_admin_drop_everything			--Merged with view variables
 			verbs += /client/proc/make_sound
 			verbs += /client/proc/play_local_sound
@@ -278,7 +278,7 @@
 			verbs += /client/proc/Force_Event_admin
 			verbs += /client/proc/radioalert
 			verbs += /client/proc/CarbonCopy
-			verbs += /client/proc/jump_to_dead_group
+			//verbs += /client/proc/jump_to_dead_group
 		else	return
 
 		//Game Master
@@ -403,7 +403,7 @@
 	verbs -= /client/proc/voting
 	verbs -= /client/proc/hide_verbs
 	verbs -= /client/proc/general_report
-	verbs -= /client/proc/air_report
+	//verbs -= /client/proc/air_report
 	verbs -= /client/proc/cmd_admin_say
 	verbs -= /client/proc/cmd_admin_gib_self
 	verbs -= /client/proc/restartcontroller
@@ -452,13 +452,13 @@
 	//verbs -= /obj/admins/proc/unprison 								--Merged with player panel
 	//verbs -= /client/proc/cmd_switch_radio							--removed because tcommsat is staying
 	verbs -= /client/proc/togglebuildmodeself
-	verbs -= /client/proc/kill_airgroup
+	//verbs -= /client/proc/kill_airgroup
 	verbs -= /client/proc/debug_master_controller
 	verbs -= /client/proc/make_tajaran
 	verbs -= /client/proc/admin_deny_shuttle
 	verbs -= /client/proc/cmd_admin_christmas
 	verbs -= /client/proc/editappear
-	verbs -= /client/proc/jump_to_dead_group
+	//verbs -= /client/proc/jump_to_dead_group
 	verbs -= /client/proc/playernotes
 	verbs -= /obj/admins/proc/show_skills
 	verbs -= /client/proc/enable_debug_verbs

code/modules/admin/verbs/diagnostics.dm

@@ -22,7 +22,7 @@
 		usr << browse(output,"window=generalreport")
 		//feedback_add_details("admin_verb","SGR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-	air_report()
+/*	air_report()
 		set category = "Debug"
 		set name = "Show Air Report"
 
@@ -83,7 +83,7 @@
 		for(var/datum/gas/trace_gas in GM.trace_gases)
 			usr << "[trace_gas.type]: [trace_gas.moles]"
 		//feedback_add_details("admin_verb","DAST") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
+*/
 	fix_next_move()
 		set category = "Debug"
 		set name = "Unfreeze Everyone"
@@ -183,7 +183,7 @@
 		//feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
-	jump_to_dead_group()
+	/*jump_to_dead_group()
 		set name = "Jump to dead group"
 		set category = "Debug"
 		if(!holder)
@@ -221,7 +221,7 @@
 		else
 			usr << "Local airgroup is unsimulated!"
 		//feedback_add_details("admin_verb","KLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
+*/
 
 	tension_report()
 		set category = "Debug"

code/modules/admin/verbs/mapping.dm

@@ -130,14 +130,14 @@ var/intercom_range_display_status = 0
 		src.verbs += /client/proc/camera_view 				//-errorage
 		src.verbs += /client/proc/sec_camera_report 		//-errorage
 		src.verbs += /client/proc/intercom_view 			//-errorage
-		src.verbs += /client/proc/air_status //Air things
+		//src.verbs += /client/proc/air_status //Air things
 		src.verbs += /client/proc/Cell //More air things
 		src.verbs += /client/proc/atmosscan //check plumbing
 		src.verbs += /client/proc/powerdebug //check power
 		src.verbs += /client/proc/count_objects_on_z_level
 		src.verbs += /client/proc/count_objects_all
 		src.verbs += /client/proc/cmd_assume_direct_control	//-errorage
-		src.verbs += /client/proc/jump_to_dead_group
+		//src.verbs += /client/proc/jump_to_dead_group
 		src.verbs += /client/proc/startSinglo
 		src.verbs += /client/proc/ticklag	//allows you to set the ticklag.
 		src.verbs += /client/proc/cmd_admin_grantfullaccess

code/modules/chemical/Chemistry-Recipes.dm

@@ -350,8 +350,6 @@ datum
 			on_reaction(var/datum/reagents/holder, var/created_volume)
 				var/turf/location = get_turf(holder.my_atom.loc)
 				for(var/turf/simulated/floor/target_tile in range(0,location))
-					if(target_tile.parent && target_tile.parent.group_processing)
-						target_tile.parent.suspend_group_processing()
 
 					var/datum/gas_mixture/napalm = new
 

code/modules/clothing/suits/fire.dm

@@ -28,6 +28,18 @@
 	protective_temperature = 10000
 	slowdown = 1.5
 
+/obj/item/clothing/head/helmet/space/fire_helmet
+	name = "Fire Helmet"
+	desc = "A helmet designed to protect against fires in sealed areas, which often create extreme pressures."
+	flags = FPRINT | TABLEPASS | HEADSPACE | HEADCOVERSEYES | BLOCKHAIR
+	see_face = 0.0
+	permeability_coefficient = 0.01
+	heat_transfer_coefficient = 0.01
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
+	icon_state = "hazmat_firered"
+	item_state = "hazhat_firered"
+
 
 
 /obj/item/clothing/head/radiation

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

@@ -183,7 +183,7 @@
 			if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return
 
 			var/datum/gas_mixture/environment = loc.return_air()
-			var/datum/air_group/breath
+			var/datum/gas_mixture/breath
 			// HACK NEED CHANGING LATER
 			if(src.health < 0)
 				src.losebreath++

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

@@ -158,7 +158,7 @@
 			if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return
 
 			var/datum/gas_mixture/environment = loc.return_air()
-			var/datum/air_group/breath
+			var/datum/gas_mixture/breath
 			// HACK NEED CHANGING LATER
 			if(health < 0)
 				losebreath++

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

@@ -359,7 +359,7 @@
 			if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return
 
 			var/datum/gas_mixture/environment = loc.return_air()
-			var/datum/air_group/breath
+			var/datum/gas_mixture/breath
 
 			// HACK NEED CHANGING LATER
 			if(isbreathing && health < config.health_threshold_crit)
@@ -420,6 +420,14 @@
 											smoke.reagents.copy_to(src, 10) // I dunno, maybe the reagents enter the blood stream through the lungs?
 									break // If they breathe in the nasty stuff once, no need to continue checking
 
+					if(istype(wear_mask, /obj/item/clothing/mask/gas))
+						var/datum/gas_mixture/filtered = new()
+						filtered.toxins = breath.toxins
+						filtered.trace_gases = breath.trace_gases.Copy()
+						breath.toxins = 0
+						breath.trace_gases = list()
+						loc.assume_air(filtered)
+
 				else //Still give containing object the chance to interact
 					if(istype(loc, /obj/))
 						var/obj/location_as_object = loc
@@ -469,7 +477,7 @@
 			var/safe_oxygen_min = 16 // Minimum safe partial pressure of O2, in kPa
 			//var/safe_oxygen_max = 140 // Maximum safe partial pressure of O2, in kPa (Not used for now)
 			var/safe_co2_max = 10 // Yes it's an arbitrary value who cares?
-			var/safe_toxins_max = 0.005
+			var/safe_toxins_max = 0.0025
 			var/SA_para_min = 1
 			var/SA_sleep_min = 5
 			var/oxygen_used = 0
@@ -649,7 +657,7 @@
 
 			//Account for massive pressure differences.  Done by Polymorph
 			var/pressure = environment.return_pressure()
-			if(!istype(wear_suit, /obj/item/clothing/suit/space))
+			if(!istype(wear_suit, /obj/item/clothing/suit/space) && !istype(wear_suit, /obj/item/clothing/suit/fire))
 					/*if(pressure < 20)
 						if(prob(25))
 							src << "You feel the splittle on your lips and the fluid on your eyes boiling away, the capillteries in your skin breaking."
@@ -658,6 +666,9 @@
 				if(pressure > HAZARD_HIGH_PRESSURE)
 					adjustBruteLoss(min((10+(round(pressure/(HIGH_STEP_PRESSURE)-2)*5)),MAX_PRESSURE_DAMAGE))
 
+			if(environment.toxins > MOLES_PLASMA_VISIBLE)
+				pl_effects()
+
 			return //TODO: DEFERRED
 
 		adjust_body_temperature(current, loc_temp, boost)

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

@@ -187,7 +187,7 @@
 			if(!loc) return //probably ought to make a proper fix for this, but :effort: --NeoFite
 
 			var/datum/gas_mixture/environment = loc.return_air()
-			var/datum/air_group/breath
+			var/datum/gas_mixture/breath
 
 			if(losebreath>0) //Suffocating so do not take a breath
 				src.losebreath--

code/modules/mob/living/living.dm

@@ -40,14 +40,8 @@
 			return 0
 		var/mob/living/carbon/human/H = src	//make this damage method divide the damage to be done among all the body parts, then burn each body part for that much damage. will have better effect then just randomly picking a body part
 		var/divided_damage = (burn_amount)/(H.organs.len)
-		var/extradam = 0	//added to when organ is at max dam
 		for(var/name in H.organs)
-			var/datum/organ/external/affecting = H.organs[name]
-			if(!affecting)	continue
-			if(affecting.take_damage(0, divided_damage+extradam, 0, used_weapon))
-				extradam = 0
-			else
-				extradam += divided_damage
+			apply_damage(divided_damage, BURN, name, 0, 0, "Skin Burns")
 		H.UpdateDamageIcon()
 		H.updatehealth()
 		return 1

code/modules/mob/organ/organ.dm

@@ -104,7 +104,7 @@
 			burn *= 0.66 //~2/3 damage for ROBOLIMBS
 
 		if(owner && !robot)
-			owner.pain(display_name, (brute+burn)*3, 1)
+			owner.pain(display_name, (brute+burn)*3, 1, burn > brute)
 		if(sharp)
 			var/nux = brute * rand(10,15)
 			if(brute_dam >= max_damage)

code/modules/mob/organ/pain.dm

@@ -7,7 +7,7 @@ mob/var/next_pain_time = 0
 
 // partname is the name of a body part
 // amount is a num from 1 to 100
-mob/proc/pain(var/partname, var/amount, var/force)
+mob/proc/pain(var/partname, var/amount, var/force, var/burning = 0)
 	if(stat >= 2) return
 	if(world.time < next_pain_time && !force)
 		return
@@ -17,15 +17,26 @@ mob/proc/pain(var/partname, var/amount, var/force)
 	if(amount > 50 && prob(amount / 5))
 		src:drop_item()
 	var/msg
-	switch(amount)
-		if(1 to 10)
-			msg = "<b>Your [partname] hurts a bit.</b>"
-		if(11 to 90)
-			flash_weak_pain()
-			msg = "<b><font size=1>Ouch! Your [partname] hurts.</font></b>"
-		if(91 to 10000)
-			flash_pain()
-			msg = "<b><font size=3>OH GOD! Your [partname] is hurting terribly!</font></b>"
+	if(burning)
+		switch(amount)
+			if(1 to 10)
+				msg = "\red <b>Your [partname] burns.</b>"
+			if(11 to 90)
+				flash_weak_pain()
+				msg = "\red <b><font size=2>Your [partname] burns badly!</font></b>"
+			if(91 to 10000)
+				flash_pain()
+				msg = "\red <b><font size=3>OH GOD! Your [partname] is on fire!</font></b>"
+	else
+		switch(amount)
+			if(1 to 10)
+				msg = "<b>Your [partname] hurts.</b>"
+			if(11 to 90)
+				flash_weak_pain()
+				msg = "<b><font size=2>Your [partname] hurts badly.</font></b>"
+			if(91 to 10000)
+				flash_pain()
+				msg = "<b><font size=3>OH GOD! Your [partname] is hurting terribly!</font></b>"
 	if(msg && (msg != last_pain_message || prob(10)))
 		last_pain_message = msg
 		src << msg