diff --git a/baystation12.dme b/baystation12.dme index d1a917f794e..6ddf22432bc 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1203,9 +1203,9 @@ #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\Debug.dm" #include "code\ZAS\Definition.dm" #include "code\ZAS\FEA_gas_mixture.dm" #include "code\ZAS\FEA_system.dm" diff --git a/code/ZAS/Processing.dm b/code/ZAS/Processing.dm index 48e51767eb1..3282e444f61 100644 --- a/code/ZAS/Processing.dm +++ b/code/ZAS/Processing.dm @@ -51,8 +51,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) + //if(abs(air.pressure) > vsc.airflow_lightest_pressure) + // AirflowSpace(src) ShareSpace(air,total_space*(zone_share_percent/100)) //React the air here. @@ -109,8 +109,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) + //if(abs(Z.air.pressure - air.pressure) > vsc.airflow_lightest_pressure) + // Airflow(src,Z) ShareRatio(air,Z.air,connected_zones[Z]*(zone_share_percent/100)) proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, ratio) diff --git a/code/modules/mob/living/carbon/human/hud_overlays.dm b/code/modules/mob/living/carbon/human/hud_overlays.dm index 4d09641fcdb..9163a8a6af9 100644 --- a/code/modules/mob/living/carbon/human/hud_overlays.dm +++ b/code/modules/mob/living/carbon/human/hud_overlays.dm @@ -4,4 +4,16 @@ mob/living/carbon/human var/image/sec_img var/image/sec2_img var/image/imp_img - var/image/health_img \ No newline at end of file + var/image/health_img + +mob/New() + . = ..() + antag_img = image('icons/mob/hud.dmi',src) + +mob/living/carbon/human/New() + . = ..() + med_img = image('icons/mob/hud.dmi',src) + sec_img = image('icons/mob/hud.dmi',src) + sec2_img = image('icons/mob/hud.dmi',src) + imp_img = image('icons/mob/hud.dmi',src) + health_img = image('icons/mob/hud.dmi',src) \ No newline at end of file diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index af336e04ee8..773bb2ca7c5 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ