From a431f9b6dcc6dcabcb164de5cb9085edcc45c8de Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Tue, 7 Oct 2025 15:13:28 -0500 Subject: [PATCH] Fix master (#93342) ## About The Pull Request #93165 skewed with #93305 --- code/datums/elements/cuffable_item.dm | 2 +- code/datums/status_effects/cuffed_item.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/elements/cuffable_item.dm b/code/datums/elements/cuffable_item.dm index d52d2a1057f..4d22337098f 100644 --- a/code/datums/elements/cuffable_item.dm +++ b/code/datums/elements/cuffable_item.dm @@ -36,7 +36,7 @@ /datum/element/cuffable_item/proc/item_interaction(obj/item/source, mob/living/user, obj/item/tool, modifiers) SIGNAL_HANDLER - if(!istype(tool, /obj/item/restraints/handcuffs) || iscyborg(user) || source.anchored || !user.CanReach(source)) + if(!istype(tool, /obj/item/restraints/handcuffs) || iscyborg(user) || source.anchored || !source.IsReachableBy(user)) return NONE INVOKE_ASYNC(src, PROC_REF(apply_cuffs), source, user, tool) diff --git a/code/datums/status_effects/cuffed_item.dm b/code/datums/status_effects/cuffed_item.dm index c3843b1a4cf..3bd034fb097 100644 --- a/code/datums/status_effects/cuffed_item.dm +++ b/code/datums/status_effects/cuffed_item.dm @@ -109,7 +109,7 @@ if(LAZYACCESS(user.do_afters, interaction_key)) return FALSE - if(!(user.mobility_flags & MOBILITY_USE) || (user != owner && !user.CanReach(owner))) + if(!(user.mobility_flags & MOBILITY_USE) || (user != owner && !owner.IsReachableBy(user))) owner.balloon_alert(user, "can't do it right now!") return FALSE