From 6d8d449d109ef736c86cea27624203b155dc319e Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Sat, 8 Jun 2024 00:04:35 -0400
Subject: [PATCH] fixes telegun (#25835)

* fixes telegun

* fully fixes matts messup :^)

* Update special_projectiles.dm
---
 code/modules/projectiles/projectile/special_projectiles.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/modules/projectiles/projectile/special_projectiles.dm b/code/modules/projectiles/projectile/special_projectiles.dm
index 942fe1504e1..98792ef8335 100644
--- a/code/modules/projectiles/projectile/special_projectiles.dm
+++ b/code/modules/projectiles/projectile/special_projectiles.dm
@@ -297,12 +297,13 @@
 
 /obj/item/projectile/energy/teleport/on_hit(atom/target, blocked = 0)
 	var/turf/target_turf = get_turf(teleport_target)
-	if(isliving(target) && istype(target_turf))
-		if(target_turf.z == target.z || teleport_target.emagged)
+	if(isliving(target))
+		if(istype(target_turf) && (target_turf.z == target.z || teleport_target.emagged))
 			do_teleport(target, teleport_target, 0)//teleport what's in the tile to the beacon
 		else
 			do_teleport(target, target, 15) //Otherwise it just warps you off somewhere.
 	add_attack_logs(firer, target, "Shot with a [type] [teleport_target ? "(Destination: [teleport_target])" : ""]")
+	return ..()
 
 /obj/item/projectile/snowball
 	name = "snowball"