From 7717631aac75a0f1ab1f5e6f0151b6873990b996 Mon Sep 17 00:00:00 2001
From: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Date: Sun, 8 Dec 2024 16:09:26 -0500
Subject: [PATCH] yeagh
---
code/__DEFINES/species.dm | 6 +++---
code/game/objects/structures/shower.dm | 4 ++--
.../living/simple_animal/hostile/mining_mobs/ice_demon.dm | 2 +-
code/modules/surgery/organs/lungs.dm | 6 +++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/code/__DEFINES/species.dm b/code/__DEFINES/species.dm
index 73b5f601a7f4..a43b2e23ad95 100644
--- a/code/__DEFINES/species.dm
+++ b/code/__DEFINES/species.dm
@@ -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.
diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm
index be4aa601e10f..f1b1e8190f44 100644
--- a/code/game/objects/structures/shower.dm
+++ b/code/game/objects/structures/shower.dm
@@ -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, "[src] is cold!")
if(SHOWER_BOILING)
if(iscarbon(L))
- C.adjust_bodytemperature(2, 0, 350)
+ C.adjust_bodytemperature(2, 0, 330)
to_chat(L, "[src] is hot!")
if(SHOWER_NORMAL)
if(iscarbon(L))
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
index 17f189080d75..6a3b203a8981 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
@@ -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
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index cfe93bc00572..3121e4cf604d 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -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