From e70eb23dce749a02728e64cfc050cdc982758617 Mon Sep 17 00:00:00 2001 From: Heroman Date: Mon, 5 Jul 2021 18:05:46 +1000 Subject: [PATCH] Makes incorporeal things properly immune to bonfires and lava --- code/game/objects/structures/bonfire.dm | 5 +++-- code/game/turfs/simulated/lava.dm | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm index 92aad9af879..8ce86945cee 100644 --- a/code/game/objects/structures/bonfire.dm +++ b/code/game/objects/structures/bonfire.dm @@ -180,8 +180,9 @@ O.fire_act(null, 1000, 500) else if(isliving(A) && get_fuel_amount() > 4) var/mob/living/L = A - L.adjust_fire_stacks(get_fuel_amount() / 4) - L.IgniteMob() + if(!(L.is_incorporeal())) + L.adjust_fire_stacks(get_fuel_amount() / 4) + L.IgniteMob() /obj/structure/bonfire/update_icon() cut_overlays() diff --git a/code/game/turfs/simulated/lava.dm b/code/game/turfs/simulated/lava.dm index 67524c05ef0..0e842626ab3 100644 --- a/code/game/turfs/simulated/lava.dm +++ b/code/game/turfs/simulated/lava.dm @@ -95,6 +95,6 @@ // Tells AI mobs to not suicide by pathing into lava if it would hurt them. /turf/simulated/floor/lava/is_safe_to_enter(mob/living/L) - if(!is_safe() && !L.hovering) + if(!is_safe() && !L.hovering && !(L.is_incorporeal())) return FALSE return ..() \ No newline at end of file