Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not

2021-10-08 21:05:41 -03:00
parent 5aa12b4716 3cfaad31c1
commit 437b3105d1
135 changed files with 144395 additions and 145067 deletions
@@ -528,7 +528,8 @@
 		BZ_brain_damage_min += bz

 	gas_max[GAS_N2] = PP(breath, GAS_N2) + 5
-	var/o2_pp = PP(breath, GAS_O2)
+	var/datum/breathing_class/class = GLOB.gas_data.breathing_classes[breathing_class]
+	var/o2_pp = class.get_effective_pp(breath)
 	safe_breath_min = 0.3 * o2_pp
 	safe_breath_max = 1.3 * o2_pp
 	..()