diff --git a/code/ZAS/Creation.dm b/code/ZAS/Creation.dm index ff20eed6f2a..69a8e1425fe 100644 --- a/code/ZAS/Creation.dm +++ b/code/ZAS/Creation.dm @@ -1,5 +1,6 @@ zone New(turf/start) + . = ..() //Get the turfs that are part of the zone using a floodfill method if(istype(start,/list)) contents = start diff --git a/code/ZAS/FEA_system.dm b/code/ZAS/FEA_system.dm index 4f9bc2aa11f..27ce9995e19 100644 --- a/code/ZAS/FEA_system.dm +++ b/code/ZAS/FEA_system.dm @@ -136,15 +136,12 @@ datum var/start_time = world.timeofday for(var/turf/simulated/S in world) - if(S.z < 5) - if(!S.zone && !S.blocks_air) - if(S.CanPass(null, S, 0, 0)) - new/zone(S) + if(!S.zone && !S.blocks_air) + if(S.CanPass(null, S, 0, 0)) + new/zone(S) for(var/turf/simulated/S in world) - if(S.z < 5) - S.update_air_properties() - // S.check_connections() + S.update_air_properties() world << "\red \b Geometry processed in [time2text(world.timeofday-start_time, "mm:ss")] minutes!" spawn start() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index ef0cd7bdb43..2be48979c90 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -585,6 +585,7 @@ if(breath.temperature > (T0C+66) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :( if(prob(20)) src << "\red You feel a searing heat in your lungs!" + take_overall_damage(0,2) //burn them a bit. fire_alert = max(fire_alert, 1) else fire_alert = 0 @@ -603,8 +604,6 @@ if(istype(loc, /turf/space)) environment_heat_capacity = loc:heat_capacity loc_temp = 2.7 - else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) - loc_temp = loc:air_contents.temperature else loc_temp = environment.temperature diff --git a/code/setup.dm b/code/setup.dm index 9060feafac7..9be56d9f79e 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -19,9 +19,9 @@ #define MOLES_PLASMA_VISIBLE 0.5 //Moles in a standard cell after which plasma is visible -#define SPECIFIC_HEAT_TOXIN 700 -#define SPECIFIC_HEAT_AIR 100 -#define SPECIFIC_HEAT_CDO 150 +#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)