diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 67d7ddc9f33..9ac08083e99 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -19,6 +19,10 @@ var/obj/item/radio/radio = null // For use with the radio MMI upgrade var/datum/action/generic/configure_mmi_radio/radio_action = null + // Used for cases when mmi or one of it's children commits suicide. + // Needed to fix a rather insane bug when a posibrain/robotic brain commits suicide + var/dead_icon = "mmi_dead" + /obj/item/mmi/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/organ/internal/brain/crystal )) to_chat(user, " This brain is too malformed to be able to use with the [src].") diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm index 777fce50423..fe25ed111dd 100644 --- a/code/modules/mob/living/carbon/brain/death.dm +++ b/code/modules/mob/living/carbon/brain/death.dm @@ -4,8 +4,12 @@ if(!.) return FALSE if(!gibbed && container && istype(container, /obj/item/mmi))//If not gibbed but in a container. + var/obj/item/mmi/mmi = container visible_message("[src]'s MMI flatlines!", "You hear something flatline.") - container.icon_state = "mmi_dead" + // + // Doesn't account for posibrains and robotic brains! + // + mmi.icon_state = mmi.dead_icon /mob/living/carbon/brain/gib() // can we muster a parent call here? diff --git a/code/modules/mob/living/carbon/brain/robotic_brain.dm b/code/modules/mob/living/carbon/brain/robotic_brain.dm index b766d419d09..28a36e5f540 100644 --- a/code/modules/mob/living/carbon/brain/robotic_brain.dm +++ b/code/modules/mob/living/carbon/brain/robotic_brain.dm @@ -21,6 +21,8 @@ var/mob/living/carbon/human/imprinted_master = null var/ejected_flavor_text = "circuit" + dead_icon = "boris_blank" + /obj/item/mmi/robotic_brain/Destroy() imprinted_master = null return ..() @@ -228,4 +230,5 @@ desc = "A cube of shining metal, four inches to a side and covered in shallow grooves." silenced = TRUE requires_master = FALSE - ejected_flavor_text = "metal cube" \ No newline at end of file + ejected_flavor_text = "metal cube" + dead_icon = "posibrain" \ No newline at end of file