From 04e3af6abcbee052d2f41fb9ada51b8f9d9224be Mon Sep 17 00:00:00 2001
From: AnturK <AnturK@users.noreply.github.com>
Date: Fri, 8 Jun 2018 13:05:57 +0200
Subject: [PATCH] Fixes jaunter emp effect. (#38331)

* Fixes jaunter emp effect.

* Sure
---
 .../mining/equipment/wormhole_jaunter.dm      | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index 437d6fb26f6..f9ffaeed2c4 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -54,18 +54,20 @@
 	. = ..()
 	if(. & EMP_PROTECT_SELF)
 		return
-	var/triggered = FALSE
 
-	if(usr.get_item_by_slot(SLOT_BELT) == src)
-		if(power == 1)
-			triggered = TRUE
-		else if(power == 2 && prob(50))
-			triggered = TRUE
+	var/mob/M = loc
+	if(istype(M))
+		var/triggered = FALSE
+		if(M.get_item_by_slot(SLOT_BELT) == src)
+			if(power == 1)
+				triggered = TRUE
+			else if(power == 2 && prob(50))
+				triggered = TRUE
 
-	if(triggered)
-		usr.visible_message("<span class='warning'>[src] overloads and activates!</span>")
-		SSblackbox.record_feedback("tally", "jaunter", 1, "EMP") // EMP accidental activation
-		activate(usr)
+		if(triggered)
+			M.visible_message("<span class='warning'>[src] overloads and activates!</span>")
+			SSblackbox.record_feedback("tally", "jaunter", 1, "EMP") // EMP accidental activation
+			activate(M)
 
 /obj/item/wormhole_jaunter/proc/chasm_react(mob/user)
 	if(user.get_item_by_slot(SLOT_BELT) == src)