From 91fa56575eff7b923472b995fdb03b497e00f817 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 3 Mar 2021 19:35:25 +0100 Subject: [PATCH] [MIRROR] Mines no longer get triggered by directional lights (#3810) * Mines no longer get triggered by directional lights (#57349) fix #55382 * Mines no longer get triggered by directional lights Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com> --- code/game/objects/effects/mines.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 50488d59f4d..c24d6827c47 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -36,9 +36,10 @@ visible_message("\The [src] beeps softly, indicating it is now active.", vision_distance = COMBAT_MESSAGE_RANGE) /obj/effect/mine/Crossed(atom/movable/AM) + . = ..() + if(triggered || !isturf(loc) || !armed) return - . = ..() if(AM.movement_type & FLYING) return @@ -51,6 +52,8 @@ /// When something sets off a mine /obj/effect/mine/proc/triggermine(atom/movable/triggerer) + if(iseffect(triggerer)) + return if(triggered) //too busy detonating to detonate again return if(triggerer)