From 0bcec2bcb258bc7fd4952fbbeaf205effccb95f3 Mon Sep 17 00:00:00 2001 From: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com> Date: Sun, 23 Sep 2018 04:34:45 +0200 Subject: [PATCH] fixes traps not checking for antimagic (#40382) * fixes traps not checking for antimagic :cl: fix: traps check for antimagic /:cl: should work * will this blend * e --- code/game/objects/structures/traps.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index ffc2c344f92..34f8c05c4f4 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -63,7 +63,7 @@ return if(ismob(AM)) var/mob/M = AM - if(M.mind in immune_minds) + if(M.mind in immune_minds || M.anti_magic_check()) return if(charges <= 0) return