Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makes Health Analyzers Work 4 The Blind #241

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Makes Health Analyzers Work 4 The Blind #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/game/objects/items/devices/scanners/gas_analyzer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/items/devices/scanners/health_analyzer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -80,7 +80,7 @@
floor_text += "<span class='alert ml-1'>Subject lacks a brain.</span><br>"
floor_text += "<span class='info ml-1'>Body temperature: [scan_turf?.return_air()?.return_temperature() || "???"]</span><br>"

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
Expand All @@ -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)
Expand All @@ -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

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/scanners/slime_scanner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!"))
Expand Down
Loading