From 2099f185060d311cfacf76e2859ad7decefac2dd Mon Sep 17 00:00:00 2001 From: evan Date: Tue, 7 Dec 2021 21:28:30 -0500 Subject: [PATCH 1/5] Update pool_controller.dm --- code/modules/pool/pool_controller.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/pool/pool_controller.dm b/code/modules/pool/pool_controller.dm index 142690566b..ff52fb9fef 100644 --- a/code/modules/pool/pool_controller.dm +++ b/code/modules/pool/pool_controller.dm @@ -235,10 +235,10 @@ if(POOL_SCALDING) //Scalding M.adjust_bodytemperature(50,0,500) if(POOL_WARM) //Warm - M.adjust_bodytemperature(20,0,360) //Heats up mobs till the thermometer shows up + M.adjust_bodytemperature(20,0,323.15) //Heats up mobs till the thermometer shows up //Normal temp does nothing, because it's just room temperature water. if(POOL_COOL) - M.adjust_bodytemperature(-20,250) //Cools mobs till the thermometer shows up + M.adjust_bodytemperature(-20,274.15) //Cools mobs till the thermometer shows up if(POOL_FRIGID) //Freezing M.adjust_bodytemperature(-60) //cool mob at -35k per cycle, less would not affect the mob enough. if(M.bodytemperature <= 50 && !M.stat) From afe6179191d77613522d6264f79f94d1b035bc36 Mon Sep 17 00:00:00 2001 From: evan Date: Tue, 7 Dec 2021 21:39:17 -0500 Subject: [PATCH 2/5] Update species.dm --- code/modules/mob/living/carbon/human/species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 3976b1ebca..1918896728 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -2195,7 +2195,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 1) if(-20 to 0) //This is the sweet spot where air is considered normal H.clear_alert("tempfeel") - if(0 to 15) //When the air around you matches your body's temperature, you'll start to feel warm. + if(1 to 15) //When the air around you matches your body's temperature, you'll start to feel warm. H.throw_alert("tempfeel", /atom/movable/screen/alert/hot, 1) if(15 to 30) H.throw_alert("tempfeel", /atom/movable/screen/alert/hot, 2) From 5a7dbfe9ef781eafb2478921512a10774507d364 Mon Sep 17 00:00:00 2001 From: evan Date: Tue, 7 Dec 2021 21:50:16 -0500 Subject: [PATCH 3/5] Update pool_controller.dm --- code/modules/pool/pool_controller.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/pool/pool_controller.dm b/code/modules/pool/pool_controller.dm index ff52fb9fef..142690566b 100644 --- a/code/modules/pool/pool_controller.dm +++ b/code/modules/pool/pool_controller.dm @@ -235,10 +235,10 @@ if(POOL_SCALDING) //Scalding M.adjust_bodytemperature(50,0,500) if(POOL_WARM) //Warm - M.adjust_bodytemperature(20,0,323.15) //Heats up mobs till the thermometer shows up + M.adjust_bodytemperature(20,0,360) //Heats up mobs till the thermometer shows up //Normal temp does nothing, because it's just room temperature water. if(POOL_COOL) - M.adjust_bodytemperature(-20,274.15) //Cools mobs till the thermometer shows up + M.adjust_bodytemperature(-20,250) //Cools mobs till the thermometer shows up if(POOL_FRIGID) //Freezing M.adjust_bodytemperature(-60) //cool mob at -35k per cycle, less would not affect the mob enough. if(M.bodytemperature <= 50 && !M.stat) From 0ca84b7cc52ff2dc51d4f4aa4a239108ea2d2fbf Mon Sep 17 00:00:00 2001 From: evan Date: Tue, 7 Dec 2021 22:11:56 -0500 Subject: [PATCH 4/5] Update species.dm woops, forgot something --- code/modules/mob/living/carbon/human/species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 1918896728..fcf9360e07 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -2193,7 +2193,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 2) if(-35 to -20) H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 1) - if(-20 to 0) //This is the sweet spot where air is considered normal + if(-20 to 0.9) //This is the sweet spot where air is considered normal H.clear_alert("tempfeel") if(1 to 15) //When the air around you matches your body's temperature, you'll start to feel warm. H.throw_alert("tempfeel", /atom/movable/screen/alert/hot, 1) From da5140e1cacb4bc12d5ae37cdeb595068e15f540 Mon Sep 17 00:00:00 2001 From: bunny232 Date: Wed, 8 Dec 2021 05:21:52 -0500 Subject: [PATCH 5/5] Update code/modules/mob/living/carbon/human/species.dm Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com> --- code/modules/mob/living/carbon/human/species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index fcf9360e07..d81297d41f 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -2193,7 +2193,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 2) if(-35 to -20) H.throw_alert("tempfeel", /atom/movable/screen/alert/cold, 1) - if(-20 to 0.9) //This is the sweet spot where air is considered normal + if(-20 to 1) //This is the sweet spot where air is considered normal H.clear_alert("tempfeel") if(1 to 15) //When the air around you matches your body's temperature, you'll start to feel warm. H.throw_alert("tempfeel", /atom/movable/screen/alert/hot, 1)