Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/__DEFINES/~monkestation/keybinding.dm
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/datums/keybinding/living.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading