diff --git a/code/__DEFINES/~monkestation/keybinding.dm b/code/__DEFINES/~monkestation/keybinding.dm index c1ba6387c557e..d16851cff17d3 100644 --- a/code/__DEFINES/~monkestation/keybinding.dm +++ b/code/__DEFINES/~monkestation/keybinding.dm @@ -1,10 +1,10 @@ #define COMSIG_KB_CLIENT_LOOC_DOWN "keybinding_client_looc_down" -#define COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_DOWN "keybinding_living_item_pixelshift_down" -#define COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_UP "keybinding_living_item_pixelshift_up" -#define COMSIG_KB_LIVING_PIXELSHIFT "keybinding_living_pixelshift" -#define COMSIG_KB_LIVING_PIXEL_SHIFT_DOWN "keybinding_living_pixelshift_down" -#define COMSIG_KB_LIVING_PIXEL_SHIFT_UP "keybinding_living_pixelshift_up" +#define COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_DOWN "keybinding_living_item_pixelshift_down" +#define COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_UP "keybinding_living_item_pixelshift_up" +#define COMSIG_KB_LIVING_PIXELSHIFT "keybinding_living_pixelshift" +#define COMSIG_KB_LIVING_PIXEL_SHIFT_DOWN "keybinding_living_pixelshift_down" +#define COMSIG_KB_LIVING_PIXEL_SHIFT_UP "keybinding_living_pixelshift_up" #define COMSIG_KB_LIVING_PIXEL_TILT_DOWN "keybinding_living_pixeltilt_down" #define COMSIG_KB_LIVING_PIXEL_TILT_UP "keybinding_living_pixeltilt_up" diff --git a/monkestation/code/datums/keybinding/living.dm b/monkestation/code/datums/keybinding/living.dm index d250e9646ed8e..865d67c58ee87 100644 --- a/monkestation/code/datums/keybinding/living.dm +++ b/monkestation/code/datums/keybinding/living.dm @@ -73,7 +73,7 @@ /datum/keybinding/living/item_pixel_shift/down(client/user) . = ..() - if(.) + if(. || isnull(user.mob.pulling)) return user.mob.AddComponent(/datum/component/pixel_shift) SEND_SIGNAL(user.mob, COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_DOWN)