From 0a7b9320af9e0f778e6ac5a38734ca7c7ac36c4e Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Mon, 27 Feb 2017 12:38:51 -0500
Subject: [PATCH] Fixes mine effect being activated when picked up

---
 code/game/objects/effects/mines.dm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index f8af9c5fa00..bba06a832f0 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -11,12 +11,13 @@
 	victim << "<span class='danger'>*click*</span>"
 
 /obj/effect/mine/Crossed(AM as mob|obj)
-	if(ismob(AM))
-		var/mob/MM = AM
-		if(!(MM.movement_type & FLYING))
+	if(isturf(loc))
+		if(ismob(AM))
+			var/mob/MM = AM
+			if(!(MM.movement_type & FLYING))
+				triggermine(AM)
+		else
 			triggermine(AM)
-	else
-		triggermine(AM)
 
 /obj/effect/mine/proc/triggermine(mob/victim)
 	if(triggered)