Skip to content

Temp bodytemp patch #718

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

Open
MrMelbert wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Temp bodytemp patch #718

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d212d56
Temp bodytemp patch
MrMelbert May 17, 2025
cee959c
Merge branch 'master' into therma_tweak
MrMelbert Jun 23, 2025
31f5d62
Zoop
MrMelbert Jul 16, 2025
9ef3dc6
Merge branch 'therma_tweak' of https://github.com/MrMelbert/MapleStat…
MrMelbert 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
4 changes: 4 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 @@ -263,6 +263,10 @@
var/temp_change = temp_sign * (1 - (thermal_protection * protection_modifier)) * ((0.1 * max(1, abs(temp_delta))) ** 1.8) * temperature_normalization_speed
// Cap increase and decrease
temp_change = temp_change < 0 ? max(temp_change, BODYTEMP_ENVIRONMENT_COOLING_MAX) : min(temp_change, BODYTEMP_ENVIRONMENT_HEATING_MAX)
// Boost when returning to equilibrium
if(equilibrium_temp < standard_body_temperature - 2 KELVIN || equilibrium_temp > standard_body_temperature + 2 KELVIN)
temp_change *= 3

adjust_body_temperature(temp_change * seconds_per_tick) // no use_insulation beacuse we account for it manually

/mob/living/silicon/handle_environment(datum/gas_mixture/environment, seconds_per_tick, times_fired)
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 @@ -258,7 +258,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
Expand Down
2 changes: 2 additions & 0 deletions code/modules/mob/status_procs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@
if(amount == 0)
return 0
amount = round(amount, 0.01)
min_temp = max(min_temp, TCMB)
max_temp = max(max_temp, CELCIUS_TO_KELVIN(330 CELCIUS))
Copy link

@Absolucy Absolucy Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is that meant to be max(), rather than min()?

Copy link
Owner Author

@MrMelbert MrMelbert Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps should be a min


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