Merge pull request #241 from Nerev4r/sheistryinghardtoformherfirsttho…

…ught Makes Health Analyzers Work 4 The Blind
DopplerShift13 · Nov 20, 2024 · 168f8e0 · 168f8e0
2 parents d6d26c5 + 17220f6
commit 168f8e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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 += "<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
@@ -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
@@ -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!"))