Skip to content

Commit

Permalink
fine tuning
Browse files Browse the repository at this point in the history
  • Loading branch information
rye-rice committed Oct 15, 2024
1 parent 0b7fd51 commit 76b326e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/datums/atmosphere/planetary.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/species_types/vox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 76b326e

Please sign in to comment.