Merge pull request #10057 from Ghommie/Ghommie-cit431

fixes on_mob eyes overlays not updating properly in certain cases.
2019-12-07 21:49:18 +00:00
parent 5824162b72 4ceb0a25d0
commit 24e4673c2b
4 changed files with 27 additions and 17 deletions
@@ -128,7 +128,8 @@
 	current.clear_alert("bloodsense")
 	if(ishuman(current))
 		var/mob/living/carbon/human/H = current
-		H.eye_color = initial(H.eye_color)
+		var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES)
+		H.eye_color = eyes?.eye_color || initial(H.eye_color)
 		H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
 		REMOVE_TRAIT(H, TRAIT_CULT_EYES, "valid_cultist")
 		H.update_body()