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

2021-10-27 13:54:49 -03:00
parent 67c6cc3fc0 e5faee5774
commit 13d7a166fe
51 changed files with 331 additions and 563 deletions
@@ -530,8 +530,8 @@
 	gas_max[GAS_N2] = PP(breath, GAS_N2) + 5
 	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
+	safe_breath_min = min(3, 0.3 * o2_pp)
+	safe_breath_max = max(18, 1.3 * o2_pp + 1)
 	..()
 	#undef SAFE_THRESHOLD_RATIO