Makes incorporeal things properly immune to bonfires and lava

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()

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 ..()