Skip to content

Commit

Permalink
yeagh
Browse files Browse the repository at this point in the history
  • Loading branch information
Erikafox committed Dec 8, 2024
1 parent 9f831ba commit 7717631
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions code/__DEFINES/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
/// The natural temperature for a body
#define HUMAN_BODYTEMP_NORMAL 310.15
/// This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive.
#define HUMAN_BODYTEMP_AUTORECOVERY_DIVISOR 11
#define HUMAN_BODYTEMP_AUTORECOVERY_DIVISOR 16
/// Minimum amount of kelvin moved toward 310K per tick. So long as abs(310.15 - bodytemp) is more than 50.
#define HUMAN_BODYTEMP_AUTORECOVERY_MINIMUM 12
///Similar to the HUMAN_BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster.
#define HUMAN_BODYTEMP_COLD_DIVISOR 15
#define HUMAN_BODYTEMP_COLD_DIVISOR 10
/// Similar to the HUMAN_BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to gain bodytemp faster.
#define HUMAN_BODYTEMP_HEAT_DIVISOR 15
#define HUMAN_BODYTEMP_HEAT_DIVISOR 10
/// The maximum number of degrees that your body can cool in 1 tick, due to the environment, when in a cold area.
#define HUMAN_BODYTEMP_COOLING_MAX -100
/// The maximum number of degrees that your body can heat up in 1 tick, due to the environment, when in a hot area.
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/shower.dm
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@
switch(current_temperature)
if(SHOWER_FREEZING)
if(iscarbon(L))
C.adjust_bodytemperature(-2)
C.adjust_bodytemperature(-2, 280)
to_chat(L, "<span class='warning'>[src] is cold!</span>")
if(SHOWER_BOILING)
if(iscarbon(L))
C.adjust_bodytemperature(2, 0, 350)
C.adjust_bodytemperature(2, 0, 330)
to_chat(L, "<span class='danger'>[src] is hot!</span>")
if(SHOWER_NORMAL)
if(iscarbon(L))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
name = "ice blast"
damage = 5
nodamage = FALSE
temperature = -2
temperature = -40

/mob/living/simple_animal/hostile/asteroid/ice_demon/OpenFire()
// Sentient ice demons teleporting has been linked to server crashes
Expand Down
6 changes: 3 additions & 3 deletions code/modules/surgery/organs/lungs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
var/hot_message = "your face burning and a searing heat"
var/warm_message = "warm air"
var/warm_threshold = T20C+20
var/heat_level_1_threshold = 316
var/heat_level_2_threshold = 323
var/heat_level_3_threshold = 343
var/heat_level_1_threshold = 323
var/heat_level_2_threshold = 335
var/heat_level_3_threshold = 350
var/heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_1
var/heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_2
var/heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3
Expand Down

0 comments on commit 7717631

Please sign in to comment.