diff --git a/auxmos.dll b/auxmos.dll index 78a4197813..14d6cc9ea0 100644 Binary files a/auxmos.dll and b/auxmos.dll differ diff --git a/auxmos.pdb b/auxmos.pdb index 5f69376636..1733359456 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 92482b06cc..5b0419a59e 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -50,7 +50,7 @@ SUBSYSTEM_DEF(air) var/log_explosive_decompression = TRUE // If things get spammy, admemes can turn this off. // Max number of turfs equalization will grab. - var/equalize_turf_limit = 25 + var/equalize_turf_limit = 10 // Max number of turfs to look for a space turf, and max number of turfs that will be decompressed. var/equalize_hard_turf_limit = 2000 // Whether equalization should be enabled at all. @@ -58,11 +58,9 @@ SUBSYSTEM_DEF(air) // Whether turf-to-turf heat exchanging should be enabled. var/heat_enabled = FALSE // Max number of times process_turfs will share in a tick. - var/share_max_steps = 1 - // If process_turfs finds no pressure differentials larger than this, it'll stop for that tick. - var/share_pressure_diff_to_stop = 101.325 + var/share_max_steps = 2 // Excited group processing will try to equalize groups with total pressure difference less than this amount. - var/excited_group_pressure_goal = 1 + var/excited_group_pressure_goal = 0.25 /datum/controller/subsystem/air/stat_entry(msg) msg += "C:{" diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index ce0220e08b..d70196a78c 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -125,7 +125,8 @@ var/obj/loc_as_obj = loc loc_as_obj.handle_internal_lifeform(src,0) - breath.set_volume(BREATH_VOLUME) + if(breath) + breath.set_volume(BREATH_VOLUME) check_breath(breath) if(breath)