Fixex bugs with locker wand (#40323)

No more deleting or gibbing people
This commit is contained in:
Time-Green
2018-09-20 14:15:33 -04:00
committed by ShizCalev
parent c58073ed05
commit a48aa3eb0a
+3 -6
View File
@@ -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("<span class='warning'>[src] vanishes on contact with [A]!</span>")
@@ -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()