diff --git a/auxmos.dll b/auxmos.dll index 4e0687fa2b..7263a494a1 100644 Binary files a/auxmos.dll and b/auxmos.dll differ diff --git a/auxmos.pdb b/auxmos.pdb index da06980179..940e2b60a6 100644 Binary files a/auxmos.pdb and b/auxmos.pdb differ diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index 56820d2836..70c5065231 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -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) diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 23b73cea35..39395298b9 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -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) diff --git a/dependencies.sh b/dependencies.sh index 7943782996..e0df827a2a 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -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