Merge pull request #24518 from Cyberboss/MineEffects

Fixes mine effect being activated when picked up
This commit is contained in:
oranges
2017-03-01 09:14:29 +13:00
committed by GitHub
+6 -5
View File
@@ -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)