From a48aa3eb0a6d5aa0d2a73d6c52196876f9700133 Mon Sep 17 00:00:00 2001 From: Time-Green Date: Thu, 20 Sep 2018 20:15:33 +0200 Subject: [PATCH] Fixex bugs with locker wand (#40323) No more deleting or gibbing people --- code/modules/projectiles/projectile/magic.dm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 3ac50c8e721..4060060ac4f 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -345,9 +345,10 @@ flag = "magic" var/weld = TRUE var/created = FALSE //prevents creation of more then one locker if it has multiple hits + var/locker_suck = TRUE /obj/item/projectile/magic/locker/prehit(atom/A) - if(ismob(A)) + if(ismob(A) && locker_suck) var/mob/M = A if(M.anti_magic_check()) M.visible_message("[src] vanishes on contact with [A]!") @@ -372,6 +373,7 @@ return ..() /obj/item/projectile/magic/locker/Destroy() + locker_suck = FALSE for(var/atom/movable/AM in contents) AM.forceMove(get_turf(src)) . = ..() @@ -411,11 +413,6 @@ else addtimer(CALLBACK(src, .proc/decay), 15 SECONDS) -/obj/structure/closet/decay/contents_explosion(severity, target) - for(var/atom/A in contents) - A.ex_act(severity/2, target) //Difference is it does half the damage to contents from explosion, to make fireball not completely instakill - CHECK_TICK - /obj/structure/closet/decay/proc/unmagify() icon_state = weakened_icon update_icon()