From c67fe4a76f646c506f0067b890cb3b1a30a5c495 Mon Sep 17 00:00:00 2001 From: XDTM Date: Mon, 11 Jun 2018 07:15:57 +0200 Subject: [PATCH 1/2] Anti-magic component start enabled (#38388) --- code/datums/components/anti_magic.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm index 3d63d9a63e..be4e08eaca 100644 --- a/code/datums/components/anti_magic.dm +++ b/code/datums/components/anti_magic.dm @@ -1,4 +1,5 @@ /datum/component/anti_magic + var/active = TRUE var/magic = FALSE var/holy = FALSE @@ -7,7 +8,7 @@ holy = _holy /datum/component/anti_magic/proc/can_protect(_magic = TRUE, _holy = FALSE) - if(!enabled) + if(!active) return FALSE if((_magic && magic) || (_holy && holy)) return TRUE