diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 644bda91c8b..ce3fb9d186c 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -375,5 +375,6 @@ if(choice) E.eye_icon_location = robohead.monitor_icon E.eye_icon = states[choice] + E.eye_icon_override = TRUE to_chat(src,"You set your monitor to display [choice]!") update_icons_body() diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 944b8ecb301..b1fbafc52c2 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -260,7 +260,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() if (species.selects_bodytype != SELECTS_BODYTYPE_FALSE) var/headtype = GLOB.all_species[species.base_species]?.has_limbs[BP_HEAD] var/obj/item/organ/external/head/headtypepath = headtype["path"] - if (headtypepath) + if (headtypepath && !head.eye_icon_override) head.eye_icon = initial(headtypepath.eye_icon) head.eye_icon_location = initial(headtypepath.eye_icon_location) icon_key += "[head.eye_icon]" diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm index 35ea47e98c2..152c3679672 100644 --- a/code/modules/organs/subtypes/standard.dm +++ b/code/modules/organs/subtypes/standard.dm @@ -277,6 +277,7 @@ var/head_offset = 0 var/eye_icon = "eyes_s" var/eye_icon_location = 'icons/mob/human_face.dmi' + var/eye_icon_override = FALSE // if true, we dont reset our icon back to default force = 3 throwforce = 7 var/eyes_over_markings = FALSE //VOREStation edit