mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-25 22:19:30 +01:00
Fix keybinding action buttons (#92396)
## About The Pull Request Put a ! where there should not be. Whoops. Fixes https://github.com/tgstation/tgstation/issues/92395 Fixes https://github.com/tgstation/tgstation/issues/92348 ## Why It's Good For The Game Bug fix and working feature good ## Changelog 🆑 fix: Action button binding works again /🆑
This commit is contained in:
@@ -56,7 +56,7 @@
|
||||
|
||||
var/list/modifiers = params2list(params)
|
||||
if(LAZYACCESS(modifiers, ALT_CLICK))
|
||||
linked_action?.begin_creating_bind(usr)
|
||||
linked_action?.begin_creating_bind(src, usr)
|
||||
return TRUE
|
||||
if(LAZYACCESS(modifiers, SHIFT_CLICK))
|
||||
var/datum/hud/our_hud = usr.hud_used
|
||||
|
||||
@@ -432,15 +432,15 @@
|
||||
/datum/action/proc/is_action_active(atom/movable/screen/movable/action_button/current_button)
|
||||
return FALSE
|
||||
|
||||
/datum/action/proc/begin_creating_bind(mob/user)
|
||||
if(!user != owner)
|
||||
/datum/action/proc/begin_creating_bind(atom/movable/screen/movable/action_button/current_button, mob/user)
|
||||
if(!current_button || user != owner)
|
||||
return
|
||||
if(!isnull(full_key))
|
||||
full_key = null
|
||||
update_button_status(src)
|
||||
update_button_status(current_button)
|
||||
return
|
||||
full_key = tgui_input_keycombo(user, "Please bind a key for this action.")
|
||||
update_button_status(src)
|
||||
update_button_status(current_button)
|
||||
|
||||
/datum/action/proc/keydown(mob/source, key, client/client, full_key)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
Reference in New Issue
Block a user