From 17220f6bef9b8b2b8d37fb049d07c6dc0599b31e Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Tue, 19 Nov 2024 12:28:45 -0700 Subject: [PATCH] real --- .../objects/items/devices/scanners/gas_analyzer.dm | 4 ++-- .../objects/items/devices/scanners/health_analyzer.dm | 10 +++++----- .../objects/items/devices/scanners/slime_scanner.dm | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/devices/scanners/gas_analyzer.dm b/code/game/objects/items/devices/scanners/gas_analyzer.dm index d71d84e1f1909..745c855e2fc71 100644 --- a/code/game/objects/items/devices/scanners/gas_analyzer.dm +++ b/code/game/objects/items/devices/scanners/gas_analyzer.dm @@ -136,13 +136,13 @@ return list("gasmixes" = last_gasmix_data) /obj/item/analyzer/attack_self(mob/user, modifiers) - if(user.stat != CONSCIOUS || !user.can_read(src) || user.is_blind()) + if(user.stat != CONSCIOUS || !user.can_read(src)) //DOPPLER EDIT: Blind People Can Analyze Again return atmos_scan(user=user, target=get_turf(src), silent=FALSE) on_analyze(source=src, target=get_turf(src)) /obj/item/analyzer/attack_self_secondary(mob/user, modifiers) - if(user.stat != CONSCIOUS || !user.can_read(src) || user.is_blind()) + if(user.stat != CONSCIOUS || !user.can_read(src)) //DOPPLER EDIT: Blind People Can Analyze Again return ui_interact(user) diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm index 76942605f2b13..e2fe6de338aaf 100644 --- a/code/game/objects/items/devices/scanners/health_analyzer.dm +++ b/code/game/objects/items/devices/scanners/health_analyzer.dm @@ -47,7 +47,7 @@ return BRUTELOSS /obj/item/healthanalyzer/attack_self(mob/user) - if(!user.can_read(src) || user.is_blind()) + if(!user.can_read(src)) //DOPPLER EDIT: Blind People Can Analyze Again return scanmode = (scanmode + 1) % SCANMODE_COUNT @@ -80,7 +80,7 @@ floor_text += "Subject lacks a brain.
" floor_text += "Body temperature: [scan_turf?.return_air()?.return_temperature() || "???"]
" - if(user.can_read(src) && !user.is_blind()) + if(!user.can_read(src)) //DOPPLER EDIT: Blind People Can Analyze Again to_chat(user, examine_block(floor_text)) last_scan_text = floor_text return @@ -93,7 +93,7 @@ balloon_alert(user, "analyzing vitals") playsound(user.loc, 'sound/items/healthanalyzer.ogg', 50) - var/readability_check = user.can_read(src) && !user.is_blind() + var/readability_check = user.can_read(src) //DOPPLER EDIT - Blind People Can Analyze Again switch (scanmode) if (SCANMODE_HEALTH) last_scan_text = healthscan(user, M, mode, advanced, tochat = readability_check) @@ -106,7 +106,7 @@ /obj/item/healthanalyzer/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers) if(!isliving(interacting_with)) return NONE - if(user.can_read(src) && !user.is_blind()) + if(user.can_read(src)) //DOPPLER EDIT - Blind People can Analyze Again chemscan(user, interacting_with) return ITEM_INTERACT_SUCCESS @@ -626,7 +626,7 @@ /obj/item/healthanalyzer/simple/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!isliving(interacting_with)) return NONE - if(!user.can_read(src) || user.is_blind()) + if(!user.can_read(src)) //DOPPLER EDIT - Blind People Can Analyze Again return ITEM_INTERACT_BLOCKING add_fingerprint(user) diff --git a/code/game/objects/items/devices/scanners/slime_scanner.dm b/code/game/objects/items/devices/scanners/slime_scanner.dm index 79050f0a78c67..87bea03261b8b 100644 --- a/code/game/objects/items/devices/scanners/slime_scanner.dm +++ b/code/game/objects/items/devices/scanners/slime_scanner.dm @@ -16,7 +16,7 @@ /obj/item/slime_scanner/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) if(!isliving(interacting_with)) return NONE - if(!user.can_read(src) || user.is_blind()) + if(!user.can_read(src)) //DOPPLER EDIT - Blind People Can Analyze Again return ITEM_INTERACT_BLOCKING if (!isslime(interacting_with)) to_chat(user, span_warning("This device can only scan slimes!"))