Merge pull request #5702 from Citadel-Station-13/upstream-merge-35639

[MIRROR] Refactors anti-magic into a component
2018-02-25 16:59:38 -06:00
parent 793ddf91cc a8e458188a
commit d2607c0654
42 changed files with 378 additions and 128 deletions
@@ -54,3 +54,7 @@
 	icon_state = "holymelon"
 	filling_color = "#FFD700"
 	dried_type = null
+
+/obj/item/reagent_containers/food/snacks/grown/holymelon/Initialize()
+	. = ..()
+	AddComponent(/datum/component/anti_magic, TRUE, TRUE) //deliver us from evil o melon god