prevent shadekin conflagration in phase (#18915)

* prevent shadekin conflagration

* don't do this either
This commit is contained in:
Will
2025-12-18 06:37:01 -08:00
committed by GitHub
parent 002348ae13
commit 57f85c4af5
4 changed files with 13 additions and 0 deletions
+2
View File
@@ -326,6 +326,8 @@
// ++++ROCKDTBEN++++ MOB PROCS //END
/mob/living/carbon/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(is_incorporeal())
return
..()
var/temp_inc = max(min(BODYTEMP_HEATING_MAX*(1-get_heat_protection()), exposed_temperature - bodytemperature), 0)
bodytemperature += temp_inc
+6
View File
@@ -2,6 +2,8 @@
//altered this to cap at the temperature of the fire causing it, using the same 1:1500 value as /mob/living/carbon/human/handle_fire() in human/life.dm
/mob/living/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(is_incorporeal())
return
if(exposed_temperature)
if(fire_stacks < exposed_temperature/1500) // Subject to balance
adjust_fire_stacks(2)
@@ -108,6 +110,10 @@ GLOBAL_LIST_EMPTY(fire_appearances)
if(!istype(spread_to))
return
// Shadekin checkkkkk~~~
if(is_incorporeal() || spread_to.is_incorporeal())
return
// can't spread fire to mobs that don't catch on fire
if(HAS_TRAIT(spread_to, TRAIT_NOFIRE_SPREAD) || HAS_TRAIT(src, TRAIT_NOFIRE_SPREAD))
return
@@ -370,6 +370,8 @@
return canmove
/mob/living/silicon/robot/fire_act()
if(is_incorporeal())
return
if(!on_fire) //Silicons don't gain stacks from hotspots, but hotspots can ignite them
ignite_mob()