From a6af5eadb458bd7e562dbfd2017b3fc939dc7929 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Mon, 29 Aug 2016 19:12:24 -0700 Subject: [PATCH] Revert "lavaproofing" This reverts commit e528b659151176c45b82d7a48ad09f7d3aa15298. --- code/modules/mining/lavaland/necropolis_chests.dm | 3 --- .../mob/living/simple_animal/hostile/megafauna/legion.dm | 1 - 2 files changed, 4 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index d8c22ddad52..99522e44faf 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -214,7 +214,6 @@ icon_state = "talisman" actions_types = list(/datum/action/item_action/immortality) var/cooldown = 0 - burn_state = LAVA_PROOF /datum/action/item_action/immortality name = "Immortality" @@ -493,7 +492,6 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended") var/summon_cooldown = 0 var/list/mob/dead/observer/spirits - burn_state = LAVA_PROOF /obj/item/weapon/melee/ghost_sword/New() ..() @@ -569,7 +567,6 @@ desc = "You're not actually going to drink this, are you?" icon = 'icons/obj/wizard.dmi' icon_state = "vial" - burn_state = LAVA_PROOF /obj/item/weapon/dragons_blood/attack_self(mob/living/carbon/human/user) if(!istype(user)) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 68716a38764..b81f0a77789 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -152,7 +152,6 @@ Difficulty: Medium hitsound = 'sound/weapons/sear.ogg' var/storm_type = /datum/weather/ash_storm var/storm_cooldown = 0 - burn_state = LAVA_PROOF /obj/item/weapon/staff/storm/attack_self(mob/user) if(storm_cooldown > world.time)