Merge pull request #15826 from Putnam3145/auxmos-2

Update auxmos to 2.0.0
This commit is contained in:
Lin
2022-09-18 05:44:58 +00:00
committed by GitHub
5 changed files with 10 additions and 1 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -280,7 +280,11 @@ we use a hook instead
parse_gas_string(model.initial_gas_mix)
return 1
/datum/gas_mixture/proc/__auxtools_parse_gas_string(gas_string)
/datum/gas_mixture/parse_gas_string(gas_string)
__auxtools_parse_gas_string(gas_string)
/*
gas_string = SSair.preprocess_gas_string(gas_string)
var/list/gas = params2list(gas_string)
@@ -294,6 +298,7 @@ we use a hook instead
for(var/id in gas)
set_moles(id, text2num(gas[id]))
archive()
*/
return 1
/*
/datum/gas_mixture/react(datum/holder)

View File

@@ -69,6 +69,8 @@
// no test cause it's entirely based on location
GLOBAL_VAR_INIT(condensation_priority, 0)
/datum/gas_reaction/condensation
priority = 0
name = "Condensation"
@@ -87,6 +89,8 @@
name = "[R.name] condensation"
id = "[R.type] condensation"
condensing_reagent = GLOB.chemical_reagents_list[R.type]
GLOB.condensation_priority += 0.000000000001
priority = GLOB.condensation_priority
exclude = FALSE
/datum/gas_reaction/condensation/react(datum/gas_mixture/air, datum/holder)

View File

@@ -21,7 +21,7 @@ export SPACEMAN_DMM_VERSION=suite-1.7
export PYTHON_VERSION=3.7.9
# Auxmos git tag
export AUXMOS_VERSION=v1.1.1
export AUXMOS_VERSION=v2.1.0
# Extools git tag
export EXTOOLS_VERSION=v0.0.7