WIP

code/modules/mob/living/brain/MMI.dm

@@ -14,20 +14,20 @@
 	var/force_replace_ai_name = FALSE
 	var/overrides_aicore_laws = FALSE // Whether the laws on the MMI, if any, override possible pre-existing laws loaded on the AI core.
 
-/obj/item/mmi/update_icon()
+/obj/item/mmi/update_icon_state()
 	if(!brain)
 		icon_state = "mmi_off"
-		return
-	if(istype(brain, /obj/item/organ/brain/alien))
+	else if(istype(brain, /obj/item/organ/brain/alien))
 		icon_state = "mmi_brain_alien"
-		braintype = "Xenoborg" //HISS....Beep.
 	else
 		icon_state = "mmi_brain"
-		braintype = "Cyborg"
+
+/obj/item/mmi/update_overlays()
+	. = ..()
 	if(brainmob && brainmob.stat != DEAD)
-		add_overlay("mmi_alive")
+		. += "mmi_alive"
 	else
-		add_overlay("mmi_dead")
+		. += "mmi_dead"
 
 /obj/item/mmi/Initialize()
 	. = ..()
@@ -68,6 +68,10 @@
 
 		name = "Man-Machine Interface: [brainmob.real_name]"
 		update_icon()
+		if(istype(brain, /obj/item/organ/brain/alien))
+			braintype = "Xenoborg" //HISS....Beep.
+		else
+			braintype = "Cyborg"
 
 		SSblackbox.record_feedback("amount", "mmis_filled", 1)
 
@@ -85,7 +89,7 @@
 		to_chat(user, "<span class='notice'>You unlock and upend the MMI, spilling the brain onto the floor.</span>")
 		eject_brain(user)
 		update_icon()
-		name = "Man-Machine Interface"
+		name = initial(name)
 
 /obj/item/mmi/proc/eject_brain(mob/user)
 	brainmob.container = null //Reset brainmob mmi var.
@@ -129,7 +133,10 @@
 
 	name = "Man-Machine Interface: [brainmob.real_name]"
 	update_icon()
-	return
+	if(istype(brain, /obj/item/organ/brain/alien))
+		braintype = "Xenoborg" //HISS....Beep.
+	else
+		braintype = "Cyborg"
 
 /obj/item/mmi/proc/replacement_ai_name()
 	return brainmob.name

code/modules/mob/living/brain/posibrain.dm

@@ -184,11 +184,10 @@ GLOBAL_VAR(posibrain_notify_cooldown)
 	return
 
 
-/obj/item/mmi/posibrain/update_icon()
+/obj/item/mmi/posibrain/update_icon_state()
 	if(searching)
 		icon_state = "[initial(icon_state)]-searching"
-		return
-	if(brainmob && brainmob.key)
+	else if(brainmob && brainmob.key)
 		icon_state = "[initial(icon_state)]-occupied"
 	else
 		icon_state = initial(icon_state)

code/modules/mob/living/carbon/human/species_types/shadowpeople.dm

@@ -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

code/modules/mob/living/simple_animal/guardian/guardian.dm

@@ -633,8 +633,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
  <br>
 "}
 
-/obj/item/paper/guides/antag/guardian/update_icon()
-	return
+/obj/item/paper/guides/antag/guardian/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/update_icon_blocker)
 
 /obj/item/paper/guides/antag/guardian/wizard
 	name = "Guardian Guide"