Skip to content

Commit

Permalink
[MIRROR] Fix grabs dropping when swapping hands
Browse files Browse the repository at this point in the history
  • Loading branch information
SierraKomodo authored and SuhEugene committed Sep 14, 2023
1 parent 63da478 commit 9492d0a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/mob/grab/grab_object.dm
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,8 @@
/obj/item/grab/proc/use_sanity_check(atom/target, flags = SANITY_CHECK_DEFAULT)
if (QDELETED(src) || QDELETED(assailant))
return FALSE
// Sanity check the grab itself
if (!assailant.use_sanity_check(target, src, flags))
// Sanity check the grab itself, allowing hand swapping
if (!assailant.use_sanity_check(target, src, flags & ~SANITY_CHECK_TOOL_IN_HAND))
return FALSE
// Sanity check the victim
if (!assailant.use_sanity_check(target, affecting, flags))
Expand Down

0 comments on commit 9492d0a

Please sign in to comment.