Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

code/modules/mob/living/carbon/breathe.dm

@@ -54,7 +54,7 @@
 		breath = environment.remove_volume(volume_needed)
 		handle_chemical_smoke(environment) //handle chemical smoke while we're at it
 
-	if(breath)
+	if(breath && breath.total_moles)
 		//handle mask filtering
 		if(istype(wear_mask, /obj/item/clothing/mask) && breath)
 			var/obj/item/clothing/mask/M = wear_mask

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

@@ -980,7 +980,7 @@
 
 	if(L && !L.is_bruised())
 		src.custom_pain("You feel a stabbing pain in your chest!", 1)
-		L.damage = L.min_bruised_damage
+		L.bruise()
 
 /*
 /mob/living/carbon/human/verb/simulate()

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

@@ -342,10 +342,26 @@
 	if(status_flags & GODMODE)
 		return
 
-	if(!breath || (breath.total_moles == 0) || suiciding)
-		failed_last_breath = 1
-		if(suiciding)
-			adjustOxyLoss(2)//If you are suiciding, you should die a little bit faster
+		if(status_flags & GODMODE)
+			return
+
+		//exposure to extreme pressures can rupture lungs
+		if(breath && (breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5))
+			if(!is_lung_ruptured() && prob(5))
+				rupture_lung()
+
+		//check if we actually need to process breath
+		if(!breath || (breath.total_moles == 0) || suiciding)
+			failed_last_breath = 1
+			if(suiciding)
+				adjustOxyLoss(2)//If you are suiciding, you should die a little bit faster
+				oxygen_alert = max(oxygen_alert, 1)
+				return 0
+			if(health > config.health_threshold_crit)
+				adjustOxyLoss(HUMAN_MAX_OXYLOSS)
+			else
+				adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
+
 			oxygen_alert = max(oxygen_alert, 1)
 			return 0
 		if(health > config.health_threshold_crit)