Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528

[MIRROR] Minor refactor of how gas IDs are handled
This commit is contained in:
LetterJay
2017-10-12 07:19:30 -04:00
committed by GitHub
52 changed files with 425 additions and 412 deletions
+3 -3
View File
@@ -191,11 +191,11 @@
// Can most things breathe?
if(trace_gases)
continue
if(!(A_gases["o2"] && A_gases["o2"][MOLES] >= 16))
if(!(A_gases[/datum/gas/oxygen] && A_gases[/datum/gas/oxygen][MOLES] >= 16))
continue
if(A_gases["plasma"])
if(A_gases[/datum/gas/plasma])
continue
if(A_gases["co2"] && A_gases["co2"][MOLES] >= 10)
if(A_gases[/datum/gas/carbon_dioxide] && A_gases[/datum/gas/carbon_dioxide][MOLES] >= 10)
continue
// Aim for goldilocks temperatures and pressure