From 6f0025837601eb4910217361d3f9b85bda21709d Mon Sep 17 00:00:00 2001 From: Aryn Date: Sat, 26 May 2012 01:59:10 -0600 Subject: [PATCH 1/7] I accidentally ALL THE THINGS! But yeah, ZAS is updated. --- baystation12.dme | 450 ++++---- code/ATMOSPHERICS/datum_pipeline.dm | 35 +- code/ZAS/Airflow.dm | 3 +- code/ZAS/Connection.dm | 16 +- code/ZAS/Creation.dm | 1 + code/ZAS/Debug.dm | 8 +- code/ZAS/Definition.dm | 19 - code/ZAS/FEA_gas_mixture.dm | 1008 +++++++++++++++++ code/ZAS/FEA_system.dm | 178 +++ code/ZAS/FEA_turf_tile.dm | 205 ++++ code/ZAS/Fire.dm | 198 ++-- code/ZAS/Functions.dm | 32 +- code/ZAS/Plasma.dm | 195 ++-- code/ZAS/Processing.dm | 171 ++- code/ZAS/Variable Settings.dm | 30 +- code/defines/atom.dm | 4 +- code/defines/procs/helpers.dm | 15 +- code/defines/turf.dm | 2 - code/game/machinery/doors/door.dm | 55 +- code/game/machinery/doors/firedoor.dm | 16 +- code/game/machinery/doors/windowdoor.dm | 16 +- code/game/machinery/shieldgen.dm | 37 +- code/game/objects/closets/firecloset.dm | 4 +- code/game/objects/effect_system.dm | 37 +- .../objects/items/weapons/flamethrower.dm | 6 +- code/game/objects/mineral_doors.dm | 41 +- code/game/objects/weapons.dm | 4 - code/game/objects/window.dm | 16 +- code/modules/admin/admin_verbs.dm | 12 +- code/modules/admin/verbs/diagnostics.dm | 8 +- code/modules/admin/verbs/mapping.dm | 4 +- code/modules/chemical/Chemistry-Recipes.dm | 2 - code/modules/clothing/suits/fire.dm | 12 + .../mob/living/carbon/alien/humanoid/life.dm | 2 +- .../mob/living/carbon/alien/larva/life.dm | 2 +- code/modules/mob/living/carbon/human/life.dm | 17 +- code/modules/mob/living/carbon/monkey/life.dm | 2 +- code/modules/mob/living/living.dm | 8 +- code/modules/mob/organ/organ.dm | 2 +- code/modules/mob/organ/pain.dm | 31 +- code/setup.dm | 10 + icons/effects/contamination.dmi | Bin 0 -> 380 bytes icons/effects/plasma.dmi | Bin 712 -> 1024 bytes icons/effects/tile_effects.dmi | Bin 739 -> 1032 bytes 44 files changed, 2120 insertions(+), 794 deletions(-) create mode 100644 code/ZAS/FEA_gas_mixture.dm create mode 100644 code/ZAS/FEA_system.dm create mode 100644 code/ZAS/FEA_turf_tile.dm create mode 100644 icons/effects/contamination.dmi diff --git a/baystation12.dme b/baystation12.dme index 43e4dfcc446..a72955196df 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -3,222 +3,6 @@ // New source code should be placed in .dm files: choose File/New --> Code File. // BEGIN_INTERNALS // END_INTERNALS -// BEGIN_FILE_DIR -#define FILE_DIR . -#define FILE_DIR "code" -#define FILE_DIR "code/ATMOSPHERICS" -#define FILE_DIR "code/ATMOSPHERICS/components" -#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices" -#define FILE_DIR "code/ATMOSPHERICS/components/trinary_devices" -#define FILE_DIR "code/ATMOSPHERICS/components/unary" -#define FILE_DIR "code/datums" -#define FILE_DIR "code/datums/diseases" -#define FILE_DIR "code/datums/helper_datums" -#define FILE_DIR "code/datums/spells" -#define FILE_DIR "code/defines" -#define FILE_DIR "code/defines/area" -#define FILE_DIR "code/defines/mob" -#define FILE_DIR "code/defines/mob/dead" -#define FILE_DIR "code/defines/mob/living" -#define FILE_DIR "code/defines/mob/living/carbon" -#define FILE_DIR "code/defines/mob/living/silicon" -#define FILE_DIR "code/defines/obj" -#define FILE_DIR "code/defines/procs" -#define FILE_DIR "code/defines/sd_procs" -#define FILE_DIR "code/FEA" -#define FILE_DIR "code/game" -#define FILE_DIR "code/game/area" -#define FILE_DIR "code/game/asteroid" -#define FILE_DIR "code/game/events" -#define FILE_DIR "code/game/events/EventProcs" -#define FILE_DIR "code/game/events/Events" -#define FILE_DIR "code/game/gamemodes" -#define FILE_DIR "code/game/gamemodes/autotraitor" -#define FILE_DIR "code/game/gamemodes/blob" -#define FILE_DIR "code/game/gamemodes/changeling" -#define FILE_DIR "code/game/gamemodes/cult" -#define FILE_DIR "code/game/gamemodes/epidemic" -#define FILE_DIR "code/game/gamemodes/extended" -#define FILE_DIR "code/game/gamemodes/malfunction" -#define FILE_DIR "code/game/gamemodes/meme" -#define FILE_DIR "code/game/gamemodes/meteor" -#define FILE_DIR "code/game/gamemodes/nuclear" -#define FILE_DIR "code/game/gamemodes/revolution" -#define FILE_DIR "code/game/gamemodes/sandbox" -#define FILE_DIR "code/game/gamemodes/traitor" -#define FILE_DIR "code/game/gamemodes/wizard" -#define FILE_DIR "code/game/jobs" -#define FILE_DIR "code/game/jobs/job" -#define FILE_DIR "code/game/machinery" -#define FILE_DIR "code/game/machinery/atmoalter" -#define FILE_DIR "code/game/machinery/bots" -#define FILE_DIR "code/game/machinery/computer" -#define FILE_DIR "code/game/machinery/doors" -#define FILE_DIR "code/game/machinery/embedded_controller" -#define FILE_DIR "code/game/machinery/kitchen" -#define FILE_DIR "code/game/machinery/pipe" -#define FILE_DIR "code/game/machinery/telecomms" -#define FILE_DIR "code/game/magic" -#define FILE_DIR "code/game/magic/cultist" -#define FILE_DIR "code/game/mecha" -#define FILE_DIR "code/game/mecha/combat" -#define FILE_DIR "code/game/mecha/equipment" -#define FILE_DIR "code/game/mecha/equipment/tools" -#define FILE_DIR "code/game/mecha/equipment/weapons" -#define FILE_DIR "code/game/mecha/medical" -#define FILE_DIR "code/game/mecha/working" -#define FILE_DIR "code/game/objects" -#define FILE_DIR "code/game/objects/alien" -#define FILE_DIR "code/game/objects/closets" -#define FILE_DIR "code/game/objects/closets/secure" -#define FILE_DIR "code/game/objects/devices" -#define FILE_DIR "code/game/objects/devices/PDA" -#define FILE_DIR "code/game/objects/items" -#define FILE_DIR "code/game/objects/items/weapons" -#define FILE_DIR "code/game/objects/items/weapons/implants" -#define FILE_DIR "code/game/objects/radio" -#define FILE_DIR "code/game/objects/secstorage" -#define FILE_DIR "code/game/objects/stacks" -#define FILE_DIR "code/game/objects/storage" -#define FILE_DIR "code/game/objects/tanks" -#define FILE_DIR "code/game/player" -#define FILE_DIR "code/game/vehicles" -#define FILE_DIR "code/game/vehicles/airtight" -#define FILE_DIR "code/game/verbs" -#define FILE_DIR "code/js" -#define FILE_DIR "code/modules" -#define FILE_DIR "code/modules/admin" -#define FILE_DIR "code/modules/admin/verbs" -#define FILE_DIR "code/modules/assembly" -#define FILE_DIR "code/modules/chemical" -#define FILE_DIR "code/modules/clothing" -#define FILE_DIR "code/modules/clothing/glasses" -#define FILE_DIR "code/modules/clothing/head" -#define FILE_DIR "code/modules/clothing/spacesuits" -#define FILE_DIR "code/modules/clothing/suits" -#define FILE_DIR "code/modules/clothing/uniforms" -#define FILE_DIR "code/modules/critters" -#define FILE_DIR "code/modules/critters/hivebots" -#define FILE_DIR "code/modules/customitems" -#define FILE_DIR "code/modules/DetectiveWork" -#define FILE_DIR "code/modules/flufftext" -#define FILE_DIR "code/modules/food" -#define FILE_DIR "code/modules/maps" -#define FILE_DIR "code/modules/mining" -#define FILE_DIR "code/modules/mob" -#define FILE_DIR "code/modules/mob/dead" -#define FILE_DIR "code/modules/mob/dead/observer" -#define FILE_DIR "code/modules/mob/living" -#define FILE_DIR "code/modules/mob/living/blob" -#define FILE_DIR "code/modules/mob/living/carbon" -#define FILE_DIR "code/modules/mob/living/carbon/alien" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste" -#define FILE_DIR "code/modules/mob/living/carbon/alien/larva" -#define FILE_DIR "code/modules/mob/living/carbon/alien/special" -#define FILE_DIR "code/modules/mob/living/carbon/brain" -#define FILE_DIR "code/modules/mob/living/carbon/human" -#define FILE_DIR "code/modules/mob/living/carbon/metroid" -#define FILE_DIR "code/modules/mob/living/carbon/monkey" -#define FILE_DIR "code/modules/mob/living/parasite" -#define FILE_DIR "code/modules/mob/living/silicon" -#define FILE_DIR "code/modules/mob/living/silicon/ai" -#define FILE_DIR "code/modules/mob/living/silicon/decoy" -#define FILE_DIR "code/modules/mob/living/silicon/pai" -#define FILE_DIR "code/modules/mob/living/silicon/robot" -#define FILE_DIR "code/modules/mob/new_player" -#define FILE_DIR "code/modules/mob/organ" -#define FILE_DIR "code/modules/mob/simple_animal" -#define FILE_DIR "code/modules/paperwork" -#define FILE_DIR "code/modules/power" -#define FILE_DIR "code/modules/power/antimatter" -#define FILE_DIR "code/modules/power/singularity" -#define FILE_DIR "code/modules/power/singularity/particle_accelerator" -#define FILE_DIR "code/modules/projectiles" -#define FILE_DIR "code/modules/projectiles/ammunition" -#define FILE_DIR "code/modules/projectiles/guns" -#define FILE_DIR "code/modules/projectiles/guns/energy" -#define FILE_DIR "code/modules/projectiles/guns/projectile" -#define FILE_DIR "code/modules/projectiles/projectile" -#define FILE_DIR "code/modules/recycling" -#define FILE_DIR "code/modules/research" -#define FILE_DIR "code/modules/scripting" -#define FILE_DIR "code/modules/scripting/AST" -#define FILE_DIR "code/modules/scripting/AST/Operators" -#define FILE_DIR "code/modules/scripting/Implementations" -#define FILE_DIR "code/modules/scripting/Interpreter" -#define FILE_DIR "code/modules/scripting/Parser" -#define FILE_DIR "code/modules/scripting/Scanner" -#define FILE_DIR "code/modules/security levels" -#define FILE_DIR "code/unused" -#define FILE_DIR "code/unused/beast" -#define FILE_DIR "code/unused/computer2" -#define FILE_DIR "code/unused/gamemodes" -#define FILE_DIR "code/unused/hivebot" -#define FILE_DIR "code/unused/mining" -#define FILE_DIR "code/unused/optics" -#define FILE_DIR "code/unused/pda2" -#define FILE_DIR "code/unused/powerarmor" -#define FILE_DIR "code/unused/spacecraft" -#define FILE_DIR "code/WorkInProgress" -#define FILE_DIR "code/WorkInProgress/AI_Visibility" -#define FILE_DIR "code/WorkInProgress/animusstation" -#define FILE_DIR "code/WorkInProgress/Apples" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/BirdMan" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara" -#define FILE_DIR "code/WorkInProgress/Chinsky" -#define FILE_DIR "code/WorkInProgress/mapload" -#define FILE_DIR "code/WorkInProgress/Mini" -#define FILE_DIR "code/WorkInProgress/Mloc" -#define FILE_DIR "code/WorkInProgress/organs" -#define FILE_DIR "code/WorkInProgress/Ported" -#define FILE_DIR "code/WorkInProgress/Ported/Abi79" -#define FILE_DIR "code/WorkInProgress/Ported/Bureaucracy" -#define FILE_DIR "code/WorkInProgress/Ported/Spawners" -#define FILE_DIR "code/WorkInProgress/SkyMarshal" -#define FILE_DIR "code/WorkInProgress/Tastyfish" -#define FILE_DIR "code/WorkInProgress/virus2" -#define FILE_DIR "code/WorkInProgress/Wrongnumber" -#define FILE_DIR "code/ZAS" -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/48x48" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "interface" -#define FILE_DIR "maps" -#define FILE_DIR "maps/RandomZLevels" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/announcer" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/weapons" -// END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG // END_PREFERENCES @@ -361,12 +145,6 @@ #include "code\defines\sd_procs\constants.dm" #include "code\defines\sd_procs\direction.dm" #include "code\defines\sd_procs\math.dm" -#include "code\FEA\FEA_airgroup.dm" -#include "code\FEA\FEA_fire.dm" -#include "code\FEA\FEA_gas_mixture.dm" -#include "code\FEA\FEA_group_helpers.dm" -#include "code\FEA\FEA_system.dm" -#include "code\FEA\FEA_turf_tile.dm" #include "code\game\algorithm.dm" #include "code\game\atom_procs.dm" #include "code\game\cellautomata.dm" @@ -1209,7 +987,235 @@ #include "code\WorkInProgress\virus2\monkeydispensor.dm" #include "code\WorkInProgress\virus2\Prob.dm" #include "code\WorkInProgress\Wrongnumber\weldbackpack.dm" +#include "code\ZAS\Airflow.dm" +#include "code\ZAS\Connection.dm" +#include "code\ZAS\Creation.dm" +#include "code\ZAS\Definition.dm" +#include "code\ZAS\FEA_gas_mixture.dm" +#include "code\ZAS\FEA_system.dm" +#include "code\ZAS\FEA_turf_tile.dm" +#include "code\ZAS\Fire.dm" +#include "code\ZAS\Functions.dm" +#include "code\ZAS\Plasma.dm" +#include "code\ZAS\Processing.dm" +#include "code\ZAS\Variable Settings.dm" #include "interface\interface.dm" #include "interface\skin.dmf" #include "maps\tgstation.2.0.8.dmm" // END_INCLUDE +// BEGIN_FILE_DIR +#define FILE_DIR . +#define FILE_DIR "code" +#define FILE_DIR "code/ATMOSPHERICS" +#define FILE_DIR "code/ATMOSPHERICS/components" +#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices" +#define FILE_DIR "code/ATMOSPHERICS/components/trinary_devices" +#define FILE_DIR "code/ATMOSPHERICS/components/unary" +#define FILE_DIR "code/datums" +#define FILE_DIR "code/datums/diseases" +#define FILE_DIR "code/datums/helper_datums" +#define FILE_DIR "code/datums/spells" +#define FILE_DIR "code/defines" +#define FILE_DIR "code/defines/area" +#define FILE_DIR "code/defines/mob" +#define FILE_DIR "code/defines/mob/dead" +#define FILE_DIR "code/defines/mob/living" +#define FILE_DIR "code/defines/mob/living/carbon" +#define FILE_DIR "code/defines/mob/living/silicon" +#define FILE_DIR "code/defines/obj" +#define FILE_DIR "code/defines/procs" +#define FILE_DIR "code/defines/sd_procs" +#define FILE_DIR "code/FEA" +#define FILE_DIR "code/game" +#define FILE_DIR "code/game/area" +#define FILE_DIR "code/game/asteroid" +#define FILE_DIR "code/game/events" +#define FILE_DIR "code/game/events/EventProcs" +#define FILE_DIR "code/game/events/Events" +#define FILE_DIR "code/game/gamemodes" +#define FILE_DIR "code/game/gamemodes/autotraitor" +#define FILE_DIR "code/game/gamemodes/blob" +#define FILE_DIR "code/game/gamemodes/changeling" +#define FILE_DIR "code/game/gamemodes/cult" +#define FILE_DIR "code/game/gamemodes/epidemic" +#define FILE_DIR "code/game/gamemodes/extended" +#define FILE_DIR "code/game/gamemodes/malfunction" +#define FILE_DIR "code/game/gamemodes/meme" +#define FILE_DIR "code/game/gamemodes/meteor" +#define FILE_DIR "code/game/gamemodes/nuclear" +#define FILE_DIR "code/game/gamemodes/revolution" +#define FILE_DIR "code/game/gamemodes/sandbox" +#define FILE_DIR "code/game/gamemodes/traitor" +#define FILE_DIR "code/game/gamemodes/wizard" +#define FILE_DIR "code/game/jobs" +#define FILE_DIR "code/game/jobs/job" +#define FILE_DIR "code/game/machinery" +#define FILE_DIR "code/game/machinery/atmoalter" +#define FILE_DIR "code/game/machinery/bots" +#define FILE_DIR "code/game/machinery/computer" +#define FILE_DIR "code/game/machinery/doors" +#define FILE_DIR "code/game/machinery/embedded_controller" +#define FILE_DIR "code/game/machinery/kitchen" +#define FILE_DIR "code/game/machinery/pipe" +#define FILE_DIR "code/game/machinery/telecomms" +#define FILE_DIR "code/game/magic" +#define FILE_DIR "code/game/magic/cultist" +#define FILE_DIR "code/game/mecha" +#define FILE_DIR "code/game/mecha/combat" +#define FILE_DIR "code/game/mecha/equipment" +#define FILE_DIR "code/game/mecha/equipment/tools" +#define FILE_DIR "code/game/mecha/equipment/weapons" +#define FILE_DIR "code/game/mecha/medical" +#define FILE_DIR "code/game/mecha/working" +#define FILE_DIR "code/game/objects" +#define FILE_DIR "code/game/objects/alien" +#define FILE_DIR "code/game/objects/closets" +#define FILE_DIR "code/game/objects/closets/secure" +#define FILE_DIR "code/game/objects/devices" +#define FILE_DIR "code/game/objects/devices/PDA" +#define FILE_DIR "code/game/objects/items" +#define FILE_DIR "code/game/objects/items/weapons" +#define FILE_DIR "code/game/objects/items/weapons/implants" +#define FILE_DIR "code/game/objects/radio" +#define FILE_DIR "code/game/objects/secstorage" +#define FILE_DIR "code/game/objects/stacks" +#define FILE_DIR "code/game/objects/storage" +#define FILE_DIR "code/game/objects/tanks" +#define FILE_DIR "code/game/player" +#define FILE_DIR "code/game/vehicles" +#define FILE_DIR "code/game/vehicles/airtight" +#define FILE_DIR "code/game/verbs" +#define FILE_DIR "code/js" +#define FILE_DIR "code/modules" +#define FILE_DIR "code/modules/admin" +#define FILE_DIR "code/modules/admin/verbs" +#define FILE_DIR "code/modules/assembly" +#define FILE_DIR "code/modules/chemical" +#define FILE_DIR "code/modules/clothing" +#define FILE_DIR "code/modules/clothing/glasses" +#define FILE_DIR "code/modules/clothing/head" +#define FILE_DIR "code/modules/clothing/spacesuits" +#define FILE_DIR "code/modules/clothing/suits" +#define FILE_DIR "code/modules/clothing/uniforms" +#define FILE_DIR "code/modules/critters" +#define FILE_DIR "code/modules/critters/hivebots" +#define FILE_DIR "code/modules/customitems" +#define FILE_DIR "code/modules/DetectiveWork" +#define FILE_DIR "code/modules/flufftext" +#define FILE_DIR "code/modules/food" +#define FILE_DIR "code/modules/maps" +#define FILE_DIR "code/modules/mining" +#define FILE_DIR "code/modules/mob" +#define FILE_DIR "code/modules/mob/dead" +#define FILE_DIR "code/modules/mob/dead/observer" +#define FILE_DIR "code/modules/mob/living" +#define FILE_DIR "code/modules/mob/living/blob" +#define FILE_DIR "code/modules/mob/living/carbon" +#define FILE_DIR "code/modules/mob/living/carbon/alien" +#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid" +#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste" +#define FILE_DIR "code/modules/mob/living/carbon/alien/larva" +#define FILE_DIR "code/modules/mob/living/carbon/alien/special" +#define FILE_DIR "code/modules/mob/living/carbon/brain" +#define FILE_DIR "code/modules/mob/living/carbon/human" +#define FILE_DIR "code/modules/mob/living/carbon/metroid" +#define FILE_DIR "code/modules/mob/living/carbon/monkey" +#define FILE_DIR "code/modules/mob/living/parasite" +#define FILE_DIR "code/modules/mob/living/silicon" +#define FILE_DIR "code/modules/mob/living/silicon/ai" +#define FILE_DIR "code/modules/mob/living/silicon/decoy" +#define FILE_DIR "code/modules/mob/living/silicon/pai" +#define FILE_DIR "code/modules/mob/living/silicon/robot" +#define FILE_DIR "code/modules/mob/new_player" +#define FILE_DIR "code/modules/mob/organ" +#define FILE_DIR "code/modules/mob/simple_animal" +#define FILE_DIR "code/modules/paperwork" +#define FILE_DIR "code/modules/power" +#define FILE_DIR "code/modules/power/antimatter" +#define FILE_DIR "code/modules/power/singularity" +#define FILE_DIR "code/modules/power/singularity/particle_accelerator" +#define FILE_DIR "code/modules/projectiles" +#define FILE_DIR "code/modules/projectiles/ammunition" +#define FILE_DIR "code/modules/projectiles/guns" +#define FILE_DIR "code/modules/projectiles/guns/energy" +#define FILE_DIR "code/modules/projectiles/guns/projectile" +#define FILE_DIR "code/modules/projectiles/projectile" +#define FILE_DIR "code/modules/recycling" +#define FILE_DIR "code/modules/research" +#define FILE_DIR "code/modules/scripting" +#define FILE_DIR "code/modules/scripting/AST" +#define FILE_DIR "code/modules/scripting/AST/Operators" +#define FILE_DIR "code/modules/scripting/Implementations" +#define FILE_DIR "code/modules/scripting/Interpreter" +#define FILE_DIR "code/modules/scripting/Parser" +#define FILE_DIR "code/modules/scripting/Scanner" +#define FILE_DIR "code/modules/security levels" +#define FILE_DIR "code/unused" +#define FILE_DIR "code/unused/beast" +#define FILE_DIR "code/unused/computer2" +#define FILE_DIR "code/unused/gamemodes" +#define FILE_DIR "code/unused/hivebot" +#define FILE_DIR "code/unused/mining" +#define FILE_DIR "code/unused/optics" +#define FILE_DIR "code/unused/pda2" +#define FILE_DIR "code/unused/powerarmor" +#define FILE_DIR "code/unused/spacecraft" +#define FILE_DIR "code/WorkInProgress" +#define FILE_DIR "code/WorkInProgress/AI_Visibility" +#define FILE_DIR "code/WorkInProgress/animusstation" +#define FILE_DIR "code/WorkInProgress/Apples" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/BirdMan" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara" +#define FILE_DIR "code/WorkInProgress/Chinsky" +#define FILE_DIR "code/WorkInProgress/mapload" +#define FILE_DIR "code/WorkInProgress/Mini" +#define FILE_DIR "code/WorkInProgress/Mloc" +#define FILE_DIR "code/WorkInProgress/organs" +#define FILE_DIR "code/WorkInProgress/Ported" +#define FILE_DIR "code/WorkInProgress/Ported/Abi79" +#define FILE_DIR "code/WorkInProgress/Ported/Bureaucracy" +#define FILE_DIR "code/WorkInProgress/Ported/Spawners" +#define FILE_DIR "code/WorkInProgress/SkyMarshal" +#define FILE_DIR "code/WorkInProgress/Tastyfish" +#define FILE_DIR "code/WorkInProgress/virus2" +#define FILE_DIR "code/WorkInProgress/Wrongnumber" +#define FILE_DIR "code/ZAS" +#define FILE_DIR "html" +#define FILE_DIR "icons" +#define FILE_DIR "icons/48x48" +#define FILE_DIR "icons/effects" +#define FILE_DIR "icons/mecha" +#define FILE_DIR "icons/misc" +#define FILE_DIR "icons/mob" +#define FILE_DIR "icons/obj" +#define FILE_DIR "icons/obj/assemblies" +#define FILE_DIR "icons/obj/atmospherics" +#define FILE_DIR "icons/obj/clothing" +#define FILE_DIR "icons/obj/doors" +#define FILE_DIR "icons/obj/machines" +#define FILE_DIR "icons/obj/pipes" +#define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/spideros_icons" +#define FILE_DIR "icons/Testing" +#define FILE_DIR "icons/turf" +#define FILE_DIR "icons/vending_icons" +#define FILE_DIR "interface" +#define FILE_DIR "maps" +#define FILE_DIR "maps/RandomZLevels" +#define FILE_DIR "sound" +#define FILE_DIR "sound/AI" +#define FILE_DIR "sound/ambience" +#define FILE_DIR "sound/announcer" +#define FILE_DIR "sound/effects" +#define FILE_DIR "sound/hallucinations" +#define FILE_DIR "sound/items" +#define FILE_DIR "sound/machines" +#define FILE_DIR "sound/mecha" +#define FILE_DIR "sound/misc" +#define FILE_DIR "sound/piano" +#define FILE_DIR "sound/voice" +#define FILE_DIR "sound/weapons" +// END_FILE_DIR diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index 1b63e605481..5ade345e08f 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -128,28 +128,19 @@ datum/pipeline var/datum/gas_mixture/air_sample = air.remove_ratio(mingle_volume/air.volume) air_sample.volume = mingle_volume - if(istype(target) && target.parent && target.parent.group_processing) + if(istype(target) && target.zone) //Have to consider preservation of group statuses var/datum/gas_mixture/turf_copy = new - turf_copy.copy_from(target.parent.air) - turf_copy.volume = target.parent.air.volume //Copy a good representation of the turf from parent group + turf_copy.copy_from(target.zone.air) + turf_copy.volume = target.zone.air.volume //Copy a good representation of the turf from parent group equalize_gases(list(air_sample, turf_copy)) air.merge(air_sample) - if(target.parent.air.compare(turf_copy)) - //The new turf would be an acceptable group member so permit the integration + turf_copy.subtract(target.zone.air) - turf_copy.subtract(target.parent.air) - - target.parent.air.merge(turf_copy) - - else - //Comparison failure so dissemble group and copy turf - - target.parent.suspend_group_processing() - target.air.copy_from(turf_copy) + target.zone.air.merge(turf_copy) else var/datum/gas_mixture/turf_air = target.return_air() @@ -187,9 +178,9 @@ datum/pipeline var/delta_temperature = 0 var/sharer_heat_capacity = 0 - if(modeled_location.parent && modeled_location.parent.group_processing) - delta_temperature = (air.temperature - modeled_location.parent.air.temperature) - sharer_heat_capacity = modeled_location.parent.air.heat_capacity() + if(modeled_location.zone) + delta_temperature = (air.temperature - modeled_location.zone.air.temperature) + sharer_heat_capacity = modeled_location.zone.air.heat_capacity() else delta_temperature = (air.temperature - modeled_location.air.temperature) sharer_heat_capacity = modeled_location.air.heat_capacity() @@ -208,14 +199,8 @@ datum/pipeline air.temperature += self_temperature_delta - if(modeled_location.parent && modeled_location.parent.group_processing) - if((abs(sharer_temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) && (abs(sharer_temperature_delta) > MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND*modeled_location.parent.air.temperature)) - modeled_location.parent.suspend_group_processing() - - modeled_location.air.temperature += sharer_temperature_delta - - else - modeled_location.parent.air.temperature += sharer_temperature_delta/modeled_location.parent.air.group_multiplier + if(modeled_location.zone) + modeled_location.zone.air.temperature += sharer_temperature_delta/modeled_location.zone.air.group_multiplier else modeled_location.air.temperature += sharer_temperature_delta diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index a3cb01eb7ee..50d8888c853 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -64,14 +64,13 @@ atom/movable/RepelAirflowDest(n) */ -var/tick_multiplier = 2 vs_control/var zone_update_delay = 10 zone_update_delay_NAME = "Zone Update Delay" zone_update_delay_DESC = "The delay in ticks between updates of zones. Increase if lag is bad seemingly because of air." - zone_share_percent = 2 + zone_share_percent = 5 zone_share_percent_NAME = "Zone Connection Transfer %" zone_share_percent_DESC = "Percent of gas per connected tile that is shared between zones." diff --git a/code/ZAS/Connection.dm b/code/ZAS/Connection.dm index bf43f90d1c0..022a714222e 100644 --- a/code/ZAS/Connection.dm +++ b/code/ZAS/Connection.dm @@ -5,6 +5,7 @@ connection B indirect = 0 //If the connection is purely indirect, the zones should not join. last_updated //The tick at which this was last updated. + no_zone_count = 0 New(turf/T,turf/O) A = T B = O @@ -31,6 +32,8 @@ connection B.zone.connected_zones[A.zone] = 1 else B.zone.connected_zones[A.zone]++ + else + world.log << "Attempted to create connection object for non-zone tiles: [T] -> [O]" Del() if(A.zone && A.zone.connections) A.zone.connections -= src @@ -57,5 +60,14 @@ connection . = ..() proc/Cleanup() - if(A.zone == B.zone) del src - if(!A.zone || !B.zone) del src \ No newline at end of file + if(!A || !B) + world.log << "Connection removed: [A] or [B] missing entirely." + del src + if(A.zone == B.zone) + world.log << "Connection removed: Zones now merged." + del src + if(!A.zone || !B.zone) + no_zone_count++ + if(no_zone_count >= 5) + world.log << "Connection removed: [A] or [B] missing a zone." + del src \ No newline at end of file diff --git a/code/ZAS/Creation.dm b/code/ZAS/Creation.dm index 5f256767fd3..1dba1d296ba 100644 --- a/code/ZAS/Creation.dm +++ b/code/ZAS/Creation.dm @@ -17,6 +17,7 @@ zone air.toxins += T.toxins / members air.temperature += T.temperature / members air.group_multiplier = contents.len + air.update_values() zones += src Del() zones -= src diff --git a/code/ZAS/Debug.dm b/code/ZAS/Debug.dm index 28fc3caef53..66c6a12ca33 100644 --- a/code/ZAS/Debug.dm +++ b/code/ZAS/Debug.dm @@ -1,5 +1,5 @@ -client/proc/Zone_Info(turf/T as null|turf) +client/verb/Zone_Info(turf/T as null|turf) set category = "Debug" if(T) if(T.zone) @@ -28,9 +28,10 @@ zone/proc M << "Plasma: [air.toxins]" M << "Carbon Dioxide: [air.carbon_dioxide]" M << "Temperature: [air.temperature]" - M << "Heat Energy: [air.thermal_energy()]" + M << "Heat Energy: [air.temperature * air.heat_capacity()]" M << "Pressure: [air.return_pressure()]" M << "" + M << "Space Tiles: [length(space_tiles)]" M << "Connections: [length(connections)]" for(var/connection/C in connections) @@ -40,6 +41,9 @@ zone/proc spawn(50) C.A.overlays -= 'debug_connect.dmi' C.B.overlays -= 'debug_connect.dmi' + for(var/C in connections) + if(!istype(C,/connection)) + M << "[C] (Not Connection!)" else dbg_output = 0 diff --git a/code/ZAS/Definition.dm b/code/ZAS/Definition.dm index 729d19841fc..b092dc304b7 100644 --- a/code/ZAS/Definition.dm +++ b/code/ZAS/Definition.dm @@ -1,25 +1,6 @@ turf/var/zone/zone var/list/zones = list() -var/zone_controller/zone_master = new - -zone_controller - var - current_tick = 0 - proc - start() - set background = 1 - while(1) - current_tick++ - for(var/zone/Z in zones) - if(Z.last_update < current_tick) - Z.process() - if(Z) Z.last_update = current_tick - for(var/obj/fire/F) - F.process() - //for(var/obj/z_hotspot/H in z_hotspots) - // H.process() - sleep(max(5,vsc.zone_update_delay*tick_multiplier)) zone var diff --git a/code/ZAS/FEA_gas_mixture.dm b/code/ZAS/FEA_gas_mixture.dm new file mode 100644 index 00000000000..24a6682381b --- /dev/null +++ b/code/ZAS/FEA_gas_mixture.dm @@ -0,0 +1,1008 @@ +/* +What are the archived variables for? + Calculations are done using the archived variables with the results merged into the regular variables. + This prevents race conditions that arise based on the order of tile processing. +*/ + +datum + gas //These are used for the "Trace Gases" stuff, but is buggy. + sleeping_agent + specific_heat = 40 + + volatile_fuel + specific_heat = 30 + + var + moles = 0 + specific_heat = 0 + + moles_archived = 0 + + gas_mixture + var //Holds the "moles" of each of the four gases. + oxygen = 0 + carbon_dioxide = 0 + nitrogen = 0 + toxins = 0 + total_moles = 0 //Updated when a reaction occurs. + pressure = 0 + + volume = CELL_VOLUME + + temperature = 0 //in Kelvin, use calculate_temperature() to modify + + group_multiplier = 1 + //Size of the group this gas_mixture is representing. + //=1 for singletons + + graphic + + list/datum/gas/trace_gases = list() //Seemed to be a good idea that was abandoned + + tmp //These are variables for use with the archived data + oxygen_archived + carbon_dioxide_archived + nitrogen_archived + toxins_archived + + temperature_archived + + graphic_archived + fuel_burnt = 0 + +//FOR THE LOVE OF GOD PLEASE USE THIS PROC +//Call it with negative numbers to remove gases. + + proc/adjustGases(o2 = 0, co2 = 0, n2 = 0, tx = 0, list/datum/gas/traces = list()) + //Purpose: Adjusting the gases within a airmix + //Called by: Nothing, yet! + //Inputs: The values of the gases to adjust + //Outputs: null + + oxygen = max(0, oxygen + o2) + carbon_dioxide = max(0, carbon_dioxide + co2) + nitrogen = max(0, nitrogen + n2) + toxins = max(0, toxins + tx) + + //handle trace gasses + for(var/datum/gas/G in traces) + var/datum/gas/T = locate(G.type) in trace_gases + if(T) + T.moles = max(G.moles + T.moles, 0) + else if(G.moles > 0) + trace_gases |= G + update_values() + return + +/////////////////////////////// +//PV=nRT - related procedures// +/////////////////////////////// + + + proc/heat_capacity() + //Purpose: Returning the heat capacity of the gas mix + //Called by: UNKNOWN + //Inputs: None + //Outputs: Heat capacity + + var/heat_capacity = HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,toxins) + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + heat_capacity += trace_gas.moles*trace_gas.specific_heat + + return max(MINIMUM_HEAT_CAPACITY,heat_capacity) + + proc/heat_capacity_archived() + //Purpose: Returning the archived heat capacity of the gas mix + //Called by: UNKNOWN + //Inputs: None + //Outputs: Archived heat capacity + + var/heat_capacity_archived = HEAT_CAPACITY_CALCULATION(oxygen_archived,carbon_dioxide_archived,nitrogen_archived,toxins_archived) + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + heat_capacity_archived += trace_gas.moles_archived*trace_gas.specific_heat + + return max(MINIMUM_HEAT_CAPACITY,heat_capacity_archived) + + proc/return_pressure() + //Purpose: Calculating Current Pressure + //Called by: + //Inputs: None + //Outputs: Gas pressure. + + if(volume>0) + return total_moles*R_IDEAL_GAS_EQUATION*temperature/volume + return 0 + +// proc/return_temperature() + //Purpose: + //Inputs: + //Outputs: + +// return temperature + +// proc/return_volume() + //Purpose: + //Inputs: + //Outputs: + +// return max(0, volume) + +// proc/thermal_energy() + //Purpose: + //Inputs: + //Outputs: + +// return temperature*heat_capacity() + + proc/update_values() + //Purpose: Calculating and storing values which were normally called CONSTANTLY + //Called by: Anything that changes values within a gas mix. + //Inputs: None + //Outputs: None + + total_moles = oxygen + carbon_dioxide + nitrogen + toxins + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + total_moles += trace_gas.moles + + if(volume) + pressure = total_moles*R_IDEAL_GAS_EQUATION*temperature/volume + else + pressure = 0 + return + +//////////////////////////////////////////// +//Procedures used for very specific events// +//////////////////////////////////////////// + + + proc/check_tile_graphic() + //Purpose: Calculating the graphic for a tile + //Called by: Turfs updating + //Inputs: None + //Outputs: 1 if graphic changed, 0 if unchanged + + graphic = null + if(toxins > MOLES_PLASMA_VISIBLE) + graphic = "plasma" + else if(length(trace_gases)) + var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in trace_gases + if(sleeping_agent && (sleeping_agent.moles > 1)) + graphic = "sleeping_agent" + else + graphic = null + + return graphic != graphic_archived + + proc/react(atom/dump_location) + //Purpose: Calculating if it is possible for a fire to occur in the airmix + //Called by: Air mixes updating? + //Inputs: None + //Outputs: If a fire occured + + var/reacting = 0 //set to 1 if a notable reaction occured (used by pipe_network) + + if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) + if(fire() > 0) + reacting = 1 + + return reacting + + proc/fire() + //Purpose: Calculating any fire reactions. + //Called by: react() (See above) + //Inputs: None + //Outputs: How much fuel burned + + return zburn(null) + + /*var/energy_released = 0 + var/old_heat_capacity = heat_capacity() + + var/datum/gas/volatile_fuel/fuel_store = locate(/datum/gas/volatile_fuel) in trace_gases + if(fuel_store) //General volatile gas burn + var/burned_fuel = 0 + + if(oxygen < fuel_store.moles) + burned_fuel = oxygen + fuel_store.moles -= burned_fuel + oxygen = 0 + else + burned_fuel = fuel_store.moles + oxygen -= fuel_store.moles + del(fuel_store) + + energy_released += FIRE_CARBON_ENERGY_RELEASED * burned_fuel + carbon_dioxide += burned_fuel + fuel_burnt += burned_fuel + + //Handle plasma burning + if(toxins > MINIMUM_HEAT_CAPACITY) + var/plasma_burn_rate = 0 + var/oxygen_burn_rate = 0 + //more plasma released at higher temperatures + var/temperature_scale + if(temperature > PLASMA_UPPER_TEMPERATURE) + temperature_scale = 1 + else + temperature_scale = (temperature-PLASMA_MINIMUM_BURN_TEMPERATURE)/(PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE) + if(temperature_scale > 0) + oxygen_burn_rate = 1.4 - temperature_scale + if(oxygen > toxins*PLASMA_OXYGEN_FULLBURN) + plasma_burn_rate = (toxins*temperature_scale)/4 + else + plasma_burn_rate = (temperature_scale*(oxygen/PLASMA_OXYGEN_FULLBURN))/4 + if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY) + toxins -= plasma_burn_rate + oxygen -= plasma_burn_rate*oxygen_burn_rate + carbon_dioxide += plasma_burn_rate + + energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate) + + fuel_burnt += (plasma_burn_rate)*(1+oxygen_burn_rate) + + if(energy_released > 0) + var/new_heat_capacity = heat_capacity() + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + temperature = (temperature*old_heat_capacity + energy_released)/new_heat_capacity + update_values() + + return fuel_burnt*/ + +////////////////////////////////////////////// +//Procs for general gas spread calculations.// +////////////////////////////////////////////// + + + proc/archive() + //Purpose: Archives the current gas values + //Called by: UNKNOWN + //Inputs: None + //Outputs: 1 + + oxygen_archived = oxygen + carbon_dioxide_archived = carbon_dioxide + nitrogen_archived = nitrogen + toxins_archived = toxins + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + trace_gas.moles_archived = trace_gas.moles + + temperature_archived = temperature + + graphic_archived = graphic + + return 1 + + proc/check_then_merge(datum/gas_mixture/giver) + //Purpose: Similar to merge(...) but first checks to see if the amount of air assumed is small enough + // that group processing is still accurate for source (aborts if not) + //Called by: airgroups/machinery expelling air, ? + //Inputs: The gas to try and merge + //Outputs: 1 on successful merge. 0 otherwise. + + if(!giver) + return 0 + if(((giver.oxygen > MINIMUM_AIR_TO_SUSPEND) && (giver.oxygen >= oxygen*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((giver.carbon_dioxide > MINIMUM_AIR_TO_SUSPEND) && (giver.carbon_dioxide >= carbon_dioxide*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((giver.nitrogen > MINIMUM_AIR_TO_SUSPEND) && (giver.nitrogen >= nitrogen*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((giver.toxins > MINIMUM_AIR_TO_SUSPEND) && (giver.toxins >= toxins*MINIMUM_AIR_RATIO_TO_SUSPEND))) + return 0 + if(abs(giver.temperature - temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) + return 0 + + if(giver.trace_gases.len) + for(var/datum/gas/trace_gas in giver.trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if((trace_gas.moles > MINIMUM_AIR_TO_SUSPEND) && (!corresponding || (trace_gas.moles >= corresponding.moles*MINIMUM_AIR_RATIO_TO_SUSPEND))) + return 0 + + return merge(giver) + + proc/merge(datum/gas_mixture/giver) + //Purpose: Merges all air from giver into self. Deletes giver. + //Called by: Machinery expelling air, check_then_merge, ? + //Inputs: The gas to merge. + //Outputs: 1 + + if(!giver) + return 0 + + if(abs(temperature-giver.temperature)>MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/self_heat_capacity = heat_capacity()*group_multiplier + var/giver_heat_capacity = giver.heat_capacity()*giver.group_multiplier + var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity + if(combined_heat_capacity != 0) + temperature = (giver.temperature*giver_heat_capacity + temperature*self_heat_capacity)/combined_heat_capacity + + if((group_multiplier>1)||(giver.group_multiplier>1)) + oxygen += giver.oxygen*giver.group_multiplier/group_multiplier + carbon_dioxide += giver.carbon_dioxide*giver.group_multiplier/group_multiplier + nitrogen += giver.nitrogen*giver.group_multiplier/group_multiplier + toxins += giver.toxins*giver.group_multiplier/group_multiplier + else + oxygen += giver.oxygen + carbon_dioxide += giver.carbon_dioxide + nitrogen += giver.nitrogen + toxins += giver.toxins + + if(giver.trace_gases.len) + for(var/datum/gas/trace_gas in giver.trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if(!corresponding) + corresponding = new trace_gas.type() + trace_gases += corresponding + corresponding.moles += trace_gas.moles*giver.group_multiplier/group_multiplier + update_values() + + del(giver) + return 1 + + proc/remove(amount) + //Purpose: Removes a certain number of moles from the air. + //Called by: ? + //Inputs: How many moles to remove. + //Outputs: Removed air. + + var/sum = total_moles + amount = min(amount,sum) //Can not take more air than tile has! + if(amount <= 0) + return null + + var/datum/gas_mixture/removed = new + + + removed.oxygen = QUANTIZE((oxygen/sum)*amount) + removed.nitrogen = QUANTIZE((nitrogen/sum)*amount) + removed.carbon_dioxide = QUANTIZE((carbon_dioxide/sum)*amount) + removed.toxins = QUANTIZE((toxins/sum)*amount) + + oxygen -= removed.oxygen/group_multiplier + nitrogen -= removed.nitrogen/group_multiplier + carbon_dioxide -= removed.carbon_dioxide/group_multiplier + toxins -= removed.toxins/group_multiplier + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + var/datum/gas/corresponding = new trace_gas.type() + removed.trace_gases += corresponding + + corresponding.moles = (trace_gas.moles/sum)*amount + trace_gas.moles -= corresponding.moles/group_multiplier + + removed.temperature = temperature + update_values() + removed.update_values() + + return removed + + proc/remove_ratio(ratio) + //Purpose: Removes a certain ratio of the air. + //Called by: ? + //Inputs: Percentage to remove. + //Outputs: Removed air. + + if(ratio <= 0) + return null + + ratio = min(ratio, 1) + + var/datum/gas_mixture/removed = new + + removed.oxygen = QUANTIZE(oxygen*ratio) + removed.nitrogen = QUANTIZE(nitrogen*ratio) + removed.carbon_dioxide = QUANTIZE(carbon_dioxide*ratio) + removed.toxins = QUANTIZE(toxins*ratio) + + oxygen -= removed.oxygen/group_multiplier + nitrogen -= removed.nitrogen/group_multiplier + carbon_dioxide -= removed.carbon_dioxide/group_multiplier + toxins -= removed.toxins/group_multiplier + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + var/datum/gas/corresponding = new trace_gas.type() + removed.trace_gases += corresponding + + corresponding.moles = trace_gas.moles*ratio + trace_gas.moles -= corresponding.moles/group_multiplier + + removed.temperature = temperature + update_values() + removed.update_values() + + return removed + + proc/check_then_remove(amount) + //Purpose: Similar to remove(...) but first checks to see if the amount of air removed is small enough + // that group processing is still accurate for source (aborts if not) + //Called by: ? + //Inputs: Number of moles to remove + //Outputs: Removed air or 0 if it can remove air or not. + + amount = min(amount,total_moles) //Can not take more air than tile has! + + if((amount > MINIMUM_AIR_RATIO_TO_SUSPEND) && (amount > total_moles*MINIMUM_AIR_RATIO_TO_SUSPEND)) + return 0 + + return remove(amount) + + proc/copy_from(datum/gas_mixture/sample) + //Purpose: Duplicates the sample air mixture. + //Called by: airgroups splitting, ? + //Inputs: Gas to copy + //Outputs: 1 + + oxygen = sample.oxygen + carbon_dioxide = sample.carbon_dioxide + nitrogen = sample.nitrogen + toxins = sample.toxins + total_moles = sample.total_moles + + trace_gases.len=null + if(sample.trace_gases.len > 0) + for(var/datum/gas/trace_gas in sample.trace_gases) + var/datum/gas/corresponding = new trace_gas.type() + trace_gases += corresponding + + corresponding.moles = trace_gas.moles + + temperature = sample.temperature + + return 1 + + proc/check_gas_mixture(datum/gas_mixture/sharer) + //Purpose: Telling if one or both airgroups needs to disable group processing. + //Called by: Airgroups sharing air, checking if group processing needs disabled. + //Inputs: Gas to compare from other airgroup + //Outputs: 0 if the self-check failed (local airgroup breaks?) + // then -1 if sharer-check failed (sharing airgroup breaks?) + // then 1 if both checks pass (share succesful?) + if(!istype(sharer)) + return + + var/delta_oxygen = QUANTIZE(oxygen_archived - sharer.oxygen_archived)/TRANSFER_FRACTION + var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - sharer.carbon_dioxide_archived)/TRANSFER_FRACTION + var/delta_nitrogen = QUANTIZE(nitrogen_archived - sharer.nitrogen_archived)/TRANSFER_FRACTION + var/delta_toxins = QUANTIZE(toxins_archived - sharer.toxins_archived)/TRANSFER_FRACTION + + var/delta_temperature = (temperature_archived - sharer.temperature_archived) + + if(((abs(delta_oxygen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_oxygen) >= oxygen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_carbon_dioxide) >= carbon_dioxide_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_nitrogen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_nitrogen) >= nitrogen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_toxins) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_toxins) >= toxins_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) + return 0 + + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) + return 0 + + if(sharer.trace_gases.len) + for(var/datum/gas/trace_gas in sharer.trace_gases) + if(trace_gas.moles_archived > MINIMUM_AIR_TO_SUSPEND*4) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if(corresponding) + if(trace_gas.moles_archived >= corresponding.moles_archived*MINIMUM_AIR_RATIO_TO_SUSPEND*4) + return 0 + else + return 0 + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + if(trace_gas.moles_archived > MINIMUM_AIR_TO_SUSPEND*4) + if(!locate(trace_gas.type) in sharer.trace_gases) + return 0 + + if(((abs(delta_oxygen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_oxygen) >= sharer.oxygen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_carbon_dioxide) >= sharer.carbon_dioxide_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_nitrogen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_nitrogen) >= sharer.nitrogen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_toxins) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_toxins) >= sharer.toxins_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) + return -1 + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + if(trace_gas.moles_archived > MINIMUM_AIR_TO_SUSPEND*4) + var/datum/gas/corresponding = locate(trace_gas.type) in sharer.trace_gases + if(corresponding) + if(trace_gas.moles_archived >= corresponding.moles_archived*MINIMUM_AIR_RATIO_TO_SUSPEND*4) + return -1 + else + return -1 + + return 1 + + proc/check_turf(turf/model) + //Purpose: Used to compare the gases in an unsimulated turf with the gas in a simulated one. + //Called by: Sharing air (mimicing) with adjacent unsimulated turfs + //Inputs: Unsimulated turf + //Outputs: 1 if safe to mimic, 0 if needs to break airgroup. + + var/delta_oxygen = (oxygen_archived - model.oxygen)/TRANSFER_FRACTION + var/delta_carbon_dioxide = (carbon_dioxide_archived - model.carbon_dioxide)/TRANSFER_FRACTION + var/delta_nitrogen = (nitrogen_archived - model.nitrogen)/TRANSFER_FRACTION + var/delta_toxins = (toxins_archived - model.toxins)/TRANSFER_FRACTION + + var/delta_temperature = (temperature_archived - model.temperature) + + if(((abs(delta_oxygen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_oxygen) >= oxygen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_carbon_dioxide) >= carbon_dioxide_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_nitrogen) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_nitrogen) >= nitrogen_archived*MINIMUM_AIR_RATIO_TO_SUSPEND)) \ + || ((abs(delta_toxins) > MINIMUM_AIR_TO_SUSPEND) && (abs(delta_toxins) >= toxins_archived*MINIMUM_AIR_RATIO_TO_SUSPEND))) + return 0 + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) + return 0 + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + if(trace_gas.moles_archived > MINIMUM_AIR_TO_SUSPEND*4) + return 0 + + return 1 + + proc/share(datum/gas_mixture/sharer) + //Purpose: Used to transfer gas from a more pressurised tile to a less presurised tile + // (Two directional, if the other tile is more pressurised, air travels to current tile) + //Called by: Sharing air with adjacent simulated turfs + //Inputs: Air datum to share with + //Outputs: Amount of gas exchanged (Negative if lost air, positive if gained.) + + + if(!istype(sharer)) + return + + var/delta_oxygen = QUANTIZE(oxygen_archived - sharer.oxygen_archived)/TRANSFER_FRACTION + var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - sharer.carbon_dioxide_archived)/TRANSFER_FRACTION + var/delta_nitrogen = QUANTIZE(nitrogen_archived - sharer.nitrogen_archived)/TRANSFER_FRACTION + var/delta_toxins = QUANTIZE(toxins_archived - sharer.toxins_archived)/TRANSFER_FRACTION + + var/delta_temperature = (temperature_archived - sharer.temperature_archived) + + var/old_self_heat_capacity = 0 + var/old_sharer_heat_capacity = 0 + + var/heat_self_to_sharer = 0 + var/heat_capacity_self_to_sharer = 0 + var/heat_sharer_to_self = 0 + var/heat_capacity_sharer_to_self = 0 + + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + + var/delta_air = delta_oxygen+delta_nitrogen + if(delta_air) + var/air_heat_capacity = SPECIFIC_HEAT_AIR*delta_air + if(delta_air > 0) + heat_self_to_sharer += air_heat_capacity*temperature_archived + heat_capacity_self_to_sharer += air_heat_capacity + else + heat_sharer_to_self -= air_heat_capacity*sharer.temperature_archived + heat_capacity_sharer_to_self -= air_heat_capacity + + if(delta_carbon_dioxide) + var/carbon_dioxide_heat_capacity = SPECIFIC_HEAT_CDO*delta_carbon_dioxide + if(delta_carbon_dioxide > 0) + heat_self_to_sharer += carbon_dioxide_heat_capacity*temperature_archived + heat_capacity_self_to_sharer += carbon_dioxide_heat_capacity + else + heat_sharer_to_self -= carbon_dioxide_heat_capacity*sharer.temperature_archived + heat_capacity_sharer_to_self -= carbon_dioxide_heat_capacity + + if(delta_toxins) + var/toxins_heat_capacity = SPECIFIC_HEAT_TOXIN*delta_toxins + if(delta_toxins > 0) + heat_self_to_sharer += toxins_heat_capacity*temperature_archived + heat_capacity_self_to_sharer += toxins_heat_capacity + else + heat_sharer_to_self -= toxins_heat_capacity*sharer.temperature_archived + heat_capacity_sharer_to_self -= toxins_heat_capacity + + old_self_heat_capacity = heat_capacity()*group_multiplier + old_sharer_heat_capacity = sharer.heat_capacity()*sharer.group_multiplier + + oxygen -= delta_oxygen/group_multiplier + sharer.oxygen += delta_oxygen/sharer.group_multiplier + + carbon_dioxide -= delta_carbon_dioxide/group_multiplier + sharer.carbon_dioxide += delta_carbon_dioxide/sharer.group_multiplier + + nitrogen -= delta_nitrogen/group_multiplier + sharer.nitrogen += delta_nitrogen/sharer.group_multiplier + + toxins -= delta_toxins/group_multiplier + sharer.toxins += delta_toxins/sharer.group_multiplier + + var/moved_moles = (delta_oxygen + delta_carbon_dioxide + delta_nitrogen + delta_toxins) + + var/list/trace_types_considered = list() + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + + var/datum/gas/corresponding = locate(trace_gas.type) in sharer.trace_gases + var/delta = 0 + + if(corresponding) + delta = QUANTIZE(trace_gas.moles_archived - corresponding.moles_archived)/TRANSFER_FRACTION + else + corresponding = new trace_gas.type() + sharer.trace_gases += corresponding + + delta = trace_gas.moles_archived/TRANSFER_FRACTION + + trace_gas.moles -= delta/group_multiplier + corresponding.moles += delta/sharer.group_multiplier + + if(delta) + var/individual_heat_capacity = trace_gas.specific_heat*delta + if(delta > 0) + heat_self_to_sharer += individual_heat_capacity*temperature_archived + heat_capacity_self_to_sharer += individual_heat_capacity + else + heat_sharer_to_self -= individual_heat_capacity*sharer.temperature_archived + heat_capacity_sharer_to_self -= individual_heat_capacity + + moved_moles += delta + + trace_types_considered += trace_gas.type + + + if(sharer.trace_gases.len) + for(var/datum/gas/trace_gas in sharer.trace_gases) + if(trace_gas.type in trace_types_considered) continue + else + var/datum/gas/corresponding + var/delta = 0 + + corresponding = new trace_gas.type() + trace_gases += corresponding + + delta = trace_gas.moles_archived/TRANSFER_FRACTION + + trace_gas.moles -= delta/sharer.group_multiplier + corresponding.moles += delta/group_multiplier + + //Guaranteed transfer from sharer to self + var/individual_heat_capacity = trace_gas.specific_heat*delta + heat_sharer_to_self += individual_heat_capacity*sharer.temperature_archived + heat_capacity_sharer_to_self += individual_heat_capacity + + moved_moles += -delta + update_values() + sharer.update_values() + + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/new_self_heat_capacity = old_self_heat_capacity + heat_capacity_sharer_to_self - heat_capacity_self_to_sharer + var/new_sharer_heat_capacity = old_sharer_heat_capacity + heat_capacity_self_to_sharer - heat_capacity_sharer_to_self + + if(new_self_heat_capacity > MINIMUM_HEAT_CAPACITY) + temperature = (old_self_heat_capacity*temperature - heat_capacity_self_to_sharer*temperature_archived + heat_capacity_sharer_to_self*sharer.temperature_archived)/new_self_heat_capacity + + if(new_sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) + sharer.temperature = (old_sharer_heat_capacity*sharer.temperature-heat_capacity_sharer_to_self*sharer.temperature_archived + heat_capacity_self_to_sharer*temperature_archived)/new_sharer_heat_capacity + + if(abs(old_sharer_heat_capacity) > MINIMUM_HEAT_CAPACITY) + if(abs(new_sharer_heat_capacity/old_sharer_heat_capacity - 1) < 0.10) // <10% change in sharer heat capacity + temperature_share(sharer, OPEN_HEAT_TRANSFER_COEFFICIENT) + + if((delta_temperature > MINIMUM_TEMPERATURE_TO_MOVE) || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE) + var/delta_pressure = temperature_archived*(total_moles + moved_moles) - sharer.temperature_archived*(sharer.total_moles - moved_moles) + return delta_pressure*R_IDEAL_GAS_EQUATION/volume + + else + return 0 + + proc/mimic(turf/model, border_multiplier) + //Purpose: Used transfer gas from a more pressurised tile to a less presurised unsimulated tile. + //Called by: "sharing" from unsimulated to simulated turfs. + //Inputs: Unsimulated turf, Multiplier for gas transfer (optional) + //Outputs: Amount of gas exchanged + + var/delta_oxygen = QUANTIZE(oxygen_archived - model.oxygen)/TRANSFER_FRACTION + var/delta_carbon_dioxide = QUANTIZE(carbon_dioxide_archived - model.carbon_dioxide)/TRANSFER_FRACTION + var/delta_nitrogen = QUANTIZE(nitrogen_archived - model.nitrogen)/TRANSFER_FRACTION + var/delta_toxins = QUANTIZE(toxins_archived - model.toxins)/TRANSFER_FRACTION + + var/delta_temperature = (temperature_archived - model.temperature) + + var/heat_transferred = 0 + var/old_self_heat_capacity = 0 + var/heat_capacity_transferred = 0 + + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + + var/delta_air = delta_oxygen+delta_nitrogen + if(delta_air) + var/air_heat_capacity = SPECIFIC_HEAT_AIR*delta_air + heat_transferred -= air_heat_capacity*model.temperature + heat_capacity_transferred -= air_heat_capacity + + if(delta_carbon_dioxide) + var/carbon_dioxide_heat_capacity = SPECIFIC_HEAT_CDO*delta_carbon_dioxide + heat_transferred -= carbon_dioxide_heat_capacity*model.temperature + heat_capacity_transferred -= carbon_dioxide_heat_capacity + + if(delta_toxins) + var/toxins_heat_capacity = SPECIFIC_HEAT_TOXIN*delta_toxins + heat_transferred -= toxins_heat_capacity*model.temperature + heat_capacity_transferred -= toxins_heat_capacity + + old_self_heat_capacity = heat_capacity()*group_multiplier + + if(border_multiplier) + oxygen -= delta_oxygen*border_multiplier/group_multiplier + carbon_dioxide -= delta_carbon_dioxide*border_multiplier/group_multiplier + nitrogen -= delta_nitrogen*border_multiplier/group_multiplier + toxins -= delta_toxins*border_multiplier/group_multiplier + else + oxygen -= delta_oxygen/group_multiplier + carbon_dioxide -= delta_carbon_dioxide/group_multiplier + nitrogen -= delta_nitrogen/group_multiplier + toxins -= delta_toxins/group_multiplier + + var/moved_moles = (delta_oxygen + delta_carbon_dioxide + delta_nitrogen + delta_toxins) + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + var/delta = 0 + + delta = trace_gas.moles_archived/TRANSFER_FRACTION + + if(border_multiplier) + trace_gas.moles -= delta*border_multiplier/group_multiplier + else + trace_gas.moles -= delta/group_multiplier + + var/heat_cap_transferred = delta*trace_gas.specific_heat + heat_transferred += heat_cap_transferred*temperature_archived + heat_capacity_transferred += heat_cap_transferred + moved_moles += delta + update_values() + + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/new_self_heat_capacity = old_self_heat_capacity - heat_capacity_transferred + if(new_self_heat_capacity > MINIMUM_HEAT_CAPACITY) + if(border_multiplier) + temperature = (old_self_heat_capacity*temperature - heat_capacity_transferred*border_multiplier*temperature_archived)/new_self_heat_capacity + else + temperature = (old_self_heat_capacity*temperature - heat_capacity_transferred*border_multiplier*temperature_archived)/new_self_heat_capacity + + temperature_mimic(model, model.thermal_conductivity, border_multiplier) + + if((delta_temperature > MINIMUM_TEMPERATURE_TO_MOVE) || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE) + var/delta_pressure = temperature_archived*(total_moles + moved_moles) - model.temperature*(model.oxygen+model.carbon_dioxide+model.nitrogen+model.toxins) + return delta_pressure*R_IDEAL_GAS_EQUATION/volume + else + return 0 + + proc/check_both_then_temperature_share(datum/gas_mixture/sharer, conduction_coefficient) + var/delta_temperature = (temperature_archived - sharer.temperature_archived) + + var/self_heat_capacity = heat_capacity_archived() + var/sharer_heat_capacity = sharer.heat_capacity_archived() + + var/self_temperature_delta = 0 + var/sharer_temperature_delta = 0 + + if((sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) + var/heat = conduction_coefficient*delta_temperature* \ + (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity)) + + self_temperature_delta = -heat/(self_heat_capacity*group_multiplier) + sharer_temperature_delta = heat/(sharer_heat_capacity*sharer.group_multiplier) + else + return 1 + + if((abs(self_temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) \ + && (abs(self_temperature_delta) > MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND*temperature_archived)) + return 0 + + if((abs(sharer_temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) \ + && (abs(sharer_temperature_delta) > MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND*sharer.temperature_archived)) + return -1 + + temperature += self_temperature_delta + sharer.temperature += sharer_temperature_delta + + return 1 + //Logic integrated from: temperature_share(sharer, conduction_coefficient) for efficiency + + proc/check_me_then_temperature_share(datum/gas_mixture/sharer, conduction_coefficient) + var/delta_temperature = (temperature_archived - sharer.temperature_archived) + + var/self_heat_capacity = heat_capacity_archived() + var/sharer_heat_capacity = sharer.heat_capacity_archived() + + var/self_temperature_delta = 0 + var/sharer_temperature_delta = 0 + + if((sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) + var/heat = conduction_coefficient*delta_temperature* \ + (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity)) + + self_temperature_delta = -heat/(self_heat_capacity*group_multiplier) + sharer_temperature_delta = heat/(sharer_heat_capacity*sharer.group_multiplier) + else + return 1 + + if((abs(self_temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) \ + && (abs(self_temperature_delta) > MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND*temperature_archived)) + return 0 + + temperature += self_temperature_delta + sharer.temperature += sharer_temperature_delta + + return 1 + //Logic integrated from: temperature_share(sharer, conduction_coefficient) for efficiency + + proc/check_me_then_temperature_turf_share(turf/simulated/sharer, conduction_coefficient) + var/delta_temperature = (temperature_archived - sharer.temperature) + + var/self_temperature_delta = 0 + var/sharer_temperature_delta = 0 + + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/self_heat_capacity = heat_capacity_archived() + + if((sharer.heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) + var/heat = conduction_coefficient*delta_temperature* \ + (self_heat_capacity*sharer.heat_capacity/(self_heat_capacity+sharer.heat_capacity)) + + self_temperature_delta = -heat/(self_heat_capacity*group_multiplier) + sharer_temperature_delta = heat/sharer.heat_capacity + else + return 1 + + if((abs(self_temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) \ + && (abs(self_temperature_delta) > MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND*temperature_archived)) + return 0 + + temperature += self_temperature_delta + sharer.temperature += sharer_temperature_delta + + return 1 + //Logic integrated from: temperature_turf_share(sharer, conduction_coefficient) for efficiency + + proc/check_me_then_temperature_mimic(turf/model, conduction_coefficient) + var/delta_temperature = (temperature_archived - model.temperature) + var/self_temperature_delta = 0 + + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/self_heat_capacity = heat_capacity_archived() + + if((model.heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) + var/heat = conduction_coefficient*delta_temperature* \ + (self_heat_capacity*model.heat_capacity/(self_heat_capacity+model.heat_capacity)) + + self_temperature_delta = -heat/(self_heat_capacity*group_multiplier) + + if((abs(self_temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) \ + && (abs(self_temperature_delta) > MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND*temperature_archived)) + return 0 + + temperature += self_temperature_delta + + return 1 + //Logic integrated from: temperature_mimic(model, conduction_coefficient) for efficiency + + proc/temperature_share(datum/gas_mixture/sharer, conduction_coefficient) + + var/delta_temperature = (temperature_archived - sharer.temperature_archived) + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/self_heat_capacity = heat_capacity_archived() + var/sharer_heat_capacity = sharer.heat_capacity_archived() + if(!group_multiplier) + message_admins("Error! The gas mixture (ref \ref[src]) has no group multiplier!") + return + + if((sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) + var/heat = conduction_coefficient*delta_temperature* \ + (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity)) + + temperature -= heat/(self_heat_capacity*group_multiplier) + sharer.temperature += heat/(sharer_heat_capacity*sharer.group_multiplier) + + proc/temperature_mimic(turf/model, conduction_coefficient, border_multiplier) + var/delta_temperature = (temperature - model.temperature) + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/self_heat_capacity = heat_capacity()//_archived() + if(!group_multiplier) + message_admins("Error! The gas mixture (ref \ref[src]) has no group multiplier!") + return + + if((model.heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) + var/heat = conduction_coefficient*delta_temperature* \ + (self_heat_capacity*model.heat_capacity/(self_heat_capacity+model.heat_capacity)) + + if(border_multiplier) + temperature -= heat*border_multiplier/(self_heat_capacity*group_multiplier) + else + temperature -= heat/(self_heat_capacity*group_multiplier) + + proc/temperature_turf_share(turf/simulated/sharer, conduction_coefficient) + var/delta_temperature = (temperature_archived - sharer.temperature) + if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/self_heat_capacity = heat_capacity() + + if((sharer.heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) + var/heat = conduction_coefficient*delta_temperature* \ + (self_heat_capacity*sharer.heat_capacity/(self_heat_capacity+sharer.heat_capacity)) + + temperature -= heat/(self_heat_capacity*group_multiplier) + sharer.temperature += heat/sharer.heat_capacity + + proc/compare(datum/gas_mixture/sample) + //Purpose: Compares sample to self to see if within acceptable ranges that group processing may be enabled + //Called by: Airgroups trying to rebuild + //Inputs: Gas mix to compare + //Outputs: 1 if can rebuild, 0 if not. + if(!sample) return 0 + + if((abs(oxygen-sample.oxygen) > MINIMUM_AIR_TO_SUSPEND) && \ + ((oxygen < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.oxygen) || (oxygen > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.oxygen))) + return 0 + if((abs(nitrogen-sample.nitrogen) > MINIMUM_AIR_TO_SUSPEND) && \ + ((nitrogen < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.nitrogen) || (nitrogen > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.nitrogen))) + return 0 + if((abs(carbon_dioxide-sample.carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && \ + ((carbon_dioxide < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide) || (oxygen > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide))) + return 0 + if((abs(toxins-sample.toxins) > MINIMUM_AIR_TO_SUSPEND) && \ + ((toxins < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins) || (toxins > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins))) + return 0 + + if(total_moles > MINIMUM_AIR_TO_SUSPEND) + if((abs(temperature-sample.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) && \ + ((temperature < (1-MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND)*sample.temperature) || (temperature > (1+MINIMUM_TEMPERATURE_RATIO_TO_SUSPEND)*sample.temperature))) + //world << "temp fail [temperature] & [sample.temperature]" + return 0 + + if(sample.trace_gases.len) + for(var/datum/gas/trace_gas in sample.trace_gases) + if(trace_gas.moles_archived > MINIMUM_AIR_TO_SUSPEND) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if(corresponding) + if((abs(trace_gas.moles - corresponding.moles) > MINIMUM_AIR_TO_SUSPEND) && \ + ((corresponding.moles < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*trace_gas.moles) || (corresponding.moles > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*trace_gas.moles))) + return 0 + else + return 0 + + if(trace_gases.len) + for(var/datum/gas/trace_gas in trace_gases) + if(trace_gas.moles > MINIMUM_AIR_TO_SUSPEND) + var/datum/gas/corresponding = locate(trace_gas.type) in sample.trace_gases + if(corresponding) + if((abs(trace_gas.moles - corresponding.moles) > MINIMUM_AIR_TO_SUSPEND) && \ + ((trace_gas.moles < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*corresponding.moles) || (trace_gas.moles > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*corresponding.moles))) + return 0 + else + return 0 + return 1 + + + proc/subtract(datum/gas_mixture/right_side) + //Purpose: Subtracts right_side from air_mixture. Used to help turfs mingle + //Called by: Pipelines ending in a break (or something) + //Inputs: Gas mix to remove + //Outputs: 1 + + oxygen -= right_side.oxygen + carbon_dioxide -= right_side.carbon_dioxide + nitrogen -= right_side.nitrogen + toxins -= right_side.toxins + + if((trace_gases.len > 0)||(right_side.trace_gases.len > 0)) + for(var/datum/gas/trace_gas in right_side.trace_gases) + var/datum/gas/corresponding = locate(trace_gas.type) in trace_gases + if(!corresponding) + corresponding = new trace_gas.type() + trace_gases += corresponding + + corresponding.moles -= trace_gas.moles + update_values() + return 1 \ No newline at end of file diff --git a/code/ZAS/FEA_system.dm b/code/ZAS/FEA_system.dm new file mode 100644 index 00000000000..dd2fca6ef21 --- /dev/null +++ b/code/ZAS/FEA_system.dm @@ -0,0 +1,178 @@ +/* +Overview: + The air_master global variable is the workhorse for the system. + +Why are you archiving data before modifying it? + The general concept with archiving data and having each tile keep track of when they were last updated is to keep everything symmetric + and totally independent of the order they are read in an update cycle. + This prevents abnormalities like air/fire spreading rapidly in one direction and super slowly in the other. + +Why not just archive everything and then calculate? + Efficiency. While a for-loop that goes through all tils and groups to archive their information before doing any calculations seems simple, it is + slightly less efficient than the archive-before-modify/read method. + +Why is there a cycle check for calculating data as well? + This ensures that every connection between group-tile, tile-tile, and group-group is only evaluated once per loop. + + + + +Important variables: + air_master.groups_to_rebuild (list) + A list of air groups that have had their geometry occluded and thus may need to be split in half. + A set of adjacent groups put in here will join together if validly connected. + This is done before air system calculations for a cycle. + air_master.tiles_to_update (list) + Turfs that are in this list have their border data updated before the next air calculations for a cycle. + Place turfs in this list rather than call the proc directly to prevent race conditions + + turf/simulated.archive() and datum/air_group.archive() + This stores all data for. + If you modify, make sure to update the archived_cycle to prevent race conditions and maintain symmetry + + atom/CanPass(atom/movable/mover, turf/target, height, air_group) + returns 1 for allow pass and 0 for deny pass + Turfs automatically call this for all objects/mobs in its turf. + This is called both as source.CanPass(target, height, air_group) + and target.CanPass(source, height, air_group) + + Cases for the parameters + 1. This is called with args (mover, location, height>0, air_group=0) for normal objects. + 2. This is called with args (null, location, height=0, air_group=0) for flowing air. + 3. This is called with args (null, location, height=?, air_group=1) for determining group boundaries. + + Cases 2 and 3 would be different for doors or other objects open and close fairly often. + (Case 3 would return 0 always while Case 2 would return 0 only when the door is open) + This prevents the necessity of re-evaluating group geometry every time a door opens/closes. + + +Important Procedures + air_master.process() + This first processes the air_master update/rebuild lists then processes all groups and tiles for air calculations + + +*/ + +var/kill_air = 0 +var/tick_multiplier = 2 + +atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0) + //Purpose: Determines if the object (or airflow) can pass this atom. + //Called by: Movement, airflow. + //Inputs: The moving atom (optional), target turf, "height" and air group + //Outputs: Boolean if can pass. + + return (!density || !height || air_group) + +turf + CanPass(atom/movable/mover, turf/target, height=1.5,air_group=0) + if(!target) return 0 + + if(istype(mover)) // turf/Enter(...) will perform more advanced checks + return !density + + else // Now, doing more detailed checks for air movement and air group formation + if(target.blocks_air||blocks_air) + return 0 + + for(var/obj/obstacle in src) + if(!obstacle.CanPass(mover, target, height, air_group)) + return 0 + for(var/obj/obstacle in target) + if(!obstacle.CanPass(mover, src, height, air_group)) + return 0 + + return 1 + + +var/global/datum/controller/air_system/air_master + +datum + controller + air_system + //Geoemetry lists + var/list/turf/simulated/active_singletons = list() + + //Special functions lists + var/list/turf/simulated/active_super_conductivity = list() + var/list/turf/simulated/high_pressure_delta = list() + + //Geometry updates lists + var/list/turf/simulated/tiles_to_update = list() + var/list/turf/simulated/groups_to_rebuild = list() + + var/current_cycle = 0 + var/update_delay = 5 //How long between check should it try to process atmos again. + var/failed_ticks = 0 //How many ticks have runtimed? + + +/* process() + //Call this to process air movements for a cycle + + process_rebuild_select_groups() + //Used by process() + //Warning: Do not call this + + rebuild_group(datum/air_group) + //Used by process_rebuild_select_groups() + //Warning: Do not call this, add the group to air_master.groups_to_rebuild instead + */ + + + proc/setup() + //Purpose: Call this at the start to setup air groups geometry + // (Warning: Very processor intensive but only must be done once per round) + //Called by: Gameticker/Master controller + //Inputs: None. + //Outputs: None. + + set background = 1 + world << "\red \b Processing Geometry..." + sleep(-1) + + var/start_time = world.timeofday + + for(var/turf/simulated/S in world) + if(S.z < 5) + if(!S.blocks_air && !S.zone && S.z < 5) // Added last check to force skipping asteroid z-levels -- TLE + new/zone(S) + + S.update_air_properties() + + world << "\red \b Geometry processed in [time2text(world.timeofday-start_time, "mm:ss")] minutes!" + spawn start() + + proc/start() + //Purpose: This is kicked off by the master controller, and controls the processing of all atmosphere. + //Called by: Master controller + //Inputs: None. + //Outputs: None. + + set background = 1 + while(1) + if(!kill_air) + current_cycle++ + var/success = tick() //Changed so that a runtime does not crash the ticker. + if(!success) //Runtimed. + failed_ticks++ + if(failed_ticks > 20) + world << "ERROR IN ATMOS TICKER. Killing air simulation!" + kill_air = 1 + sleep(max(5,update_delay*tick_multiplier)) + + proc/tick() + + if(tiles_to_update.len > 0) //If there are tiles to update, do so. + for(var/turf/simulated/T in tiles_to_update) + spawn T.update_air_properties() + tiles_to_update = list() + + for(var/zone/Z in zones) + if(Z.last_update < current_cycle) + Z.process() + if(Z) Z.last_update = current_cycle + + for(var/obj/fire/F) + F.process() + + return 1 \ No newline at end of file diff --git a/code/ZAS/FEA_turf_tile.dm b/code/ZAS/FEA_turf_tile.dm new file mode 100644 index 00000000000..d65d1d96650 --- /dev/null +++ b/code/ZAS/FEA_turf_tile.dm @@ -0,0 +1,205 @@ +atom/var/pressure_resistance = ONE_ATMOSPHERE +turf + assume_air(datum/gas_mixture/giver) //use this for machines to adjust air + del(giver) + return 0 + + return_air() + //Create gas mixture to hold data for passing + var/datum/gas_mixture/GM = new + + GM.oxygen = oxygen + GM.carbon_dioxide = carbon_dioxide + GM.nitrogen = nitrogen + GM.toxins = toxins + + GM.temperature = temperature + GM.update_values() + + return GM + + remove_air(amount as num) + var/datum/gas_mixture/GM = new + + var/sum = oxygen + carbon_dioxide + nitrogen + toxins + if(sum>0) + GM.oxygen = (oxygen/sum)*amount + GM.carbon_dioxide = (carbon_dioxide/sum)*amount + GM.nitrogen = (nitrogen/sum)*amount + GM.toxins = (toxins/sum)*amount + + GM.temperature = temperature + GM.update_values() + + return GM + + +turf + simulated + + var/current_graphic = null + + var/tmp + datum/gas_mixture/air + + processing = 1 + group_border = 0 + length_space_border = 0 + + air_check_directions = 0 //Do not modify this, just add turf to air_master.tiles_to_update + + archived_cycle = 0 + current_cycle = 0 + + obj/effect/hotspot/active_hotspot + + temperature_archived //USED ONLY FOR SOLIDS + being_superconductive = 0 + + + proc + process_cell() + update_air_properties() + archive() + + mimic_air_with_tile(turf/model) + share_air_with_tile(turf/simulated/sharer) + + mimic_temperature_with_tile(turf/model) + share_temperature_with_tile(turf/simulated/sharer) + + + super_conduct() + + update_visuals() + overlays = null + + var/siding_icon_state = return_siding_icon_state() + if(siding_icon_state) + overlays += image('floors.dmi',siding_icon_state) + var/datum/gas_mixture/model = return_air() + switch(model.graphic) + if("plasma") + overlays.Add(plmaster) + if("sleeping_agent") + overlays.Add(slmaster) + + + + New() + ..() + + if(!blocks_air) + air = new + + air.oxygen = oxygen + air.carbon_dioxide = carbon_dioxide + air.nitrogen = nitrogen + air.toxins = toxins + + air.temperature = temperature + air.update_values() + + if(air_master) + air_master.tiles_to_update.Add(src) + + find_zone() + +// air.parent = src //TODO DEBUG REMOVE + + else + if(air_master) + for(var/direction in cardinal) + var/turf/simulated/floor/target = get_step(src,direction) + if(istype(target)) + air_master.tiles_to_update.Add(target) + + Del() + if(active_hotspot) + del(active_hotspot) + if(blocks_air) + for(var/direction in list(NORTH, SOUTH, EAST, WEST)) + var/turf/simulated/tile = get_step(src,direction) + if(istype(tile) && !tile.blocks_air) + air_master.tiles_to_update.Add(tile) + ..() + + assume_air(datum/gas_mixture/giver) + if(!giver) return 0 + if(zone) + zone.air.merge(giver) + return 1 + else + return ..() + + archive() + if(air) //For open space like floors + air.archive() + + temperature_archived = temperature + archived_cycle = air_master.current_cycle + + share_air_with_tile(turf/simulated/T) + return air.share(T.air) + + mimic_air_with_tile(turf/T) + return air.mimic(T) + + return_air() + if(zone) + return zone.air + else if(air) + return air + + else + return ..() + + remove_air(amount as num) + if(zone) + var/datum/gas_mixture/removed = null + removed = zone.air.remove(amount) + return removed + else if(air) + var/datum/gas_mixture/removed = null + removed = air.remove(amount) + + if(air.check_tile_graphic()) + update_visuals(air) + return removed + + else + return ..() + + update_air_properties()//OPTIMIZE + air_check_directions = 0 + + for(var/direction in cardinal) + if(CanPass(null, get_step(src,direction), 0, 0)) + air_check_directions |= direction + + if(zone) + for(var/direction in cardinal) + if(air_check_directions&direction) + + var/turf/simulated/T = get_step(src,direction) + if(T) + ZConnect(src,T) + else + var/turf/simulated/T = get_step(src,direction) + if(T) + ZDisconnect(src,T) + else + + for(var/direction in cardinal) + if(air_check_directions&direction) + var/turf/simulated/T = get_step(src,direction) + if(T.zone) + T.zone.AddTurf(src) + break + if(!zone) + new/zone(src) + + if(air_check_directions) + processing = 1 + else + processing = 0 \ No newline at end of file diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index f265c45877a..24f98ccb02f 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -7,7 +7,7 @@ atom/proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0) turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) - if(fire_protection) return + if(fire_protection > world.time-300) return var/datum/gas_mixture/air_contents = return_air(1) if(!air_contents) return 0 @@ -25,19 +25,11 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) return 1 var/datum/gas/volatile_fuel/fuel = locate() in air_contents.trace_gases var/obj/liquid_fuel/liquid = locate() in src - var/fuel_level = 0 - var/liquid_level = 0 - if(fuel) fuel_level = fuel.moles - if(liquid) liquid_level = liquid.amount - var/total_fuel = air_contents.toxins + fuel_level + liquid_level - if((air_contents.oxygen + air_contents.toxins + fuel_level*1.5 + liquid_level*1.5) - (air_contents.carbon_dioxide*0.25) > vsc.IgnitionLevel && total_fuel > 0.5) + if(air_contents.calculate_firelevel(liquid) > vsc.IgnitionLevel && (fuel || liquid || air_contents.toxins > 0.5)) igniting = 1 if(air_contents.oxygen < 0.5) return 0 - if(parent&&parent.group_processing) - parent.suspend_group_processing() - if(! (locate(/obj/fire) in src)) var/obj/fire/F = new(src,1000) F.temperature = exposed_temperature @@ -180,31 +172,20 @@ obj var datum/gas_mixture/air_contents = S.return_air() datum/gas/volatile_fuel/fuel = locate(/datum/gas/volatile_fuel/) in air_contents.trace_gases - fuel_level = 0 obj/liquid_fuel/liquid = locate() in S - liquid_level = 0 - if(fuel) fuel_level = fuel.moles - if(liquid) - liquid_level = liquid.amount - if(liquid.amount <= 0) - del liquid - liquid_level = 0 + firelevel = air_contents.calculate_firelevel(liquid) - firelevel = (air_contents.oxygen + air_contents.toxins + fuel_level*1.5 + liquid_level*1.5) - (air_contents.carbon_dioxide*0.25) - - firelevel = min(firelevel,vsc.IgnitionLevel*5) - - if(firelevel > vsc.IgnitionLevel * 1.5 && (air_contents.toxins || fuel_level || liquid_level)) + if(firelevel > 25 && (air_contents.toxins || fuel || liquid)) for(var/direction in cardinal) if(S.air_check_directions&direction) //Grab all valid bordering tiles var/turf/simulated/enemy_tile = get_step(S, direction) if(istype(enemy_tile)) - if(enemy_tile.fire_protection) - firelevel -= vsc.IgnitionLevel + if(enemy_tile.fire_protection > world.time-30) + firelevel -= 150 continue if(!(locate(/obj/fire) in enemy_tile)) - if( prob( firelevel/(vsc.IgnitionLevel*0.1) ) ) + if( prob( firelevel/2.5 ) ) new/obj/fire(enemy_tile,firelevel) // else // world << "Spread Probability: [firelevel/(vsc.IgnitionLevel*0.1)]%." @@ -220,12 +201,12 @@ obj if(flow) - if(flow.oxygen > 0.3 && (flow.toxins || fuel_level || liquid)) + if(flow.oxygen > 0.3 && (flow.toxins || fuel || liquid)) icon_state = "1" - if(firelevel > vsc.IgnitionLevel * 2) + if(firelevel > 25) icon_state = "2" - if(firelevel > vsc.IgnitionLevel * 3.5) + if(firelevel > 100) icon_state = "3" flow.temperature = max(PLASMA_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature) flow.zburn(liquid) @@ -245,7 +226,7 @@ obj del src for(var/mob/living/carbon/human/M in loc) - M.FireBurn(firelevel/(vsc.IgnitionLevel*10)) + M.FireBurn(min(max(0.1,firelevel / 20),10)) New(newLoc,fl) @@ -254,7 +235,7 @@ obj sd_SetLuminosity(3) firelevel = fl for(var/mob/living/carbon/human/M in loc) - M.FireBurn(firelevel/(vsc.IgnitionLevel*10)) + M.FireBurn(min(max(0.1,firelevel / 20),10)) Del() if (istype(loc, /turf/simulated)) @@ -265,74 +246,135 @@ obj ..() obj/liquid_fuel - icon = 'effects.dmi' - icon_state = "slube" + icon = 'icons/effects/effects.dmi' + icon_state = "fuel" layer = TURF_LAYER+0.2 anchored = 1 var/amount = 1 - New(newLoc) + New(newLoc,amt=1) + src.amount = amt for(var/obj/liquid_fuel/other in newLoc) if(other != src) other.amount += src.amount + spawn other.Spread() del src + return + Spread() . = ..() + proc/Spread() + if(amount < 0.5) return + var/turf/simulated/S = loc + if(!istype(S)) return + for(var/d in cardinal) + if(S.air_check_directions & d) + if(rand(25)) + var/turf/simulated/O = get_step(src,d) + new/obj/liquid_fuel(O,amount*0.25) + amount *= 0.75 + + flamethrower_fuel + icon_state = "mustard" + anchored = 0 + New(newLoc, amt = 1, d = 0) + dir = d + . = ..() + Spread() + if(amount < 0.1) return + var/turf/simulated/S = loc + if(!istype(S)) return + for(var/d in list(turn(dir,90),turn(dir,-90))) + if(S.air_check_directions & d) + var/turf/simulated/O = get_step(S,d) + new/obj/liquid_fuel/flamethrower_fuel(O,amount*0.25,d) + O.hotspot_expose((T20C*2) + 380,500) + amount *= 0.5 vs_control/var/switch_fire = 1 turf/simulated/var/fire_protection = 0 -datum/gas_mixture/proc/zburn(obj/liquid_fuel/liquid) - if(vsc.switch_fire) - . = fire() - if(liquid && liquid.amount > 0) - oxygen -= fire_ratio_1 - liquid.amount = max(liquid.amount-fire_ratio_1,0) - carbon_dioxide += fire_ratio_1 - if(liquid.amount <= 0) - del liquid - return - if(temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) +turf/proc/apply_fire_protection() +turf/simulated/apply_fire_protection() + fire_protection = world.time + +datum/gas_mixture/proc + zburn(obj/liquid_fuel/liquid) + if(temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) + var + total_fuel = toxins + fuel_sources = 0 + datum/gas/volatile_fuel/fuel = locate() in trace_gases + if(fuel) + total_fuel += fuel.moles + fuel_sources++ + if(liquid) + if(liquid.amount <= 0) + del liquid + else + total_fuel += liquid.amount + fuel_sources++ + if(toxins > 0.3) fuel_sources++ + + if(!fuel_sources) return 0 + if(oxygen > 0.3 && total_fuel) + var/firelevel = calculate_firelevel(liquid) + //f(x) = 1000ln(0.01x + 1.45) + temperature = 1000*log(0.016*firelevel + 1.45) + var/consumed_gas = min(oxygen,0.002*firelevel,total_fuel) / fuel_sources + oxygen -= consumed_gas + toxins = max(0,toxins-consumed_gas) + if(fuel) + fuel.moles -= consumed_gas + if(fuel.moles <= 0) del fuel + if(liquid) + liquid.amount -= consumed_gas + if(liquid.amount <= 0) del liquid + update_values() + return consumed_gas*fuel_sources + return 0 + calculate_firelevel(obj/liquid_fuel/liquid) var - fuel_level = 0 datum/gas/volatile_fuel/fuel = locate() in trace_gases + fuel_level = 0 liquid_level = 0 if(fuel) fuel_level = fuel.moles if(liquid) liquid_level = liquid.amount - if(liquid && liquid_level <= 0) - del liquid - liquid_level = 0 - if(oxygen > 0.3 && (toxins || fuel_level || liquid_level)) - if(toxins && temperature < PLASMA_UPPER_TEMPERATURE) - temperature += (FIRE_PLASMA_ENERGY_RELEASED*fire_ratio_1) / heat_capacity() + return oxygen + toxins + liquid_level*15 + fuel_level*5 - if((fuel_level || liquid_level) && temperature < PLASMA_UPPER_TEMPERATURE) - temperature += (FIRE_CARBON_ENERGY_RELEASED*fire_ratio_1) / heat_capacity() +/mob/living/carbon/human/proc/FireBurn(mx as num) + //NO! NOT INTO THE PIT! IT BURRRRRNS! - if(toxins > fire_ratio_1) - oxygen -= vsc.plc.OXY_TO_PLASMA*fire_ratio_1 - toxins -= fire_ratio_1 - carbon_dioxide += fire_ratio_1 - else if(toxins) - oxygen -= toxins * vsc.plc.OXY_TO_PLASMA - carbon_dioxide += toxins - toxins = 0 + var + head_exposure = 1 + chest_exposure = 1 + groin_exposure = 1 + legs_exposure = 1 + arms_exposure = 1 - if(fuel_level > fire_ratio_1/1.5) - oxygen -= vsc.plc.OXY_TO_PLASMA*fire_ratio_1 - fuel.moles -= fire_ratio_1 - carbon_dioxide += fire_ratio_1 + for(var/obj/item/clothing/C in src) + if(l_hand == C || r_hand == C) continue + if(C.body_parts_covered & HEAD) + head_exposure *= C.heat_transfer_coefficient + if(C.body_parts_covered & UPPER_TORSO) + chest_exposure *= C.heat_transfer_coefficient + if(C.body_parts_covered & LOWER_TORSO) + groin_exposure *= C.heat_transfer_coefficient + if(C.body_parts_covered & LEGS) + legs_exposure *= C.heat_transfer_coefficient + if(C.body_parts_covered & ARMS) + arms_exposure *= C.heat_transfer_coefficient - else if(fuel_level) - oxygen -= fuel.moles * vsc.plc.OXY_TO_PLASMA - carbon_dioxide += fuel.moles - fuel.moles = 0 + mx *= 1 - if(liquid_level > 0) - oxygen -= fire_ratio_1 - liquid.amount = max(liquid.amount-fire_ratio_1,0) - carbon_dioxide += fire_ratio_1 - if(liquid.amount <= 0) - del liquid - return 1 - return 0 \ No newline at end of file + //Always check these damage procs first if fire damage isn't working. They're probably what's wrong. + + apply_damage(2.5*mx*head_exposure, BURN, "head", 0, 0, "Fire") + apply_damage(2.5*mx*chest_exposure, BURN, "chest", 0, 0, "Fire") + apply_damage(2.0*mx*groin_exposure, BURN, "groin", 0, 0, "Fire") + apply_damage(0.6*mx*legs_exposure, BURN, "l_leg", 0, 0, "Fire") + apply_damage(0.6*mx*legs_exposure, BURN, "r_leg", 0, 0, "Fire") + apply_damage(0.4*mx*arms_exposure, BURN, "l_arm", 0, 0, "Fire") + apply_damage(0.4*mx*arms_exposure, BURN, "r_arm", 0, 0, "Fire") + + flash_pain() \ No newline at end of file diff --git a/code/ZAS/Functions.dm b/code/ZAS/Functions.dm index ab52842dd1f..548289ade07 100644 --- a/code/ZAS/Functions.dm +++ b/code/ZAS/Functions.dm @@ -48,15 +48,29 @@ turf/proc/HasDoor(turf/O) return 1 turf/proc/find_zone() + if(world.time < 10) return for(var/d in cardinal) var/turf/T = get_step(src,d) - if(!T || !T.zone) continue + if(!T || !T.zone || !T.ZCanPass(src)) continue if(!zone) zone = T.zone zone.AddTurf(src) else if(T.zone != zone) ZConnect(src,T) +turf/proc/check_connections() + for(var/d in cardinal) + var/turf/T = get_step(src,d) + if(!T || !T.zone || !T.CanPass(0,src,0,0)) continue + if(T.zone != zone) + ZConnect(src,T) + +turf/proc/check_for_space() + for(var/d in cardinal) + var/turf/T = get_step(src,d) + if(istype(T,/turf/space) && T.CanPass(0,src,0,0)) + zone.AddSpace(T) + proc ZMerge(zone/A,zone/B) //world << "Merge occured." @@ -78,6 +92,7 @@ proc if((C.A in new_contents) && (C.B in new_contents)) del C continue + if(!A.connections) A.connections = list() A.connections += C A.space_tiles += B.space_tiles A.contents = new_contents @@ -93,7 +108,7 @@ proc return if(istype(A,/turf/space)) if(B.zone) - B.zone.AddSpace(B) + B.zone.AddSpace(A) //world << "Space added." return if(!A.zone || !B.zone) return @@ -124,7 +139,7 @@ proc A.overlays -= 'zone_connection_A.dmi' B.overlays -= 'zone_connection_B.dmi'*/ del C - /*else + else if(A == B) return if(A.CanPass(0,B,0,0)) return if(A.HasDoor(B) || B.HasDoor(A)) return @@ -137,6 +152,8 @@ proc if((A in Z.contents) || (B in Z.contents)) if(!Z.connections) Z.connections = list() Z.connections += C + for(var/turf/T in test) + T.check_for_space() var/datum/gas_mixture/Y_Air = new Y_Air.copy_from(oldzone.air) var/zone/Y = new(B,Y_Air) @@ -144,14 +161,11 @@ proc if((A in Y.contents) || (B in Y.contents)) if(!Y.connections) Y.connections = list() Y.connections += C + for(var/turf/space/T in oldzone.space_tiles) + if(!(T in Z.space_tiles)) + Y.AddSpace(T) oldzone.air = null del oldzone - world << "Zone Split: [A] / [B]" - A.overlays += 'zone_connection_A.dmi' - B.overlays += 'zone_connection_B.dmi' - spawn(10) - A.overlays -= 'zone_connection_A.dmi' - B.overlays -= 'zone_connection_B.dmi'*/ else if(istype(A,/turf/space) && B.zone) B.zone.RemoveSpace(A) diff --git a/code/ZAS/Plasma.dm b/code/ZAS/Plasma.dm index df25a974578..ab7f452fa9e 100644 --- a/code/ZAS/Plasma.dm +++ b/code/ZAS/Plasma.dm @@ -3,17 +3,12 @@ pl_control/var PLASMA_DMG_NAME = "Plasma Damage Multiplier" PLASMA_DMG_DESC = "Multiplier on how much damage inhaling plasma can do." - OXY_TO_PLASMA = 1 - OXY_TO_PLASMA_NAME = "O2/Plasma Ratio" - OXY_TO_PLASMA_DESC = "Multiplier for the ratio of oxygen to plasma required in fires." - - CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. + CLOTH_CONTAMINATION = 0 //If this is on, plasma does damage by getting into cloth. CLOTH_CONTAMINATION_NAME = "Plasma - Cloth Contamination" CLOTH_CONTAMINATION_RANDOM = 60 CLOTH_CONTAMINATION_METHOD = "Toggle" CLOTH_CONTAMINATION_DESC = "If set to nonzero, plasma will contaminate cloth items (uniforms, backpacks, etc.)\ - and cause a small amount of damage over time to anyone carrying or wearing them. Contamination can be detected\ - with a Health Analyzer, and washed off in the washer." + and cause a small amount of damage over time to anyone carrying or wearing them. Contamination can be washed off in the washer." ALL_ITEM_CONTAMINATION = 0 //If this is on, any item can be contaminated, so suits and tools must be discarded or //decontaminated. @@ -48,7 +43,7 @@ pl_control/var //PLASMA_INJECTS_TOXINS_RANDOM = 30 //PLASMA_INJECTS_TOXINS_METHOD = "Toggle" - EYE_BURNS = 0 //Plasma burns the eyes of anyone not wearing eye protection. + EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection. EYE_BURNS_NAME = "Plasma - Eye Burns" EYE_BURNS_RANDOM = 30 EYE_BURNS_METHOD = "Toggle" @@ -66,8 +61,8 @@ pl_control/var //PLASMA_DMG_QUOTIENT = 10 //PLASMA_DMG_QUOTIENT_RANDOM = "1d10+4" - CONTAMINATION_LOSS = 0.1 - _NAME = "Plasma - Contamination Damage" + CONTAMINATION_LOSS = 0.01 + CONTAMINATION_LOSS_NAME = "Plasma - Contamination Damage" CONTAMINATION_LOSS_DESC = "A number representing the damage done per life cycle by contaminated items." PLASMA_HALLUCINATION = 1 @@ -93,160 +88,102 @@ obj/item/proc else if(istype(src,/obj/item/clothing)) return 1 else if(istype(src,/obj/item/weapon/storage/backpack)) return 1 -/mob/living/carbon/human/proc/contaminate() + contaminate() + if(!contaminated) + contaminated = 1 + overlays += 'icons/effects/contamination.dmi' + + decontaminate() + contaminated = 0 + overlays -= 'icons/effects/contamination.dmi' + +/mob/proc/contaminate() + +/mob/living/carbon/human/contaminate() if(!pl_suit_protected()) suit_contamination() - else if(vsc.plc.PLASMAGUARD_ONLY) - if(!wear_suit.flags & PLASMAGUARD) wear_suit.contaminated = 1 - - if(!pl_head_protected()) - if(wear_mask) wear_mask.contaminated = 1 if(prob(1)) suit_contamination() //Plasma can sometimes get through such an open suit. - else if(vsc.plc.PLASMAGUARD_ONLY) - if(!head.flags & PLASMAGUARD) head.contaminated = 1 - if(istype(back,/obj/item/weapon/storage/backpack) || vsc.plc.ALL_ITEM_CONTAMINATION) - back.contaminated = 1 + if(istype(back,/obj/item/weapon/storage/backpack)) + back.contaminate() - if(l_hand) - if(l_hand.can_contaminate()) l_hand.contaminated = 1 + /*if(l_hand) + if(l_hand.can_contaminate()) l_hand.contaminate() if(r_hand) - if(r_hand.can_contaminate()) r_hand.contaminated = 1 + if(r_hand.can_contaminate()) r_hand.contaminate() if(belt) - if(belt.can_contaminate()) belt.contaminated = 1 - if(wear_id && !pl_suit_protected()) - if(wear_id.can_contaminate()) wear_id.contaminated = 1 - if(l_ear && !pl_head_protected()) - if(l_ear.can_contaminate()) l_ear.contaminated = 1 - if(r_ear && !pl_head_protected()) - if(r_ear.can_contaminate()) r_ear.contaminated = 1 + if(belt.can_contaminate()) belt.contaminate()*/ -/mob/living/carbon/human/proc/pl_effects() +/mob/proc/pl_effects() + +/mob/living/carbon/human/pl_effects() + if(vsc.plc.CLOTH_CONTAMINATION) contaminate() if(stat >= 2) return if(vsc.plc.SKIN_BURNS) if(!pl_head_protected() || !pl_suit_protected()) burn_skin(0.75) - if (coughedtime != 1) - coughedtime = 1 - emote("gasp") - spawn (20) - coughedtime = 0 + if(prob(20)) src << "\red Your skin burns!" updatehealth() - if(vsc.plc.EYE_BURNS && !pl_head_protected()) - if(!wear_mask) - if(prob(20)) usr << "\red Your eyes burn!" - eye_stat += 2.5 - eye_blurry += 1.5 - if (eye_stat >= 20 && !(disabilities & 1)) - src << "\red Your eyes start to burn badly!" - disabilities |= 1 - if (prob(max(0,eye_stat - 20) + 1)) - src << "\red You are blinded!" - eye_blind += 20 - eye_stat = max(eye_stat-25,0) + + if(vsc.plc.EYE_BURNS) + if(!head) + if(!wear_mask) + burn_eyes() + else + if(!(wear_mask.flags & MASKCOVERSEYES)) + burn_eyes() else - if(!(wear_mask.flags & MASKCOVERSEYES)) - if(prob(20)) usr << "\red Your eyes burn!" - eye_stat += 2.5 - eye_blurry = min(eye_blurry+1.5,50) - if (eye_stat >= 20 && !(disabilities & 1)) - src << "\red Your eyes start to burn badly!" - disabilities |= 1 - if (prob(max(0,eye_stat - 20) + 1) &&!eye_blind) - src << "\red You are blinded!" - eye_blind += 20 - eye_stat = 0 + if(!(head.flags & MASKCOVERSEYES)) + if(!wear_mask) + burn_eyes() + else + if(!(wear_mask.flags & MASKCOVERSEYES)) + burn_eyes() + if(vsc.plc.GENETIC_CORRUPTION) - if(rand(1,1000) < vsc.plc.GENETIC_CORRUPTION) + if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION) randmutb(src) src << "\red High levels of toxins cause you to spontaneously mutate." domutcheck(src,null) -/mob/living/carbon/human/proc/FireBurn(mx as num) - //NO! NOT INTO THE PIT! IT BURRRRRNS! - mx *= vsc.BURN_DMG - - var - head_exposure = 1 - chest_exposure = 1 - groin_exposure = 1 - legs_exposure = 1 - feet_exposure = 1 - arms_exposure = 1 - hands_exposure = 1 - for(var/obj/item/clothing/C in src) - if(l_hand == C || r_hand == C) continue - if(C.body_parts_covered & HEAD) - head_exposure *= C.heat_transfer_coefficient - if(C.body_parts_covered & UPPER_TORSO) - chest_exposure *= C.heat_transfer_coefficient - if(C.body_parts_covered & LOWER_TORSO) - groin_exposure *= C.heat_transfer_coefficient - if(C.body_parts_covered & LEGS) - legs_exposure *= C.heat_transfer_coefficient - if(C.body_parts_covered & FEET) - feet_exposure *= C.heat_transfer_coefficient - if(C.body_parts_covered & ARMS) - arms_exposure *= C.heat_transfer_coefficient - if(C.body_parts_covered & HANDS) - arms_exposure *= C.heat_transfer_coefficient - - mx *= 10 - - apply_damage("head", 0, 2.5*mx*head_exposure) - apply_damage("chest", 0, 2.5*mx*chest_exposure) - apply_damage("groin", 0, 2.0*mx*groin_exposure) - apply_damage("l_leg", 0, 0.6*mx*legs_exposure) - apply_damage("r_leg", 0, 0.6*mx*legs_exposure) - apply_damage("l_arm", 0, 0.4*mx*arms_exposure) - apply_damage("r_arm", 0, 0.4*mx*arms_exposure) - apply_damage("l_foot", 0, 0.25*mx*feet_exposure) - apply_damage("r_foot", 0, 0.25*mx*feet_exposure) - apply_damage("l_hand", 0, 0.25*mx*hands_exposure) - apply_damage("r_hand", 0, 0.25*mx*hands_exposure) - -/mob/living/carbon/human/proc/suit_interior() - . = list() - if(!pl_suit_protected()) - for(var/obj/item/I in src) - . += I - return . - . += wear_mask - . += w_uniform - . += shoes - . += gloves - if(!pl_head_protected()) - . += head +/mob/living/carbon/human/proc/burn_eyes() + if(prob(20)) src << "\red Your eyes burn!" + eye_stat += 2.5 + eye_blurry = min(eye_blurry+1.5,50) + if (prob(max(0,eye_stat - 20) + 1) &&!eye_blind) + src << "\red You are blinded!" + eye_blind += 20 + eye_stat = 0 /mob/living/carbon/human/proc/pl_head_protected() if(head) - if(head.flags & PLASMAGUARD || head.flags & HEADSPACE) return 1 + if(vsc.plc.PLASMAGUARD_ONLY) + if(head.flags & PLASMAGUARD || head.flags & HEADSPACE) return 1 + else + if(head.flags & HEADCOVERSEYES) return 1 return 0 /mob/living/carbon/human/proc/pl_suit_protected() if(wear_suit) - if(wear_suit.flags & PLASMAGUARD || wear_suit.flags & SUITSPACE) return 1 + if(vsc.plc.PLASMAGUARD_ONLY) + if(wear_suit.flags & PLASMAGUARD || wear_suit.flags & SUITSPACE) return 1 + else + if(wear_suit.flags_inv & HIDEJUMPSUIT) return 1 return 0 /mob/living/carbon/human/proc/suit_contamination() - if(vsc.plc.ALL_ITEM_CONTAMINATION) - for(var/obj/item/I in src) - I.contaminated = 1 - else - if(wear_suit) wear_suit.contaminated = 1 - if(w_uniform) w_uniform.contaminated = 1 - if(shoes) shoes.contaminated = 1 - if(gloves) gloves.contaminated = 1 - if(wear_mask) wear_mask.contaminated = 1 + if(w_uniform) w_uniform.contaminate() + if(shoes) shoes.contaminate() + if(gloves) gloves.contaminate() turf/Entered(obj/item/I) . = ..() - if(istype(I)) + if(istype(I) && vsc.plc.CLOTH_CONTAMINATION) var/datum/gas_mixture/env = return_air(1) - if(env.toxins > 0.35) + if(env.toxins > MOLES_PLASMA_VISIBLE + 1) if(I.can_contaminate()) - I.contaminated = 1 \ No newline at end of file + I.contaminate() \ No newline at end of file diff --git a/code/ZAS/Processing.dm b/code/ZAS/Processing.dm index 4de6c939860..8423ae46af8 100644 --- a/code/ZAS/Processing.dm +++ b/code/ZAS/Processing.dm @@ -26,55 +26,39 @@ zone Z.air.copy_from(air) rebuild = 0 - var/total_space = 0 - var/turf/space/space + if(!air) + air = new() + air.adjustGases(MOLES_O2STANDARD, 0, MOLES_N2STANDARD, 0, list()) + world.log << "Air object lost in zone. Regenerating." - if(length(connected_zones)) - for(var/zone/Z in connected_zones) - total_space += length(Z.space_tiles) - if(length(Z.space_tiles)) - space = Z.space_tiles[1] + var/total_space = 0 if(space_tiles) for(var/T in space_tiles) if(!istype(T,/turf/space)) space_tiles -= T - total_space += length(space_tiles) - if(length(space_tiles)) - space = space_tiles[1] + total_space = length(space_tiles) - if(total_space && space) - var/old_pressure = air.return_pressure() - air.temperature_mimic(space,OPEN_HEAT_TRANSFER_COEFFICIENT,total_space) - air.remove(MOLES_CELLSTANDARD * (air.group_multiplier/40) * total_space) - if(dbg_output) world << "Space removed [MOLES_CELLSTANDARD*(air.group_multiplier/40)*total_space] moles of air." - var/p_diff = old_pressure - air.return_pressure() - if(p_diff > vsc.AF_TINY_MOVEMENT_THRESHOLD) AirflowSpace(src,p_diff) + if(total_space) // SPAAAAAAAAAACE + //var/old_pressure = air.pressure + ShareSpace(air,total_space*(vsc.zone_share_percent/100)) + //var/p_diff = old_pressure - air.pressure + //if(p_diff > vsc.AF_TINY_MOVEMENT_THRESHOLD) AirflowSpace(src,p_diff) air.react(null,0) var/check = air.check_tile_graphic() - for(var/turf/T in contents) - if(T.zone && T.zone != src) - RemoveTurf(T) - if(dbg_output) world << "Removed invalid turf." - if(air.group_multiplier <= 0) // No more turfs belong to this zone, so we can get rid of it - del(src) - else // Turf was valid, so we can handle it - if(!T.zone) - T.zone = src - if(istype(T,/turf/simulated)) - var/turf/simulated/S = T - if(S.fire_protection) S.fire_protection-- - if(check) - if(S.HasDoor(1)) - S.update_visuals() - else - S.update_visuals(air) + if(check || air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) + for(var/turf/simulated/S in contents) + if(check) + if(S.HasDoor(1)) + S.update_visuals() + else + S.update_visuals(air) - if(air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) - for(var/atom/movable/item in S) - item.temperature_expose(air, air.temperature, CELL_VOLUME) - S.temperature_expose(air, air.temperature, CELL_VOLUME) + if(air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) + for(var/atom/movable/item in S) + item.temperature_expose(air, air.temperature, CELL_VOLUME) + S.temperature_expose(air, air.temperature, CELL_VOLUME) air.graphic_archived = air.graphic @@ -83,13 +67,114 @@ zone if(length(connections)) for(var/connection/C in connections) C.Cleanup() - if(C && !C.indirect) - if(C.A.zone.air.compare(C.B.zone.air)) + if(C && !C.indirect && C.A.zone && C.B.zone) + if(C.A.zone.air.compare(C.B.zone.air) || total_space) ZMerge(C.A.zone,C.B.zone) for(var/zone/Z in connected_zones) - var/p_diff = (air.return_pressure()-Z.air.return_pressure())*connected_zones[Z]*(vsc.zone_share_percent/100) - if(p_diff > vsc.AF_TINY_MOVEMENT_THRESHOLD) Airflow(src,Z,p_diff) - air.share_ratio(Z.air,connected_zones[Z]*(vsc.zone_share_percent/100)) + //var/p_diff = (air.return_pressure()-Z.air.return_pressure())*connected_zones[Z]*(vsc.zone_share_percent/100) + //if(p_diff > vsc.AF_TINY_MOVEMENT_THRESHOLD) Airflow(src,Z,p_diff) + ShareRatio(air,Z.air,connected_zones[Z]*(vsc.zone_share_percent/100)) + +proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, ratio) + var + size = max(1,A.group_multiplier) + share_size = max(1,B.group_multiplier) + + full_oxy = A.oxygen * size + full_nitro = A.nitrogen * size + full_co2 = A.carbon_dioxide * size + full_plasma = A.toxins * size + + full_thermal = A.temperature * A.heat_capacity() * size + + s_full_oxy = B.oxygen * share_size + s_full_nitro = B.nitrogen * share_size + s_full_co2 = B.carbon_dioxide * share_size + s_full_plasma = B.toxins * share_size + + s_full_thermal = B.temperature * B.heat_capacity() * share_size + + oxy_avg = (full_oxy + s_full_oxy) / (size + share_size) + nit_avg = (full_nitro + s_full_nitro) / (size + share_size) + co2_avg = (full_co2 + s_full_co2) / (size + share_size) + plasma_avg = (full_plasma + s_full_plasma) / (size + share_size) + + thermal_avg = (full_thermal + s_full_thermal) / (size+share_size) + + A.oxygen = (A.oxygen - oxy_avg) * (1-ratio) + oxy_avg + A.nitrogen = (A.nitrogen - nit_avg) * (1-ratio) + nit_avg + A.carbon_dioxide = (A.carbon_dioxide - co2_avg) * (1-ratio) + co2_avg + A.toxins = (A.toxins - plasma_avg) * (1-ratio) + plasma_avg + + B.oxygen = (B.oxygen - oxy_avg) * (1-ratio) + oxy_avg + B.nitrogen = (B.nitrogen - nit_avg) * (1-ratio) + nit_avg + B.carbon_dioxide = (B.carbon_dioxide - co2_avg) * (1-ratio) + co2_avg + B.toxins = (B.toxins - plasma_avg) * (1-ratio) + plasma_avg + + var + thermal = (full_thermal/size - thermal_avg) * (1-ratio) + thermal_avg + sharer_thermal = (s_full_thermal/share_size - thermal_avg) * (1-ratio) + thermal_avg + + A.temperature = thermal / (A.heat_capacity() == 0 ? MINIMUM_HEAT_CAPACITY : A.heat_capacity()) + + B.temperature = sharer_thermal / (B.heat_capacity() == 0 ? MINIMUM_HEAT_CAPACITY : B.heat_capacity()) + + for(var/datum/gas/G in A.trace_gases) + var/datum/gas/H = locate(G.type) in B.trace_gases + if(H) + var/G_avg = (G.moles*size + H.moles*share_size) / (size+share_size) + G.moles = (G.moles - G_avg) * (1-ratio) + G_avg + H.moles = (H.moles - G_avg) * (1-ratio) + G_avg + else + H = new G.type + B.trace_gases += H + var/G_avg = (G.moles*size) / (size+share_size) + G.moles = (G.moles - G_avg) * (1-ratio) + G_avg + H.moles = (H.moles - G_avg) * (1-ratio) + G_avg + + A.update_values() + B.update_values() + + if(A.compare(B)) return 1 + else return 0 + + /* See? Now that's how it's done. */ + +proc/ShareSpace(datum/gas_mixture/A, ratio) + var + size = max(1,A.group_multiplier) + share_size = 2000 //A huge value because space is huge. + + full_oxy = A.oxygen * size + full_nitro = A.nitrogen * size + full_co2 = A.carbon_dioxide * size + full_plasma = A.toxins * size + + full_thermal = A.temperature * A.heat_capacity() * size + + oxy_avg = (full_oxy + 0) / (size + share_size) + nit_avg = (full_nitro + 0.2) / (size + share_size) + co2_avg = (full_co2 + 0) / (size + share_size) + plasma_avg = (full_plasma + 0) / (size + share_size) + + thermal_avg = (full_thermal + MINIMUM_HEAT_CAPACITY) / (size+share_size) + + A.oxygen = (A.oxygen - oxy_avg) * (1-ratio) + oxy_avg + A.nitrogen = (A.nitrogen - nit_avg) * (1-ratio) + nit_avg + A.carbon_dioxide = (A.carbon_dioxide - co2_avg) * (1-ratio) + co2_avg + A.toxins = (A.toxins - plasma_avg) * (1-ratio) + plasma_avg + + var/thermal = (full_thermal/size - thermal_avg) * (1-ratio) + thermal_avg + + A.temperature = thermal / (A.heat_capacity() == 0 ? MINIMUM_HEAT_CAPACITY : A.heat_capacity()) + + for(var/datum/gas/G in A.trace_gases) + var/G_avg = (G.moles*size + 0) / (size+share_size) + G.moles = (G.moles - G_avg) * (1-ratio) + G_avg + + A.update_values() + + return 1 zone/proc diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index 188f885ae9b..226e38c1223 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -133,6 +133,8 @@ vs_control plc.EYE_BURNS = 0 //Plasma burns the eyes of anyone not wearing eye protection. + plc.PLASMA_HALLUCINATION = 0 + //plc.N2O_REACTION = 0 //Plasma can react with N2O, making sparks and starting a fire if levels are high. //plc.PLASMA_COLOR = "onturf" //Plasma can change colors yaaaay! @@ -141,8 +143,8 @@ vs_control //plc.PLASMA_DMG_QUOTIENT = 10 plc.CONTAMINATION_LOSS = 0 - if("Hazard-Low") - plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. + if("Hazard - Low") + plc.CLOTH_CONTAMINATION = 0 //If this is on, plasma does damage by getting into cloth. plc.ALL_ITEM_CONTAMINATION = 0 //If this is on, any item can be contaminated, so suits and tools must be discarded or @@ -152,7 +154,7 @@ vs_control plc.GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 1000. - plc.SKIN_BURNS = 0 //Plasma has an effect similar to mustard gas on the un-suited. + plc.SKIN_BURNS = 1 //Plasma has an effect similar to mustard gas on the un-suited. // plc.PLASMA_INJECTS_TOXINS = 0 //Plasma damage injects the toxins chemical to do damage over time. @@ -168,12 +170,9 @@ vs_control //plc.PLASMA_DMG_OFFSET = 1.5 //plc.PLASMA_DMG_QUOTIENT = 8 - plc.CONTAMINATION_LOSS = 0.01 + plc.CONTAMINATION_LOSS = 0 - var/s = pick(plc.settings) - plc.Randomize(s) - - if("Hazard-High") + if("Hazard - High") plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. plc.ALL_ITEM_CONTAMINATION = 0 //If this is on, any item can be contaminated, so suits and tools must be discarded or @@ -184,11 +183,11 @@ vs_control plc.GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 1000. - plc.SKIN_BURNS = 0 //Plasma has an effect similar to mustard gas on the un-suited. + plc.SKIN_BURNS = 1 //Plasma has an effect similar to mustard gas on the un-suited. // plc.PLASMA_INJECTS_TOXINS = 0 //Plasma damage injects the toxins chemical to do damage over time. - plc.EYE_BURNS = 0 //Plasma burns the eyes of anyone not wearing eye protection. + plc.EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection. // plc.N2O_REACTION = 0 //Plasma can react with N2O, making sparks and starting a fire if levels are high. @@ -197,16 +196,10 @@ vs_control //plc.PLASMA_DMG_OFFSET = 3 //plc.PLASMA_DMG_QUOTIENT = 5 - plc.CONTAMINATION_LOSS = 0.05 - - for(var/i = rand(3,5),i>0,i--) - var/s = pick(plc.settings) - plc.Randomize(s) - - if("Everything") + if("Oh Shit!") plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. - plc.ALL_ITEM_CONTAMINATION = 1 //If this is on, any item can be contaminated, so suits and tools must be discarded or ELSE + plc.ALL_ITEM_CONTAMINATION = 0 //If this is on, any item can be contaminated, so suits and tools must be discarded or ELSE plc.PLASMAGUARD_ONLY = 1 @@ -227,7 +220,6 @@ vs_control //plc.PLASMA_DMG_OFFSET = 3 //plc.PLASMA_DMG_QUOTIENT = 5 - plc.CONTAMINATION_LOSS = 0.02 /////world << "Plasma color updated." pl_control diff --git a/code/defines/atom.dm b/code/defines/atom.dm index d725f656503..1a1a79b94f8 100644 --- a/code/defines/atom.dm +++ b/code/defines/atom.dm @@ -17,7 +17,7 @@ // replaced by OPENCONTAINER flags and atom/proc/is_open_container() ///Chemistry. - proc/assume_air(datum/air_group/giver) + proc/assume_air(datum/gas_mixture/giver) del(giver) return null @@ -48,7 +48,7 @@ */ obj - assume_air(datum/air_group/giver) + assume_air(datum/gas_mixture/giver) if(loc) return loc.assume_air(giver) else diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm index e128be4cf8c..c04bb4ca00e 100644 --- a/code/defines/procs/helpers.dm +++ b/code/defines/procs/helpers.dm @@ -1561,19 +1561,13 @@ proc/listclearnulls(list/list) for(var/turf/simulated/T1 in toupdate) for(var/obj/machinery/door/D2 in T1) doors += D2 - if(T1.parent) - air_master.groups_to_rebuild += T1.parent - else - air_master.tiles_to_update += T1 + air_master.tiles_to_update += T1 if(fromupdate.len) for(var/turf/simulated/T2 in fromupdate) for(var/obj/machinery/door/D2 in T2) doors += D2 - if(T2.parent) - air_master.groups_to_rebuild += T2.parent - else - air_master.tiles_to_update += T2 + air_master.tiles_to_update += T2 for(var/obj/O in doors) O:update_nearby_tiles(1) @@ -1728,10 +1722,7 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0) for(var/turf/simulated/T1 in toupdate) for(var/obj/machinery/door/D2 in T1) doors += D2 - if(T1.parent) - air_master.groups_to_rebuild += T1.parent - else - air_master.tiles_to_update += T1 + air_master.tiles_to_update += T1 for(var/obj/O in doors) O:update_nearby_tiles(1) diff --git a/code/defines/turf.dm b/code/defines/turf.dm index 4fc3dfa963c..3eb764e5c6a 100644 --- a/code/defines/turf.dm +++ b/code/defines/turf.dm @@ -341,8 +341,6 @@ proc/TemperatureAct(temperature) for(var/turf/simulated/floor/target_tile in range(2,loc)) - if(target_tile.parent && target_tile.parent.group_processing) - target_tile.parent.suspend_group_processing() var/datum/gas_mixture/napalm = new diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index fb7b3c6a1b3..aa51784a615 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -267,12 +267,12 @@ if (src.operating) return src.operating = 1 - + var/X = src:x var/Y = src:y var/Z = src:z var/held = 1 - + if(src.holdopen && !forcecrush) while(held == 1 && holdopen && !forcecrush) //If it is no longer hold open, it should close. sleep(held? 10:40) @@ -288,25 +288,25 @@ spawn(4) if(!istype(src, /obj/machinery/door/window)) for(var/mob/living/L in src.loc) // Crush mobs and move them out of the way - + if(src.forcecrush) // Save an AI, crush a limb var/limbname = pick("l_arm", "r_arm", "l_hand","r_hand", "l_foot", "r_foot") var/limbdisplay - + for(var/organ in L:organs) var/datum/organ/external/temp = L:organs["[organ]"] if (istype(temp, /datum/organ/external) && temp.name == limbname) limbdisplay = temp.display_name // Take the name for down below temp.take_damage(rand(50,80), 0) //OH GOD IT HURTS break - + L << "\red The airlock crushes your [limbdisplay]!" for(var/mob/O in viewers(L, null)) if(O == L) continue O.show_message("\red The airlock crushes [L.name]'s [limbdisplay]!", 1) sleep(rand(2,8)) - + L << "\red The airlock forces you out of the way!" //Lucky you for(var/mob/O in viewers(L, null)) O.show_message("\red The airlock pushes [L.name] out of the way!", 1) @@ -314,7 +314,7 @@ var/turf/T = get_random_turf(L, lst) if(T) L.loc = T - + if(!src.forcecrush) for(var/obj/item/I in src.loc) // Move items out of the way if(!I.anchored) @@ -322,10 +322,10 @@ var/turf/T = get_random_turf(I, lst) if(T) I.loc = T - + sleep(6) update_icon() - + if(src.visible && (!src.glass)) src.sd_SetOpacity(1) if(operating == 1) @@ -343,38 +343,11 @@ var/turf/simulated/east = get_step(source,EAST) var/turf/simulated/west = get_step(source,WEST) - if(need_rebuild) - if(istype(source)) //Rebuild/update nearby group geometry - if(source.parent) - air_master.groups_to_rebuild += source.parent - else - air_master.tiles_to_update += source - if(istype(north)) - if(north.parent) - air_master.groups_to_rebuild += north.parent - else - air_master.tiles_to_update += north - if(istype(south)) - if(south.parent) - air_master.groups_to_rebuild += south.parent - else - air_master.tiles_to_update += south - if(istype(east)) - if(east.parent) - air_master.groups_to_rebuild += east.parent - else - air_master.tiles_to_update += east - if(istype(west)) - if(west.parent) - air_master.groups_to_rebuild += west.parent - else - air_master.tiles_to_update += west - else - if(istype(source)) air_master.tiles_to_update += source - if(istype(north)) air_master.tiles_to_update += north - if(istype(south)) air_master.tiles_to_update += south - if(istype(east)) air_master.tiles_to_update += east - if(istype(west)) air_master.tiles_to_update += west + if(istype(source)) air_master.tiles_to_update += source + if(istype(north)) air_master.tiles_to_update += north + if(istype(south)) air_master.tiles_to_update += south + if(istype(east)) air_master.tiles_to_update += east + if(istype(west)) air_master.tiles_to_update += west return 1 diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 41462f0b0ce..efb86ae369e 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -110,18 +110,6 @@ var/turf/simulated/source = loc var/turf/simulated/destination = get_step(source,dir) - if(need_rebuild) - if(istype(source)) //Rebuild/update nearby group geometry - if(source.parent) - air_master.groups_to_rebuild += source.parent - else - air_master.tiles_to_update += source - if(istype(destination)) - if(destination.parent) - air_master.groups_to_rebuild += destination.parent - else - air_master.tiles_to_update += destination - else - if(istype(source)) air_master.tiles_to_update += source - if(istype(destination)) air_master.tiles_to_update += destination + if(istype(source)) air_master.tiles_to_update += source + if(istype(destination)) air_master.tiles_to_update += destination return 1 \ No newline at end of file diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 50baa203d0d..27967591d0d 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -15,20 +15,8 @@ var/turf/simulated/source = loc var/turf/simulated/target = get_step(source,dir) - if(need_rebuild) - if(istype(source)) //Rebuild/update nearby group geometry - if(source.parent) - air_master.groups_to_rebuild += source.parent - else - air_master.tiles_to_update += source - if(istype(target)) - if(target.parent) - air_master.groups_to_rebuild += target.parent - else - air_master.tiles_to_update += target - else - if(istype(source)) air_master.tiles_to_update += source - if(istype(target)) air_master.tiles_to_update += target + if(istype(source)) air_master.tiles_to_update += source + if(istype(target)) air_master.tiles_to_update += target return 1 diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 9bb05f46583..6050615cdcc 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -408,38 +408,11 @@ var/turf/simulated/east = get_step(source,EAST) var/turf/simulated/west = get_step(source,WEST) - if(need_rebuild) - if(istype(source)) //Rebuild/update nearby group geometry - if(source.parent) - air_master.groups_to_rebuild += source.parent - else - air_master.tiles_to_update += source - if(istype(north)) - if(north.parent) - air_master.groups_to_rebuild += north.parent - else - air_master.tiles_to_update += north - if(istype(south)) - if(south.parent) - air_master.groups_to_rebuild += south.parent - else - air_master.tiles_to_update += south - if(istype(east)) - if(east.parent) - air_master.groups_to_rebuild += east.parent - else - air_master.tiles_to_update += east - if(istype(west)) - if(west.parent) - air_master.groups_to_rebuild += west.parent - else - air_master.tiles_to_update += west - else - if(istype(source)) air_master.tiles_to_update += source - if(istype(north)) air_master.tiles_to_update += north - if(istype(south)) air_master.tiles_to_update += south - if(istype(east)) air_master.tiles_to_update += east - if(istype(west)) air_master.tiles_to_update += west + if(istype(source)) air_master.tiles_to_update += source + if(istype(north)) air_master.tiles_to_update += north + if(istype(south)) air_master.tiles_to_update += south + if(istype(east)) air_master.tiles_to_update += east + if(istype(west)) air_master.tiles_to_update += west return 1 diff --git a/code/game/objects/closets/firecloset.dm b/code/game/objects/closets/firecloset.dm index be3571a83f1..c3a6ad2fbc5 100644 --- a/code/game/objects/closets/firecloset.dm +++ b/code/game/objects/closets/firecloset.dm @@ -8,7 +8,7 @@ new /obj/item/device/flashlight(src) new /obj/item/weapon/tank/oxygen/red(src) new /obj/item/weapon/extinguisher(src) - new /obj/item/clothing/head/helmet/hardhat/red(src) + new /obj/item/clothing/head/helmet/space/fire_helmet(src) /obj/structure/closet/firecloset/New() ..() @@ -17,7 +17,7 @@ new /obj/item/clothing/mask/gas(src) new /obj/item/weapon/tank/oxygen/red(src) new /obj/item/weapon/extinguisher(src) - new /obj/item/clothing/head/helmet/hardhat/red(src) + new /obj/item/clothing/head/helmet/space/fire_helmet(src) /*switch (pickweight(list("nothing" = 5, "bare-bones" = 35, "basic" = 40, "pickpocketed" = 10, "untouched" = 10))) if ("nothing") diff --git a/code/game/objects/effect_system.dm b/code/game/objects/effect_system.dm index c661ae8a725..1b449b6fc94 100644 --- a/code/game/objects/effect_system.dm +++ b/code/game/objects/effect_system.dm @@ -1050,38 +1050,11 @@ steam.start() -- spawns the effect var/turf/simulated/east = get_step(source,EAST) var/turf/simulated/west = get_step(source,WEST) - if(need_rebuild) - if(istype(source)) //Rebuild/update nearby group geometry - if(source.parent) - air_master.groups_to_rebuild += source.parent - else - air_master.tiles_to_update += source - if(istype(north)) - if(north.parent) - air_master.groups_to_rebuild += north.parent - else - air_master.tiles_to_update += north - if(istype(south)) - if(south.parent) - air_master.groups_to_rebuild += south.parent - else - air_master.tiles_to_update += south - if(istype(east)) - if(east.parent) - air_master.groups_to_rebuild += east.parent - else - air_master.tiles_to_update += east - if(istype(west)) - if(west.parent) - air_master.groups_to_rebuild += west.parent - else - air_master.tiles_to_update += west - else - if(istype(source)) air_master.tiles_to_update += source - if(istype(north)) air_master.tiles_to_update += north - if(istype(south)) air_master.tiles_to_update += south - if(istype(east)) air_master.tiles_to_update += east - if(istype(west)) air_master.tiles_to_update += west + if(istype(source)) air_master.tiles_to_update += source + if(istype(north)) air_master.tiles_to_update += north + if(istype(south)) air_master.tiles_to_update += south + if(istype(east)) air_master.tiles_to_update += east + if(istype(west)) air_master.tiles_to_update += west return 1 diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 7ed926c801d..f976d3ee999 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -236,8 +236,10 @@ /obj/item/weapon/flamethrower/proc/ignite_turf(turf/target) //TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this... //Transfer 5% of current tank air contents to turf - var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(0.05*throw_amount/100) - air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is retarded and I could probably make it work without fucking it up like this, but there you have it. -- TLE + var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(0.02*(throw_amount/100)) + //air_transfer.toxins = air_transfer.toxins * 5 // This is me not comprehending the air system. I realize this is retarded and I could probably make it work without fucking it up like this, but there you have it. -- TLE + new/obj/liquid_fuel/flamethrower_fuel(target,air_transfer.toxins,get_dir(loc,target)) + air_transfer.toxins = 0 target.assume_air(air_transfer) //Burn it based on transfered gas //target.hotspot_expose(part4.air_contents.temperature*2,300) diff --git a/code/game/objects/mineral_doors.dm b/code/game/objects/mineral_doors.dm index 310cdfd8805..f99a8d395fe 100644 --- a/code/game/objects/mineral_doors.dm +++ b/code/game/objects/mineral_doors.dm @@ -145,38 +145,11 @@ var/turf/simulated/east = get_step(source,EAST) var/turf/simulated/west = get_step(source,WEST) - if(need_rebuild) - if(istype(source)) //Rebuild/update nearby group geometry - if(source.parent) - air_master.groups_to_rebuild += source.parent - else - air_master.tiles_to_update += source - if(istype(north)) - if(north.parent) - air_master.groups_to_rebuild += north.parent - else - air_master.tiles_to_update += north - if(istype(south)) - if(south.parent) - air_master.groups_to_rebuild += south.parent - else - air_master.tiles_to_update += south - if(istype(east)) - if(east.parent) - air_master.groups_to_rebuild += east.parent - else - air_master.tiles_to_update += east - if(istype(west)) - if(west.parent) - air_master.groups_to_rebuild += west.parent - else - air_master.tiles_to_update += west - else - if(istype(source)) air_master.tiles_to_update += source - if(istype(north)) air_master.tiles_to_update += north - if(istype(south)) air_master.tiles_to_update += south - if(istype(east)) air_master.tiles_to_update += east - if(istype(west)) air_master.tiles_to_update += west + if(istype(source)) air_master.tiles_to_update += source + if(istype(north)) air_master.tiles_to_update += north + if(istype(south)) air_master.tiles_to_update += south + if(istype(east)) air_master.tiles_to_update += east + if(istype(west)) air_master.tiles_to_update += west return 1 @@ -225,8 +198,6 @@ proc/TemperatureAct(temperature) for(var/turf/simulated/floor/target_tile in range(2,loc)) - if(target_tile.parent && target_tile.parent.group_processing) - target_tile.parent.suspend_group_processing() var/datum/gas_mixture/napalm = new @@ -305,4 +276,4 @@ isSwitchingStates = 0 Dismantle(devastated = 0) - del(src) + del(src) diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index 6d04a7d4ea0..24be9eed502 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -30,8 +30,6 @@ for (var/turf/simulated/floor/target in range(1,src)) if(!target.blocks_air) - if(target.parent) - target.parent.suspend_group_processing() var/datum/gas_mixture/payload = new var/datum/gas/sleeping_agent/trace_gas = new @@ -48,8 +46,6 @@ /obj/effect/mine/proc/triggerplasma(obj) for (var/turf/simulated/floor/target in range(1,src)) if(!target.blocks_air) - if(target.parent) - target.parent.suspend_group_processing() var/datum/gas_mixture/payload = new diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm index ee9871be0fc..f3e69130cf6 100644 --- a/code/game/objects/window.dm +++ b/code/game/objects/window.dm @@ -346,20 +346,8 @@ var/turf/simulated/source = loc var/turf/simulated/target = get_step(source,dir) - if(need_rebuild) - if(istype(source)) //Rebuild/update nearby group geometry - if(source.parent) - air_master.groups_to_rebuild += source.parent - else - air_master.tiles_to_update += source - if(istype(target)) - if(target.parent) - air_master.groups_to_rebuild += target.parent - else - air_master.tiles_to_update += target - else - if(istype(source)) air_master.tiles_to_update += source - if(istype(target)) air_master.tiles_to_update += target + if(istype(source)) air_master.tiles_to_update += source + if(istype(target)) air_master.tiles_to_update += target return 1 diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 186fadd0ee8..8e8aceab534 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -144,7 +144,7 @@ verbs += /client/proc/voting verbs += /client/proc/hide_verbs verbs += /client/proc/general_report - verbs += /client/proc/air_report + //verbs += /client/proc/air_report verbs += /client/proc/deadmin_self //verbs += /client/proc/cmd_admin_prison --Merged with player panel //verbs += /obj/admins/proc/unprison --Merged with player panel @@ -248,7 +248,7 @@ // verbs += /client/proc/mapload verbs += /client/proc/check_words verbs += /client/proc/drop_bomb - verbs += /client/proc/kill_airgroup + //verbs += /client/proc/kill_airgroup //verbs += /client/proc/cmd_admin_drop_everything --Merged with view variables verbs += /client/proc/make_sound verbs += /client/proc/play_local_sound @@ -278,7 +278,7 @@ verbs += /client/proc/Force_Event_admin verbs += /client/proc/radioalert verbs += /client/proc/CarbonCopy - verbs += /client/proc/jump_to_dead_group + //verbs += /client/proc/jump_to_dead_group else return //Game Master @@ -403,7 +403,7 @@ verbs -= /client/proc/voting verbs -= /client/proc/hide_verbs verbs -= /client/proc/general_report - verbs -= /client/proc/air_report + //verbs -= /client/proc/air_report verbs -= /client/proc/cmd_admin_say verbs -= /client/proc/cmd_admin_gib_self verbs -= /client/proc/restartcontroller @@ -452,13 +452,13 @@ //verbs -= /obj/admins/proc/unprison --Merged with player panel //verbs -= /client/proc/cmd_switch_radio --removed because tcommsat is staying verbs -= /client/proc/togglebuildmodeself - verbs -= /client/proc/kill_airgroup + //verbs -= /client/proc/kill_airgroup verbs -= /client/proc/debug_master_controller verbs -= /client/proc/make_tajaran verbs -= /client/proc/admin_deny_shuttle verbs -= /client/proc/cmd_admin_christmas verbs -= /client/proc/editappear - verbs -= /client/proc/jump_to_dead_group + //verbs -= /client/proc/jump_to_dead_group verbs -= /client/proc/playernotes verbs -= /obj/admins/proc/show_skills verbs -= /client/proc/enable_debug_verbs diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index fa68b836d90..dc8c6371f53 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -22,7 +22,7 @@ usr << browse(output,"window=generalreport") //feedback_add_details("admin_verb","SGR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - air_report() +/* air_report() set category = "Debug" set name = "Show Air Report" @@ -83,7 +83,7 @@ for(var/datum/gas/trace_gas in GM.trace_gases) usr << "[trace_gas.type]: [trace_gas.moles]" //feedback_add_details("admin_verb","DAST") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - +*/ fix_next_move() set category = "Debug" set name = "Unfreeze Everyone" @@ -183,7 +183,7 @@ //feedback_add_details("admin_verb","RLDA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - jump_to_dead_group() + /*jump_to_dead_group() set name = "Jump to dead group" set category = "Debug" if(!holder) @@ -221,7 +221,7 @@ else usr << "Local airgroup is unsimulated!" //feedback_add_details("admin_verb","KLAG") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - +*/ tension_report() set category = "Debug" diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index a899f823ddf..f319ebe5019 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -130,14 +130,14 @@ var/intercom_range_display_status = 0 src.verbs += /client/proc/camera_view //-errorage src.verbs += /client/proc/sec_camera_report //-errorage src.verbs += /client/proc/intercom_view //-errorage - src.verbs += /client/proc/air_status //Air things + //src.verbs += /client/proc/air_status //Air things src.verbs += /client/proc/Cell //More air things src.verbs += /client/proc/atmosscan //check plumbing src.verbs += /client/proc/powerdebug //check power src.verbs += /client/proc/count_objects_on_z_level src.verbs += /client/proc/count_objects_all src.verbs += /client/proc/cmd_assume_direct_control //-errorage - src.verbs += /client/proc/jump_to_dead_group + //src.verbs += /client/proc/jump_to_dead_group src.verbs += /client/proc/startSinglo src.verbs += /client/proc/ticklag //allows you to set the ticklag. src.verbs += /client/proc/cmd_admin_grantfullaccess diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm index ad825ca068d..af599eced07 100644 --- a/code/modules/chemical/Chemistry-Recipes.dm +++ b/code/modules/chemical/Chemistry-Recipes.dm @@ -350,8 +350,6 @@ datum on_reaction(var/datum/reagents/holder, var/created_volume) var/turf/location = get_turf(holder.my_atom.loc) for(var/turf/simulated/floor/target_tile in range(0,location)) - if(target_tile.parent && target_tile.parent.group_processing) - target_tile.parent.suspend_group_processing() var/datum/gas_mixture/napalm = new diff --git a/code/modules/clothing/suits/fire.dm b/code/modules/clothing/suits/fire.dm index 42dc200379a..7f03617caa5 100644 --- a/code/modules/clothing/suits/fire.dm +++ b/code/modules/clothing/suits/fire.dm @@ -28,6 +28,18 @@ protective_temperature = 10000 slowdown = 1.5 +/obj/item/clothing/head/helmet/space/fire_helmet + name = "Fire Helmet" + desc = "A helmet designed to protect against fires in sealed areas, which often create extreme pressures." + flags = FPRINT | TABLEPASS | HEADSPACE | HEADCOVERSEYES | BLOCKHAIR + see_face = 0.0 + permeability_coefficient = 0.01 + heat_transfer_coefficient = 0.01 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES + icon_state = "hazmat_firered" + item_state = "hazhat_firered" + /obj/item/clothing/head/radiation diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index edef1ab43a4..7a386ef417f 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -183,7 +183,7 @@ if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return var/datum/gas_mixture/environment = loc.return_air() - var/datum/air_group/breath + var/datum/gas_mixture/breath // HACK NEED CHANGING LATER if(src.health < 0) src.losebreath++ diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 23e9a6ca067..b35b9735434 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -158,7 +158,7 @@ if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return var/datum/gas_mixture/environment = loc.return_air() - var/datum/air_group/breath + var/datum/gas_mixture/breath // HACK NEED CHANGING LATER if(health < 0) losebreath++ diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index b30bc302ceb..f091d8bf000 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -359,7 +359,7 @@ if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return var/datum/gas_mixture/environment = loc.return_air() - var/datum/air_group/breath + var/datum/gas_mixture/breath // HACK NEED CHANGING LATER if(isbreathing && health < config.health_threshold_crit) @@ -420,6 +420,14 @@ smoke.reagents.copy_to(src, 10) // I dunno, maybe the reagents enter the blood stream through the lungs? break // If they breathe in the nasty stuff once, no need to continue checking + if(istype(wear_mask, /obj/item/clothing/mask/gas)) + var/datum/gas_mixture/filtered = new() + filtered.toxins = breath.toxins + filtered.trace_gases = breath.trace_gases.Copy() + breath.toxins = 0 + breath.trace_gases = list() + loc.assume_air(filtered) + else //Still give containing object the chance to interact if(istype(loc, /obj/)) var/obj/location_as_object = loc @@ -469,7 +477,7 @@ var/safe_oxygen_min = 16 // Minimum safe partial pressure of O2, in kPa //var/safe_oxygen_max = 140 // Maximum safe partial pressure of O2, in kPa (Not used for now) var/safe_co2_max = 10 // Yes it's an arbitrary value who cares? - var/safe_toxins_max = 0.005 + var/safe_toxins_max = 0.0025 var/SA_para_min = 1 var/SA_sleep_min = 5 var/oxygen_used = 0 @@ -649,7 +657,7 @@ //Account for massive pressure differences. Done by Polymorph var/pressure = environment.return_pressure() - if(!istype(wear_suit, /obj/item/clothing/suit/space)) + if(!istype(wear_suit, /obj/item/clothing/suit/space) && !istype(wear_suit, /obj/item/clothing/suit/fire)) /*if(pressure < 20) if(prob(25)) src << "You feel the splittle on your lips and the fluid on your eyes boiling away, the capillteries in your skin breaking." @@ -658,6 +666,9 @@ if(pressure > HAZARD_HIGH_PRESSURE) adjustBruteLoss(min((10+(round(pressure/(HIGH_STEP_PRESSURE)-2)*5)),MAX_PRESSURE_DAMAGE)) + if(environment.toxins > MOLES_PLASMA_VISIBLE) + pl_effects() + return //TODO: DEFERRED adjust_body_temperature(current, loc_temp, boost) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 70489c1117a..e4baace6694 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -187,7 +187,7 @@ if(!loc) return //probably ought to make a proper fix for this, but :effort: --NeoFite var/datum/gas_mixture/environment = loc.return_air() - var/datum/air_group/breath + var/datum/gas_mixture/breath if(losebreath>0) //Suffocating so do not take a breath src.losebreath-- diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index aa829b0930e..c1067a0523a 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -40,14 +40,8 @@ return 0 var/mob/living/carbon/human/H = src //make this damage method divide the damage to be done among all the body parts, then burn each body part for that much damage. will have better effect then just randomly picking a body part var/divided_damage = (burn_amount)/(H.organs.len) - var/extradam = 0 //added to when organ is at max dam for(var/name in H.organs) - var/datum/organ/external/affecting = H.organs[name] - if(!affecting) continue - if(affecting.take_damage(0, divided_damage+extradam, 0, used_weapon)) - extradam = 0 - else - extradam += divided_damage + apply_damage(divided_damage, BURN, name, 0, 0, "Skin Burns") H.UpdateDamageIcon() H.updatehealth() return 1 diff --git a/code/modules/mob/organ/organ.dm b/code/modules/mob/organ/organ.dm index 4070542e6c7..01155cbdbb8 100644 --- a/code/modules/mob/organ/organ.dm +++ b/code/modules/mob/organ/organ.dm @@ -104,7 +104,7 @@ burn *= 0.66 //~2/3 damage for ROBOLIMBS if(owner && !robot) - owner.pain(display_name, (brute+burn)*3, 1) + owner.pain(display_name, (brute+burn)*3, 1, burn > brute) if(sharp) var/nux = brute * rand(10,15) if(brute_dam >= max_damage) diff --git a/code/modules/mob/organ/pain.dm b/code/modules/mob/organ/pain.dm index 21825ce8eaa..3213b26ffae 100644 --- a/code/modules/mob/organ/pain.dm +++ b/code/modules/mob/organ/pain.dm @@ -7,7 +7,7 @@ mob/var/next_pain_time = 0 // partname is the name of a body part // amount is a num from 1 to 100 -mob/proc/pain(var/partname, var/amount, var/force) +mob/proc/pain(var/partname, var/amount, var/force, var/burning = 0) if(stat >= 2) return if(world.time < next_pain_time && !force) return @@ -17,15 +17,26 @@ mob/proc/pain(var/partname, var/amount, var/force) if(amount > 50 && prob(amount / 5)) src:drop_item() var/msg - switch(amount) - if(1 to 10) - msg = "Your [partname] hurts a bit." - if(11 to 90) - flash_weak_pain() - msg = "Ouch! Your [partname] hurts." - if(91 to 10000) - flash_pain() - msg = "OH GOD! Your [partname] is hurting terribly!" + if(burning) + switch(amount) + if(1 to 10) + msg = "\red Your [partname] burns." + if(11 to 90) + flash_weak_pain() + msg = "\red Your [partname] burns badly!" + if(91 to 10000) + flash_pain() + msg = "\red OH GOD! Your [partname] is on fire!" + else + switch(amount) + if(1 to 10) + msg = "Your [partname] hurts." + if(11 to 90) + flash_weak_pain() + msg = "Your [partname] hurts badly." + if(91 to 10000) + flash_pain() + msg = "OH GOD! Your [partname] is hurting terribly!" if(msg && (msg != last_pain_message || prob(10))) last_pain_message = msg src << msg diff --git a/code/setup.dm b/code/setup.dm index 05e8e837728..b701acb6118 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -14,6 +14,16 @@ #define MOLES_PLASMA_VISIBLE 0.5 //Moles in a standard cell after which plasma is visible +#define SPECIFIC_HEAT_TOXIN 200 +#define SPECIFIC_HEAT_AIR 20 +#define SPECIFIC_HEAT_CDO 30 +#define HEAT_CAPACITY_CALCULATION(oxygen,carbon_dioxide,nitrogen,toxins) \ + (carbon_dioxide*SPECIFIC_HEAT_CDO + (oxygen+nitrogen)*SPECIFIC_HEAT_AIR + toxins*SPECIFIC_HEAT_TOXIN) + +#define MINIMUM_HEAT_CAPACITY 0.0003 +#define QUANTIZE(variable) (round(variable,0.0001)) +#define TRANSFER_FRACTION 5 //What fraction (1/#) of the air difference to try and transfer + #define BREATH_VOLUME 0.5 //liters in a normal breath #define BREATH_PERCENTAGE BREATH_VOLUME/CELL_VOLUME //Amount of air to take a from a tile diff --git a/icons/effects/contamination.dmi b/icons/effects/contamination.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e0f34e26469b6984f5bef6322eccdc843d4df04a GIT binary patch literal 380 zcmV-?0fYXDP)+yN9gwFr~00DGTPE!Ct=GbNc003lqR9JLGWpiV4X>fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY zR3KAHiHkEOv#1!zH00t;D@x2wg|L+sT>V_YCISGOw-^h3tARrR005{-L_t(2k-d=J z5yBu0fSV1Hhyx_h0c=Up8SbCYlxoCMjW*?ysN@jI-TLMhh3nIIXH^8%^Flzi9npBh a-^L3-FBZ4AUm1Y_0000)QegMH^0RNvm?V10lUAD3_%+!D7($doZ|No!hHK+gp00DGTPE!Ct=GbNc z004@SQ!RhuEYD0S$pCVUjkq{7QZv&tN+6u#lEji!AX6znucWjnO^J&$C9|j)C}7CN znO2mTn+jqZ14UDF5-WjBBOM?_*QHxfT2zpeN~-4KocQ#_Vj^`ZE4cc(fPDr4x!yi* zO@EZL0008_Nkl;441_6}l6-Pr1)P6W;1X1VFUgswoLz!Sa0$Mq%O{9G zECo5%Wad50nC24T?(!!h5r_Hb-iVq2jpO#x&Iw0`yRl3l&Qbs^m6Ax%>c~K$kwpzT zM3Ch;vyuU9sw|B}e~6iyz`~}_p&-yB65&QL)j%>MFm*ABhWEu}T0oY@m7m% zxS@Zf9_)y816hgE5p%+Uh>LzTRL7XP#kprRQgt7;Xk=F2i=_{Ds6wgG$c#xYmL8&1 zWy)^2)NSJrkVB~~(ulT3t99ZDD(C5P75CgZbjBhtkUN*>Gb&j4d@p_v`(kLi9YsKB){0_|9X5^$g@Kbf1fBu80 z3($IQZ~dI`WVsv51mY|O&{HXi1ig+d6k1u-kw*ksjw>r!z_!ZLMD$6_)CCqceGPvF zfgX_vKY^(Zk{N-in@u#lFE-NxnuOG`7Tt)CT5Q7&CG}uOq&vt;l#ZAa9z=ZftD!ok z%q`A6qlv2futg)Y@?I=`xI-06g;r*4a4W^e}FtnWsy#_HCn9`Pf$5e zpR2g%uc0#)d4c@3JfBGs!^6f3QQAiVMt z>jDu|7&?M|L_R9n6>qwNVG^Qcq;M_w_E^NfNLpcJ(}!Z> z#fjJ3MUqZI*;y~{{^oaJ-Zm>I)e#)rY7iqz0<>rqL4iHxKKl3*mo-bGroT=*>zHb+FcE7+zlCz7iDtn zd1sGJ0Mr{Ee)XbvU3-pybeW#}8btfj)K`{yul`?&#lmC91Wl0Rv|7&a7Z=u9XoDtc QNB{r;07*qoM6N<$g4O%Zy8r+H delta 680 zcmV;Z0$2Tj2*?FfiBL{Q4GJ0x0000DNk~Le0002M0000W1Oos70JgSjwg3PC6;Mo6 zMZmzo?V10lUAD3_%+!D7($doZ|NrXizu*7>00DGTPE!Ct=GbNc003=~UoC$sE=ep& z1+ta$^GZsK(v-M3Q!!Z}Oz0-Los;rlVQs+-k{z@G4ID6)WYED7 zW_7l(xvw<3U;!2CuFPpT*`}UbLnKCw-(j!VXBZyf2ZE=Tte%*XUXvy==L7ULiGb=nyc)k^+ zjn|3TAFM$gXly#RqB=p9lyOvScg^PPWA3_+J5La7lxt23#a14g4&+T?>;PX0-`qF_ zbJbPYc+H0%uGH~uA!2{JI$kj7x2vrsBIZbi=gVN;alQ4Ayck z{werxJ+0Ve&y*d?o99QAHT%Ta*hq)PRTz<&S*x3B*=w?v446!*1jo;6$K3{!ZSo%p zACkjLk4;8xIhQYP8e>NweH^RhvdqOTIR>@Y?5R8u3fjL)JdmYH$NUHIHXS42 diff --git a/icons/effects/tile_effects.dmi b/icons/effects/tile_effects.dmi index 4c78f8f2e06e3bd3b9572bd8e2ce3a043822486d..5ed60b7adcd44165592ff49f779c07e24275d3fd 100644 GIT binary patch delta 937 zcmV;a16KUw1&9b=iBL{Q4GJ0x0000DNk~Le0001B0001B1Oos701&on3jhEBAy7)QegMH^0RNvm?V10lUAD3_%+!D7($doZ|No!hHK+gp00DGTPE!Ct=GbNc z005GaQ*M9PrCU&1RFIQOs^;RH)YO8^y!80Q^whi(B6TY(xca$(eFy;De?fYC8zsU3 z00Q?(L_t(og~e3MaqBP)gejSld~#j|oK)ZvRDv(bnWvmxf=X}+zNX73h(9a^Io4$6 zJays=jn14_uM&j#v(6}JD2A(Dq?s!1-ghzlG%|ewD!x%GfYCX zj1;cr-X4nhJ4q{yO!`oayg2cCn@G|qC_8^^#ogch4$RwTu!q!wn_%U`M1o$V!xsm=hjEeDtfKI;PAm&OLvl ziK_dsMI*EFUMzjMLlsJeR%UE+vGfq7DqD8Lr*0pAfILcNkxsNVTCEdLP&rSZtGMT{ zp)(bEf&8^RpGgtJ%PG)Jv?BEV^?Br$Xy&1>QV7T%LrEX?qUaPWt%4xD@)GL;5mOjC zf_+3jD%llpzkDQaDvI-Mag@wXRH1*hUrt_O5~5|Ka4q-tSj4|bT47|mKb!NokjPb3ibq$4KG^Ev0C8cmv)|t=?l-J zwV9{!E&A%3Pqe+$!-}GiJodOyLt)r=D*rRSe=gZ|QiIxE4Q$*E8IKoba_m8QXOB$) z)Egdt^`duOdyao}nV$O^MElazSC)CN{$Gj3!ehq-O_1ZXTF&qn7uH#5gC=Q600000 LNkvXXu0mjf%_+KB delta 642 zcmV-|0)7362;&7)iBL{Q4GJ0x0000DNk~Le0002M0000W1Oos70JgSjwg3PC6;Mo6 zMZmzo?V10lUAD3_%+!D7($doZ|NrXizu*7>00DGTPE!Ct=GbNc004-QUv7WsD$Yqw zEy&DEk55cb%_|{Nx3Yq(p9|QL0QPV&3VT*E0RR92=t)FDR7i=PR@;??APkLwemh%1 z&Q@Rvlwb+|O#dyc5Re3d;@)!xdF19nAPfM*bpG%IU})dtD&Q~}nLf}DQ+CK?0@Kxpj4&i^a#?J6rNZ#vr zxY$9P(9<(3JWP1L6{L;ViP#^kK^z}A9Poe3BoF8fgzI@lu+2m&U5Y0K<&&gx4+bK+VdJ|e=DCbZZJws$ zyEAmdwA@NIrbrCdaxVTU_-{R}*ksR?9m<>MN0c@D#MszKhs9MGk(gPln`+r>vX%^( zsRYN*YRBCMl5O%I2_KTfN{>xOZ8?`OZW?1pAblLG<+9AhEjcCzwb$&aJP-=nze+ri crAf#92kBjDu35&!@I07*qoM6N<$f;(+2Q2+n{ From 56a2c1d77a9f340efb4e2524ac21ebd3732b102f Mon Sep 17 00:00:00 2001 From: Aryn Date: Sat, 26 May 2012 22:00:38 -0600 Subject: [PATCH 2/7] Added comments and updated the changelog. --- code/ZAS/Connection.dm | 5 + code/ZAS/Creation.dm | 17 ++++ code/ZAS/Definition.dm | 2 +- code/ZAS/Fire.dm | 207 ++++++++++++++--------------------------- code/ZAS/Functions.dm | 94 ++++++++++++------- code/ZAS/Plasma.dm | 98 +++++-------------- code/ZAS/Processing.dm | 43 +++++++-- html/changelog.html | 11 +++ 8 files changed, 222 insertions(+), 255 deletions(-) diff --git a/code/ZAS/Connection.dm b/code/ZAS/Connection.dm index 022a714222e..af113cc514f 100644 --- a/code/ZAS/Connection.dm +++ b/code/ZAS/Connection.dm @@ -1,3 +1,8 @@ +/* +This object is contained within zone/var/connections. It's generated whenever two turfs from different zones are linked. +Indirect connections will not merge the two zones after they reach equilibrium. +*/ + connection var turf //The turfs involved in the connection. diff --git a/code/ZAS/Creation.dm b/code/ZAS/Creation.dm index 1dba1d296ba..10508e0aa2f 100644 --- a/code/ZAS/Creation.dm +++ b/code/ZAS/Creation.dm @@ -1,13 +1,19 @@ zone New(turf/start) + //Get the turfs that are part of the zone using a floodfill method if(istype(start,/list)) contents = start else contents = FloodFill(start) + + //Change all the zone vars of the turfs, check for space to be added to space_tiles. for(var/turf/T in contents) T.zone = src if(istype(T,/turf/space)) AddSpace(T) + + //Generate the gas_mixture for use in this zone by using the average of the gases + //defined at startup. air = new var/members = contents.len for(var/turf/simulated/T in contents) @@ -18,8 +24,12 @@ zone air.temperature += T.temperature / members air.group_multiplier = contents.len air.update_values() + + //Add this zone to the global list. zones += src + Del() + //Ensuring the zone list doesn't get clogged with null values. zones -= src . = ..() @@ -31,17 +41,23 @@ proc/FloodFill(turf/start) while(open.len) for(var/turf/T in open) + //Stop if there's a door, even if it's open. These are handled by indirect connection. if(!T.HasDoor()) + for(var/d in cardinal) var/turf/O = get_step(T,d) + //Simple pass check. if(O.ZCanPass(T) && !(O in open) && !(O in closed)) open += O + open -= T closed += T return closed turf/proc/ZCanPass(turf/T) + //Fairly standard pass checks for turfs, objects and directional windows. Also stops at the edge of space. + if(istype(T,/turf/space)) return 0 else if(T.blocks_air||blocks_air) @@ -52,6 +68,7 @@ turf/proc/ZCanPass(turf/T) continue if(!obstacle.CanPass(0, T, 0, 1)) return 0 + for(var/obj/obstacle in T) if(istype(obstacle,/obj/machinery/door) && !istype(obstacle,/obj/machinery/door/window)) continue diff --git a/code/ZAS/Definition.dm b/code/ZAS/Definition.dm index b092dc304b7..90e88a6c613 100644 --- a/code/ZAS/Definition.dm +++ b/code/ZAS/Definition.dm @@ -5,7 +5,7 @@ var/list/zones = list() zone var dbg_output = 0 //Enables debug output. - rebuild = 0 //If 1, zone will be rebuilt on next process. + rebuild = 0 //If 1, zone will be rebuilt on next process. Not sure if used. datum/gas_mixture/air //The air contents of the zone. list/contents //All the tiles that are contained in this zone. list/connections // /connection objects which refer to connections with other zones, e.g. through a door. diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index 24f98ccb02f..0159bfa0566 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -1,11 +1,14 @@ vs_control/var/IgnitionLevel = 10 //Moles of oxygen+plasma - co2 needed to burn. -#define OXYGEN +//Some legacy definitions so fires can be started. atom/proc/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) return null + turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0) + + turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) if(fire_protection > world.time-300) return var/datum/gas_mixture/air_contents = return_air(1) @@ -40,109 +43,6 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) return igniting -obj/effect/hotspot - //Icon for fire on turfs, also helps for nurturing small fires until they are full tile - - anchored = 1 - - mouse_opacity = 0 - - //luminosity = 3 - - icon = 'fire.dmi' - icon_state = "1" - - layer = TURF_LAYER - - var - volume = 125 - temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - - just_spawned = 1 - - bypassing = 0 - -obj/effect/hotspot/proc/perform_exposure() - var/turf/simulated/floor/location = loc - if(!istype(location)) - return 0 - - if(volume > CELL_VOLUME*0.95) - bypassing = 1 - else bypassing = 0 - - if(bypassing) - if(!just_spawned) - volume = location.air.fuel_burnt*FIRE_GROWTH_RATE - temperature = location.air.temperature - else - var/datum/gas_mixture/affected = location.air.remove_ratio(volume/location.air.volume) - - affected.temperature = temperature - - affected.react() - - temperature = affected.temperature - volume = affected.fuel_burnt*FIRE_GROWTH_RATE - - location.assume_air(affected) - - for(var/atom/item in loc) - item.temperature_expose(null, temperature, volume) - -obj/effect/hotspot/process(turf/simulated/list/possible_spread) - if(just_spawned) - just_spawned = 0 - return 0 - - var/turf/simulated/floor/location = loc - if(!istype(location)) - del(src) - - if((temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST) || (volume <= 1)) - del(src) - - if(location.air.toxins < 0.5 || location.air.oxygen < 0.5) - del(src) - - - perform_exposure() - - if(location.wet) location.wet = 0 - - if(bypassing) - icon_state = "3" - location.burn_tile() - - //Possible spread due to radiated heat - if(location.air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_SPREAD) - var/radiated_temperature = location.air.temperature*FIRE_SPREAD_RADIOSITY_SCALE - - for(var/turf/simulated/possible_target in possible_spread) - if(!locate(/obj/effect/hotspot) in possible_target) - possible_target.hotspot_expose(radiated_temperature, CELL_VOLUME/4) - - else - if(volume > CELL_VOLUME*0.4) - icon_state = "2" - else - icon_state = "1" - - return 1 - -obj/effect/hotspot/New() - ..() - dir = pick(cardinal) - sd_SetLuminosity(3) - -obj/effect/hotspot/Del() - src.sd_SetLuminosity(0) - loc = null - ..() - -var - fire_ratio_1 = 0.05 - obj fire //Icon for fire on turfs, also helps for nurturing small fires until they are full tile @@ -160,73 +60,82 @@ obj var volume = CELL_VOLUME temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - firelevel = 10000 + firelevel = 10000 //Calculated by gas_mixture.calculate_firelevel() archived_firelevel = 0 process() + if(firelevel > vsc.IgnitionLevel) + var/turf/simulated/floor/S = loc - if(!S.zone) del src - //src.temperature += (src.firelevel/FireTempDivider+FireOffset - src.temperature) / FireRate + if(!S.zone) del src //Cannot exist where zones are broken. + if(istype(S,/turf/simulated/floor)) var datum/gas_mixture/air_contents = S.return_air() + //Get whatever trace fuels are in the area datum/gas/volatile_fuel/fuel = locate(/datum/gas/volatile_fuel/) in air_contents.trace_gases + //Also get liquid fuels on the ground. obj/liquid_fuel/liquid = locate() in S firelevel = air_contents.calculate_firelevel(liquid) + //Ensure that there is an appropriate amount of fuel and O2 here. if(firelevel > 25 && (air_contents.toxins || fuel || liquid)) + for(var/direction in cardinal) if(S.air_check_directions&direction) //Grab all valid bordering tiles + var/turf/simulated/enemy_tile = get_step(S, direction) + if(istype(enemy_tile)) + //If extinguisher mist passed over the turf it's trying to spread to, don't spread and + //reduce firelevel. if(enemy_tile.fire_protection > world.time-30) firelevel -= 150 continue + + //Spread the fire. if(!(locate(/obj/fire) in enemy_tile)) if( prob( firelevel/2.5 ) ) new/obj/fire(enemy_tile,firelevel) - // else - // world << "Spread Probability: [firelevel/(vsc.IgnitionLevel*0.1)]%." - // else - // world << "There's a fire there bitch." - // else - // world << "[enemy_tile] cannot be spread to." - //else - // world << "Not enough firelevel to spread: [firelevel]/[vsc.IgnitionLevel*1.5]" - var/datum/gas_mixture/flow = air_contents.remove_ratio(0.5) - //n = PV/RT, taking the volume of a single tile from the gas. + var/datum/gas_mixture/flow = air_contents.remove_ratio(0.5) //Take half the air from the room I guess. if(flow) + //Ensure adequate oxygen and fuel. if(flow.oxygen > 0.3 && (flow.toxins || fuel || liquid)) + //Change icon depending on the fuel, and thus temperature. icon_state = "1" if(firelevel > 25) icon_state = "2" if(firelevel > 100) icon_state = "3" + + //Ensure flow temperature is higher than minimum fire temperatures. flow.temperature = max(PLASMA_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature) + + //Burn the gas mixture. flow.zburn(liquid) else + del src - S.assume_air(flow) + S.assume_air(flow) //Then put it back where you found it. + else - //world << "No air at all." del src else del src else - //world << "Insufficient fire level for ignition: [firelevel]/[IgnitionLevel]" del src for(var/mob/living/carbon/human/M in loc) - M.FireBurn(min(max(0.1,firelevel / 20),10)) + M.FireBurn(min(max(0.1,firelevel / 20),10)) //Burn the humans! New(newLoc,fl) @@ -235,7 +144,7 @@ obj sd_SetLuminosity(3) firelevel = fl for(var/mob/living/carbon/human/M in loc) - M.FireBurn(min(max(0.1,firelevel / 20),10)) + M.FireBurn(min(max(0.1,firelevel / 20),10)) //Burn the humans! Del() if (istype(loc, /turf/simulated)) @@ -246,23 +155,29 @@ obj ..() obj/liquid_fuel + //Liquid fuel is used for things that used to rely on volatile fuels or plasma being contained to a couple tiles. icon = 'icons/effects/effects.dmi' icon_state = "fuel" layer = TURF_LAYER+0.2 anchored = 1 - var/amount = 1 + var/amount = 1 //Basically moles. New(newLoc,amt=1) src.amount = amt + + //Be absorbed by any other liquid fuel in the tile. for(var/obj/liquid_fuel/other in newLoc) if(other != src) other.amount += src.amount spawn other.Spread() del src return + Spread() . = ..() + proc/Spread() + //Allows liquid fuels to sometimes flow into other tiles. if(amount < 0.5) return var/turf/simulated/S = loc if(!istype(S)) return @@ -277,22 +192,23 @@ obj/liquid_fuel icon_state = "mustard" anchored = 0 New(newLoc, amt = 1, d = 0) - dir = d + dir = d //Setting this direction means you won't get torched by your own flamethrower. . = ..() Spread() + //The spread for flamethrower fuel is much more precise, to create a wide fire pattern. if(amount < 0.1) return var/turf/simulated/S = loc if(!istype(S)) return + for(var/d in list(turn(dir,90),turn(dir,-90))) if(S.air_check_directions & d) var/turf/simulated/O = get_step(S,d) new/obj/liquid_fuel/flamethrower_fuel(O,amount*0.25,d) - O.hotspot_expose((T20C*2) + 380,500) + O.hotspot_expose((T20C*2) + 380,500) //Light flamethrower fuel on fire immediately. + amount *= 0.5 -vs_control/var/switch_fire = 1 - -turf/simulated/var/fire_protection = 0 +turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again. turf/proc/apply_fire_protection() turf/simulated/apply_fire_protection() @@ -300,50 +216,72 @@ turf/simulated/apply_fire_protection() datum/gas_mixture/proc zburn(obj/liquid_fuel/liquid) + //This proc is similar to fire(), but uses a simple logarithm to calculate temp, and is thus more stable with ZAS. if(temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) var total_fuel = toxins - fuel_sources = 0 + fuel_sources = 0 //We'll divide by this later so that fuel is consumed evenly. datum/gas/volatile_fuel/fuel = locate() in trace_gases + if(fuel) + //Volatile Fuel total_fuel += fuel.moles fuel_sources++ + if(liquid) + //Liquid Fuel if(liquid.amount <= 0) del liquid else total_fuel += liquid.amount fuel_sources++ + + //Toxins if(toxins > 0.3) fuel_sources++ - if(!fuel_sources) return 0 - if(oxygen > 0.3 && total_fuel) + if(!fuel_sources) return 0 //If there's no fuel, there's no burn. Can't divide by zero anyway. + + if(oxygen > 0.3) + + //Calculate the firelevel. var/firelevel = calculate_firelevel(liquid) - //f(x) = 1000ln(0.01x + 1.45) + + //Reaches a maximum practical temperature of around 2750. + temperature = 1000*log(0.016*firelevel + 1.45) + + //Consume some gas. var/consumed_gas = min(oxygen,0.002*firelevel,total_fuel) / fuel_sources + oxygen -= consumed_gas + toxins = max(0,toxins-consumed_gas) + if(fuel) fuel.moles -= consumed_gas if(fuel.moles <= 0) del fuel + if(liquid) liquid.amount -= consumed_gas if(liquid.amount <= 0) del liquid + update_values() return consumed_gas*fuel_sources return 0 + calculate_firelevel(obj/liquid_fuel/liquid) + //Calculates the firelevel based on one equation instead of having to do this multiple times in different areas. var datum/gas/volatile_fuel/fuel = locate() in trace_gases fuel_level = 0 liquid_level = 0 + if(fuel) fuel_level = fuel.moles if(liquid) liquid_level = liquid.amount return oxygen + toxins + liquid_level*15 + fuel_level*5 /mob/living/carbon/human/proc/FireBurn(mx as num) - //NO! NOT INTO THE PIT! IT BURRRRRNS! + //Burns mobs due to fire. Respects heat transfer coefficients on various body parts. var head_exposure = 1 @@ -352,6 +290,7 @@ datum/gas_mixture/proc legs_exposure = 1 arms_exposure = 1 + //Get heat transfer coefficients for clothing. for(var/obj/item/clothing/C in src) if(l_hand == C || r_hand == C) continue if(C.body_parts_covered & HEAD) @@ -365,8 +304,6 @@ datum/gas_mixture/proc if(C.body_parts_covered & ARMS) arms_exposure *= C.heat_transfer_coefficient - mx *= 1 - //Always check these damage procs first if fire damage isn't working. They're probably what's wrong. apply_damage(2.5*mx*head_exposure, BURN, "head", 0, 0, "Fire") diff --git a/code/ZAS/Functions.dm b/code/ZAS/Functions.dm index 548289ade07..b9d88a84f22 100644 --- a/code/ZAS/Functions.dm +++ b/code/ZAS/Functions.dm @@ -1,43 +1,34 @@ zone proc AddTurf(turf/T) + //Adds the turf to contents, increases the size of the zone, and sets the zone var. if(T in contents) return contents += T air.group_multiplier++ T.zone = src RemoveTurf(turf/T) + //Same, but in reverse. if(!(T in contents)) return contents -= T air.group_multiplier-- T.zone = null - DivideAir(ratio) - ratio = min(1,max(0,ratio)) - air.oxygen *= ratio - air.oxygen = QUANTIZE(air.oxygen) - air.nitrogen *= ratio - air.nitrogen = QUANTIZE(air.nitrogen) - air.toxins *= ratio - air.toxins = QUANTIZE(air.toxins) - air.carbon_dioxide *= ratio - air.carbon_dioxide = QUANTIZE(air.carbon_dioxide) - if(air.trace_gases.len) - for(var/datum/gas/trace_gas in air.trace_gases) - trace_gas.moles *= ratio - trace_gas.moles = QUANTIZE(trace_gas.moles) - air.temperature = air.temperature*ratio + TCMB*(1-ratio) - air.temperature = QUANTIZE(air.temperature) - AddSpace(turf/space/S) + //Adds a space tile to the list, and creates the list if null. if(istype(S,/turf/space)) if(!space_tiles) space_tiles = list() space_tiles += S + RemoveSpace(turf/space/S) + //Removes a space tile from the list, and deletes the list if length is 0. if(space_tiles) space_tiles -= S if(!space_tiles.len) space_tiles = null turf/proc/HasDoor(turf/O) + //Checks for the presence of doors, used for zone spreading and connection. + //A positive numerical argument checks only for closed doors. + //Another turf as an argument checks for windoors between here and there. for(var/obj/machinery/door/D in src) if(isnum(O) && O) if(!D.density) continue @@ -48,6 +39,7 @@ turf/proc/HasDoor(turf/O) return 1 turf/proc/find_zone() + //Allows newly generated turfs to join up with a nearby zone. if(world.time < 10) return for(var/d in cardinal) var/turf/T = get_step(src,d) @@ -59,6 +51,7 @@ turf/proc/find_zone() ZConnect(src,T) turf/proc/check_connections() + //Checks for new connections that can be made. for(var/d in cardinal) var/turf/T = get_step(src,d) if(!T || !T.zone || !T.CanPass(0,src,0,0)) continue @@ -66,6 +59,7 @@ turf/proc/check_connections() ZConnect(src,T) turf/proc/check_for_space() + //Checks for space around the turf. for(var/d in cardinal) var/turf/T = get_step(src,d) if(istype(T,/turf/space) && T.CanPass(0,src,0,0)) @@ -73,97 +67,125 @@ turf/proc/check_for_space() proc ZMerge(zone/A,zone/B) - //world << "Merge occured." + //Merges two zones so that they are one. var a_size = A.air.group_multiplier b_size = B.air.group_multiplier c_size = a_size + b_size new_contents = A.contents + B.contents + //Set air multipliers to one so air represents gas per tile. A.air.group_multiplier = 1 B.air.group_multiplier = 1 + //Remove some air proportional to the size of this zone. A.air.remove_ratio(a_size/c_size) B.air.remove_ratio(b_size/c_size) + + //Merge the gases and set the multiplier to the sum of the old ones. A.air.merge(B.air) A.air.group_multiplier = c_size + //Check for connections to merge into the new zone. for(var/connection/C in B.connections) if((C.A in new_contents) && (C.B in new_contents)) del C continue if(!A.connections) A.connections = list() A.connections += C + + //Add space tiles. A.space_tiles += B.space_tiles + + //Add contents. A.contents = new_contents + + //Set all the zone vars. for(var/turf/T in B.contents) T.zone = A + del B ZConnect(turf/A,turf/B) + //Connects two zones by forming a connection object representing turfs A and B. + + //Make sure that if it's space, it gets added to space_tiles instead. if(istype(B,/turf/space)) if(A.zone) A.zone.AddSpace(B) - //world << "Space added." return if(istype(A,/turf/space)) if(B.zone) B.zone.AddSpace(A) - //world << "Space added." return + + //Make some preliminary checks to see if the connection is valid. if(!A.zone || !B.zone) return if(A.zone == B.zone) return if(!A.CanPass(0,B,0,0)) return + + //Ensure the connection isn't already made. for(var/connection/C in A.zone.connections) if((C.A == A && C.B == B) || (C.A == B && C.B == A)) return - var/connection/C = new(A,B) - if(A.HasDoor(B) || B.HasDoor(A)) C.indirect = 1 - //world << "Connection Formed: [A] --> [B] [(C.indirect?"Indirect":"Direct")]" - //A.overlays += 'zone_connection_A.dmi' - //B.overlays += 'zone_connection_B.dmi' - //spawn(10) - // A.overlays -= 'zone_connection_A.dmi' - // B.overlays -= 'zone_connection_B.dmi' + var/connection/C = new(A,B) + + //Ensure zones separated by doors do not merge. + if(A.HasDoor(B) || B.HasDoor(A)) C.indirect = 1 ZDisconnect(turf/A,turf/B) + //Removes a zone connection. Can split zones in the case of a permanent barrier. + + //If one of them doesn't have a zone, it might be space, so check for that. if(A.zone && B.zone) + //If the two zones are different, just remove a connection. if(A.zone != B.zone) for(var/connection/C in A.zone.connections) if((C.A == A && C.B == B) || (C.A == B && C.B == A)) - //world << "Connection Dissolved: [A] -/-> [B] [(C.indirect?"Indirect":"Direct")]" - /*A.overlays += 'zone_connection_A.dmi' - B.overlays += 'zone_connection_B.dmi' - spawn(10) - A.overlays -= 'zone_connection_A.dmi' - B.overlays -= 'zone_connection_B.dmi'*/ del C + //If they're the same, split the zone at this line. else + //Preliminary checks to prevent stupidity. if(A == B) return if(A.CanPass(0,B,0,0)) return if(A.HasDoor(B) || B.HasDoor(A)) return + + //Do a test fill. If turf B is still in the floodfill, then the zone isn't really split. var/zone/oldzone = A.zone var/list/test = FloodFill(A) if(B in test) return + else - var/zone/Z = new(test,oldzone.air) + var/zone/Z = new(test,oldzone.air) //Create a new zone based on the old air and the test fill. + + //Add connections from the old zone. for(var/connection/C in oldzone.connections) if((A in Z.contents) || (B in Z.contents)) if(!Z.connections) Z.connections = list() Z.connections += C + + //Check for space. for(var/turf/T in test) T.check_for_space() + + //Make a new, identical air mixture for the other zone. var/datum/gas_mixture/Y_Air = new Y_Air.copy_from(oldzone.air) - var/zone/Y = new(B,Y_Air) + + var/zone/Y = new(B,Y_Air) //Make a new zone starting at B and using Y_Air. + + //Add relevant connections from old zone. for(var/connection/C in oldzone.connections) if((A in Y.contents) || (B in Y.contents)) if(!Y.connections) Y.connections = list() Y.connections += C + + //Add the remaining space tiles to this zone. for(var/turf/space/T in oldzone.space_tiles) if(!(T in Z.space_tiles)) Y.AddSpace(T) + oldzone.air = null del oldzone else diff --git a/code/ZAS/Plasma.dm b/code/ZAS/Plasma.dm index ab7f452fa9e..858799a2729 100644 --- a/code/ZAS/Plasma.dm +++ b/code/ZAS/Plasma.dm @@ -1,94 +1,35 @@ pl_control/var PLASMA_DMG = 3 - PLASMA_DMG_NAME = "Plasma Damage Multiplier" - PLASMA_DMG_DESC = "Multiplier on how much damage inhaling plasma can do." CLOTH_CONTAMINATION = 0 //If this is on, plasma does damage by getting into cloth. - CLOTH_CONTAMINATION_NAME = "Plasma - Cloth Contamination" - CLOTH_CONTAMINATION_RANDOM = 60 - CLOTH_CONTAMINATION_METHOD = "Toggle" - CLOTH_CONTAMINATION_DESC = "If set to nonzero, plasma will contaminate cloth items (uniforms, backpacks, etc.)\ - and cause a small amount of damage over time to anyone carrying or wearing them. Contamination can be washed off in the washer." - ALL_ITEM_CONTAMINATION = 0 //If this is on, any item can be contaminated, so suits and tools must be discarded or - //decontaminated. - ALL_ITEM_CONTAMINATION_NAME = "Plasma - Full Contamination" - ALL_ITEM_CONTAMINATION_RANDOM = 10 - ALL_ITEM_CONTAMINATION_METHOD = "Toggle" - ALL_ITEM_CONTAMINATION_DESC = "Like Cloth Contamination, but all item types are susceptible." - - PLASMAGUARD_ONLY = 0 - PLASMAGUARD_ONLY_NAME = "Plasma - Biosuits/Spacesuits Only" - PLASMAGUARD_ONLY_RANDOM = 20 - PLASMAGUARD_ONLY_METHOD = "Toggle" - PLASMAGUARD_ONLY_DESC = "If on, any suits that are not biosuits or space suits will not protect against contamination." - - //CANISTER_CORROSION = 0 //If this is on, plasma must be stored in orange tanks and canisters, - //CANISTER_CORROSION_RANDOM = 20 //or it will corrode the tank. - //CANISTER_CORROSION_METHOD = "Toggle" + PLASMAGUARD_ONLY = 0 //If this is on, only biosuits and spacesuits protect against contamination and ill effects. GENETIC_CORRUPTION = 0 //Chance of genetic corruption as well as toxic damage, X in 10,000. - GENETIC_CORRUPTION_NAME = "Plasma - Genetic Corruption" - GENETIC_CORRUPTION_RANDOM = "PROB10/3d6" - GENETIC_CORRUPTION_METHOD = "Numeric" - GENETIC_CORRUPTION_DESC = "When set to a probability in 1000, any humans in plasma will have this chance to develop a random mutation." SKIN_BURNS = 1 //Plasma has an effect similar to mustard gas on the un-suited. - SKIN_BURNS_NAME = "Plasma - Skin Burns" - SKIN_BURNS_RANDOM = 10 - SKIN_BURNS_METHOD = "Toggle" - SKIN_BURNS_DESC = "When toggled, humans with exposed skin will suffer burns (similar to mustard gas) in plasma." - - //PLASMA_INJECTS_TOXINS = 0 //Plasma damage injects the toxins chemical to do damage over time. - //PLASMA_INJECTS_TOXINS_RANDOM = 30 - //PLASMA_INJECTS_TOXINS_METHOD = "Toggle" EYE_BURNS = 1 //Plasma burns the eyes of anyone not wearing eye protection. - EYE_BURNS_NAME = "Plasma - Eye Burns" - EYE_BURNS_RANDOM = 30 - EYE_BURNS_METHOD = "Toggle" - EYE_BURNS_DESC = "When toggled, humans without masks that cover the eyes will suffer temporary blurriness and sight loss,\ - and may need glasses to see again if exposed for long durations." - - //N2O_REACTION = 0 //Plasma can react with N2O, making sparks and starting a fire if levels are high. - //N2O_REACTION_RANDOM = 5 - - //PLASMA_COLOR = "onturf" //Plasma can change colors yaaaay! - //PLASMA_COLOR_RANDOM = "PICKonturf,onturf" - - //PLASMA_DMG_OFFSET = 1 - //PLASMA_DMG_OFFSET_RANDOM = "1d5" - //PLASMA_DMG_QUOTIENT = 10 - //PLASMA_DMG_QUOTIENT_RANDOM = "1d10+4" CONTAMINATION_LOSS = 0.01 - CONTAMINATION_LOSS_NAME = "Plasma - Contamination Damage" - CONTAMINATION_LOSS_DESC = "A number representing the damage done per life cycle by contaminated items." - PLASMA_HALLUCINATION = 1 - PLASMA_HALLUCINATION_NAME = "Plasma - Hallucination" - PLASMA_HALLUCINATION_METHOD = "Toggle" - PLASMA_HALLUCINATION_DESC = "If toggled, uses the remnants of the hallucination code to induce visions in those\ - who breathe plasma." + PLASMA_HALLUCINATION = 0 + N2O_HALLUCINATION = 1 - N2O_HALLUCINATION_NAME = "Nitrous Oxide - Hallucination" - N2O_HALLUCINATION_METHOD = "Toggle" - N2O_HALLUCINATION_DESC = "If toggled, uses the remnants of the hallucination code to induce visions in those\ - who breathe N2O." - //CONTAMINATION_LOSS_RANDOM = "5d5" -//Plasma has a chance to be a different color. + obj/var/contaminated = 0 obj/item/proc can_contaminate() + //Clothing and backpacks can be contaminated. if(flags & PLASMAGUARD) return 0 - if((flags & SUITSPACE) && !vsc.plc.PLASMAGUARD_ONLY) return 1 - if(vsc.plc.ALL_ITEM_CONTAMINATION) return 1 + if(flags & SUITSPACE) return 0 else if(istype(src,/obj/item/clothing)) return 1 else if(istype(src,/obj/item/weapon/storage/backpack)) return 1 contaminate() + //Do a contamination overlay? Temporary measure to keep contamination less deadly than it was. if(!contaminated) contaminated = 1 overlays += 'icons/effects/contamination.dmi' @@ -100,6 +41,8 @@ obj/item/proc /mob/proc/contaminate() /mob/living/carbon/human/contaminate() + //See if anything can be contaminated. + if(!pl_suit_protected()) suit_contamination() @@ -109,25 +52,26 @@ obj/item/proc if(istype(back,/obj/item/weapon/storage/backpack)) back.contaminate() - /*if(l_hand) - if(l_hand.can_contaminate()) l_hand.contaminate() - if(r_hand) - if(r_hand.can_contaminate()) r_hand.contaminate() - if(belt) - if(belt.can_contaminate()) belt.contaminate()*/ - /mob/proc/pl_effects() /mob/living/carbon/human/pl_effects() + //Handles all the bad things plasma can do. + + //Contamination if(vsc.plc.CLOTH_CONTAMINATION) contaminate() + + //Anything else requires them to not be dead. if(stat >= 2) return + + //Burn skin if exposed. if(vsc.plc.SKIN_BURNS) if(!pl_head_protected() || !pl_suit_protected()) burn_skin(0.75) if(prob(20)) src << "\red Your skin burns!" updatehealth() + //Burn eyes if exposed. if(vsc.plc.EYE_BURNS) if(!head) if(!wear_mask) @@ -136,13 +80,14 @@ obj/item/proc if(!(wear_mask.flags & MASKCOVERSEYES)) burn_eyes() else - if(!(head.flags & MASKCOVERSEYES)) + if(!(head.flags & HEADCOVERSEYES)) if(!wear_mask) burn_eyes() else if(!(wear_mask.flags & MASKCOVERSEYES)) burn_eyes() + //Genetic Corruption if(vsc.plc.GENETIC_CORRUPTION) if(rand(1,10000) < vsc.plc.GENETIC_CORRUPTION) randmutb(src) @@ -150,6 +95,7 @@ obj/item/proc domutcheck(src,null) /mob/living/carbon/human/proc/burn_eyes() + //The proc that handles eye burning. if(prob(20)) src << "\red Your eyes burn!" eye_stat += 2.5 eye_blurry = min(eye_blurry+1.5,50) @@ -159,6 +105,7 @@ obj/item/proc eye_stat = 0 /mob/living/carbon/human/proc/pl_head_protected() + //Checks if the head is adequately sealed. if(head) if(vsc.plc.PLASMAGUARD_ONLY) if(head.flags & PLASMAGUARD || head.flags & HEADSPACE) return 1 @@ -167,6 +114,7 @@ obj/item/proc return 0 /mob/living/carbon/human/proc/pl_suit_protected() + //Checks if the suit is adequately sealed. if(wear_suit) if(vsc.plc.PLASMAGUARD_ONLY) if(wear_suit.flags & PLASMAGUARD || wear_suit.flags & SUITSPACE) return 1 @@ -175,6 +123,7 @@ obj/item/proc return 0 /mob/living/carbon/human/proc/suit_contamination() + //Runs over the things that can be contaminated and does so. if(w_uniform) w_uniform.contaminate() if(shoes) shoes.contaminate() if(gloves) gloves.contaminate() @@ -182,6 +131,7 @@ obj/item/proc turf/Entered(obj/item/I) . = ..() + //Items that are in plasma, but not on a mob, can still be contaminated. if(istype(I) && vsc.plc.CLOTH_CONTAMINATION) var/datum/gas_mixture/env = return_air(1) if(env.toxins > MOLES_PLASMA_VISIBLE + 1) diff --git a/code/ZAS/Processing.dm b/code/ZAS/Processing.dm index 8423ae46af8..d80048cbb13 100644 --- a/code/ZAS/Processing.dm +++ b/code/ZAS/Processing.dm @@ -2,19 +2,26 @@ var/explosion_halt = 0 zone proc/process() + //Does rebuilding stuff. Not sure if used. if(rebuild) + //Deletes zone if empty. if(!contents.len) del src return 0 + + //Choose a random turf and regenerate the zone from it. var turf/sample = pick(contents) list/new_contents = FloodFill(sample) problem = 0 + + //If something isn't carried over, there was a complication. for(var/turf/T in contents) if(!(T in new_contents)) problem = 1 if(problem) + //Build some new zones for stuff that wasn't included. var/list/rebuild_turfs = list() for(var/turf/T in contents - new_contents) contents -= T @@ -26,11 +33,13 @@ zone Z.air.copy_from(air) rebuild = 0 + //Sometimes explosions will cause the air to be deleted for some reason. if(!air) air = new() air.adjustGases(MOLES_O2STANDARD, 0, MOLES_N2STANDARD, 0, list()) world.log << "Air object lost in zone. Regenerating." + //Counting up space. var/total_space = 0 if(space_tiles) @@ -38,44 +47,60 @@ zone if(!istype(T,/turf/space)) space_tiles -= T total_space = length(space_tiles) - if(total_space) // SPAAAAAAAAAACE - //var/old_pressure = air.pressure + //Add checks to ensure that we're not sucking air out of an empty room. + if(total_space && air.total_moles > 0.1 && air.temperature > TCMB+0.5) + //If there is space, air should flow out of the zone. ShareSpace(air,total_space*(vsc.zone_share_percent/100)) - //var/p_diff = old_pressure - air.pressure - //if(p_diff > vsc.AF_TINY_MOVEMENT_THRESHOLD) AirflowSpace(src,p_diff) + //React the air here. air.react(null,0) + + //Check the graphic. var/check = air.check_tile_graphic() + //Only run through the individual turfs if there's reason to. if(check || air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) + for(var/turf/simulated/S in contents) + //Update overlays. if(check) if(S.HasDoor(1)) S.update_visuals() else S.update_visuals(air) + //Expose stuff to extreme heat. if(air.temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) for(var/atom/movable/item in S) item.temperature_expose(air, air.temperature, CELL_VOLUME) S.temperature_expose(air, air.temperature, CELL_VOLUME) + //Archive graphic so we can know if it's different. air.graphic_archived = air.graphic + //Ensure temperature does not reach absolute zero. air.temperature = max(TCMB,air.temperature) + //Handle connections to other zones. if(length(connections)) for(var/connection/C in connections) + //Check if the connection is valid first. C.Cleanup() + //Do merging if conditions are met. Specifically, if there's a non-door connection + //to somewhere with space, the zones are merged regardless of equilibrium, to speed + //up spacing in areas with double-plated windows. if(C && !C.indirect && C.A.zone && C.B.zone) if(C.A.zone.air.compare(C.B.zone.air) || total_space) ZMerge(C.A.zone,C.B.zone) + + //Share some for(var/zone/Z in connected_zones) - //var/p_diff = (air.return_pressure()-Z.air.return_pressure())*connected_zones[Z]*(vsc.zone_share_percent/100) - //if(p_diff > vsc.AF_TINY_MOVEMENT_THRESHOLD) Airflow(src,Z,p_diff) - ShareRatio(air,Z.air,connected_zones[Z]*(vsc.zone_share_percent/100)) + //Ensure we're not doing pointless calculations on equilibrium zones. + if(abs(air.total_moles - Z.air.total_moles) > 0.1 || abs(air.temperature - Z.air.temperature) > 0.1) + ShareRatio(air,Z.air,connected_zones[Z]*(vsc.zone_share_percent/100)) proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, ratio) + //Shares a specific ratio of gas between mixtures using simple weighted averages. var size = max(1,A.group_multiplier) share_size = max(1,B.group_multiplier) @@ -138,9 +163,8 @@ proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, ratio) if(A.compare(B)) return 1 else return 0 - /* See? Now that's how it's done. */ - proc/ShareSpace(datum/gas_mixture/A, ratio) + //A modified version of ShareRatio for spacing gas at the same rate as if it were going into a huge airless room. var size = max(1,A.group_multiplier) share_size = 2000 //A huge value because space is huge. @@ -179,6 +203,7 @@ proc/ShareSpace(datum/gas_mixture/A, ratio) zone/proc connected_zones() + //A legacy proc for getting connected zones. . = list() for(var/connection/C in connections) var/zone/Z diff --git a/html/changelog.html b/html/changelog.html index ec5d41f73d2..c099a42b9ee 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,17 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit though. Thanks. --> + +
+

5/26/2012

+

Aryn updated:

+
    +
  • Airflow works on a room-by-room basis rather than on individual tiles. Rooms will depressurize much faster than they did, though not too fast for balance reasons.
    • +
  • Fire now works on a logarithmic scale based on oxygen and fuel content. This is a far more complex tweak under the hood than it is in game.
    • +
  • Plasma now has increased toxicity and can burn exposed skin and eyes. In addition, because of the new air, it fills the room instantaneously. Try not to spill any.
    • +
+
+

26 May 2012

Erthilo updated:

From d51294fa9607c211c6e496c516ea47626cefb3c5 Mon Sep 17 00:00:00 2001 From: Aryn Date: Sat, 26 May 2012 22:02:18 -0600 Subject: [PATCH 3/7] Tweaked HUD icons so that they mesh better with the style of Midnight and Orange. --- icons/mob/screen1_Midnight.dmi | Bin 138830 -> 141675 bytes icons/mob/screen1_Orange.dmi | Bin 152533 -> 154354 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/screen1_Midnight.dmi b/icons/mob/screen1_Midnight.dmi index 42d15482c2270a9d317073f74a9a96fb99cfac14..4554286123567337bcc828226a9e9e86923b311c 100644 GIT binary patch delta 22316 zcmY&nboa0-#Ti$nSLCi95 zJsV%Y_4E#eYdnSXnsw2Jf+)l{KFK)CZT{)0uX@>h8#N)yRjAT%@yvQIYMbm?U){H+ z@ZsZq5;vi|Ud8O*`{2N4nva;%n7Ovt9wD|1(ks6NFV*>jFs_m~V@pdJEe$_f8m3zs zW^ZsHD3t|$(s5XKC?`ODW%qZ_VF9X*qAok4ZZD;xBy7;h$KYsWm=d|lAf9!6sgYJnwfrCmrEIGaramKXB)hVXkxrZlxj92W5V^>nR zfT%_!c`b7EFxecUIr%%|U-u0?sLQAgvyL2EXO?b^Im|!od8#W@ngx>eW6>d(FOB%H z4z9Ead3h$hHhQhab8SYxzGR8FBf-gIMd(~6f$xjWnRT9@Az}4pb0R3cdyOymt$V3G zA#S~_ntaX<8O`-AvtL&Z9UFdQUxAb_tY_StYs0$PLsUQ36GC^6SCdh-Zf}@BlfQU& z^h+(fmfFMKF-|R&%Dt8~eT_^JBB>DN1@zNUO4QHpvBHL4a~=8!$sXUXkTByElHExSoe@PsfWb#y=N%Y zTiLOgO-^GGw+)AEgXd;WVQl3RPmj$d8h@Sd1my|(ehOKAdCVKUBviDbgYY>l!qY)9 zly!JcyY_(B0<~;Z$MYVoCw}%7r+!fZJ+M4YDNJ|#U@s;aHJX^?lDn9Qjrl_8_ zrFwRh8Xrn`vitpOu^LX>{wt1x+Q6}_$oj7-L?6CEA0D=R5*lC42$$Eeet-S_aBR|G z5X&6hpLRfqnR=Mo9M@U{K~h5knFI&t9m%u?C28ac|8Dr-h@nrN%+$=xw9!KYjPOHv z>gp)@)f}h>fsVyfD;M_~Uv_s@JtlYDnS!QoMSPlfXTSS>jrw$0F)n&#q{4{5v$G>3 zBU9A}@j@wXpDO(v8uP5v!m1l1kd|8k|?W59;RZ ze&)lby)a(?Ss-oH>>kPfy8dUSxpe#EgC9c(Wxf@i~1r$-= z^L*nLPn6(VlP=M#WocE_IPMh|X66WFO7Fl|S$rsIrpN!ouQugX&S?>TpHS|C;mU&uErB`l{B`8aZo)V);v0z^c_lR>6D<}c9fmUj%;e~X$0@3T?<=PWF=FJIz=>+9+gk&=>v z)l}L~G5TH|zN)bq)vvL^3_-?bWM)=S#3Q1jQj?KE0PxW%(>+P+xRWJ~t2F%1re7I& zd9cK~GvIfz+eh_qjJ*2(%J}>$@8Mx;4VpQ7c_dNbG)j$Pwsh^G{dh>4+RWDHw++hMHnS3aJS zfs-?#<*+%rwwC9GNvi??Wr{>kXQxDPaPWNldr0_TsX?AVmhbJV%2Tr0iVFznD-N#Y zOTwG@?l6FqkpLMC-Y5+4rM2AX`s*XLg0jo@*4A@$Di5&xAYCd!Abl@(OGJk2ot9W6 z&DWquQGjwe0$DUPv_{W^XW*lB?Ci0!H0iOEcAlO@W; zpiB+tiuyGkwciemk2BHHNuvfdU#*XOn~6{EU?9wvUJW^vpPrsR06pHC{)izh!dR$vT1uUs z*7iJHR?HFdh=`9b1&ag_WOc!FwYB5Uu$%sznAA}eaQ~0ZwB0Duh8Q6TL@W+$qLz`7 z3doU!T*mYne zK9fbAp+SvJEO*J9z9@(=ebgoli(&|@vFY}(MbL9U9nZc4Ac~utn?%%?$EGI3G~nh# zk$gP2<2t;42l3JfhBoifFlS4NzwQ;}Mpn3RWU2>7uN zA!&)7g996sWpEoXA2D2lf`UNeFsfz`^ix6K5WW_dKqW4l1GrDy+87K1>HKFbCz?4* z>FX*0kVV6i&+S2j&t{^$-ON`)5Ce;Y#X1ZMp^rUoR28$x>Qf-s-0^6IgoGNzq{A=> z%O+R1^C~>>OlF)+OFb>%>?OZ~%bY&k9=)^~A(1frce6Q|JYA+2Pa_>>1`6KYNk62h zth@mV&w3Ct<*zwYNR~jBfpsO0LO5N>g9UVCy&v2?Jv~jXTWB1u$8daEu^<1;D*4)1P3xp6)-QF32&7_vS&smI=BqDK56$e-V z)ilLk8M@yyU1)dF1&tJR%X+y-O-}qiqP2q@84-v?w2nIM@Hy{S)=bp z_IN0`qq@HtmD_H*&R`yB#J$`bYH*)ZsgEosmNu6suF%+$I+@) zCJ30(Um(ZPcQgi;?KD|6*^lduWD9D2eDt6F9M{jLpUE}^t=5|>DJs%%aKwW?#cHq@ zhD{X*%{b`%AvA6E#%);{+nFl02b7JAi);SC^Qj~T!osKX*yGub=Q6OcM1A|l7I1sO zUsza3!tb12?P_+k+Lp3aL`O$=llOQ-wd%Xa?t6P0=^eEETW_wEwHaAPzSI+sj4awL zAxxhZF1QoRWfZT9kk}Fp0}dAtZ#RhIbP}q^ovkMJ*qfEEUFgIDrCr@DC{Q6pyTSQ= zrL@04xlcXWyrZVLOHt(j*l(-1Dt0m`5eZ(7$mXNTC3^`K@)sF7%^9B3jBe%|XiQlS z%L^4K0FVS*Iu2X+fb8jYD7U3nn%P&+f5|#~=;ab-xx0H6m~^VET0B)Ki|z>>t-f+_ zV2KwwMZp$5$1yN4SOzr^aJDRyHeVVPI6*-{|C_Be1VqHdtgPWD6pYxs49B9N1@Wk{ z9d`wIaNW-Fddd|*lTa`)HVeWj3qOC3c&_#7-T73<&EXes$yZsZh0)j)Ig5%mHjKg4 zW;_xBGMpEIdrdby&=G&;hADf|iv+ieXA=_o(I#f$pvlQ-6jLUc56X^Inc)Q6!^o`7 z2f5tPe&nbZ!O@v^^ObO(H!jq z<;E>`i?v^>i@nUvX+TZN2b5UpQ$2)9#>e^Ymjocvpb!A=HStA@3A7VZ@c6* z?$+8*$r&tf-(RhjIxW@DJJ#>EUOkIEgq@i9k}=RtH#2(Dq7>)HDr1EmY6b(#NgA7N z&=8C>lKo&IXk*C??xErYUo_iw8gp_dvajgO-rg3&*K`yJ}?XLu_#!bbIdd-l(H zlwh42GnRGO#EO0^&UZHVXu*j1PaoChbhAHmbu3_%nNTej4Ll=D#b?PBtZ_#CGye|m zpdhox%pVuN`Z5Ii$nxgCzaYg~um7c7+zVsA7bWWl=}+b9)2pmcF;i_1|Mu<<-o`b? zq_9GI7MvvMB0k)6<;F#CO%+c-g=;w9nFxe(HW@C!+Yy0T)(wjTe z7Yn2tK7OA7O-{Yt!R}>W_(2==vrJIb2gIkGK2purB*qnk4Q)F^Nh z26~Oo9Ni8ziV*4$j|et5;YDC$;pNXz(%`0NbUAt)duVfx{Ke$dCi5Kes6END-{X!H zGS8W)vN%Nyj2fHQUvj$-{h%6On+7x+6l9>dMF5-4H}44(xjXK8VkP2tzp+)a1rl%0 zwqN?3T76Q<2%d3xy6wq9MtoUW*(VxS(eVIfIM~m4`Tv~f?X`*r7E?&{ghXvBZ1k1jh<-`2@ z7+CwUZ;nha+3T7Z?L#-WFmyZyzkc{EYH7Ok5k6k$@3YpEKoyc)HZf}U+%k7x=-0J& zn&@r93n~BDj@*tN04^&)x&TWRyWM{&_MAmGDKzDEcWro~_qgGv@(Ea=~V#`DHOvBW`u1%(yBOv%vj8IbQ!R6^w6-=fX! z?c04CA7u|O==z@_r;rdoQ#%2bdONa|NixHt6(bW(qF5Wl+tXPmvWQwM%cwYpY5jJX zrxr&%r>=oLaJ)&;y-P7@vG{|CQ~g3~sbnhI=W&JeUj?SEx9f+Izl~ja<7)_&{x`0R z4R6)5_?(`k#*>Bc#B%`n@9xgVpOmZ12K2)mFkfDar=)+Dw0@WS1ps#-=RsJzF81aYTD&;uvk zot@NO2cC-JAi;;C+3Y(#o9I~UK@rd$ZUZ{zLk1DskJE57mJQgGK3>QhAHJIVJ7tSu zUbt7!-`wdym8ynNXR%xlLcLI-2 zaXeRaXZAbUEp&Nc*%OATlFs?m((&-|ab**MI-8ELZ{)>XfiEo5syPY24xIFnkjWO0 zMS`dCkYdKdl9YhK^*mZoQdbawy>MoF@r%2up7tBVA@Urb$SC}}gXyKsz>S1R6VmHJ zMZzjmB1Q4d2~nxtW6ulG@u9pkgBx8136GtSmevpQ(r&F?R8msXalSIBKswxlFN-S! zQu$`uv1+f{6c_rRl6>)iM@8*JU0q#0Fg8TXB%HNJ>I3{G*0P~LHk*l5^pyq0?rlQ#L?Yb~k2I|yRe_r`s~?QdCqfl5SHXe>FvXYZOE5{0CvKD}CK z^?3priO%7bYt>H9$3X0LAj>j=&jy4&PfAejA{4gE&mt<=J zx9mWHYKGYXS4p{4H3!CfrzGvk!_+NH0aXaF9VHVJN}ylGAb*(#Bwi;41^H6GlF>MvqmYUy$z^D=nr8>z|2rI=U~1H%hQLPAAvHi{su^5k%*^dq+=2 zVxV|?+<(STNJxlFLNWkgAg!-Y($v%x^Nd%?(7eh-RP6p-3&=C?bB*Vw;cdNjHg$$i zDEDm10dfR~oIC~qDVBfr*UffbKj?Ja8P^bCbv~e(G`;%`=d@T0TdWcQ;??cQcYBSi zlf8Q>@Ha!<3XtctmWoD{`G9eM#6HZGd%>s>nMqgw>|+3`~7xSAjj z*J3uV>z(adrm;kj@z6U%D^C2yfqP!Z8yogC_M|jA1x~$z00TCoHt7U64gX`<$!>2L z{M=1=@}*K@vEIdI)5;AOQRE1YleshEc0lf&fDK3oCK^vR3yXmw7w{edXPIbtYs%-e z*c*Z^rU1$@5HGfSv(Wb^vgftx6AnxmL;HQek$U_4L1YAcPU-XfPf?$!1+a~Vc#ING zBWoRI&?IpLrU$R1;&T)A{3nh|4rc64M}c?pkpzd`eEoA4kei9tXESz zux=jEH-<-Fto6v`>}{m5b!yktJ9NvKj6mv|&7f-wu@5`ee$?P*P%Dv>TLNglQ)PEn ztd)1V7QwvMh4t}#{;qbOB&Nw+`ru7tYKZqb!VaJCoNC(#2nS!u>>WzO1?k}U9&u8h zi9*%yFg;2fQjhIVhZr6c8oby4Zn6v;oL>PN{L~p6w{!g(1MY>?L@x*mnYk@`Q9!SM z8bq)g)~dI=1CtO8Fp`0xy9T5%OAq@Ki+M`0Cr057*f$_z7{Hvh{?!@e|8J)h0xnH5 zaHMLW#{d{G2a#J+5>I-K{+=iX&`cR3BCjS~>QyxCjP!YZ`yhU<2)8A@cYYmA0#{qE zY`+Ug5MbS;sQEFHh)H4hb<1j5e5yXAe^YU_>_MpvhnbAYpoX)beoL_3ZY)Xi8)25c z`$d>$dW9&uZ2eoJV1-983xQg^=(p>?cUqv*{B(!6bipa`2w`^h!d%GM{2-4{q8>W& zOvQ|uXP-CeTr>}tCKNBh3|yqC&Q!yFLZj_^{U!_a%qNBTG#WctOo@m<0UoU^7+HaF z5v8av4j4)(M4b0M9QR;9&Er6)Qppp`0qV+(QvqHo1IozQUuj9}r}T>v^}GBD5cx?h z534hV^yT$dnyKAFH3P_HOTf$A50^8huUIPGP1q%fsf2`hvxd+xy^ID2WN;8LkT|W- zjf}2|E|X@gr9YTOk=1WKh+$jQL_4mv!zx!HX4R3j%nbFNtDt?L-S@OdGzx(Q>@!Vi zu@Z_dbRBV`Okg!2!N6fez_)9ZgiFZC`M|Igw_-&TO1&RD+<~M)fLfb@ii7wJ4p=Pu z+-HOMZ_OH{?G)0*Df7l&Mc9Kz1%`}_D(Rh3gsea-(Z`EklIT^KSWgtn0-E(K;ZMZU zf#(wy1J3HrNk5fAokI%ueznyg9+dn3(m+OI6IA7VFg75;Kmrm|7O<0rdM7fiPb!i) z2teO}Sb~WCEE77)-90+KQ27ijXLTX$@R&inUUK^%cqD<$QI0FsamR%!a8c2NMBOQF z=wPLVpEs8{Nm$ZB9}9yiO8hyXzUu*f+`lJN{5A*UrvN)^0Sj5W!^mzK^Evz&G&OP(|rFbaVQgo27nBOpKme8qGw%XCpcK906?ym7HxHW*-IgBj+N z+2jtn^8mXM)Da{sa+FR`iv`aI&t^Q&)XzS(?XF7$193f*PFf<9i$sNUwh`%k?+j4T6WBE<-|FgoOI{fc-`WOu89V^TRy*2Zi zGTB@)dx-@k81GhW`s~m;S8Gut^(x$?nY*1?Uk5gx1@`v-z_WYl=CbX8cSNc>`+x~9 z*fk@yizJ_H*^uUgSnNZ1Ox=!sT0^2heoeta`b~^KRgxUE&_af zX%!U=7$<0{-umJ0=4sc!WWn`!H)1BAQ`C$@pA|PSJe7gdiGv_%a5L*rM;k>8$h0{~ z$ESn^!?s*tuTB9i2i&s3;bF_aKMVXXX7tVvSF!+BafpaMjR#Nsm#SciYz4sd;I_dJ zU{8K^nKCac?9*lAT>Kct3`HT>BK9~bPTtUT5#+Q4u3%kqr#3NjAki~3MVzy~oq9;L zy>=OVt4bb#JuGm9~HF@<{BHP(AMzXp6R2eO$QKu0N{TY z>sSFi)x>T>fm=3JAdOsZ)FcI(+4WqYD)0TIz;o8Of~+fAmzD>A&v ziHQ^OZH`<Gidge+;U@KAFM?9Ox-T+1J_aIWQM zSg3UL5WPwb`_0i^-&E$Mv~)Kocv~2fSuNu6*)Af=9|<^G6$H6wRmjM`?wDPF)Prf^ zaYlmfT76;VUc>zO2{ZCXT}rx}=U{JI6(MW1-U-0VsKqlD%%vylonBuat_%ZD@?wlol$is4j^3>N za_bsj&B;Ec<&E@kyXrx&6(`A)32_5d=M5kipk894qN0M5>FNr(3b_Bp0n+&C^ahwE z1E~pS)+N@%spMct8iq-RM@)>YU@8WvKQN}jnG<+;Bn)*7(UV^Mr%C@)RqTKu!#W2Y zy4m0__BoZ5PnzxaxK?^KH{0=VlV$kIl&k3y@_b@88~xF|hSFXm>)eD(cqK3*cH5CC zAd0829K*0L%^dlRiLE?MO4GM-T#KZe?zheNi;kwHm)w7Ye(UTC8g!V~O?g!|AI#~x zV=JHzDksbS(@U%xEivr|KlgEc`Z|c#GTp2_B}Sza>EkVR`%tzNAV>He9S721df?D; zfBe3@40$ZheQ6uWfu!~ilrmsY3ZaN9df(o-UmvwGI|G?#q-Ag<2@o6^B9$>1>Ksub zf`1W&B<1?Ry^DZhzkTSP32>6T3be!B4&f_rv_C`pY3lpC#Sb++EKGONAIxQKvTkl} zVz^?TPqkO1^D6sg#ZzZwz7Zco_DL$=bZGElAm(0_@+Tc%(=+Yhts%edv4I2^@3-je zbY}1MYQU6C9^6-G7$Qv40B4lv2p=oWtOblS34A5GS#>l)8rwatT?1VNt)wSekSCd} z9R7{m7tEShLKU3^3PBSQ#+=Nw^g&C6xcSy=Yjz72-?fzj*>ZN@EyQJbMYpQ>pI_#r z{4wHDb{3ACT$lM!(JNmh2Px+ajpb5E+u1RLlOrX)k>csR=q3S8?gl!)zrQz)jKA?2 zvrbl8j6>&OSIyqnTWy`ZDLWEJw8d4|0E7p~{m$>rxW^B(8tEKN7-YZD zan?~a3ggXpMt>y7YwkMsyd-wc(wR=fGqVR8j7@bh?^;WY@nAC@&%+uGg~jxC_)veM%izIkV)fVcyJ~7D=bvd!fYYk^)KOTFyi)^nF5BLLD zvCok!3QaIw61V=|I)myht~mUtgTYp!!PB7gF|K0KVzj!$NqZw~n$YTA25w52Y4b3) zP`Ik%Q&PwUkznlD4q_^@*wL|Afy*)((;Jap$j^L4k~O=^HiC!32YY*|daS%HO%@r-f`d$s{P@g)?76w1(T zc3d=0Y5MpYUBkUKug*kP8MowZ^1i*dj?#g#!1sSK-$4S8TekQXBtzi4&|sx$OXav5 z`Hu*pVfX}EZRNF9YHG-4U=May>tS24@{r9g!ykX2w^y9ZzSh(*Nq?XgZWqmW?BKf^ zR%+PU4NAC5I^2Qj+&QB6lbo-NhU1fzkdcs}A22KZ=}eFMceajyZPVDxVb4`AZjLg+ zEiItXyv@^OEe*`4dnG?W2m?SN7p5KyBr)C(_A_Fr5fPV{m$*=~;1CO!Afj=wI{EE&DyGr4BZDJAvwhX%nf)cbic z7;Si-)wSBnhpIAG{)aeruVRJC=0y$JKXjj^3lWW2hXm>~BE6{#_a^f+&Vd z^=m(f6OGTYFtIXKae2;*6J`y@M_$d6EpqE!-^IbF>;`L!s;Vjk5=R2Rzp#P=Z&|%m z4=_8Mlym*$u_zXlZu#0$)Y#pzBjDo^pO&=_?@{7p;2yZ4Wqi3W-B5`#;p^9o7A+9F z@M2fS>RE=ms4O(>_nU>y3b#;)NnG6YCH~in=QTAI!7Aww)fHQ9?+A&iQ6|2+G3W{7 zf9=2I9pY&Z$jn7*I=k{>)PxrD#5~FIkuJkmS`5zjYm{!Z-nPPa)~~b(CMIvJ$foto zcZkaB7jas*2!)yd5EIR5@9AeOP&VDPzo1n z_HY_fMsOz0x7o6;G+%nYMyCF0*KhF>M=lARenS%0^;@7!sG)i+-lr02)ge_9b+;<( zzoMCY`u=HK<|+{Qs7RX;EDzELu!({X($*Yh&l1;;U7lIP)TE|}+0NP>m`Iczxb}v# zaZW>pQtU#hhdU;_*<8k6_E9+B>si^w4DFVoMZ59wibI~|t@$*>FhlLnvhsJxB}d{L z<3+r(5xPrTk@2VP0pEFYA35xcL?8a?=sa^bT}tcg?~ct<_K~zYLYCn8wb|^!Lnbmm z%*qkVCKgp)JdE{*;8R3`?P`|l>Vio3vkxcG<)WTFO3KTap#S2f5cq91 zk&RI;5EC6XrO|G6fktGy(DG?M@~fxpo01KC$WOjwBjkQHJ`YlbC5J!c@20)N!*k=qqC`9*rD+{5HARKF)XHE zi23B%E_eR)eSd{e{xswjUYZ-P%P{^gZ5j(JKIp5;a6nlL7W2i*VyW+(*-6U%QcGc_;#r^YXxfhGzcn$ZYb%#f}bF;(a6^5;-CoYNzd-QPyphHCpr-P(ql# zOx*`i1sm`j2?kv6(B>>LoGvbNq^OZD&}otywUH@axvPh1fb$;$k922n*8X3* zA^hKw%+~HZTng@^4l=pNy5AUTmlHa=#11FFhupqmdCgW=%SNR2ya2yP(aJ#yGQ*R3 zj7@|zDX0Fm@7x~C;YvhsUGXEZ^`_T*2xViaXPzsEdJFFt5>b`k75dJ8H)Lbg3SDMd zm;NI&#v2En3XW1yz;$js-Z6b)fc;F}7y3Ee&R^E0eG~2V=|9>&R?U=d>C1rZ)hl=L ze6IgJOTe4Q^wL*X8~$pVv(_PHz|AwEmm!;i|@Q=~pqED#^pqF~M1ZU+;uAXwp;cFXm_diL{c* zT@@qk3%$>ENv3$bS%vsxI)i-l`IOc-GG;2eMt2btHKOCUd4%-TXm?p~&kBgB9J**W z24jfwBC*v($PXJ)`;Y~qvFm;%oLI>zTU&@tuWt~?ZXfN;9oZ05Md!ZPJ@Frq=7?_a z?^~7+|A;1$VkrUnQ=n^pWDr2bszZU@HYYWGdE4{I+*Rs2(hri+r`B)BJay`}{j%x( zJC!O5QO{6rcsVSo3ql9AAdxd!8xV#maW(0E!at|gD9GJ=7Q~oV0ci%iMjlH@lJv}< zRhur!L|3u;MaZul7te!in)dGnP%vQlC>DlNlDt6#p!NLyARfY}0nz*D^M<{1AKiy+ z`BMZ%Z+f-B6mj8RdFNh+2bW(ukV(U%3nA5EfZ;z>y_4T#HNW}&8N{45jrzic$HO|_ z5mM>gU6g5L4-6LQH8`^^HM0okfr*psH^((~+tMs{9Vudm3N$)NW9 z9C0G##aE&27*QeEcJzknByoD@L6eJe?cRM=(SPLOSX`_FOYekc3V`8NmaIUEk2DzT zdTbQ&*k-q${T1K~SF}*0yu9Z7IkFxhfYrxK%g7ivKd(RP*3(U^&|C@+npJO~T$=q_ za>u2UZwn#iFB~dY3WLyI<9}a7D z)>gNpU;Kyo&iI@1XG8c@hFzb3EwgIdEIJ9UOS6&?X3Hv;d|F9m5~~f?c*`(^``;Vb zlvsEV>d8+E2xHLNZ~x86{CVMHItX8AvvjyJsgh3ma-dG%-}&mGbem-rlRXHR0HOoC z&nzf)w}onOx@yFL9l;86;*WMeRW6R;wfjO+iaH)X+|ODA1gZ)TjM2yKvW4X(HDSI& zwrNU~3r8Zs)C~%=Gk}7}kcDp;SX-EG15!I0jbZ3e{PlssgN&KV`j2@Oj{WTkt>AsO%fjh)GG#Cx;(3j z7N@uGPHwF|rg`WhK5i6$(S-J#wQ}0S=%ER#M0W5S+6dM}{z#`L@vY_JCeb<*}4nu!Zsyb0X!%EpJ{8&y~(GKxR)SiK&tky4wX`A3F2>E{}!!>=Ch zX0BazqZ>ZUMznsXOht`Cb<6y^SLL?=PkFG~IR~GE8`;f$~$Qaoyx*#g=7BY znmrv}Ciaa=1e@42MF@HNF0zrO6v0VBHOF||33~Z@@rNJxenP^37<+jcWpJs!-loB8 z-3PrKkgv?wl1s{pK97LUi2}u2IOP256UIEF)^dd-f z8$QmnLBABsz^TfZ4w(odhof*dDYheS5h`PS z{2}2pMmr8(N}is(JF2ByxD#WOp@W=i>V?=Jk(PJ<0XfL$A^0+FWax zmJSozs8y|hK)jgULC=hjBMBP2do^a+ zKM@rSdVjM?v1lGOVI|ppd3ydvmA07n0+6!t$vmSpnKQULlrIWx)8N&n$VhZAA{xRk zX(#%~>v}qe4;#?Cr{AxX9gq!IHpjuKbzCaq*cs55 zCc@J|buL)V2`5qfukgl!jkIbxDagm`MngvNMH*_WR~GYfnL>N|Myf=_t{HnSq!(P) zYgy)G-@jz-R#$)WY^H2M4aeO4QsX)j&i10Ve&%!hbLiFtV`)IkcE(iP1AK&M_xUaV z?=#?$fwRx%Rip{qe1PKS;I$N7MtmeJ`#t8SiHjZ40jzT@ci8nP-A#2P!TuGBGkU#x zbi=Ms;NJvm)X7Ae)|9LU+aYFs9UelHo55os98EPGH5I4Gai9}oL@HYmESJ7i+N2PD zr4J3$mvZ~8kc7Z^#-1cJpJ-7u&h3Ezd z*lgoAt$){x){O?gTOnzs)wB3x&HTG4^90A}(_&Z`=4FFMMwdQb#{v;o(n{@`L4IY9 z(@8yFwTKy-Sd7tu&~Qyv;&dUnH5z=<0KxpvS_(gKtYw>&2k)`AnnaB0Er+5{+_=UP zzt!uyAY5fb&|A6maG=`BU{Z)^qbM?ym-#jHfIn2F?uHO(laWcCCR9F+irHns?{cHG zBUJr9VVyTd4uwZ5P(uQz(}uWesmlzeNK%5JV4l&UDroeNxy09@)VNS!fB>Z>>9xhK-9A-~YnN$p7~h zLNPcPrLM4ACGEaakqebId;COy&xZ%iX=q%SX`y zhr>rT^tvPH_*a*X1q7yzyps=;n_qn%EIsYSA9w33wERf9t?W`BG9T{F>QvXdp8nLP zJ=f8(4y$OA$u`*$_3aIUOSfia2_8EBw`i9TA(S2xmUb-~0i6g*|8 z-}|%4;YH_z^mAPGmCH0nrf8k(3swfWuS>womJPV!S5Wzi=LgJwB=VdmGwqAX*RwTK zKcX0My@@8c^E8BbVKoJB_m8?&Y6GKV1+U_*+iE6VlC?E!4BREbt11D{rP zYX=S!2$Vdo5oV#IFk=+V8^Po|A`^rO%p@ib8}F6H^DDT!!#Uh8>-svS{6c4Ro^HVN zm)vF9JRrOHuIgd6={omscLP&_#oDwK^0fySs}%e^w5fHi#So2YDDiuk6M7Th0yPxZCllj*x_o)anHm#Wz-4)r23@Om)-z*&+jfGAklX ztKYWo-_2ZVCCEtl3^x52H2O;Bk2Xch9OfNIZC*R)=K_~)S1$sqS9W$>AXN`%ggBX4LF!JWCYV@hK~2#| z5|`%T&r0Xy6|k#tXda+X?%N!uX#F* zrgWmnB8LR4p}9h~+uT${D>Q=ezcspVxO2TF5VDiYBT>NVZq4qZZ=Uyuu&~={75tHg z?zinVN6~Kv#A+rFs{Z~cG45}#H`VZW>d+&_bi`K*cfFnrh^Opt6Y|?0`y&>~HF2O9 zdk^G5pYreBy1yWBCAs^t3Bym}OSqQUO8=|L!2+>F*~ANr&{{8~wGot?M7s%-OTVZ_ zmU;0;SfE`+O;KC>W3s$Vsm*#Ma<5LHk&?LSZ_oQ(*u;tRz`xqhcLOGtwmHzTW5sl5 z>b3iIBCfjwK*zo}+2wE%^f3Am!Lfh!*Tu-nsn%;7OZ0_qJ^tauM&mWZ>H<_5{&v4Y zR0LWra|^%J-^ah*^uD=c^?n3T+Ky4;q|9~WPH|IUMX?=y|Gxh!b0S(UhAc*je7#6t# zyH2Tec#HPq7^|Y<&AjcUaioa)zZ=uNUk^8WvjH3zX(S3Wm5^RImQs#M;XpY-m+j>+ zo%KAYiAl|mhS=1ue7$h^%7?z0C(HPBda4IT|9tgX>A{eCDsrzeMg-m-E)=!oYv@9M zxZiRX*cc6)C`z_#S$<(8?%}|g>nqVoBk{Eto)$eGJfxW_Hmf4Uh@NP$67>H~;V&|G z;cOzc`@{WKG_Ks6yqcOO%ul9p*WNX@fw$d4>1H~c4C8D1*M^sEv5yHK!c*VhfWH(| zkH_h`+yto|w9r|n)5C%F8sbt_<0z8yecMdWlTpm^P4He2ck&yk zjC>CB&ES~3XA$+=jiT?*p48Hw+z;Ojem%QCq#_!%hkE$S;+U7zM7@e9ol>`8pAS^3 z6C_lSCySSmawQXDD_V=-So=sU*DZl^)FaGIfDImZX!1Fkh1b-*3)gJ{l!!b+q!TIJKnJn1YaT(!J0cJ0XzW8 z`&%jj>PQ@_d5-9osw(1bf6VG@?V>CifhPtWT&zhad_` zf9Gp(npHnn4`18N;EIW(T*dY=t;0h@mw}1+c;ufsgSJ2z83Cs27Knfk0e#($!92N zvD)RqBR4AJC}FO6zgbK9Xx`%k0x{o_SE1ZW0dtk+Edqj)*VcJY=rj+H)Fwo3h&JTu zfzgAJl`fT)$RP~XZ%30G{7&$7%48Hkh@|q_-7&{#nySKNFi9v4*Kr_`dnifQ!kY`) zJbt%dR$n)?=_GOHf1`DeUijRPI~cBR?)5mp3og~{s#9ns1r$evGfi4eE@Lo)c93&Q4yu^L)vvEczpj!p!o4T7NDs zu}h!EjG}_AVeqlEMRIRnGG-#Jj!USp&cp}cx-K+*Typ8eaX{Rm-(l>%bi%%|rXaZL zfuisB9MLKLnf|G9aB!BItACB*LopGCAQl+6i+Q-F4a_#lp_V4Hg0t3pS*T-W{J`9{ zoz2DEIAP-q{2a2{*maHW2Z2ZfgAe&94V&d)DkCVU3}(m7e1Xg;PrYo#wIx!0z)*jW zBT!{-W^zi!f4?x5p(l>Q=dA9yApZ!hDv?$z7N{cVVzou8Z#Xuhg1$po&wD#K<=Z#U zv%Qf%sdXb34EQQ_;U;Eup2zzLMvS2qwb}A-h9rh;>U)I!YQuB^(&g#nF9&(f7@PZeBO-7?Ou^0z@V4(`=DBF#R|KbZXPjltamlN&;eDK z1$fVr{Rx;7PxDn}4$zj{R}wq8TM99fyV$c*%g(TY92$D@%afKP*H7(~hD8!omo`YS zFNoDN88&|_+Vn{H5S&1bO)Sa2QT#PDIpTgW2$$+dyQ5lwHxZLtt~(}IEqOT0$N82= zLcAShp3$fnzqkYUtgN^4qG}vIv;4K3a9w*EfP+(-+a`KlTT{tIo<&uScP}!xGA}y` zbn2tO4dMG9syL;oM)prUBk~}RgpF(!A*=FXQU$c{%YuU7e0vgZ{_=~g7|ZDLKS@kp ze5ZM2r$i9|GgB_&BuXY0`%WST5}l$)v&9y^-lEgII;8^a-TI5_Ue^6Ix4e3%N}c~? z4{9yeO;^zq7dI0e5Vb{MG$Eklx>9vMOG9lkv1U<~{DgHcKmvq}6zgWKPvuBPl^PcF z_ni)RX~W3)t={-XU5Mx&Ip`d%FVMQAu+P+m-GQC*Vpa9I2l&%C@)gl+s zM1>NVU+f?1BFl^rkGV*5?HaOBE@ig{j#M3vjERC@H;9?q)mr4@j7>=778MQ$TRsDK z)}x!h$6qN`%}Vil=9Dzv@j$cs;|~7u6>?rh;mAL`TKQNWf<#`jT8xH{50a~Bg93c^ z>(gPE%ym@VW(?i(Azu!*Y7Y074_B_U>KCpFyMWl_k&mOQOK#MmJNBQOAdk7 zJZ*m@chxAo+vBG7VBB6(jPrB7SYLZb$CQi=Z4hU0k}>HlZ%-d(+H5}BkJa!IjVFue z)~mT+jp1iLV$~*w74+9H*$s%6W@ZebK>*xii;}(EWO~NS&XV@@CqTyJz{sG%jM!+$ zh7~9+%5+kTRXinHNz(unupfVoSw;2*%#PzP*gD&q<7ubXIyI|y$Wy4v#IpgfiEM>^ z(Q9LFJ(o&QZ7YGE4wmvkfBCdC0IT&p+e{st%1$#HEWXOA$rLHC&qnFQ? zesOncKkxrLR)BmT%|TlP(Z77wm)R?|Hxz$x?NhaGYX<|DM0a#;^U@U2IEmC)sbaA~ z$tmskX8LW-U?If&;vd_l{o<_M;_I6qB*%|zb1Wkiz{)J$;WO|r@8MxBn8K8jjDOQnpWMbeZ%APCU;~w1HHf4Ulp!jyW z5W>I^D7rQ0lAI^C$vJr-<<X~O_uP_28zGuG##YcSTR#(rhlmlQbh zyP7iIF0d4>y?c~8&Nd5YO(;)`9rXn0m>HQyyYj1q6>xBXo7T!Y8tA@##K@uf%aDZ7vD($N#W*Lxoeb2ajMYOR{XQmatC_LW}S|9EgBLB zUfXA2{q0>1=u1ZJV1>x}Y)S+Owi!c=G@9p!ZN4v0(4!f@e6#r}@uGB~vskSHVf{63 zo%G^-QJrsDPPGN5F^lD7n{LdQY?&enBtP=Ztv=v1cah*cqSd~44=iyLG0*{A*#5$o zvV-=uOC%c^L3m|0X6yL+M$oy7gx5;YIp!RiuKvxOr22_BfmJrt(2)iQtUj6pnP!Hg zZm5=f$lLeNvY|NksgLD~3abAHzAk+UG^b_3XZ}40AOsa%GbsRD+ zH{7?Woet(~S7+~3L)^zm(^I< zxv&(Z`Mx*cNf-3>eZ+C83xD1?+ycS%1uWO-gb-Or!O;Hxrn?Q0wYBtEiO%IA)1|l> zRq-2uKjM}mGvQ}&x^608{m#6vloCr7E;HWKKL5=q2c{kTiYp=0bq+60sIuj~2l?{; zq}6%s%YOVJcGPDw6Tq{Bn%Q!-M^+*U9dF4Em|N#nC*62wTCPD!K5*+v;qMO>W-_FCPOVdgf{o`8P2(bWhO6tb zFW|b*4VCpF&iLU?QFW8whG#=dYjJ92wl{9LHrUIJ?_*-?!D-dv zpO;p%YJ)@AouFz}1=rGnHMPaLOF_GfU(_fqOUNKeZ&}0iyzG1=qoqw)xFMf@CUyZ( z_DUV6Ft)g3+g)-o$1iqMbyyBRBdK(?*E)zpoJE;50w(GuP6<_EybrQS_@N~XL@ zckfnD0+G>-hmCecqsCj4Wh+Nzk6%9?c%>#ZdX^P2>Hun>X#6s+a*~DJRaOB6L1pW20>04{~oqepxJp`1d0Ild=H* zXE|TCV3|k5lbauR{K=88kSU+lkJSrQd(Y337rl|Wepl{BwQ% zv9!`tD-!niRosj))>kNLGKRLH)5KjarvNP^VZrW?EoU@gz3wABiQ?=zz#MYkC09rb zkU~88a0ZocgMN8g=9cIxNpnX19Q@Cw#+nm>OgTHb{BFcv%j54WnEM#By z<@hsAr1Cu@k1>Vq+xw~%m+0o#x8iZsXR@z0QoDKRl5~y&?CAiSdR$Zo4S9dSQkLXm ztm;nzE_u4j-e;2D${C%b^75YGp`*owEaC1@(-=)(vNKc3DGnf#w7tThArMm0zr+L) zhE1|(&nPK%7tnNi=!%4nxNo#HTdtD&G=tG$5&*&^N|6#5nll@#5_U=V>KIvc#A$%H2OV#awedWJ6KJ6JI#eTB;FN zvL5;A9^uqRE;YJ-fD|{IXgdr1hB%S;(6tjoDMV84hmEX|dE#FC!}dUnA@1%X>s$rs zKSNWQ(Krv0kgyY(gPkE>#)B3mR{u|v9iokv)j%y>k^3q*z?903`84{N?7 z4IC<@spJLvu8h?MXD$TiNXzY-6KSl&4wqAh!k}LTC|c|fjsX%>NHh+|HuOq>0uO_N`_FZ5GeK^J z%E=ZEbT8K88ZRtH)IYQ^4G%b0=3eOZK`ouz{=D@&zCuF> zQ3&z^Kp^2I5im^k?I=mIv3A-U^jR_C#$s06>@7F>!WT>QOxlB{BUS?f0xqy(D$nTn zpTXawae8DC`5LGY2deP;7Es%(BgpBGMN*&0xKAu8U#=~`V4GO;%w>841Z|v<1tNYk zpf2uOvz`XjKkS$|PMy1v*DKBlRs(E6`3Bu|8hXNd%Mv5#Pj!ighDKk>ZB_8? zIbWCcxAhW)nwq^r^Ti&ZiUtn0p{?kwhk4)L|6o!>4ss#Zm6*fo0w*o~D6fc=M$NY# z{q|X;rJ+eCE^R?gJs1-+o;wQcd@L(d$HrvNpS8`#KZjHNlVV9?`y8$#VD(dXu``UM z`Ab2~2}pouHinfRzs(QQE*b$FyzHW%q)BUv&@UtAReAvQz|Dt$0?6@4wo+-~p^aF9=?^^pwpY59x=q1CEK6T8z%BBmJP@sqlQ)p@Q(=~3OKf1Sp`PJ12) z3%i$RJhO>;3-s|%B0-+6!@G1ziC-{XXGw2DR~t`0!XO4AyzKw< zY4)arSNBmt$wb=~UUiEdV#iy%A6gh3gve%wzTGAuW2fdd(pXPn_YYwl*!c+XO z0o1!|A|War?+Fat+LG?bx1pd9lYbVELZJ0mIeUN=fNQppHN4 z+Mol{Y`8gqmI6m1&GGkEZ5#Ni-`!aEsz)ME!g)Xm4^(flcYYaVFQp%4{~JNe?py4N z5uow?%FM-30X}FlB$na{iwz73M!r4T88N7hC>sj}#G(J|z0AvwSmW)c{HOAU)LjyT zCoq^>74-if`Df>}CMda$BKrR%FUbA%g_Yl7#723M4-&Zjog8b;7{eUW!W?~e=U2t+MB{;;Mc7OMJ$xTQ^t zY!RDV*~Wf>B6igcspzxNpPOHWU8sun%{jv$_=0Yk29u^xa*p4Tc2lAMyFv)QS%*!- z0r!SL%d_}uS>eCYUi~v@JEUeQlrdkqHWYsgmafO=wrxQtKkrzMe^WU)6qrv+=e)+kJ;AhMCkj+Ifz27VfQ)X z0s(S7+coi@`mbjx%dRydze6TUM0^N2*aQr{mMtSAcfMbu`zXJxQ1Eb1!1*{RtzTo_ zhSdf8Ewf>x36gna(k0%~u4d2#t+QQ7z#Ej-r@zhUpi&z+`Jyu1lNe{!_k z|I^p2w)z8=88-Ix^-;61gjZP(o7U*nZzSsL)Y#x-ir;Y*zbzfT`A5uaBi-nBP`z)i zrqEfG@JzqfUU_RMeWuB?D)HUN>r)F_d1`L%H+yT!s;XOy-bWLa0p91^e-zo9rPsP5 z1fd6!AWVwQyX!N%rIvJh<<#Q^_a$rmbC^(`t;4F^Z`^71>ci(Q$Z z=VZ~e7A*n7M@?}hB`hE6v?L^8q=KGX>`j*5osX%alL|zC|4vyd79f_T5=#q4kf)6E z%V|yaIhjz$c;Op)6_v>@Tj=hj`}}Yr4cwH4Ak2;CXt6o%&u3(p%>km8>rE2-=8Lzf zJl0TKR|JWm*EwThVIhy*baa|SOGQCN9(OCZwn5^+8hWjNRthu=v(iCiMQ_{>;byY3#V(jto)n zYPCG@(Ry#3w5;rCi7qz|F0S=rlb{3Cd_jWN!5S zJl*g3*s;NNPgX+%hgJUJ`2CJ#E^u+H|Wro7Bv9Yg}l_z$|3tCm; zVq>d!8YU#Iz!-eap%FQ~LRVgjH4p+hKYvC~8F@!EHHnOlje+}{o0~@`Cd%sR5rde^ zby#YtwwVaM*qeHq2RJymYHE|1n3%vXUt%&dRegL!pxe2n>O+*`iN07m#qH^eoVSrp zs+nSUJF3v?LG6;P$YaNus>mbL*0ts0uMcx(;`isc5DA~%GCOpQ27)fzWoyU>M9uzu zeH;j-pN=b%LT>v#V0hbewd}5YlXNUBN@#x&5D<Q zG`?KxvAo&xu!Ff;+c#Ln6KE6R+mU3#HbW=-GgUsf2elu!|GwI*5_a1s1Zhak$CpSZ z>}KWb@aokou=b_LkwSS7f3u{_-@oUw8E3q^yW5^9ezCH$A}uZL*w0#P_58jkhUV(_ zcC7FXLu_1}yu5stS$Cvfc2;YvI4lGU`!rneeboJ2bH6^&Ff%KXR8bHT79_0O&)0Dd zi`}w(M#jto3-EN_+fqGi69Zl+h1mGQIu~c>>X4|X)mKtN2lMzHO!jOI$nxeyyni6c zM?jpL>u&B&6dSboq<~9fzI{{D)Wj2ZKU_cG84ITn&oG0!BeC)EJ3+K;PnMEk5c9kP zc{=YpWw^e%8Jn1xM<;%9w3IoPuNs$}Trh#^v6b!);3``#iky~?4jaVTM6tH+FFPVK zp^x9eH2U1^Mx1ChF zg;ev!rY9c5#UJmuz5nf-Z2!$_I&MSzCJq@D3rts9DDpWhDlN76dLGnF33wb+dU|?> z6LHJhqNnnGP$<=_@mTrt0>n8Ph=Ng^@c?3S);_mgnnTL{58XN{pIQ zL4d|4By>WLx5lHRqsM1wIqEsG2*}7)ALjUMrplB-fYi(*@j7Xe9Ym+46=MWxxrn#5 zwN-zW_f7n`Gm3a}hdV5Oa##FqE0ebW^toWbr^w&A9!C35W;WDWF{b?fg6_Y~6 z1Tvv|s|CRSHF!$i&oxbX-G zoY#A>#cubxH;2;oJuMBtU~fuM7U&j4Kx+k?oy>H)wV?P!y>UwbKwMuMje+c@3mpLbvK{U+%06&08M zU5%c+fHs}1 zL7MoNJRiHtaQWEdBzTS#3l{pHND9eieFkx8FdX-l9` zTJgbuh_;e?E$ZAM05P5Oq zY&gc5p!ZcN00OPs6Ca?5%hoFB(NBpU7Xah>)|Tx|rOnsN6mH8W6x|xm?0#RRuBPVC z($At>8Q6Na!S2sB{u6q9P)g&AxLkrVLDf?OKOy;L---SEyxgUeF+Y8OADfY(;^ifj zLPWHlXPmWhELWEpGni0KT4wovY=4n+{q;2u=@p8yR}_>r5-r!$J4`2DWi@wh$7a|= z#lQA!@Q|!s>x@?q9SWR3XEuLtZgtD9xO9?`67#1fyk8oFTqJmQ+1)QqLc+pm z7#M=e453CFtv%UD(vS(8i7x#7A3xqz%?N;0jUeHtr>2HW8|(t)g;2zU<4wNG#y|@9 zc$r~ZcsRP>?Eyakguy^m-0Bo~fLF!J6lCP&Lyz}Mk0&>KDcOfiMF1;DX9z(SN#_cs`SkOX^$QJPCJK>?6vV?iL{vBLT@ z;d6|}|8kDc3V|;;yhKiA#q}9lg4^m%jY$4YWWh*s^v`$ER9jYXS*2zPYidz)ml-K_ z5zpH*m**3C-BP{2?IZe;V(Ey3z7LAOSIZ z788sDJjDR$PsPa@gG}KQeS6p#1qON8u*U{SoK&WmZ!~QPV4`A=cP@Z;^b8GcK2Zix zfJw!Cl4omdpGf7+<dh4>}dl{3I)Lm^oCUAN(meI&$uQnkYfO1BK zHLe5*P7Ez-6)NQ14rh&G&^wfS@webp~NR%5jKh-sCY;2LoyEA~-UjTEobzy{2O68I7zqkVIRJYO`6@*2ucDYft{X!~q zzh`W2X*pK!V(E9af}EY5jq?0?*YI%E6Jzr@ey3^>W%DK29|eIImlw{2Pcbk#-X|Oi z7Q&{KS_p2S{G)7=^)8@a+(+gr^KevQ4W6f9DLP=*Gns`zB1E>DTp-a!e-djw1SJ^t z=c~xX}%YsCU^Kt+G@t)tK8HOe5klM|odG1UUP{{cZhP zq%aC5rsZl!h(8ynmV&~w$E$8}9WZK;9h*bKN8`JDim}pqdZ`N#`KJI53bgq7U)I|jt7)ls<=~tQt2@7HV{-(jFT=3R-Xx+cc zv!6m{rs-P)&iuF&42-q)ivpTgHoKnGN`Sc{306A2P?Djc4A}j=5h;B5-Kg2?i3Eb7 z!Vs_<4S-w*%8LPFW)53y_I@hxNEpOFTq{6zc~XHNcW~YoCt#59VZC_K?S0hT4QiKw z(<%a3OUu6amv_hQn9_1`wsE&jAX%y%mNEbh=o7hQ3VB*!E!+tYTA}NfHzSva#Mr!W zR4Ed0EbqDV`OB!1DOG%brBb?3!sPRpQt6yRTl;wv(pNH+uv@jIT?jfKaB5IC&bNwD z6F&=F@7PH0e#I^zL41>e66_^H5En9*Hi^ZkE6{9>L8XBOuE^u)2w<5*sl9e`JF}5o zr&Mt;kWyRFyPA_km;2*EjcnfT{m4>Lwvb6taO{Uz#`)f^*A;iQua%;Iue@~#Fgd8& zuOZ3UFC{;dZKz+T(T$ZpE`%Y&BcMNto%@~tsz)o3iZ>T~-ECjchyV)0BR^jUr7WD7 z_nAbRu*t*SwaDeX%WTJ+C+*>}U(tPhdC5M)uS2BiX6B%orAdjU$tr1PsiGYrXUl*@ zQ_&q9MxBafUiUzf%dQnowwK+}L zSd2xY)H6vc9P&61e9#7=c~5O0o=$w$@5;ftx38^l${bHR?AbE>^AD?xDHf2(y{$jb z-Qw4EMa?B7tz1B5Rwm!}ZmW2#{`!xPYrZWr=p9oPALJeuX$Q0%aA64f1h64727 zO+ZsAe2!r;MbEKpr^+k<9RjlS{a|Y6$y)c$XfE2Y_@fA`UiG_yWX@ThA)p}FN^2KQ zZ_anXfzROXt7~i5d&ZA_KwDjjM;Q`d7TCxaP{UD!IWXX)*mds?{pH#nC=ezgV9M0j zUtsZ^x>yB5h^19$Sfkdq^VC5@OMtULia|~|m6aeJk+YIi{$voU_E2WhCByc@NZZE0 zF3Xr8POhs@7QHWWO@!;MQA61s4HrW0TEw2i&U6J00Of%U(KI0CMt;cS9=1OE z0WR5>`EbsVr|9P zcqSORN!1KTic(-ukZtDW!CcUc9X$_EJT{H2<90%jh*ymL$G~eWlp^}vlqfTq5zL9e zx++N9#{4xS5~bSnHsXckS5gUuEG_euk>4`?R#HEfj(1VahxrQ#e+}4{MJE<2GU$eu zRS?WidvrVtxID`yw_lw!`YpV15O}>kJWgO_bhQ1jsG6pkaqm-%y<4OPO zj5@l!PqH`kGU3t(rC71d2V({)*VW#e8crj|tibAd@a*4D_w0@dW=q;umjPVI>ld}* z2Z%hFCloEvE+^+-^5KSnlFJ28`Ja=aME|6=TK(=( zo;_RbOJIItyMR$X**XAsu9qGky2;$_9_|j@j8oQ$?w*JjIT>hmi6nmn_BCel~iV@Ml2vP(}6*xh1u}`|7ogvdFpx2z5l{I2#EdT88Z1|0i zP7ioQ>)Gm;45}GFEcz2!bbk5+!chUBG?GGmsQGfSKNO!inbQnOS67$Cs3{qQ8>Rdc ztOAOku)c0?YG!r~fm?ZQX9e{P4qi;lI41#q+-bl8_a`ERVGuceu%%vDq$Z9ED=!}WvOCtLR@Y2C#r_b+2;`%eT@!5 zTvk%7vR#RavdaiyL}na5%A8&HSNJEL^6QRERU{lMNx`gbrFmzt^o{2A>s0~4Tl(&qxb&d7yR|v>x3mV||xlaETMl z7~Fk4c~J{AZBCR}AJ9=SjB#BHzLyJ6P9rGbE*pLLeD?FNlh_QcMzRrMp3n^d*kAfQ zG&HoF@8A6=OCfz1psk;Xo!8}|aum7fG$0CT{0{F=*L#2D<^pfx3rjybg;L3-Rj{D^O`2*U#rxb|mmSz-Uw9NT)JUEHxn8zu+UFy1ZK zVQTOB3+xt;px2NGGk2@$oXc&Dut#hzZT;m|vOb2~Fa`Q&GhKqy(R1d$RQ}r{oqYJ# zZWZ6fF1#=DC~`%8@0^&ZFZV9Iwybpr$Y@eQ=Rn|wnAPY#MGaslTTiK8Gi9{4{O5Bx zsbDPd0;5w>dTVT_1Y9=J!DyFTZsVQ!fqrZ=t@!zVkT@V9fKccoBT&TqORbp@aDH&G zuzmyXab{HSC+W{*fj=w{9QBBdpFMP<-=lCz`M1UQq6O zgY{TovEd;P@U}{jUk&a@Wf7VoQBnE8GMt|`08lOC=OirMqc+R2qWRQR9xQ8an%8&SRaisWB9kVSjNxP|}_)Rd+n=68@z>gBdF;19itiIJWx zmiv5zoqT`CA^*2opW@;2{&~aF2y$F!+u@_{mzh=Y=|ymfb`&_5r;H?bKgW|M8=@x0 zCelsviWxc+Q5Y-NW)A=kxVm`dzFBaQan#ouk_7!$mW+s$_NxA)H^gll3Ty$B%dDz- zhj*9OV%MA&X&b${`|``r7waApK^ouP-(T+*mp|Fl!oq2CklPjXEP z^W}w*olF*Q@q_}1^`A3#(36h+{aXSIzP#mz3G@Jft~aUBxdH^w6Yv=U_d`+u7ycT( zN5H&BKt%Ms!b!;Nixdb}C;%w+r(!x~tUuJNP9GkDl17y5u?_IeE!+ifrta1&f4DOB zWT%8CxE{MFr)(KWCX1e|MqVa$qjF)Y0f5+puOIK*9^lTNUeO7C zuc4#@sXUqT=!6{pz|wFAr7;?Kl%UUW4KQzKs+{5x_yeB66Rt@&taJPXJbvJiGpKx9 z27qG{;Bw(X9u3K>R!ebA?sUp*$<+!Fm5F~3^%Y51^2$yYRq-FVVjB0M~#b_x}N zH^T4!rvCi<$6Vqf8?io;dqOej4z}J&(*97I zC zUl}DfMMZq?SwY_fxxT*s$vbTJz8nQ=PV8zK9`tRbO--rUTkp8y=#^KC%Ueu;`@_DD zl?G%f#v-Mg0{X^lJ9)gF69v>mNN6Y=C16nJ=O4Y!w?6@&8C1Y0X;|lE1~RzosWbvk zS${F94~aU;7rpq8B#JuY5H#ni@Fi{2_KnEbmI@Q^$Y2LEXR^}YEEbY3J-{M*PW`kn z%Ka`u%_u?rQ~eFCJdtN?raQjvD=|=1=b3eTx>X$$_mZE%_2``-Z3a``!3D&lbXbPf zC+c}2P>YI^iR)9&0D*Ow(R+6@NPJpuoC|TRF$wa~IaU8AeXSNp-_`9Xh<1JDq=ELq zK3^z*z`esIAdm%WyE?55c!!{ia|T*9K?MbjrHvcnkI*${l;}UgOrKNK zCxKC7Xz-YAI2BzIctwfR8_6%co zEjg39yn>;^fa`H_Lr>XRA20gcYE1s#mhyq>?~h?ZjY~htWV`@lUo<|!@j^dO?7ST3 zla7m8X&D*yRzKgTDh#MADjFJ%m{MH5yj_sWQhvWR1P!jg zSbt;1`ulxNY;5Wf?@P=y+6A+`xH#Z`uwEhjcfhpP>%60yKc|!#djl z&gfRX$1v*(HyJNbH)!}60!Sk?0@`B|L^SqQGoWKdGnmS|7DVAkDJEvL=cZd>il{1j zfmg|L1~B~zVSr0{wl$pZezdqhUGW+4c`A9F|FwY#*bH80_KA2iwf=dLpoRzs8(-3% zWy+a``V5nLX$ey|@!IWH)@CDjOQR(QSY^9 zd!;5w{xJ;%NvLr2)o;D&Qi$L`J4#haOJ%%1@2vc3ekGB zoJkhfRHAT#8u#cJYD_?#=e7XE7%0Rk#lvvk&ftK(4l%nYIiqV=j@GBLuUIBp^E!Ps z#Ib7^rdT}=A~3(~7m8$5K%_&T2j8!4kK{b@>m0c#&=zh7 z2+7FE_}!B(!$(V6S^|)ekP!oxyzG#rvKPv$y3v_(qArZuZBiU5%L-ZeRh^jn{RGm6 z4Q;M3G4)M$kUDe`XtV7N@6bNKo~el}5SEK|ddCgww&M;l2Hak>MOA_q`WIHc(dAKm zb4m+nj9AGP?&J)OGW$$T!>yENKd%8HwH&x?674wH*sr9e5n#YTEl*ZEpFBVsxk$&u zc|pBjcEB+1G_8nEPge%bzgSvp?j^m_x8}NeGGPQyx&riZIKBVb5wPe;fTktjsSLnw zerlSqw_F9Z_}*3miwbl=J0V6w_$Luj+3rq8Hlc zy7U}0SoZd1cfO94p3t}U_wf2J#|+{V;BlhyC3ZXccdnM>?tZSio}ST}>r&H-rkAEE zh<^?H^JzWvp6umP=I@VJV^>6^4_C_1*k^i}`_!=oDdF&O8P8h3i9+6q+Qz;Kg>Ujf z{}WV^*2nuJfLRqE3pK`?LI1qzY)IGuRDS+N4=Iv+YIz(WI`h3R4?%#Qj>u7Px@;5b#4VVCddwFh%#TS7gKAMD!!(~^2h`o3lxk(tyO#+ zQU!^39KWD<;_EK?(SEA!J|}RWUQr<+2AP&^1PQVty68Rg(|v*Z>^Yr)z__FF?w(!W zOR4+lWwn3+Nsgc^6SniUEmy_pfV&g4s$~lME`sf&QBDM;FIZTIL3r!K!+VME*v{KY zSLM{yP^kW7eSK<1Y3k_Ine`{KKJ{aPs{Y&J3wb}qC`iT~(C(;Yp?T7$`0}wFX@j#u zYL!J3y9JG0M5MUR{B%FaDU$}Pc^gbKAl#cw(E6*Uhw|?;TTg5 zR?4E|b`C{0R*J;3uK}y{=7+DC(D#89LFER^vi-K3QAZZI&4TjH%(^1TqIz*gEc_g_ zX2N>SS2Mg1SAapaF=Y(V2??bF=gq7F=%2J%L`W;%6D`Gz#v)olqg>bcDJV&fJ6Qn`Imax=KlbI!p83OckjAF5m4BVEPti{@gY>fncy7PiFW9bTV>X>+1ZF zP{>|TU$ANRz_heINKxEWOfSt%p~`YO2-_rzjYW?jjnI+oMLyjv!*JV#g04Y+HALP< zMMZ_5I6OGWJ8ud4&uc7e3KN%jXImuDCVX)2?(Wo?MEZ}gnXcQWWDM&As>=Aiqry1{ z=>BeX1N$uO^0puO@2~2!a&zBTgWzkw7amn>;%1+8IA`vhbvO?Oj(=n_mw2nf{yZ(h zyEs)uN#y)IJ=3n$rlsM?E1rizNW?-cmCw++_HZD@DKIb)3kOG|?VHEv>$8>mErqf( z{KH-EJ|C8$3S<5ntECH@1Re&r8~mgxh#0!R?ly6ND=KP{_`Vg^(s%pYAuNeZym(H) zKHr!?Q+b|`k~zP-Pc(I!U7G|~13Ppe$ZSpS+fbkf_JohXZg*$txKeN}r_J4jg>iCp z-?;XmT<@N-on%vyYHt@syu}29rls$zi$6VfgjuQ4qe`LQZB`RuK?j849&?8tY75*R z45Iy{7p`_&l8VKi#ZMu7Q-pd#Z?jfDHAV5cLD_YDDh+dOuRIycA6)p3OB1a+DcGwM~MCXMf^s;=qYJx zLx<>n=Npk6ai>L`+Vdp#RQ;Xux?;Kx^fF?t*aHis5H2PDccW%EJ&rS4JmnLjHBuvGNv*G{X`B^aoq_Y z&uL-aHZ=`crfMZrtjWRuwCU7q9L|t-;P~e2_RIcVes)2(T@-oj@AmjP|9#arMyd;z ztzr!rBL8AfXZR;riYPBaA!m`*ct6K`cz(9$o3&X3>Kyn~w6uZTmR;B{YAZY1#n{R` zXv6vC{uEr}%Tis{2^=wedYk9htfvquXJ8@O)2g#E^;#{WXW(QltmQ27I1;bsQDM#fO}Mf>;}@=(8XL}}_`ZN?mGtK-p8&2DfHdwdss? z4w}N}@2Rb}Dyc?vPbq_GsBj9A1$PXv74f6odyg25XNBQdzfwbZ_{-#Z`;4td#=*~ zR5AMMJe{R1#fy8oF3jC47$;>lrncxa?~T!FBNqASC#zrUyWorz{;fx@F^couIwbvJ zCXL>FM!%|>Ey?ozVos^*)#mq0rJhZ^*ksMa?I40{$BUz1Fy%Alu@=c3CK(G2my7zp zjUR=gz~AMM+R%ORDgV)hA*Ismmv!b6lXM+@6>%nK8WNUldhV=zEcBNVwRx3HabRI+e@ zqcKYel08l2vupAHC-l$v1X65$Sg4iKO`HGQD0hfv@>XcI@VBN7@gX;ZLXaTzyuF zQ(QQ38%e{I^OFxBF> z4R4+4@i()PQJ##bPYCh7K+U6~*sQOTV4^z#=TXH&D%FVGYmwed@w_LbrB^mCDBYW- z>SLSDqR;grc6SySXCs*iuM0J29=eZq`!3B+YAiIADeiEkk%BzW7FsCSNe2)2ldqnt zQ8j%73|fA1^eg1P^qkd1Xi+@333FC0jA5#Iy|euvw$~YF|MH6#X8BzFp6kD9n5;Kh z?Fm0LqEaxmsY!?GU|L?)k&~=~f!ESb>sildzBUyfm{tPdLFrNZL_WoK3cADWk z(~{*(vv+6{dhd{TFw$Qh%e5jjjL8`?>l^)D=YpS_A@qp2N4@d^plV7(s()xdIYx6 z5S3e{sema%J22FHma>zh_J4v_&2reHi2c!;mDo2|8*fy(vlW*7c3Y1=pZV_sshE(Z zAlYKuh|ks4zhVti5R9r(+qWUb4^Qp`7z-yZ_X8Haou{Mw5uI3^L6RUR0Y@oa!9_dpyzrewkwR`!69zz)B zxci#Idi3Y#_aaDpeB$fZ5KRF=ye-~96{m}T#NF9DE*5S3IuM0F2qQOo#|s4nx%;u-s zwe*Fvk&rG}P%}(w?`Jz!8=lPdE9WQ8B}xcYdm9;~hkwzI(R)sz<0RS`!y+@FXfPDO z#8>nK?2IN=xk-#1Q3zg(I&*CNJD8^t3tsn5{xYmYkONtltfWZdjjOyBnJk&!2Gk%CmI*ME14bIh6oas;i-93RRe zBkN(E22e)^f)4K{MmQILb29uW{d1u$*R6?sZZQ=FK&8FjMP5l6F1o6R~EFnolduR z*QC2V74w_z%p;hhOKmGHeXqz=Zrzy zGTVBTw$u?$V@|m8dF7Fo+&S44s$=;&acUX!k`BoZ$A_H~qui?*TIN{VQ}z)X6|=J; zO=C>BLf~wXc;2STlYe9XUArkO?Z7lXkNFex=Z&)pp|;M+DHr_!=~0TWAYs^O%OyeN zS#!YxyX@KT?X93f#-dLGnlbVlBGK`BOh|d#e`^)0bBMzcFPJvir1SV+{I^?RuNbjj zz7KvrftbQ*oV`ELL%&r>j#D9b`_8ZsI$2Tn)wc1`w9I2MW*a0GUu@o4W){F@`@Q z1d@^bmdQf}<=BidCd3ngZHltW0O+6}@JBijBj^1w=?JEUCs`BLe zq@4wy=xG7xsA2rd->C8JMDbLIHB>#lL1X?8u5327N84*n1XaS2&}CGb6*jtops>!K zA~+ko4kxn3mlMuXtGyzHyWMvceeCLLO2LXyRUgd)yIQ=o-jCK(x$YU6aNYXae9H!7 z2~Mir>m)5JrQE?Hn~{4s8TlWO%oYXF(d@NcOYQ%=Xlb%@Z|N5}W#XP1tL}q9)566n zTu@65gu0K7^n+*D#6i+vhK+Vs?8Of_AoZqGu#$c;k6!9@(9V20n{vp{fOxMujmi_7 zQJt(Cv(GN2JARP=qwmN)2tBuT?vQr;oWuO*@NkK~lyPYu;tc4^k~HL)z;WF!ncXoO zHc4N*B(%$CYc!FJ&#LN->$l#_wgShPZjP!g+?9ey{wm)$jDB?!@^gph3)uau%ey7T z{Q@cTV!L%Lae;#h9JxQpH{QAuMVhnj=U={ffub20Qt*HRzZ$Im%ea}V#r(fe0w;dcefhIgbV z>$r0fzMi8TC}-+^BDzKk>AqU02iiL~0mR{{->&;kSJ&UrjH!Rc=DgE4F)E^^hBFOh z$oytM6tMSlJ|lSO&AdPEi05cvoiJKizM~~|UEd`1Vq9eWRZuFbr{vUy#;lNB24imj zrc%XQ)Wr;)nV%@&9qjEOfqub%yX?_qe!I~P0c9c0`!boV#^ z1~rVF;E^2*NtzN11#C*DqXcHhe-6eKX(K6?L*TmzM*{E)!IpLAcDWaHVj*?^sPu2} z`q85BRXYmxz?ss;*yO4#m=&PyaOG z$}4LTgqgdfQvxcwJRFKh@b$P&;DAji1&)UmCS<(mk0<_F>+Ix;XQ}$t(Vc$%#TV2< zV$IEaOOaOlOqY>N^;FFm)8#1Tzw>r3 z*=NC#47Pl}-0MVPleuJ|%j0fkPmtWe1zsMR(WT9MObrk25K{Dvv{NHrGBtw;K$nVVBTseUlu?;}$6Q z*J_-wR5kdxkebYe=*-pL#hRLugl=a&lfE&fBatfKGyA{)MojOcGL2N`eu;@Ad}4QG zjL766iCS!(IALH|&Q^Z{?QJ3&aU5073^-`El}7v3iQ+kDassMpo}@d^I`ob{l@+$L*ub z&i#V^&FwwPs=3BQN1rG^kCt}2Oq*iL+NEfzbQn_H79P3m;55%L+B&69==Uc@7uPX09I#k>*=kXL1-oC^WhtBKM>pBrvPRPWfou*Ja@ zI=^e{2;;t7{N6jn^**R|Q*)^ft;3Z|wY)|+>N7H~q8%>onEd5YQ(|2mrfA;L>#IMp zQ;*K!XM4u#_hL6`gs*x29^v8Ud>E615@*O5Je68mR%OGN>o4|18^<*2E<0mj>{6?S zo{Sy&s3@3sGs1fZV&0@dhj@-osa}}(3aKFZ7_-!9G;n5F8zniT1Tzlb=yx?FY~u=7a~~ z&YSae8|jQ5?dtIJg~3O)h@hC38*n6^b{G?*5oUFD{78}HYtDCmilP&ayGwSPI4v6B z*E>0Be7U$N=xTr6sx{(XguNqZ+*{?Cx8%}do1=EVNmGI6djVG^RIy_ut+tsnu!8)3Xol8d< zzcs@2s6pwyO}|q zet`jZp|a(dfGMQ#%~a?g+n2*QUpGSIPKJ{msybVdMQ)0l^|9)@Rk5oXTwhbk^AXHu zzd1PuAzrFShe&fvk@4Y2FZEyg1oMQnrO60VIiY7!j6=u@dYpxA^glG=v-v5&222^Y z8{Pax$=&v=FE5PLe!25d$r^NQyxhImlqxS@EjY504DW%42DnNBZ2}j;3_KkWNVhOR zoj?I|4*DkAV*h1AO3u%luwV|s2R83G|%7o3tU<4b28;%Y?<0j#e~2q^Py> zvs-=8_E#cKy2x$LVSLDlC9XPedRL~l#Mth2Q_qiXIgY!3tHWw|h@L)yTMZ@(*ND3z z#u*kS;}_XeFKF~__-uGstUGCm4X2+)@iDpHx=?)MHZa~a{|I&jnuDF@pfRjT-K%m< zCtx{5dho)uFuvV~aHkm4wT6nZ+|P3WL^-tnT~+X+-%QM4g#GfuJ?q4M;MP&jIQCn3 z>dT<(g5VZz1M54o!O!{tzn!F(h(fRH((B-ZV5Wm~y$eU88in28qW3YE$GczVW~W5O zBlYd^$@e4IyN@v*`a02G+7oZ6E6Zt~#hiOH$+zaiMOVw}Ufz+%AB84P*b_S(Pe7sA zEc%3l`9XMNSuHK0s-sH5Q`6tz>XPACEqpCEr6N8CTghF>d2JXTxYXJ&d}~o?w?>eT z@Y{B}L)@$jgx=@wsgqMbtlZA?tLcWO!-NBG5S8&e>TyjkoLA5r%8)mD-@PapXr z`Q#bVJ(^)*xi7;QhW?sCMknSB7;@h6t+UT^Yu{Evsg-w>{%1WEPP{?LNvE>ob>jSD zK$}_ic!!G6uW@uEyQR1Q8@qPq>%9SKRbpIVSxh;6^@y)=jCA$~I_+lY%%RtwExFuS z@446gTZyRE&Un17M(xWS`?D*al=%2nclEE$&nhu~ylQ}wbdOHCkEjPV2%t$M=Aew+Y3vV$+TBTl!+% z;$CiM4S=mU7l8-D8 zb4%_D4o#E#|8hC8a7VPrn9d%U$NULJJ?MTGr{vjJ*{8p1bwnHp%JNfZoY%S!O$Or% z9Wt(M;Q{}S!nu*zRBU{B9z)r_XZ)$FwQuJI+2@7({C-8Q(Q>Ob0w*`J>9f4x+%uyxvMVuOStuj3pGPG5e$oHZ!_;W0`n9jve)FB5PpA}* zW5gJ{(AU(wR!omF7faU19JDWbtA#dV&+$?)@huqb^B_PF`A{Rb8;tlOOvjo}I_ag! zGWJ+;E8Pnd*I*?sdrP1nEerG%zw{+P zHxeiDR-P(X>QjxSTiZtJ4{(@T6{)9?#+)wHg2>#^#iropU2oS-}c z_eRoGDBxE~=_Pe6?F=2vUJ@DZ=i;1}$%FUR2Ds;8YG-1k*QdW>h02YGDgRQ_WtfjO zD@={%3GT(C1e?_=jw8}ZY6K>dtePm0EL5H(Y2JQl!a`Nw^PT4fu`v{sbN%{$A}pj} z0^e20&ez4)OWPjjP=oA|tk=ebu>kh-_l)eWnY)!E{WJAR za;>qTp2PI`nhRG^UB(9!J)poz1sp?fg>Gp~F!NJC&+au2faKzwIE?zAR3-_n}Q^w-%*{2+@>-#NBGK!|@GwD_^$ zea8!IEH!E}ud$VW6cjwnYXooZHF@rIz;5jwL#^#T4mKgpx9(WT;MrJQOWT zl!s~(v4o^_B`p%hQd^Z&1c|6Ml;?{159a>#J@>x8=brDm_rC5upV#|bnGyIccg0H- zWRLZSJHyFfK5oP;tYo=`$3+m?{|!M!Skhz5md3z>B9kN z(RXlL+w2!^&B{p6CJ`0%^a;-`mSuhNTj^6rcp~#^+k%V9PrfX9yTU`kK+~OuMvyIt zIFSupB>)^5VIZspnN%^^SlhT__l%ogGYNd{qDSsU zxT|tg5pCJyiTNQ~;IEk}Iq+z0f2eYej;P8W1v`pxa=bhcRXAej1{v5CK||CZ09YIf zctuQ?2PurAWy&Bczmjbds&rJv7WKg7NZx7{rkr}aGIDzEhA5+o&dXu<8KPhws0ce+ z^rT==;ZiAV?$68Ha&vzE9+4s(<23A6Mh}y-DsNaO_MB8XVQ*ND5K+`*BP@G#HN_zD zz)0$q;+sOePW3%+#HTqEU9f<^6)tTrb#}COI*%&NyJqg5=_6y(#2Qnc4;)@k8^=J} z0VYR1Y8I3NHCBqOqbZBwqv*6Ot5dzdqQkqsT72wL`O#k-lXaV-*JM-{O$~6W?!Re9 zZaeB)S4{0Z|2W2uDj%ghQu)mG)P!6n0ra@%X{uTFQEvd{&I*d z+CM;=vEHr7aKnU(SQqAOx6O|-Vblcy(R=MmDbvgS9RLSr<|3RgUOfGIdI%aXDCW@p z#`++O1#>3xV5CUoe?Lp-j1A+xKrNmxJcjv}6XEdXeF>{|Bfzz!e(Ub+0Xls4n+YwDX{h{o8Uedh%Px`GQJ zPGj{PbM9Ee?b3CWB*A@hd3xv-c+>2R!da5y`IN#kkn5(l69CLfR@vsa^!L)^2uQo~6Oa0rZ8eaw*Nw(oZ%@+?_tp7X zkhV5})(pcqf+QT-8dYxx2kAYf4Ae!6>5y8`X!22}OkpH$Jij*FH8G7`=)O8a{7T8p z;_a`zB|N~mQ<6J7?Il$%Kp*ZKpAMuS_&WzN|8R6|Kb8N;&5rE{bKji diff --git a/icons/mob/screen1_Orange.dmi b/icons/mob/screen1_Orange.dmi index e3762ef4b2b21a86f2531bf7c3242d4734a9250e..cf8a6d3d4b3a910c6ea5c63c780b18814763774a 100644 GIT binary patch delta 14805 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 Jlr|0ee*hPjOP~M% delta 12969 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 From f0f6f14355d307ad9de9bf21ff2f1c472ff87aab Mon Sep 17 00:00:00 2001 From: Aryn Date: Sun, 27 May 2012 12:49:26 -0600 Subject: [PATCH 4/7] Fixed up the errors related to ALL_ITEM_CONTAMINATION and hotspots, made extinguishers work again. --- code/ZAS/FEA_turf_tile.dm | 2 +- code/ZAS/Fire.dm | 2 +- code/ZAS/Variable Settings.dm | 8 -------- code/modules/chemical/Chemistry-Reagents.dm | 9 ++++++--- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/code/ZAS/FEA_turf_tile.dm b/code/ZAS/FEA_turf_tile.dm index d65d1d96650..c8dda862530 100644 --- a/code/ZAS/FEA_turf_tile.dm +++ b/code/ZAS/FEA_turf_tile.dm @@ -51,7 +51,7 @@ turf archived_cycle = 0 current_cycle = 0 - obj/effect/hotspot/active_hotspot + obj/fire/active_hotspot temperature_archived //USED ONLY FOR SOLIDS being_superconductive = 0 diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index 0159bfa0566..e74198e8f4c 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -45,7 +45,7 @@ turf/simulated/hotspot_expose(exposed_temperature, exposed_volume, soh) obj fire - //Icon for fire on turfs, also helps for nurturing small fires until they are full tile + //Icon for fire on turfs. anchored = 1 mouse_opacity = 0 diff --git a/code/ZAS/Variable Settings.dm b/code/ZAS/Variable Settings.dm index 226e38c1223..70f186613b2 100644 --- a/code/ZAS/Variable Settings.dm +++ b/code/ZAS/Variable Settings.dm @@ -119,8 +119,6 @@ vs_control if("Original") plc.CLOTH_CONTAMINATION = 0 //If this is on, plasma does damage by getting into cloth. - plc.ALL_ITEM_CONTAMINATION = 0 //If this is on, any item can be contaminated, so suits and tools must be discarded or - plc.PLASMAGUARD_ONLY = 0 //plc.CANISTER_CORROSION = 0 //If this is on, plasma must be stored in orange tanks and canisters, @@ -146,8 +144,6 @@ vs_control if("Hazard - Low") plc.CLOTH_CONTAMINATION = 0 //If this is on, plasma does damage by getting into cloth. - plc.ALL_ITEM_CONTAMINATION = 0 //If this is on, any item can be contaminated, so suits and tools must be discarded or - plc.PLASMAGUARD_ONLY = 0 // plc.CANISTER_CORROSION = 0 //If this is on, plasma must be stored in orange tanks and canisters, @@ -175,8 +171,6 @@ vs_control if("Hazard - High") plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. - plc.ALL_ITEM_CONTAMINATION = 0 //If this is on, any item can be contaminated, so suits and tools must be discarded or - plc.PLASMAGUARD_ONLY = 0 // plc.CANISTER_CORROSION = 1 //If this is on, plasma must be stored in orange tanks and canisters, @@ -199,8 +193,6 @@ vs_control if("Oh Shit!") plc.CLOTH_CONTAMINATION = 1 //If this is on, plasma does damage by getting into cloth. - plc.ALL_ITEM_CONTAMINATION = 0 //If this is on, any item can be contaminated, so suits and tools must be discarded or ELSE - plc.PLASMAGUARD_ONLY = 1 // plc.CANISTER_CORROSION = 1 //If this is on, plasma must be stored in orange tanks and canisters, diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index 86d28577e4c..c94cd145e75 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -261,23 +261,25 @@ datum for(var/mob/living/carbon/metroid/M in T) M.adjustToxLoss(rand(15,20)) - var/hotspot = (locate(/obj/effect/hotspot) in T) + var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles ) lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) lowertemp.react() T.assume_air(lowertemp) + T.apply_fire_protection() del(hotspot) return reaction_obj(var/obj/O, var/volume) src = null var/turf/T = get_turf(O) - var/hotspot = (locate(/obj/effect/hotspot) in T) + var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles ) lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) lowertemp.react() T.assume_air(lowertemp) + T.apply_fire_protection() del(hotspot) if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube)) var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O @@ -2142,12 +2144,13 @@ datum if(T.wet_overlay) T.overlays -= T.wet_overlay T.wet_overlay = null - var/hotspot = (locate(/obj/effect/hotspot) in T) + var/hotspot = (locate(/obj/fire) in T) if(hotspot) var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles ) lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0) lowertemp.react() T.assume_air(lowertemp) + T.apply_fire_protection() del(hotspot) enzyme From e2ae20dc074968bf7bbb35f881b04ad42700ef54 Mon Sep 17 00:00:00 2001 From: Aryn Date: Mon, 28 May 2012 15:30:17 -0600 Subject: [PATCH 5/7] Made SkyMarshal's recommended changes. --- code/ZAS/Fire.dm | 5 ++--- code/modules/mob/living/carbon/human/life.dm | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index e74198e8f4c..e96d1070681 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -208,10 +208,9 @@ obj/liquid_fuel amount *= 0.5 -turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again. -turf/proc/apply_fire_protection() -turf/simulated/apply_fire_protection() +turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again. +turf/simulated/proc/apply_fire_protection() fire_protection = world.time datum/gas_mixture/proc diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 44fa38e6c61..3dfd49d6b0f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -424,8 +424,10 @@ var/datum/gas_mixture/filtered = new() filtered.toxins = breath.toxins filtered.trace_gases = breath.trace_gases.Copy() + filtered.update_values() breath.toxins = 0 breath.trace_gases = list() + breath.update_values() loc.assume_air(filtered) else //Still give containing object the chance to interact From c9478c6a46958e1fe71b3e038f2dbcc5624d8ba7 Mon Sep 17 00:00:00 2001 From: Aryn Date: Mon, 28 May 2012 15:30:17 -0600 Subject: [PATCH 6/7] Made SkyMarshal's recommended changes. --- baystation12.dme | 1 - code/ZAS/Fire.dm | 94 ++++++++++---------- code/modules/mob/living/carbon/human/life.dm | 2 + 3 files changed, 48 insertions(+), 49 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 28d20df74c3..024afe994d0 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -985,7 +985,6 @@ #include "code\WorkInProgress\virus2\monkeydispensor.dm" #include "code\WorkInProgress\virus2\Prob.dm" #include "code\WorkInProgress\Wrongnumber\weldbackpack.dm" -#include "code\ZAS\Airflow.dm" #include "code\ZAS\Connection.dm" #include "code\ZAS\Creation.dm" #include "code\ZAS\Definition.dm" diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index e74198e8f4c..a45b7fa3b3b 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -208,77 +208,75 @@ obj/liquid_fuel amount *= 0.5 -turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again. -turf/proc/apply_fire_protection() -turf/simulated/apply_fire_protection() +turf/simulated/var/fire_protection = 0 //Protects newly extinguished tiles from being overrun again. +turf/simulated/proc/apply_fire_protection() fire_protection = world.time -datum/gas_mixture/proc - zburn(obj/liquid_fuel/liquid) - //This proc is similar to fire(), but uses a simple logarithm to calculate temp, and is thus more stable with ZAS. - if(temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) - var - total_fuel = toxins - fuel_sources = 0 //We'll divide by this later so that fuel is consumed evenly. - datum/gas/volatile_fuel/fuel = locate() in trace_gases +datum/gas_mixture/proc/zburn(obj/liquid_fuel/liquid) + //This proc is similar to fire(), but uses a simple logarithm to calculate temp, and is thus more stable with ZAS. + if(temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) + var + total_fuel = toxins + fuel_sources = 0 //We'll divide by this later so that fuel is consumed evenly. + datum/gas/volatile_fuel/fuel = locate() in trace_gases - if(fuel) - //Volatile Fuel - total_fuel += fuel.moles + if(fuel) + //Volatile Fuel + total_fuel += fuel.moles + fuel_sources++ + + if(liquid) + //Liquid Fuel + if(liquid.amount <= 0) + del liquid + else + total_fuel += liquid.amount fuel_sources++ - if(liquid) - //Liquid Fuel - if(liquid.amount <= 0) - del liquid - else - total_fuel += liquid.amount - fuel_sources++ - //Toxins - if(toxins > 0.3) fuel_sources++ + if(toxins > 0.3) fuel_sources++ - if(!fuel_sources) return 0 //If there's no fuel, there's no burn. Can't divide by zero anyway. + if(!fuel_sources) return 0 //If there's no fuel, there's no burn. Can't divide by zero anyway. - if(oxygen > 0.3) + if(oxygen > 0.3) //Calculate the firelevel. - var/firelevel = calculate_firelevel(liquid) + var/firelevel = calculate_firelevel(liquid) //Reaches a maximum practical temperature of around 2750. - temperature = 1000*log(0.016*firelevel + 1.45) + temperature = 1000*log(0.016*firelevel + 1.45) - //Consume some gas. - var/consumed_gas = min(oxygen,0.002*firelevel,total_fuel) / fuel_sources + //Consume some gas. + var/consumed_gas = min(oxygen,0.002*firelevel,total_fuel) / fuel_sources - oxygen -= consumed_gas + oxygen -= consumed_gas - toxins = max(0,toxins-consumed_gas) + toxins = max(0,toxins-consumed_gas) - if(fuel) - fuel.moles -= consumed_gas - if(fuel.moles <= 0) del fuel + if(fuel) + fuel.moles -= consumed_gas + if(fuel.moles <= 0) del fuel - if(liquid) - liquid.amount -= consumed_gas - if(liquid.amount <= 0) del liquid + if(liquid) + liquid.amount -= consumed_gas + if(liquid.amount <= 0) del liquid - update_values() - return consumed_gas*fuel_sources - return 0 + update_values() + return consumed_gas*fuel_sources + return 0 - calculate_firelevel(obj/liquid_fuel/liquid) +datum/gas_mixture/proc/calculate_firelevel(obj/liquid_fuel/liquid) //Calculates the firelevel based on one equation instead of having to do this multiple times in different areas. - var - datum/gas/volatile_fuel/fuel = locate() in trace_gases - fuel_level = 0 - liquid_level = 0 + var + datum/gas/volatile_fuel/fuel = locate() in trace_gases + fuel_level = 0 + liquid_level = 0 - if(fuel) fuel_level = fuel.moles - if(liquid) liquid_level = liquid.amount - return oxygen + toxins + liquid_level*15 + fuel_level*5 + if(fuel) fuel_level = fuel.moles + if(liquid) liquid_level = liquid.amount + return oxygen + toxins + liquid_level*15 + fuel_level*5 /mob/living/carbon/human/proc/FireBurn(mx as num) //Burns mobs due to fire. Respects heat transfer coefficients on various body parts. diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 44fa38e6c61..3dfd49d6b0f 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -424,8 +424,10 @@ var/datum/gas_mixture/filtered = new() filtered.toxins = breath.toxins filtered.trace_gases = breath.trace_gases.Copy() + filtered.update_values() breath.toxins = 0 breath.trace_gases = list() + breath.update_values() loc.assume_air(filtered) else //Still give containing object the chance to interact From a8215ce62f53e0494296e23c98e98ebfedbdb891 Mon Sep 17 00:00:00 2001 From: Aryn Date: Mon, 28 May 2012 16:42:40 -0600 Subject: [PATCH 7/7] Made some airflow changes. They won't be included in the processing code until they're more thoroughly tested, but the code is here anyway. --- code/ZAS/Airflow.dm | 395 ++++++++++------------------------------- code/ZAS/Definition.dm | 4 +- code/ZAS/Processing.dm | 4 + 3 files changed, 105 insertions(+), 298 deletions(-) diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm index 50d8888c853..0e022e3c489 100644 --- a/code/ZAS/Airflow.dm +++ b/code/ZAS/Airflow.dm @@ -12,31 +12,16 @@ atom/movable/airflow_speed The speed (1-15) at which a flying object is traveling to airflow_dest. Decays over time. -CALLABLE PROCS: - -AirflowRepel(turf/T, n, per) - Causes objects to fly away from a point within a single zone. - Called manually by air releasers. T is the location of the expanding gas. - n is the pressure released. per indicates that n is a percent value if nonzero. - RETURNS: Null - -AirflowAttract(turf/T, n, per) - Causes objects to fly to a point within a single zone. - Called manually by air consumers. T is the location of the attractor. - n is the pressure consumed. per indicates that n is a percent value if nonzero. - RETURNS: Null - - OVERLOADABLE PROCS: mob/airflow_stun() Contains checks for and results of being stunned by airflow. - Called when airflow quantities exceed AF_HUMAN_STUN_THRESHOLD. + Called when airflow quantities exceed airflow_medium_pressure. RETURNS: Null atom/movable/check_airflow_movable(n) Contains checks for moving any object due to airflow. - n is the percent of 1 Atmosphere that is flowing. + n is the pressure that is flowing. RETURNS: 1 if the object moves under the air conditions, 0 if it stays put. atom/movable/airflow_hit(atom/A) @@ -47,10 +32,9 @@ atom/movable/airflow_hit(atom/A) AUTOMATIC PROCS: -Airflow(zone/A, zone/B, n) +Airflow(zone/A, zone/B) Causes objects to fly along a pressure gradient. Called by zone updates. A and B are two connected zones. - n is the pressure difference between them. AirflowSpace(zone/A) Causes objects to fly into space. @@ -66,112 +50,17 @@ atom/movable/RepelAirflowDest(n) vs_control/var - zone_update_delay = 10 - zone_update_delay_NAME = "Zone Update Delay" - zone_update_delay_DESC = "The delay in ticks between updates of zones. Increase if lag is bad seemingly because of air." - zone_share_percent = 5 - zone_share_percent_NAME = "Zone Connection Transfer %" - zone_share_percent_DESC = "Percent of gas per connected tile that is shared between zones." - //Used in /mob/carbon/human/life - OXYGEN_LOSS = 2 - OXYGEN_LOSS_NAME = "Damage - Oxygen Loss" - OXYGEN_LOSS_DESC = "A multiplier for damage due to lack of air, CO2 poisoning, and vacuum. Does not affect oxyloss\ - from being incapacitated or dying." - TEMP_DMG = 2 - TEMP_DMG_NAME = "Damage - Temperature" - TEMP_DMG_DESC = "A multiplier for damage due to body temperature irregularities." - BURN_DMG = 6 - BURN_DMG_NAME = "Damage - Fire" - BURN_DMG_DESC = "A multiplier for damage due to direct fire exposure." + airflow_lightest_pressure = 35 + airflow_light_pressure = 50 + airflow_medium_pressure = 80 + airflow_heavy_pressure = 100 + airflow_heaviest_pressure = 150 - AF_TINY_MOVEMENT_THRESHOLD = 50 //% difference to move tiny items. - AF_TINY_MOVEMENT_THRESHOLD_NAME = "Airflow - Tiny Movement Threshold %" - AF_TINY_MOVEMENT_THRESHOLD_DESC = "Percent of 1 Atm. at which items with the tiny weight class will move." - AF_SMALL_MOVEMENT_THRESHOLD = 70 //% difference to move small items. - AF_SMALL_MOVEMENT_THRESHOLD_NAME = "Airflow - Small Movement Threshold %" - AF_SMALL_MOVEMENT_THRESHOLD_DESC = "Percent of 1 Atm. at which items with the small weight class will move." - AF_NORMAL_MOVEMENT_THRESHOLD = 90 //% difference to move normal items. - AF_NORMAL_MOVEMENT_THRESHOLD_NAME = "Airflow - Normal Movement Threshold %" - AF_NORMAL_MOVEMENT_THRESHOLD_DESC = "Percent of 1 Atm. at which items with the normal weight class will move." - AF_LARGE_MOVEMENT_THRESHOLD = 100 //% difference to move large and huge items. - AF_LARGE_MOVEMENT_THRESHOLD_NAME = "Airflow - Large Movement Threshold %" - AF_LARGE_MOVEMENT_THRESHOLD_DESC = "Percent of 1 Atm. at which items with the large or huge weight class will move." - AF_DENSE_MOVEMENT_THRESHOLD = 120 //% difference to move dense crap and mobs. - AF_DENSE_MOVEMENT_THRESHOLD_NAME = "Airflow - Dense Movement Threshold %" - AF_DENSE_MOVEMENT_THRESHOLD_DESC = "Percent of 1 Atm. at which dense objects (canisters, etc.) will be shifted by airflow." - AF_MOB_MOVEMENT_THRESHOLD = 175 - AF_MOB_MOVEMENT_THRESHOLD_NAME = "Airflow - Human Movement Threshold %" - AF_MOB_MOVEMENT_THRESHOLD_DESC = "Percent of 1 Atm. at which mobs will be shifted by airflow." - - AF_HUMAN_STUN_THRESHOLD = 130 - AF_HUMAN_STUN_THRESHOLD_NAME = "Airflow - Human Stun Threshold %" - AF_HUMAN_STUN_THRESHOLD_DESC = "Percent of 1 Atm. at which living things are stunned or knocked over." - - AF_PERCENT_OF = ONE_ATMOSPHERE - AF_PERCENT_OF_NAME = "Airflow - 100% Pressure" - AF_PERCENT_OF_DESC = "Normally set to 1 Atm. in kPa, this indicates what pressure is considered 100% by the system." - - AF_SPEED_MULTIPLIER = 4 //airspeed per movement threshold value crossed. - AF_SPEED_MULTIPLIER_NAME = "Airflow - Speed Increase per 10%" - AF_SPEED_MULTIPLIER_DESC = "Velocity increase of shifted items per 10% of airflow." - AF_DAMAGE_MULTIPLIER = 5 //Amount of damage applied per airflow_speed. - AF_DAMAGE_MULTIPLIER_NAME = "Airflow - Damage Per Velocity" - AF_DAMAGE_MULTIPLIER_DESC = "Amount of damage applied per unit of speed (1-15 units) at which mobs are thrown." - AF_STUN_MULTIPLIER = 1.5 //Seconds of stun applied per airflow_speed. - AF_STUN_MULTIPLIER_NAME = "Airflow - Stun Per Velocity" - AF_STUN_MULTIPLIER_DESC = "Amount of stun effect applied per unit of speed (1-15 units) at which mobs are thrown." - AF_SPEED_DECAY = 0.5 //Amount that flow speed will decay with time. - AF_SPEED_DECAY_NAME = "Airflow - Velocity Lost per Tick" - AF_SPEED_DECAY_DESC = "Amount of airflow speed lost per tick on a moving object." - AF_SPACE_MULTIPLIER = 2 //Increasing this will make space connections more DRAMATIC! - AF_SPACE_MULTIPLIER_NAME = "Airflow - Space Airflow Multiplier" - AF_SPACE_MULTIPLIER_DESC = "Increasing this multiplier will cause more powerful airflow to space." - AF_CANISTER_MULTIPLIER = 0.25 - AF_CANISTER_MULTIPLIER_NAME = "Airflow - Canister Airflow Multiplier" - AF_CANISTER_MULTIPLIER_DESC = "Increasing this multiplier will cause more powerful airflow from single-tile sources like canisters." - -mob/proc - Change_Airflow_Constants() - set category = "Debug" - - var/choice = input("Which constant will you modify?","Change Airflow Constants")\ - as null|anything in list("Movement Threshold","Speed Multiplier","Damage Multiplier","Stun Multiplier","Speed Decay") - - var/n - - switch(choice) - if("Movement Threshold") - n = input("What will you change it to","Change Airflow Constants",vsc.AF_DENSE_MOVEMENT_THRESHOLD) as num - n = max(1,n) - vsc.AF_DENSE_MOVEMENT_THRESHOLD = n - world.log << "vsc.AF_DENSE_MOVEMENT_THRESHOLD set to [n]." - if("Speed Multiplier") - n = input("What will you change it to","Change Airflow Constants",vsc.AF_SPEED_MULTIPLIER) as num - n = max(1,n) - vsc.AF_SPEED_MULTIPLIER = n - world.log << "vsc.AF_SPEED_MULTIPLIER set to [n]." - if("Damage Multiplier") - n = input("What will you change it to","Change Airflow Constants",vsc.AF_DAMAGE_MULTIPLIER) as num - vsc.AF_DAMAGE_MULTIPLIER = n - world.log << "AF_DAMAGE_MULTIPLIER set to [n]." - if("Stun Multiplier") - n = input("What will you change it to","Change Airflow Constants",vsc.AF_STUN_MULTIPLIER) as num - vsc.AF_STUN_MULTIPLIER = n - world.log << "AF_STUN_MULTIPLIER set to [n]." - if("Speed Decay") - n = input("What will you change it to","Change Airflow Constants",vsc.AF_SPEED_DECAY) as num - vsc.AF_SPEED_DECAY = n - world.log << "AF_SPEED_DECAY set to [n]." - if("Space Flow Multiplier") - n = input("What will you change it to","Change Airflow Constants",vsc.AF_SPEED_DECAY) as num - vsc.AF_SPEED_DECAY = n - world.log << "AF_SPEED_DECAY set to [n]." - - -//The main airflow code. Called by zone updates. -//Zones A and B are air zones. n represents the amount of air moved. + airflow_damage = 0.3 + airflow_stun = 0.15 + airflow_speed_decay = 1 mob/proc/airflow_stun() if(weakened <= 0) src << "\red The sudden rush of air knocks you over!" @@ -196,8 +85,7 @@ atom/movable/proc/check_airflow_movable(n) if(anchored && !ismob(src)) return 0 - if(!istype(src,/obj/item) && n < vsc.AF_DENSE_MOVEMENT_THRESHOLD) return 0 - if(ismob(src) && n < vsc.AF_MOB_MOVEMENT_THRESHOLD) return 0 + if(!istype(src,/obj/item) && n < vsc.airflow_heavy_pressure) return 0 return 1 @@ -212,177 +100,125 @@ obj/item/check_airflow_movable(n) . = ..() switch(w_class) if(2) - if(n < vsc.AF_SMALL_MOVEMENT_THRESHOLD) return 0 + if(n < vsc.airflow_lightest_pressure) return 0 if(3) - if(n < vsc.AF_NORMAL_MOVEMENT_THRESHOLD) return 0 + if(n < vsc.airflow_light_pressure) return 0 if(4,5) - if(n < vsc.AF_LARGE_MOVEMENT_THRESHOLD) return 0 + if(n < vsc.airflow_medium_pressure) return 0 -proc/Airflow(zone/A,zone/B,n) +//The main airflow code. Called by zone updates. +//Zones A and B are air zones. n represents the amount of air moved. - //Now n is a percent of one atm. - n = round((n/vsc.AF_PERCENT_OF)*100,0.1) +proc/Airflow(zone/A,zone/B) + + var/n = B.air.pressure - A.air.pressure //Don't go any further if n is lower than the lowest value needed for airflow. - if(abs(n) < vsc.AF_TINY_MOVEMENT_THRESHOLD) return + if(abs(n) < vsc.airflow_lightest_pressure) return //These turfs are the midway point between A and B, and will be the destination point for thrown objects. var/list/connected_turfs = A.connections[B] //Get lists of things that can be thrown across the room for each zone. - var/list/pplz = A.movables() - var/list/otherpplz = B.movables() + var/list/pplz = A.movable_objects + var/list/otherpplz = B.movable_objects for(var/atom/movable/M in pplz) + if(M.last_airflow > world.time - 150) continue + //Check for knocking people over - if(ismob(M) && n > vsc.AF_HUMAN_STUN_THRESHOLD) + if(ismob(M) && n > vsc.airflow_medium_pressure) if(M:nodamage) continue M:airflow_stun() if(M.check_airflow_movable(n)) //Check for things that are in range of the midpoint turfs. - var/fail = 1 + var/list/close_turfs = list() for(var/turf/U in connected_turfs) - if(M in range(U)) fail = 0 - if(fail) continue + if(M in range(U)) close_turfs += U + if(!close_turfs.len) continue //If they're already being tossed, don't do it again. if(!M.airflow_speed) - M.airflow_dest = pick(connected_turfs) //Pick a random midpoint to fly towards. + M.airflow_dest = pick(close_turfs) //Pick a random midpoint to fly towards. - spawn M.GotoAirflowDest(abs(n) * (vsc.AF_SPEED_MULTIPLIER/10)) - //Send the object flying at a speed determined by n and AF_SPEED_MULTIPLIER. + spawn M.GotoAirflowDest(abs(n)/20) //Do it again for the stuff in the other zone, making it fly away. for(var/atom/movable/M in otherpplz) - if(ismob(M) && abs(n) > vsc.AF_HUMAN_STUN_THRESHOLD) + if(M.last_airflow > world.time - 150) continue + + if(ismob(M) && abs(n) > vsc.airflow_medium_pressure) if(M:nodamage) continue M:airflow_stun() if(M.check_airflow_movable(abs(n))) - var/fail = 1 + var/list/close_turfs = list() for(var/turf/U in connected_turfs) - if(M in range(U)) fail = 0 - if(fail) continue + if(M in range(U)) close_turfs += U + if(!close_turfs.len) continue - if(M && !M.airflow_speed) + //If they're already being tossed, don't do it again. + if(!M.airflow_speed) - M.airflow_dest = pick(connected_turfs) + M.airflow_dest = pick(close_turfs) //Pick a random midpoint to fly towards. - spawn M.RepelAirflowDest(abs(n) * (vsc.AF_SPEED_MULTIPLIER/10)) + spawn M.RepelAirflowDest(abs(n)/20) proc/AirflowSpace(zone/A) //The space version of the Airflow(A,B,n) proc. - var/n = (A.air.oxygen + A.air.nitrogen + A.air.carbon_dioxide)*vsc.AF_SPACE_MULTIPLIER - //Here, n is determined by the space multiplier constant and the zone's air. + var/n = A.air.pressure + //Here, n is determined by only the pressure in the room. - n = round((n/vsc.AF_PERCENT_OF)*100,0.1) - - if(n < vsc.AF_TINY_MOVEMENT_THRESHOLD) return + if(n < vsc.airflow_lightest_pressure) return var/list/connected_turfs = A.space_tiles //The midpoints are now all the space connections. - var/list/pplz = A.movables() //We only need to worry about things in the zone, not things in space. + var/list/pplz = A.movable_objects //We only need to worry about things in the zone, not things in space. for(var/atom/movable/M in pplz) - if(ismob(M) && n > vsc.AF_HUMAN_STUN_THRESHOLD) + if(M.last_airflow > world.time - 150) continue + + if(ismob(M) && n > vsc.airflow_medium_pressure) if(M:nodamage) continue M:airflow_stun() if(M.check_airflow_movable(n)) - var/fail = 1 + var/list/close_turfs = list() for(var/turf/U in connected_turfs) - if(M in range(U)) fail = 0 - if(fail) continue + if(M in range(U)) close_turfs += U + if(!close_turfs.len) continue + //If they're already being tossed, don't do it again. if(!M.airflow_speed) - M.airflow_dest = pick(connected_turfs) + + M.airflow_dest = pick(close_turfs) //Pick a random midpoint to fly towards. spawn - if(M) M.GotoAirflowDest(n * (vsc.AF_SPEED_MULTIPLIER/10)) + if(M) M.GotoAirflowDest(n/20) //Sometimes shit breaks, and M isn't there after the spawn. -proc/AirflowRepel(turf/T,n,per = 0) - - //This one is used for air escaping from canisters. - var/zone/A = T.zone - if(!A) return - - n *= vsc.AF_CANISTER_MULTIPLIER - - if(!per) - n = round((n/vsc.AF_PERCENT_OF) * 100,0.1) - - if(n < 0) return - if(abs(n) > vsc.AF_TINY_MOVEMENT_THRESHOLD) - - var/list/pplz = A.movables() - - for(var/atom/movable/M in pplz) - var/relative_n = n / max(1,get_dist(T,M)/2) - if(ismob(M) && relative_n > vsc.AF_HUMAN_STUN_THRESHOLD) - if(M:nodamage) continue - M:airflow_stun() - - if(M.check_airflow_movable(relative_n)) - - if(!(M in range(T))) continue //Recall that T is the center of the repelling force. - - if(!M.airflow_speed) - M.airflow_dest = T - spawn M.RepelAirflowDest(relative_n * (vsc.AF_SPEED_MULTIPLIER/10)) - -proc/AirflowAttract(turf/T,n,per=0) - - //Same as above, but attracts objects to the target. - - var/zone/A = T.zone - if(!A) return - - n *= vsc.AF_CANISTER_MULTIPLIER - - if(!per) - n = round((n/vsc.AF_PERCENT_OF) * 100,0.1) - - if(n < 0) return - if(abs(n) > vsc.AF_TINY_MOVEMENT_THRESHOLD) - //world << "Airflow!" - var/list/pplz = A.movables() - for(var/atom/movable/M in pplz) - //world << "[M] / \..." - - var/relative_n = n / max(1,get_dist(T,M)/2) - - if(ismob(M) && relative_n > vsc.AF_HUMAN_STUN_THRESHOLD) - if(M:nodamage) continue - M:airflow_stun() - - if(M.check_airflow_movable(relative_n)) - - if(!(M in range(T))) continue - - if(!M.airflow_speed) - M.airflow_dest = T - spawn M.GotoAirflowDest(relative_n * (vsc.AF_SPEED_MULTIPLIER/10)) - atom/movable var/turf/airflow_dest var/airflow_speed = 0 var/airflow_time = 0 + var/last_airflow = 0 proc/GotoAirflowDest(n) if(!airflow_dest) return if(airflow_speed < 0) return + if(last_airflow > world.time - 150) return if(airflow_speed) airflow_speed = n return + last_airflow = world.time if(airflow_dest == loc) step_away(src,loc) if(ismob(src)) @@ -407,7 +243,7 @@ atom/movable while(airflow_speed > 0) if(airflow_speed <= 0) return airflow_speed = min(airflow_speed,15) - airflow_speed -= vsc.AF_SPEED_DECAY + airflow_speed -= vsc.airflow_speed_decay if(airflow_speed > 7) if(airflow_time++ >= airflow_speed - 7) sleep(1 * tick_multiplier) @@ -420,17 +256,18 @@ atom/movable step_towards(src, src.airflow_dest) if(ismob(src) && src:client) src:client:move_delay = world.time + 10 airflow_dest = null - airflow_speed = -1 - spawn(150 * tick_multiplier) airflow_speed = 0 + airflow_speed = 0 if(od) density = 0 proc/RepelAirflowDest(n) if(!airflow_dest) return if(airflow_speed < 0) return + if(last_airflow > world.time - 150) return if(airflow_speed) airflow_speed = n return + last_airflow = world.time if(airflow_dest == loc) step_away(src,loc) if(ismob(src)) @@ -455,7 +292,7 @@ atom/movable while(airflow_speed > 0) if(airflow_speed <= 0) return airflow_speed = min(airflow_speed,15) - airflow_speed -= vsc.AF_SPEED_DECAY + airflow_speed -= vsc.airflow_speed_decay if(airflow_speed > 7) if(airflow_time++ >= airflow_speed - 7) sleep(1 * tick_multiplier) @@ -468,8 +305,7 @@ atom/movable step_towards(src, src.airflow_dest) if(ismob(src) && src:client) src:client:move_delay = world.time + 10 airflow_dest = null - airflow_speed = -1 - spawn(150 * tick_multiplier) airflow_speed = 0 + airflow_speed = 0 if(od) density = 0 @@ -481,8 +317,7 @@ atom/movable . = ..() atom/movable/proc/airflow_hit(atom/A) - airflow_speed = -1 - spawn(50 * tick_multiplier) airflow_speed = 0 + airflow_speed = 0 airflow_dest = null mob/airflow_hit(atom/A) @@ -498,8 +333,7 @@ obj/airflow_hit(atom/A) . = ..() obj/item/airflow_hit(atom/A) - airflow_speed = -1 - spawn(50 * tick_multiplier) airflow_speed = 0 + airflow_speed = 0 airflow_dest = null mob/living/carbon/human/airflow_hit(atom/A) @@ -511,76 +345,43 @@ mob/living/carbon/human/airflow_hit(atom/A) src.wear_suit.add_blood(src) if (src.w_uniform) src.w_uniform.add_blood(src) - var/b_loss = airflow_speed * vsc.AF_DAMAGE_MULTIPLIER - for(var/organ in src:organs) - var/datum/organ/external/temp = src:organs["[organ]"] - if (istype(temp, /datum/organ/external)) - switch(temp.name) - if("head") - temp.take_damage(b_loss * 0.2, 0) - if("chest") - temp.take_damage(b_loss * 0.4, 0) - if("diaper") - temp.take_damage(b_loss * 0.1, 0) - spawn UpdateDamageIcon() + var/b_loss = airflow_speed * vsc.airflow_damage + + var/blocked = run_armor_check("head","melee") + apply_damage(b_loss/3, BRUTE, "head", blocked, 0, "Airflow") + + blocked = run_armor_check("chest","melee") + apply_damage(b_loss/3, BRUTE, "chest", blocked, 0, "Airflow") + + blocked = run_armor_check("groin","melee") + apply_damage(b_loss/3, BRUTE, "groin", blocked, 0, "Airflow") + if(airflow_speed > 10) - paralysis += round(airflow_speed * vsc.AF_STUN_MULTIPLIER) + paralysis += round(airflow_speed * vsc.airflow_stun) stunned = max(stunned,paralysis + 3) else - stunned += round(airflow_speed * vsc.AF_STUN_MULTIPLIER/2) + stunned += round(airflow_speed * vsc.airflow_stun/2) . = ..() -zone/proc/movables() - . = list() - for(var/turf/T in contents) - for(var/atom/A in T) - . += A +turf/simulated/Entered(atom/A) + . = ..() + if(istype(A,/atom/movable) && zone) + zone.movable_objects += A -proc/Get_Dir(atom/S,atom/T) //Shamelessly stolen from AJX.AdvancedGetDir - var/GDist=get_dist(S,T) - var/GDir=get_dir(S,T) - if(GDist<=3) - if(GDist==0) return 0 - if(GDist==1) - return GDir +turf/simulated/Exited(atom/A) + . = ..() + if(istype(A,/atom/movable) && zone) + zone.movable_objects -= A +atom/movable/New(turf/simulated/T) + . = ..() + if(istype(T)) + if(T.zone) + T.zone.movable_objects += src - var/X1=S.x*10 - var/X2=T.x*10 - var/Y1=S.y*10 - var/Y2=T.y*10 - var/Ref - if(GDir==NORTHEAST) - Ref=(X2/X1)*Y1 - if(Ref-1>Y2) .=EAST - else if(Ref+1Y2) .=WEST - else if(Ref+1Y2) .=SOUTH - else if(Ref+1Y2) .=SOUTH - else if(Ref+1> vsc - del F - world.log << "TWEAKS: Airflow, Plasma and Damage settings loaded." \ No newline at end of file +atom/movable/Del() + var/turf/simulated/T = loc + if(istype(T)) + if(T.zone) + T.zone.movable_objects -= src + . = ..() \ No newline at end of file diff --git a/code/ZAS/Definition.dm b/code/ZAS/Definition.dm index 90e88a6c613..cdf411fe68c 100644 --- a/code/ZAS/Definition.dm +++ b/code/ZAS/Definition.dm @@ -12,4 +12,6 @@ zone list/connected_zones //Parallels connections, but lists zones to which this one is connected and the number //of points they're connected at. list/space_tiles // Any space tiles in this list will cause air to flow out. - last_update = 0 \ No newline at end of file + last_update = 0 + + list/movable_objects = list() //All the things that can be tossed by airflow. \ No newline at end of file diff --git a/code/ZAS/Processing.dm b/code/ZAS/Processing.dm index d80048cbb13..7bd3c61ecf8 100644 --- a/code/ZAS/Processing.dm +++ b/code/ZAS/Processing.dm @@ -50,6 +50,8 @@ zone //Add checks to ensure that we're not sucking air out of an empty room. if(total_space && air.total_moles > 0.1 && air.temperature > TCMB+0.5) //If there is space, air should flow out of the zone. + //if(abs(air.pressure) > vsc.airflow_lightest_pressure) + // AirflowSpace(src) ShareSpace(air,total_space*(vsc.zone_share_percent/100)) //React the air here. @@ -97,6 +99,8 @@ zone for(var/zone/Z in connected_zones) //Ensure we're not doing pointless calculations on equilibrium zones. if(abs(air.total_moles - Z.air.total_moles) > 0.1 || abs(air.temperature - Z.air.temperature) > 0.1) + //if(abs(Z.air.pressure - air.pressure) > vsc.airflow_lightest_pressure) + // Airflow(src,Z) ShareRatio(air,Z.air,connected_zones[Z]*(vsc.zone_share_percent/100)) proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, ratio)