cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15815 from datlo/heat-resist-fix

Browse Source 
Make the heat resistance trait fully fireproof
This commit is contained in:
Fox McCloud
2021-05-15 10:37:34 -04:00
committed by GitHub
parent f76efc8f73 38e0183df8
commit 6c6b1b53f0
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+3
View File
@@ -365,6 +365,9 @@
bodytemperature += (BODYTEMP_HEATING_MAX + (fire_stacks * 12))
/mob/living/carbon/human/proc/get_thermal_protection()
if(HAS_TRAIT(src, TRAIT_RESISTHEAT))
return FIRE_IMMUNITY_MAX_TEMP_PROTECT
var/thermal_protection = 0 //Simple check to estimate how protected we are against multiple temperatures
if(wear_suit)
if(wear_suit.max_heat_protection_temperature >= FIRE_SUIT_MAX_TEMP_PROTECT)