Merge pull request #11391 from Ghommie/Ghommie-cit612

Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
parent 40e470cba2 59b1a223a3
commit e210f7d535
157 changed files with 698 additions and 827 deletions
@@ -100,6 +100,9 @@
 	var/obj/item/light_eater/blade
 	decay_factor = 0

+/obj/item/organ/heart/nightmare/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/update_icon_blocker)

 /obj/item/organ/heart/nightmare/attack(mob/M, mob/living/carbon/user, obj/target)
 	if(M != user)
@@ -130,9 +133,6 @@
 /obj/item/organ/heart/nightmare/Stop()
 	return 0

-/obj/item/organ/heart/nightmare/update_icon()
-	return //always beating visually
-
 /obj/item/organ/heart/nightmare/on_death()
 	if(!owner)
 		return