Merge remote-tracking branch 'citadel/master' into backend_sync

2021-06-10 22:36:26 -07:00
parent 4289b8be1e c33348fe18
commit 816b09bf32
314 changed files with 7991 additions and 2751 deletions
@@ -142,7 +142,8 @@
 		// Can most things breathe?
 		if(trace_gases)
 			continue
-		if(A.get_moles(/datum/gas/oxygen) >= 16)
+		var/oxy_moles = A.get_moles(/datum/gas/oxygen)
+		if(oxy_moles < 16 || oxy_moles > 50)
 			continue
 		if(A.get_moles(/datum/gas/plasma))
 			continue