From 76b326ea89262797fe2e691540eebdccf547908a Mon Sep 17 00:00:00 2001 From: retlaw34 <58402542+retlaw34@users.noreply.github.com> Date: Tue, 15 Oct 2024 13:48:32 -0700 Subject: [PATCH] fine tuning --- code/__DEFINES/species.dm | 2 +- code/datums/atmosphere/planetary.dm | 4 ++-- code/modules/mob/living/carbon/human/species.dm | 4 ++-- code/modules/mob/living/carbon/human/species_types/vox.dm | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/species.dm b/code/__DEFINES/species.dm index bf5ed52247c8..d3cf27ac546e 100644 --- a/code/__DEFINES/species.dm +++ b/code/__DEFINES/species.dm @@ -32,7 +32,7 @@ /// The body temperature limit the human body can take before it starts taking damage from cold. /// This also affects how fast the body normalises it's temperature when cold. /// 270k is about -3c, that is below freezing and would hurt over time. -#define HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT (HUMAN_BODYTEMP_NORMAL - 7) +#define HUMAN_BODYTEMP_COLD_DAMAGE_LIMIT (HUMAN_BODYTEMP_NORMAL - 8) //VOX DEFINES diff --git a/code/datums/atmosphere/planetary.dm b/code/datums/atmosphere/planetary.dm index 9c8d8c658471..9883b471c22b 100644 --- a/code/datums/atmosphere/planetary.dm +++ b/code/datums/atmosphere/planetary.dm @@ -51,8 +51,8 @@ maximum_pressure = LAVALAND_EQUIPMENT_EFFECT_PRESSURE - 1 - minimum_temp = 80 //fucking cold to - maximum_temp = 200 //still cold + minimum_temp = 200 //fucking cold to + maximum_temp = 240 //still cold //wasteplanet diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 8ca91e5af976..b617d1c8a985 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1922,7 +1922,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) //Stay hydrated. if(!(H.mob_biotypes & MOB_ROBOTIC) && H.reagents.has_reagent(/datum/reagent/water)) - burn_damage -= clamp(H.reagents.get_reagent_amount(/datum/reagent/water) /10, 0, 1.5) + burn_damage -= clamp(H.reagents.get_reagent_amount(/datum/reagent/water) /10, 0, 2) // Apply species and physiology modifiers to heat damage burn_damage = burn_damage * heatmod * H.physiology.heat_mod @@ -1975,7 +1975,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) firemodifier = min(firemodifier, 0) // this can go below 5 at log 2.5 - burn_damage = max(log(2 - firemodifier, (current_human.bodytemperature - current_human.get_body_temp_normal(apply_change=FALSE))) - 2,0) + burn_damage = max(log(2 - firemodifier, (current_human.bodytemperature - current_human.get_body_temp_normal(apply_change=FALSE))) - 2.5,0) return burn_damage /// Handle the air pressure of the environment diff --git a/code/modules/mob/living/carbon/human/species_types/vox.dm b/code/modules/mob/living/carbon/human/species_types/vox.dm index b1b61007d3fd..685ac19e8e6e 100644 --- a/code/modules/mob/living/carbon/human/species_types/vox.dm +++ b/code/modules/mob/living/carbon/human/species_types/vox.dm @@ -26,7 +26,7 @@ bodytemp_cold_divisor = VOX_BODYTEMP_COLD_DIVISOR bodytemp_autorecovery_min = VOX_BODYTEMP_AUTORECOVERY_MIN - max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 20 + max_temp_comfortable = HUMAN_BODYTEMP_NORMAL + 10 min_temp_comfortable = HUMAN_BODYTEMP_NORMAL - 20 bodytemp_heat_damage_limit = HUMAN_BODYTEMP_HEAT_DAMAGE_LIMIT + 10