diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 2cf49b17548..4874fd3581e 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -165,7 +165,7 @@ stress = max(stress - 4, 0) /datum/brain_trauma/severe/monophobia/proc/check_alone() - if(HAS_TRAIT(owner, TRAIT_BLIND)) + if(owner.is_blind()) return TRUE for(var/mob/M in oview(owner, 7)) if(!isliving(M)) //ghosts ain't people diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index 87a784e7ded..079d94b55aa 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -63,7 +63,7 @@ Bonus M.become_nearsighted(EYE_DAMAGE) if(prob(eyes.damage - 10 + 1)) if(!remove_eyes) - if(!HAS_TRAIT(M, TRAIT_BLIND)) + if(!M.is_blind()) to_chat(M, "You go blind!") eyes.applyOrganDamage(eyes.maxHealth) else diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 4cd81eaa973..e7b6f40e09a 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -647,7 +647,7 @@ /mob/living/carbon/human/proc/something_horrible_mindmelt() - if(!HAS_TRAIT(src, TRAIT_BLIND)) + if(!is_blind()) var/obj/item/organ/eyes/eyes = locate(/obj/item/organ/eyes) in internal_organs if(!eyes) return diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 6eba8746a31..8d0d372274f 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -530,7 +530,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) M.adjust_blurriness(15) if(M.stat != DEAD) to_chat(M, "Your eyes start to bleed profusely!") - if(!(HAS_TRAIT(M, TRAIT_BLIND) || HAS_TRAIT(M, TRAIT_NEARSIGHT))) + if(!(M.is_blind() || HAS_TRAIT(M, TRAIT_NEARSIGHT))) to_chat(M, "You become nearsighted!") M.become_nearsighted(EYE_DAMAGE) if(prob(50)) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 46ccde39c47..89aefd48318 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -86,7 +86,7 @@ else user.visible_message("[user] directs [src] to [M]'s eyes.", \ "You direct [src] to [M]'s eyes.") - if(M.stat == DEAD || (HAS_TRAIT(M, TRAIT_BLIND)) || !M.flash_act(visual = 1)) //mob is dead or fully blind + if(M.stat == DEAD || (M.is_blind()) || !M.flash_act(visual = 1)) //mob is dead or fully blind to_chat(user, "[M]'s pupils don't react to the light!") else if(M.dna && M.dna.check_mutation(XRAY)) //mob has X-ray vision to_chat(user, "[M]'s pupils give an eerie glow!") diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 848dd12b556..e3881672e6d 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -256,7 +256,7 @@ GENE SCANNER message = "\nSubject does not have eyes." if(istype(eyes)) message = "" - if(HAS_TRAIT(C, TRAIT_BLIND)) + if(C.is_blind()) message += "\nSubject is blind." if(HAS_TRAIT(C, TRAIT_NEARSIGHT)) message += "\nSubject is nearsighted." diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 6becb3f9abe..b400a1ec154 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -46,7 +46,7 @@ if(ishuman(src.loc)) var/mob/living/carbon/human/H = src.loc var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) - if(!(HAS_TRAIT(H, TRAIT_BLIND))) + if(!H.is_blind()) if(H.glasses == src) to_chat(H, "[src] overloads and blinds you!") H.flash_act(visual = 1) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 5f17532aa62..2d87b2c777b 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -342,7 +342,7 @@ become_nearsighted(EYE_DAMAGE) else if(prob(eyes.damage - 25)) - if(!HAS_TRAIT(src, TRAIT_BLIND)) + if(!is_blind()) to_chat(src, "You can't see anything!") eyes.applyOrganDamage(eyes.maxHealth) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 20f188715b9..7c8c82d91fe 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -277,7 +277,7 @@ if(mood.sanity <= SANITY_DISTURBED) msg += "[t_He] seem[p_s()] distressed.\n" SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "empath", /datum/mood_event/sad_empath, src) - if (HAS_TRAIT(src, TRAIT_BLIND)) + if (is_blind()) msg += "[t_He] appear[p_s()] to be staring off into space.\n" if (HAS_TRAIT(src, TRAIT_DEAF)) msg += "[t_He] appear[p_s()] to not be responding to noises.\n" diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index a5a5c7be6bd..00b32d97b9e 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -402,7 +402,7 @@ /mob/living/proc/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash) if(HAS_TRAIT(src, TRAIT_NOFLASH)) return FALSE - if(get_eye_protection() < intensity && (override_blindness_check || !(HAS_TRAIT(src, TRAIT_BLIND)))) + if(get_eye_protection() < intensity && (override_blindness_check || !is_blind())) overlay_fullscreen("flash", type) addtimer(CALLBACK(src, .proc/clear_fullscreen, "flash", 25), 25) return TRUE diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 5c0b69b4296..0b93f5f7533 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -233,7 +233,7 @@ All effects don't start immediately, but rather get worse over time; the rate is if(prob(5) && iscarbon(M)) var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES) - if(HAS_TRAIT(M, TRAIT_BLIND)) + if(M.is_blind()) if(istype(eyes)) eyes.Remove(M) eyes.forceMove(get_turf(M))