From 42deca4f7290ad4b50884e955a70f746598da21c Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Mon, 6 Nov 2017 12:42:36 -0800
Subject: [PATCH 1/2] Fixes hand tele losing ranged portal-dispel function
 (#32408)

* Fixes hand teles not dispelling at range
---
 code/game/objects/items/teleportation.dm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm
index ffdb271cfb..2b3cad20ef 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -151,11 +151,20 @@ Frequency:
 	active_portal_pairs = list()
 
 /obj/item/hand_tele/pre_attackby(atom/target, mob/user, params)
+	if(try_dispel_portal(target, user))
+		return FALSE
+	return ..()
+
+/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user)
 	if(is_parent_of_portal(target))
 		qdel(target)
 		to_chat(user, "<span class='notice'>You dispel [target] with \the [src]!</span>")
-		return FALSE
-	return ..()
+		return TRUE
+	return FALSE
+
+/obj/item/hand_tele/afterattack(atom/target, mob/user)
+	try_dispel_portal(target, user)
+	. = ..()
 
 /obj/item/hand_tele/attack_self(mob/user)
 	var/turf/current_location = get_turf(user)//What turf is the user on?