cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Communication hotfix (#1062)

Browse Source 
* Communication hotfix

* bah

* Update preferences.dm

Co-authored-by: Couls <coul422@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
This commit is contained in:
SkyratBot
2020-09-30 01:12:57 +02:00
committed by GitHub
parent b8bd574701
commit cf76ee5b1a
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/input.dm
+1 -1
View File
@@ -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
code/modules/client/client_procs.dm
+1 -1
View File
@@ -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()
code/modules/client/preferences.dm
+3 -3
View File
@@ -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
code/modules/keybindings/setup.dm
+2
View File
@@ -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()
modular_skyrat/modules/customization/modules/client/preferences.dm
+3 -3
View File
@@ -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