cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor refactor of how gas IDs are handled (#31528)

Browse Source 
* gas IDs -> gas datum paths

* updates parse_gas_string() to handle both paths and IDs

* fixes compile errors

* fixes parse_gas_string() ignoring amounts of gas

* fixes roundstart jetpack runtimes

* fixes filters

* fixes map-edited filters

* fixes empty canister runtimes on initialization
This commit is contained in:
duncathan salt
2017-10-11 13:04:12 -06:00
committed by Jordan Brown
parent 79cd75b87d
commit 454d16fe32
52 changed files with 378 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/datums/helper_datums/teleport.dm
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