diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index a37a85db57..a7b22a4c30 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -197,32 +197,34 @@ SLIME SCANNER
var/obj/item/organ/O = organ
//EYES
- if(istype(O, /obj/item/organ/eyes) && advanced)
+ if(istype(O, /obj/item/organ/eyes))
var/obj/item/organ/eyes/eyes = O
- if(HAS_TRAIT_NOT_FROM(C, TRAIT_BLIND, EYES_COVERED))
- temp_message += " Subject is blind."
- if(HAS_TRAIT_NOT_FROM(C, TRAIT_NEARSIGHT, EYES_COVERED))
- temp_message += " Subject is nearsighted."
- if(eyes.damage > 30)
- damage_message += " Subject has severe eye damage."
- else if(eyes.damage > 20)
- damage_message += " Subject has significant eye damage."
- else if(eyes.damage)
- damage_message += " Subject has minor eye damage."
+ if(advanced)
+ if(HAS_TRAIT(C, TRAIT_BLIND))
+ temp_message += " Subject is blind."
+ if(HAS_TRAIT(C, TRAIT_NEARSIGHT))
+ temp_message += " Subject is nearsighted."
+ if(eyes.damage > 30)
+ damage_message += " Subject has severe eye damage."
+ else if(eyes.damage > 20)
+ damage_message += " Subject has significant eye damage."
+ else if(eyes.damage)
+ damage_message += " Subject has minor eye damage."
//EARS
- else if(istype(O, /obj/item/organ/ears) && advanced)
+ else if(istype(O, /obj/item/organ/ears))
var/obj/item/organ/ears/ears = O
- if(HAS_TRAIT_FROM(C, TRAIT_DEAF, GENETIC_MUTATION))
- temp_message += " Subject is genetically deaf."
- else if(HAS_TRAIT(C, TRAIT_DEAF))
- temp_message += " Subject is deaf."
- else
- if(ears.damage)
- damage_message += " Subject has [ears.damage > ears.maxHealth ? "permanent ": "temporary "]hearing damage."
- if(ears.deaf)
- damage_message += " Subject is [ears.damage > ears.maxHealth ? "permanently ": "temporarily "] deaf."
+ if(advanced)
+ if(HAS_TRAIT_FROM(C, TRAIT_DEAF, GENETIC_MUTATION))
+ temp_message += " Subject is genetically deaf."
+ else if(HAS_TRAIT(C, TRAIT_DEAF))
+ temp_message += " Subject is deaf."
+ else
+ if(ears.damage)
+ damage_message += " Subject has [ears.damage > ears.maxHealth ? "permanent ": "temporary "]hearing damage."
+ if(ears.deaf)
+ damage_message += " Subject is [ears.damage > ears.maxHealth ? "permanently ": "temporarily "] deaf."
//BRAIN