From d564e1e2f3f9d96312750239ce152a81831a6abe Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Thu, 17 Dec 2015 01:48:11 -0600 Subject: [PATCH] Lava proofing --- code/datums/spells/ethereal_jaunt.dm | 1 + code/modules/mob/living/bloodcrawl.dm | 2 ++ code/modules/power/singularity/singularity.dm | 1 + 3 files changed, 4 insertions(+) diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index bb0a0d7b8c6..f31bcff297a 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -88,6 +88,7 @@ density = 0 anchored = 1 invisibility = 60 + burn_state = LAVA_PROOF /obj/effect/dummy/spell_jaunt/Destroy() // Eject contents if deleted somehow diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index 0b336378dd4..dcdee906810 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -9,6 +9,8 @@ density = 0 anchored = 1 invisibility = 60 + burn_state = LAVA_PROOF + obj/effect/dummy/slaughter/relaymove(mob/user, direction) if (!src.canmove || !direction) return diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 04b17c1e4d7..e9dda2cb13b 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -26,6 +26,7 @@ var/last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing var/last_warning var/consumedSupermatter = 0 //If the singularity has eaten a supermatter shard and can go to stage six + burn_state = LAVA_PROOF /obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0) //CARN: admin-alert for chuckle-fuckery.