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

Merge pull request #5349 from Citadel-Station-13/upstream-merge-35374

Browse Source 
[MIRROR] Fix pressure damage not taking effect properly
This commit is contained in:
deathride58
2018-02-07 19:09:52 +00:00
committed by GitHub
parent 9865fec9f8 7e09c3ff65
commit e7fa382cd4
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species.dm
-2
View File
@@ -1622,8 +1622,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
//Body temperature is adjusted in two parts: first there your body tries to naturally preserve homeostasis (shivering/sweating), then it reacts to the surrounding environment //Body temperature is adjusted in two parts: first there your body tries to naturally preserve homeostasis (shivering/sweating), then it reacts to the surrounding environment
//Thermal protection (insulation) has mixed benefits in two situations (hot in hot places, cold in hot places) //Thermal protection (insulation) has mixed benefits in two situations (hot in hot places, cold in hot places)
if(!H.on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases if(!H.on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
if((abs(BODYTEMP_NORMAL - H.bodytemperature) <= 5) && (abs(BODYTEMP_NORMAL - loc_temp) <= 25))
return //Performance saver
var/natural = 0 var/natural = 0
if(H.stat != DEAD) if(H.stat != DEAD)
natural = H.natural_bodytemperature_stabilization() natural = H.natural_bodytemperature_stabilization()