From 7da5373dcdc9b64251d53d6fb614c28b9fe85c29 Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Wed, 11 Mar 2026 19:19:29 -0400 Subject: [PATCH] Item pixel shift lets you move If you don't have anything grabbed, it won't start the item pixel shifting, so you can still use the hotkey for something else without having to worry about it blocking movement. --- code/__DEFINES/~monkestation/keybinding.dm | 10 +++++----- monkestation/code/datums/keybinding/living.dm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) 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)