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

Merge pull request #9683 from Ghommie/Ghommie-cit303

Browse Source 
Dullahans fixes and QoL.
This commit is contained in:
kevinz000
2019-11-14 15:52:11 -07:00
committed by GitHub
parent 3cf1b09e0c e0afed1f8e
commit 318c03cc28
15 changed files with 128 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/weather/weather_types/ash_storm.dm
+1 -1
View File
@@ -80,7 +80,7 @@
return TRUE
if(ishuman(L)) //Are you immune?
var/mob/living/carbon/human/H = L
var/thermal_protection = H.get_thermal_protection()
var/thermal_protection = H.easy_thermal_protection()
if(thermal_protection >= FIRE_IMMUNITY_MAX_TEMP_PROTECT)
return TRUE
if(isliving(L))// if we're a non immune mob inside an immune mob we have to reconsider if that mob is immune to protect ourselves