cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 12:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Minor bugfixing/QoL for blind examining (#607)

Browse Source 
* Minor bugfixing/QoL for blind examining (#53313)

Allows blind people to examine things they're directly holding in their hands, so they don't need to swap hands back and forth between empty hands to check their ID or whatever

Slightly lowered the recent examine delay to make it easier to trigger examine_more

attack_hands that waited for input or slept (such as apiaries or airlocks) delayed the examination until after the attack_hand input or sleep was finished, so it is now called async to prevent the weird pause.

Blind people could previously examine things with disabled/detached limbs, that's fixed as well, and replaced a range check with adjacent, cause shoving your arm through windoors is bad.

* Minor bugfixing/QoL for blind examining

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-09-02 03:03:35 +02:00
committed by GitHub
co-authored by MrMelbert
parent 1ae5cbf717
commit 6d4bdb7776
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+17 -6
View File
@@ -479,14 +479,25 @@
/mob/living/blind_examine_check(atom/examined_thing)
//need to be next to something and awake
if(!in_range(examined_thing, src) || incapacitated())
if(!Adjacent(examined_thing) || incapacitated())
to_chat(src, "<span class='warning'>Something is there, but you can't see it!</span>")
return FALSE
//also neeed an empty hand, and you can only initiate as many examines as you have hands
if(LAZYLEN(do_afters) >= usable_hands || get_active_held_item())
//you can examine things you're holding directly, but you can't examine other things if your hands are full
/// the item in our active hand
var/active_item = get_active_held_item()
if(active_item && active_item != examined_thing)
to_chat(src, "<span class='warning'>Your hands are too full to examine this!</span>")
return FALSE
//you can only initiate exaimines if you have a hand, it's not disabled, and only as many examines as you have hands
/// our active hand, to check if it's disabled/detatched
var/obj/item/bodypart/active_hand = has_active_hand()? get_active_hand() : null
if(!active_hand || active_hand.bodypart_disabled || LAZYLEN(do_afters) >= usable_hands)
to_chat(src, "<span class='warning'>You don't have a free hand to examine this!</span>")
return FALSE
//can only queue up one examine on something at a time
//you can only queue up one examine on something at a time
if(examined_thing in do_afters)
return FALSE
@@ -496,7 +507,7 @@
/// 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[examined_thing]) //easier to find things we just touched
examine_delay_length = 0.5 SECONDS
examine_delay_length = 0.33 SECONDS
else if(isobj(examined_thing))
examine_delay_length *= 1.5
else if(ismob(examined_thing) && examined_thing != src)
@@ -510,7 +521,7 @@
/// our current intent, so we can go back to it after touching
var/previous_intent = a_intent
a_intent = INTENT_HELP
examined_thing.attack_hand(src)
INVOKE_ASYNC(examined_thing, /atom/proc/attack_hand, src)
a_intent = previous_intent
return TRUE