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
@@ -14,6 +14,12 @@
 	var/high_alert_category = "too_much_oxy"
 	var/high_alert_datum =  /atom/movable/screen/alert/too_much_oxy

+/datum/breathing_class/proc/get_effective_pp(datum/gas_mixture/breath)
+	var/mol = 0
+	for(var/gas in gases)
+		mol += breath.get_moles(gas) * gases[gas]
+	return (mol/breath.total_moles()) * breath.return_pressure()
+
 /datum/breathing_class/oxygen
 	gases = list(
 		GAS_O2 = 1,