Skip to content

body temperature tweaks #7193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Absolucy merged 4 commits into from
Jul 18, 2025
Merged

body temperature tweaks #7193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ae9afe
body temperature tweaks
Absolucy Jul 16, 2025
844c90c
pretty sure that's meant to be `min`
Absolucy Jul 16, 2025
f0f7e1d
use `ISINRANGE_EX` macro for that
Absolucy Jul 16, 2025
acc520d
guh extra space
Absolucy Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/modules/mob/living/life.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@

// Cap increase and decrease
temp_change = temp_change < 0 ? max(temp_change, BODYTEMP_HOMEOSTASIS_COOLING_MAX) : min(temp_change, BODYTEMP_HOMEOSTASIS_HEATING_MAX)
// Boost when returning to equilibrium
if(!ISINRANGE_EX(equilibrium_temp, standard_body_temperature - 2, standard_body_temperature + 2))
temp_change *= 3

adjust_bodytemperature(temp_change * seconds_per_tick) // No use_insulation because we manually account for it

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/living_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
/// Note that more of this = more nutrition is consumed every life tick.
var/temperature_homeostasis_speed = 0.5
/// Protection (insulation) from temperature changes, max 1
var/temperature_insulation = 0
var/temperature_insulation = 0.1

/// Whether we currently have temp alerts, minor optimization
VAR_PRIVATE/temp_alerts = FALSE
2 changes: 2 additions & 0 deletions monkestation/code/modules/temperature_overhaul/temperature_proc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@
if(amount == 0)
return 0
amount = round(amount, 0.01)
min_temp = max(min_temp, TCMB)
max_temp = min(max_temp, 603.15)

if(bodytemperature >= min_temp && bodytemperature <= max_temp)
var/old_temp = bodytemperature
Expand Down
Loading