From 0a8e5d7e62ba436bcf477e634c7bc2e0abcbb9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9C=88=E7=8C=AB?= Date: Wed, 8 Sep 2021 13:38:38 -0400 Subject: [PATCH] drags before hotkeying (#61278) --- code/_onclick/click.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 0d7cc55bfef..3ac035ae531 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -341,13 +341,13 @@ return /atom/proc/CtrlClick(mob/user) - if(!can_interact(user)) - return FALSE SEND_SIGNAL(src, COMSIG_CLICK_CTRL, user) SEND_SIGNAL(user, COMSIG_MOB_CTRL_CLICKED, src) var/mob/living/ML = user if(istype(ML)) ML.pulled(src) + if(!can_interact(user)) + return FALSE /mob/living/CtrlClick(mob/user) if(!isliving(user) || !user.CanReach(src) || user.incapacitated())