shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15415 from bunny232/master

Browse Source 
The pool's safe temperatures are now within a somewhat reasonable range.
This commit is contained in:
Lin
2021-12-10 18:42:52 +00:00
committed by GitHub
parent e18f687c05 4904f45b7c
commit d2a91c37b7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/pool/pool_controller.dm
+2 -2
View File
@@ -235,10 +235,10 @@
if(POOL_SCALDING) //Scalding if(POOL_SCALDING) //Scalding
M.adjust_bodytemperature(50,0,500) M.adjust_bodytemperature(50,0,500)
if(POOL_WARM) //Warm 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. //Normal temp does nothing, because it's just room temperature water.
if(POOL_COOL) 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 if(POOL_FRIGID) //Freezing
M.adjust_bodytemperature(-60) //cool mob at -35k per cycle, less would not affect the mob enough. M.adjust_bodytemperature(-60) //cool mob at -35k per cycle, less would not affect the mob enough.
if(M.bodytemperature <= 50 && !M.stat) if(M.bodytemperature <= 50 && !M.stat)