Merge pull request #7338 from Citadel-Station-13/upstream-merge-38649

[MIRROR] Converts antimagic from GetComponent to a signal
2018-07-10 01:59:14 -04:00
parent 21b6c7986b b3c28c36fa
commit 4f5eb02cca
4 changed files with 39 additions and 36 deletions
@@ -894,6 +894,13 @@

 	apply_effect((amount*RAD_MOB_COEFFICIENT)/max(1, (radiation**2)*RAD_OVERDOSE_REDUCTION), EFFECT_IRRADIATE, blocked)

+/mob/living/anti_magic_check(magic = TRUE, holy = FALSE)
+	. = ..()
+	if(.)
+		return
+	if((magic && has_trait(TRAIT_ANTIMAGIC)) || (holy && has_trait(TRAIT_HOLY)))
+		return src
+
 /mob/living/proc/fakefireextinguish()
 	return