Merge pull request #7059 from Citadel-Station-13/upstream-merge-38388

[MIRROR] Anti-magic components start active
2018-06-12 03:15:28 +00:00
parent 7effee3ee8 73c2009980
commit abc19ae405
1 changed files with 2 additions and 1 deletions
@@ -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