From cf76ee5b1aa0880382bdd6714ee79090ff967548 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 30 Sep 2020 01:12:57 +0200 Subject: [PATCH] [MIRROR] Communication hotfix (#1062) * Communication hotfix * bah * Update preferences.dm Co-authored-by: Couls Co-authored-by: Azarak --- code/controllers/subsystem/input.dm | 2 +- code/modules/client/client_procs.dm | 2 +- code/modules/client/preferences.dm | 6 +++--- code/modules/keybindings/setup.dm | 2 ++ .../modules/customization/modules/client/preferences.dm | 6 +++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm index 5df87e9119b..a78feffd850 100644 --- a/code/controllers/subsystem/input.dm +++ b/code/controllers/subsystem/input.dm @@ -32,7 +32,7 @@ SUBSYSTEM_DEF(input) var/list/clients = GLOB.clients for(var/i in 1 to clients.len) var/client/user = clients[i] - user.update_special_keybinds() + user.set_macros() /datum/controller/subsystem/input/fire() var/list/clients = GLOB.clients // Let's sing the list cache song diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index d1476fb6e35..56e06b3c377 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -310,7 +310,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( return if(SSinput.initialized) - update_special_keybinds() + set_macros() // Initialize tgui panel tgui_panel.initialize() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7be83b23247..8e0af09c3a1 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -158,7 +158,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) //we couldn't load character data so just randomize the character appearance + name random_character() //let's create a random character then - rather than a fat, bald and naked man. key_bindings = deepCopyList(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds and update their movement keys - C?.update_special_keybinds(src) + C?.set_macros() real_name = pref_species.random_name(gender,1) if(!loaded_preferences_successfully) save_preferences() @@ -1662,7 +1662,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) key_bindings[full_key] = sortList(key_bindings[full_key]) user << browse(null, "window=capturekeypress") - user.client.update_special_keybinds() + user.client.set_macros() save_preferences() if("keybindings_reset") @@ -1672,7 +1672,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) return hotkeys = (choice == "Hotkey") key_bindings = (hotkeys) ? deepCopyList(GLOB.hotkey_keybinding_list_by_key) : deepCopyList(GLOB.classic_keybinding_list_by_key) - user.client.update_special_keybinds() + user.client.set_macros() if("chat_on_map") chat_on_map = !chat_on_map diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm index bb0ccf9822f..83f286754be 100644 --- a/code/modules/keybindings/setup.dm +++ b/code/modules/keybindings/setup.dm @@ -36,3 +36,5 @@ winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED]") else winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_DISABLED]") + + update_special_keybinds() diff --git a/modular_skyrat/modules/customization/modules/client/preferences.dm b/modular_skyrat/modules/customization/modules/client/preferences.dm index 62c456b0747..df284a86c2b 100644 --- a/modular_skyrat/modules/customization/modules/client/preferences.dm +++ b/modular_skyrat/modules/customization/modules/client/preferences.dm @@ -203,7 +203,7 @@ //we couldn't load character data so just randomize the character appearance + name random_character() //let's create a random character then - rather than a fat, bald and naked man. key_bindings = deepCopyList(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds and update their movement keys - C?.update_special_keybinds(src) + C?.set_macros(src) real_name = pref_species.random_name(gender,1) if(!loaded_preferences_successfully) save_preferences() @@ -2354,7 +2354,7 @@ key_bindings[full_key] = sortList(key_bindings[full_key]) user << browse(null, "window=capturekeypress") - user.client.update_special_keybinds() + user.client.set_macros() save_preferences() if("keybindings_reset") @@ -2364,7 +2364,7 @@ return hotkeys = (choice == "Hotkey") key_bindings = (hotkeys) ? deepCopyList(GLOB.hotkey_keybinding_list_by_key) : deepCopyList(GLOB.classic_keybinding_list_by_key) - user.client.update_special_keybinds() + user.client.set_macros() if("chat_on_map") chat_on_map = !chat_on_map