Fixes bad istype() in hand slot code. #4789
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
comma
previously approved these changes
Jan 23, 2025
out-of-phaze
approved these changes
Jan 23, 2025
out-of-phaze
requested changes
Jan 23, 2025
code/modules/mob/mob.dm
Outdated
| @@ -1402,7 +1402,7 @@ | |||
| /// THIS DOES NOT RELATE TO HELD ITEM SLOTS. It is very specifically a functional BP_L_HAND or BP_R_HAND organ, not necessarily a gripper. | |||
| /mob/proc/get_usable_hand_slot_organ() | |||
| var/obj/item/organ/external/paw = GET_EXTERNAL_ORGAN(src, BP_L_HAND) | |||
| if(!istype(paw) && !paw.is_usable()) | |||
| if(istype(paw) && !paw.is_usable()) | |||
There was a problem hiding this comment.
are we sure this shouldn't be
Suggested change
| if(istype(paw) && !paw.is_usable()) | |
| if(!istype(paw) || !paw.is_usable()) |
out-of-phaze
added
awaiting author
MistakeNot4892
force-pushed
the
fixes/staging
branch
from
056c2e7 to
a27d4e4
Compare
MistakeNot4892
force-pushed
the
fixes/staging
branch
from
a27d4e4 to
e821ee0
Compare
MistakeNot4892
added
ready for review
out-of-phaze
approved these changes
Jan 23, 2025
| if(istype(paw) && paw.is_usable()) | ||
| return paw | ||
| var/static/list/hand_slots = list(BP_L_HAND, BP_R_HAND) | ||
| for(var/slot in shuffle(hand_slots)) |
There was a problem hiding this comment.
iirc shuffling is actually relatively expensive, i feel a little uncomfortable about this, but it's probably fine
There was a problem hiding this comment.
This isn't hot code, it's used only by a couple of specific interactions (there is also a use in get_quick_interaction_handler() but that is an error and is removed in the holsters PR).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.