Merge pull request #13120 from LetterN/nyanite-fix-1

Fixes missing icon and handtele being fast
2020-08-11 01:40:34 -07:00
parent fe0cfd3e6a ab7c560f6d
commit abf5d7070e
2 changed files with 5 additions and 2 deletions
@@ -122,11 +122,14 @@
 		return TRUE
 	return ..()

-/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user)
-	if(is_parent_of_portal(target))
+/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 30)
+	var/datum/beam/B = user.Beam(target, icon_state = "rped_upgrade", maxdistance = 50)
+	if(is_parent_of_portal(target) && (!delay || do_after(user, delay, target = target)))
 		qdel(target)
 		to_chat(user, "<span class='notice'>You dispel [target] with \the [src]!</span>")
+		qdel(B)
 		return TRUE
+	qdel(B)
 	return FALSE

 /obj/item/hand_tele/afterattack(atom/target, mob/user)