cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move pixel shift keybinds/signals to /mob/living (#4167)

Browse Source 
## About The Pull Request

Move keybind signal defines and `/datum/keybinding`s to be living
instead of mob

## Why It's Good For The Game
Fixes #4164

## Proof Of Testing

Tested on local no runtimes and still functions

## Changelog

No user facing changes
This commit is contained in:
Roxy
2025-07-02 22:07:04 -04:00
committed by GitHub
parent 6e690545a6
commit 504a8461ec
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/~skyrat_defines/keybindings.dm
+6 -6
View File
@@ -1,9 +1,9 @@
#define COMSIG_KB_MOB_PIXEL_SHIFT_DOWN "keybinding_mob_pixel_shift_down"
#define COMSIG_KB_MOB_PIXEL_SHIFT_UP "keybinding_mob_pixel_shift_up"
#define COMSIG_KB_MOB_ITEM_PIXEL_SHIFT_DOWN "keybinding_mob_item_pixelshift_down"
#define COMSIG_KB_MOB_ITEM_PIXEL_SHIFT_UP "keybinding_mob_item_pixelshift_up"
#define COMSIG_KB_MOB_PIXEL_TILT_DOWN "keybinding_mob_pixeltilt_down"
#define COMSIG_KB_MOB_PIXEL_TILT_UP "keybinding_mob_pixeltilt_up"
#define COMSIG_KB_LIVING_PIXEL_SHIFT_DOWN "keybinding_living_pixel_shift_down"
#define COMSIG_KB_LIVING_PIXEL_SHIFT_UP "keybinding_living_pixel_shift_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_PIXEL_TILT_DOWN "keybinding_living_pixeltilt_down"
#define COMSIG_KB_LIVING_PIXEL_TILT_UP "keybinding_living_pixeltilt_up"
#define COMSIG_KB_CLIENT_LOOC_DOWN "keybinding_client_looc_down"
#define COMSIG_KB_CLIENT_WHISPER_DOWN "keybinding_client_whisper_down"
#define COMSIG_KB_LIVING_COMBAT_INDICATOR "keybinding_living_combat_indicator"
modular_skyrat/modules/pixel_shift/code/pixel_shift_component.dm
+12 -12
View File
@@ -29,23 +29,23 @@
return COMPONENT_INCOMPATIBLE
/datum/component/pixel_shift/RegisterWithParent()
RegisterSignal(parent, COMSIG_KB_MOB_ITEM_PIXEL_SHIFT_DOWN, PROC_REF(item_pixel_shift_down))
RegisterSignal(parent, COMSIG_KB_MOB_ITEM_PIXEL_SHIFT_UP, PROC_REF(item_pixel_shift_up))
RegisterSignal(parent, COMSIG_KB_MOB_PIXEL_SHIFT_DOWN, PROC_REF(pixel_shift_down))
RegisterSignal(parent, COMSIG_KB_MOB_PIXEL_SHIFT_UP, PROC_REF(pixel_shift_up))
RegisterSignal(parent, COMSIG_KB_MOB_PIXEL_TILT_DOWN, PROC_REF(pixel_tilt_down))
RegisterSignal(parent, COMSIG_KB_MOB_PIXEL_TILT_UP, PROC_REF(pixel_tilt_up))
RegisterSignal(parent, COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_DOWN, PROC_REF(item_pixel_shift_down))
RegisterSignal(parent, COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_UP, PROC_REF(item_pixel_shift_up))
RegisterSignal(parent, COMSIG_KB_LIVING_PIXEL_SHIFT_DOWN, PROC_REF(pixel_shift_down))
RegisterSignal(parent, COMSIG_KB_LIVING_PIXEL_SHIFT_UP, PROC_REF(pixel_shift_up))
RegisterSignal(parent, COMSIG_KB_LIVING_PIXEL_TILT_DOWN, PROC_REF(pixel_tilt_down))
RegisterSignal(parent, COMSIG_KB_LIVING_PIXEL_TILT_UP, PROC_REF(pixel_tilt_up))
RegisterSignals(parent, list(COMSIG_LIVING_RESET_PULL_OFFSETS, COMSIG_LIVING_SET_PULL_OFFSET, COMSIG_MOVABLE_MOVED), PROC_REF(unpixel_shift))
RegisterSignal(parent, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE, PROC_REF(pre_move_check))
RegisterSignal(parent, COMSIG_LIVING_CAN_ALLOW_THROUGH, PROC_REF(check_passable))
/datum/component/pixel_shift/UnregisterFromParent()
UnregisterSignal(parent, list(
COMSIG_KB_MOB_ITEM_PIXEL_SHIFT_DOWN,
COMSIG_KB_MOB_ITEM_PIXEL_SHIFT_UP,
COMSIG_KB_MOB_PIXEL_TILT_DOWN,
COMSIG_KB_MOB_PIXEL_TILT_UP,
COMSIG_KB_MOB_PIXEL_SHIFT_DOWN,
COMSIG_KB_MOB_PIXEL_SHIFT_UP,
COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_DOWN,
COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_UP,
COMSIG_KB_LIVING_PIXEL_TILT_DOWN,
COMSIG_KB_LIVING_PIXEL_TILT_UP,
COMSIG_KB_LIVING_PIXEL_SHIFT_DOWN,
COMSIG_KB_LIVING_PIXEL_SHIFT_UP,
COMSIG_MOB_CLIENT_PRE_LIVING_MOVE,
COMSIG_LIVING_RESET_PULL_OFFSETS,
COMSIG_LIVING_SET_PULL_OFFSET,
modular_skyrat/modules/pixel_shift/code/pixel_shift_keybind.dm
+18 -18
View File
@@ -1,56 +1,56 @@
/datum/keybinding/mob/item_pixel_shift
/datum/keybinding/living/item_pixel_shift
hotkey_keys = list("V")
name = "item_pixel_shift"
full_name = "Item Pixel Shift"
description = "Shift a pulled item's offset"
category = CATEGORY_MISC
keybind_signal = COMSIG_KB_MOB_ITEM_PIXEL_SHIFT_DOWN
keybind_signal = COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_DOWN
/datum/keybinding/mob/item_pixel_shift/down(client/user)
/datum/keybinding/living/item_pixel_shift/down(client/user)
. = ..()
if(.)
return
user.mob.AddComponent(/datum/component/pixel_shift)
SEND_SIGNAL(user.mob, COMSIG_KB_MOB_ITEM_PIXEL_SHIFT_DOWN)
SEND_SIGNAL(user.mob, COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_DOWN)
/datum/keybinding/mob/item_pixel_shift/up(client/user)
/datum/keybinding/living/item_pixel_shift/up(client/user)
. = ..()
SEND_SIGNAL(user.mob, COMSIG_KB_MOB_ITEM_PIXEL_SHIFT_UP)
SEND_SIGNAL(user.mob, COMSIG_KB_LIVING_ITEM_PIXEL_SHIFT_UP)
/datum/keybinding/mob/pixel_shift
/datum/keybinding/living/pixel_shift
hotkey_keys = list("B")
name = "pixel_shift"
full_name = "Pixel Shift"
description = "Shift your characters offset."
category = CATEGORY_MOVEMENT
keybind_signal = COMSIG_KB_MOB_PIXEL_SHIFT_DOWN
keybind_signal = COMSIG_KB_LIVING_PIXEL_SHIFT_DOWN
/datum/keybinding/mob/pixel_shift/down(client/user)
/datum/keybinding/living/pixel_shift/down(client/user)
. = ..()
if(.)
return
user.mob.AddComponent(/datum/component/pixel_shift)
SEND_SIGNAL(user.mob, COMSIG_KB_MOB_PIXEL_SHIFT_DOWN)
SEND_SIGNAL(user.mob, COMSIG_KB_LIVING_PIXEL_SHIFT_DOWN)
/datum/keybinding/mob/pixel_shift/up(client/user)
/datum/keybinding/living/pixel_shift/up(client/user)
. = ..()
SEND_SIGNAL(user.mob, COMSIG_KB_MOB_PIXEL_SHIFT_UP)
SEND_SIGNAL(user.mob, COMSIG_KB_LIVING_PIXEL_SHIFT_UP)
/datum/keybinding/mob/pixel_tilting
/datum/keybinding/living/pixel_tilting
hotkey_keys = list("N")
name = "Pixel Tilting"
full_name = "Pixel Tilt"
description = "Shift a mob's rotational value"
category = CATEGORY_MOVEMENT
keybind_signal = COMSIG_KB_MOB_PIXEL_TILT_DOWN
keybind_signal = COMSIG_KB_LIVING_PIXEL_TILT_DOWN
/datum/keybinding/mob/pixel_tilting/down(client/user)
/datum/keybinding/living/pixel_tilting/down(client/user)
. = ..()
if(.)
return
user.mob.AddComponent(/datum/component/pixel_shift)
SEND_SIGNAL(user.mob, COMSIG_KB_MOB_PIXEL_TILT_DOWN)
SEND_SIGNAL(user.mob, COMSIG_KB_LIVING_PIXEL_TILT_DOWN)
/datum/keybinding/mob/pixel_tilting/up(client/user)
/datum/keybinding/living/pixel_tilting/up(client/user)
. = ..()
SEND_SIGNAL(user.mob, COMSIG_KB_MOB_PIXEL_TILT_UP)
SEND_SIGNAL(user.mob, COMSIG_KB_LIVING_PIXEL_TILT_UP)