Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

modular_sand/code/modules/mining/lavaland/necropolis_chests.dm

@@ -113,7 +113,7 @@
 
 /obj/item/gun/ballistic/revolver/doublebarrel/super/attack_self(mob/living/user)
 	if(toggled)
-		return 0
+		return FALSE
 	else
 		..()
 
@@ -121,10 +121,10 @@
 	if(toggled)
 		charge_tick++
 		if(charge_tick < recharge_rate)
-			return 0
+			return FALSE
 		charge_tick = 0
 		chambered.newshot()
-		return 1
+		return TRUE
 	else
 		..()
 
@@ -700,7 +700,8 @@
 	desc = "Become immune to lava for a brief period of time."
 	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS
 	cooldown_time = 2 MINUTES //two full minutes
-	use_target_appearance = TRUE
+	icon_icon = 'icons/obj/clothing/accessories.dmi'
+	button_icon_state = "gold"
 
 /obj/item/clothing/accessory/lavawalk/proc/activate(datum/action/cooldown/lavawalk/action, obj/item/clothing/accessory/lavawalk/item)
 	var/mob/living/L = usr
@@ -709,7 +710,7 @@
 		L.balloon_alert(L, "activated")
 		ADD_TRAIT(L, TRAIT_ASHSTORM_IMMUNE, src)
 		ADD_TRAIT(L, TRAIT_LAVA_IMMUNE, src)
-		timer = addtimer(CALLBACK(src, .proc/reset_user, L), effectduration)
+		timer = addtimer(CALLBACK(src, .proc/reset_user, L), effectduration, TIMER_STOPPABLE)
 		action.StartCooldown()
 
 /obj/item/clothing/accessory/lavawalk/proc/reset_user(mob/living/user)
@@ -717,7 +718,7 @@
 	REMOVE_TRAIT(user, TRAIT_LAVA_IMMUNE, src)
 	to_chat(user, span_boldwarning("\The [src]'s glow dims."))
 	user.balloon_alert(user, "wore off")
-	QDEL_NULL(timer)
+	deltimer(timer)
 
 //Nerfing those on the chest because too OP yada yada
 /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor/damaged