This commit is contained in:
MrMelbert
2020-08-04 15:01:09 -05:00
parent 11c026946c
commit 3f6e6ef5b4
5 changed files with 30 additions and 7 deletions
+2 -1
View File
@@ -190,7 +190,8 @@
if (!Adjacent(user))
return
if (user.a_intent == INTENT_HELP)
user.examinate(src)
if(!user.is_blind())
user.examinate(src)
return
user.visible_message("<span class='danger'>[user] kicks the display case.</span>", null, null, COMBAT_MESSAGE_RANGE)
log_combat(user, src, "kicks")
@@ -33,7 +33,7 @@
/obj/structure/plaque/attack_hand(mob/user)
. = ..()
if(.)
if(. || user.is_blind())
return
user.examinate(src)
+1 -1
View File
@@ -49,7 +49,7 @@
/obj/structure/sign/attack_hand(mob/user)
. = ..()
if(.)
if(. || user.is_blind())
return
user.examinate(src)
@@ -140,7 +140,7 @@ GLOBAL_LIST(labor_sheet_values)
/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user)
. = ..()
if(.)
if(. || user.is_blind())
return
user.examinate(src)
+25 -3
View File
@@ -446,9 +446,31 @@
// shift-click catcher may issue examinate() calls for out-of-sight turfs
return
if(is_blind())
to_chat(src, "<span class='warning'>Something is there but you can't see it!</span>")
return
if(is_blind()) //blind people see things differently (through touch)
//need to be next to something, awake, on help intent, and have an empty hand
if(!in_range(A, src) || incapacitated() || a_intent != INTENT_HELP || LAZYLEN(do_afters) >= get_num_arms() || get_active_held_item())
to_chat(src, "<span class='warning'>Something is there, but you can't see it!</span>")
return
if(A in do_afters)
return
to_chat(src, "<span class='notice'>You start feeling around for something...</span>")
visible_message("<span class='notice'> [name] begins feeling around for \the [A.name]...</span>")
/// how long it takes for the blind person to find the thing they're examining
var/examine_delay_length = rand(1 SECONDS, 2 SECONDS)
if(client?.recent_examines && client?.recent_examines[A]) //easier to find things we just touched
examine_delay_length = 0.5 SECONDS
else if(isobj(A))
examine_delay_length *= 1.5
else if(ismob(A) && A != src)
examine_delay_length *= 2
if(examine_delay_length > 0 && !do_after(src, examine_delay_length, target = A))
to_chat(src, "<span class='notice'>You can't get a good feel for what is there.</span>")
return
//now we go ahead and touch it with our hand
A.attack_hand(src)
face_atom(A)
var/list/result