From cf6ee8d4c2c06390e088433bc8d5323285803921 Mon Sep 17 00:00:00 2001
From: Leo <lzimann@users.noreply.github.com>
Date: Wed, 1 Nov 2017 10:17:13 -0200
Subject: [PATCH 1/2] Merge pull request #32288 from kevinz000/patch-369

Fixes hand tele adjacent attacks teleporting you
---
 code/game/objects/items/teleportation.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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