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

Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	html/changelogs/.all_changelog.yml

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

@@ -65,13 +65,15 @@
 
 //Handle possble chem smoke effect
 /mob/living/carbon/proc/handle_chemical_smoke(var/datum/gas_mixture/environment)
-	if(wear_mask && (wear_mask.item_flags & BLOCK_GAS_SMOKE_EFFECT))
+	if(species && environment.return_pressure() < species.breath_pressure/5)
+		return //pressure is too low to even breathe in.
+	if(wear_mask && (wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT))
 		return
 
 	for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
 		if(smoke.reagents.total_volume)
-			smoke.reagents.trans_to_mob(src, 10, CHEM_INGEST, copy = 1)
-			//maybe check air pressure here or something to see if breathing in smoke is even possible.
+			smoke.reagents.trans_to_mob(src, 5, CHEM_INGEST, copy = 1)
+			smoke.reagents.trans_to_mob(src, 5, CHEM_BLOOD, copy = 1)
 			// 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
 

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

@@ -382,7 +382,7 @@
 		oxygen_alert = max(oxygen_alert, 1)
 		return 0
 
-	var/safe_pressure_min = 16 // Minimum safe partial pressure of breathable gas in kPa
+	var/safe_pressure_min = species.breath_pressure // Minimum safe partial pressure of breathable gas in kPa
 
 	// Lung damage increases the minimum safe pressure.
 	if(species.has_organ["lungs"])
@@ -974,11 +974,11 @@
 			for(var/atom/a in hallucinations)
 				qdel(a)
 
-		if(halloss > 100)
-			src << "<span class='notice'>You're in too much pain to keep going...</span>"
-			src.visible_message("<B>[src]</B> slumps to the ground, too weak to continue fighting.")
-			Paralyse(10)
-			setHalLoss(99)
+			if(halloss > 100)
+				src << "<span class='warning'>[species.halloss_message_self]</span>"
+				src.visible_message("<B>[src]</B> [species.halloss_message].")
+				Paralyse(10)
+				setHalLoss(99)
 
 		if(paralysis || sleeping)
 			blinded = 1

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

@@ -68,9 +68,12 @@
 	var/death_sound
 	var/death_message = "seizes up and falls limp, their eyes dead and lifeless..."
 	var/knockout_message = "has been knocked unconscious!"
+	var/halloss_message = "slumps to the ground, too weak to continue fighting."
+	var/halloss_message_self = "You're in too much pain to keep going..."
 
 	// Environment tolerance/life processes vars.
 	var/reagent_tag                                   //Used for metabolizing reagents.
+	var/breath_pressure = 16                          // Minimum partial pressure safe for breathing, kPa
 	var/breath_type = "oxygen"                        // Non-oxygen gas breathed, if any.
 	var/poison_type = "phoron"                        // Poisonous air.
 	var/exhale_type = "carbon_dioxide"                // Exhaled gas type.

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

@@ -281,6 +281,8 @@
 	show_ssd = "flashing a 'system offline' glyph on their monitor"
 	death_message = "gives one shrill beep before falling lifeless."
 	knockout_message = "encounters a hardware fault and suddenly reboots!"
+	halloss_message = "encounters a hardware fault and suddenly reboots."
+	halloss_message_self = "ERROR: Unrecoverable machine check exception.<BR>System halted, rebooting..."
 
 	warning_low_pressure = 50
 	hazard_low_pressure = 0