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

Fix MMIs in mechs and firesuits being burned by ash storms (#34349)

Browse Source
This commit is contained in:
Tad Hardesty
2018-01-15 02:58:24 -06:00
committed by CitadelStationBot
parent a7b75651f9
commit aa774aeaea
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/weather/weather_types/ash_storm.dm
+9 -9
View File
@@ -70,16 +70,16 @@
sound_wo.stop() sound_wo.stop()
sound_wi.stop() sound_wi.stop()
/datum/weather/ash_storm/proc/is_ash_immune(mob/living/L) /datum/weather/ash_storm/proc/is_ash_immune(atom/L)
if(ismecha(L.loc)) //Mechs are immune while (L && !isturf(L))
return TRUE if(ismecha(L)) //Mechs are immune
if(ishuman(L)) //Are you immune?
var/mob/living/carbon/human/H = L
var/thermal_protection = H.get_thermal_protection()
if(thermal_protection >= FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT)
return TRUE return TRUE
if(istype(L.loc, /mob/living) && L.loc != L) //Matryoshka check if(ishuman(L)) //Are you immune?
return is_ash_immune(L.loc) var/mob/living/carbon/human/H = L
var/thermal_protection = H.get_thermal_protection()
if(thermal_protection >= FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT)
return TRUE
L = L.loc //Matryoshka check
return FALSE //RIP you return FALSE //RIP you
/datum/weather/ash_storm/weather_act(mob/living/L) /datum/weather/ash_storm/weather_act(mob/living/L)