diff --git a/auxmos.dll b/auxmos.dll index eaf26d3f90..151b9120c8 100644 Binary files a/auxmos.dll and b/auxmos.dll differ diff --git a/auxmos.pdb b/auxmos.pdb index d5701c0475..7c5cc5153a 100644 Binary files a/auxmos.pdb and b/auxmos.pdb differ diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 4ead4497a4..b2dad11422 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -112,7 +112,7 @@ SUBSYSTEM_DEF(air) if(state != SS_RUNNING) return resumed = 0 - currentpart = SSAIR_EQUALIZE + currentpart = equalize_enabled ? SSAIR_EQUALIZE : SSAIR_ACTIVETURFS if(currentpart == SSAIR_EQUALIZE) timer = TICK_USAGE_REAL diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 54236c8e8a..25936dbb3d 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -12,7 +12,7 @@ var/destination_x var/destination_y - var/static/datum/gas_mixture/immutable/space/space_gas = new + var/static/datum/gas_mixture/immutable/space/space_gas plane = PLANE_SPACE layer = SPACE_LAYER light_power = 0.25 @@ -26,6 +26,8 @@ /turf/open/space/Initialize() icon_state = SPACE_ICON_STATE + if(!space_gas) + space_gas = new air = space_gas update_air_ref(0) vis_contents.Cut() //removes inherited overlays diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm index 75d5f44141..1e39cc50c5 100644 --- a/code/modules/atmospherics/environmental/LINDA_system.dm +++ b/code/modules/atmospherics/environmental/LINDA_system.dm @@ -52,18 +52,20 @@ LAZYINITLIST(T.atmos_adjacent_turfs) atmos_adjacent_turfs[T] = direction T.atmos_adjacent_turfs[src] = opp_dir - T.__update_auxtools_turf_adjacency_info(isspaceturf(T.get_z_base_turf())) else if (atmos_adjacent_turfs) atmos_adjacent_turfs -= T if (T.atmos_adjacent_turfs) T.atmos_adjacent_turfs -= src - T.__update_auxtools_turf_adjacency_info(isspaceturf(T.get_z_base_turf())) UNSETEMPTY(T.atmos_adjacent_turfs) + T.__update_auxtools_turf_adjacency_info(isspaceturf(T.get_z_base_turf()), -1) UNSETEMPTY(atmos_adjacent_turfs) src.atmos_adjacent_turfs = atmos_adjacent_turfs + set_sleeping(!(canpass || canvpass)) __update_auxtools_turf_adjacency_info(isspaceturf(get_z_base_turf())) +/turf/proc/set_sleeping(should_sleep) + /turf/proc/__update_auxtools_turf_adjacency_info() //returns a list of adjacent turfs that can share air with this one. diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index 54f83c9221..3f082a760b 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(meta_gas_fusions, meta_gas_fusion_list()) var/initial_volume = CELL_VOLUME //liters var/list/reaction_results var/list/analyzer_results //used for analyzer feedback - not initialized until its used - var/_extools_pointer_gasmixture = 0 // Contains the index in the gas vector for this gas mixture in rust land. Don't. Touch. This. Var. + var/_extools_pointer_gasmixture // Contains the index in the gas vector for this gas mixture in rust land. Don't. Touch. This. Var. GLOBAL_LIST_INIT(auxtools_atmos_initialized,FALSE)