mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2026-08-28 16:36:42 +01:00
reworks game preferences (characters v2 staging) (#6310)
Co-authored-by: silicons <no@you.cat> Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>
This commit is contained in:
co-authored by
silicons
LordME
parent
9f1b911556
commit
39bc14bb4a
@@ -35,7 +35,7 @@
|
||||
/client/verb/fix_macros()
|
||||
set name = "Fix Keybindings"
|
||||
set desc = "Re-assert all your macros/keybindings."
|
||||
set category = "OOC"
|
||||
set category = VERB_CATEGORY_OOC
|
||||
if(!SSinput.initialized)
|
||||
to_chat(src, "<span class='warning'>Input hasn't been initialized yet. Wait a while.</span>")
|
||||
return
|
||||
@@ -62,7 +62,7 @@
|
||||
var/command = macroset[key]
|
||||
winset(src, "[name]-[REF(key)]", "parent=[name];name=[key];command=[command]")
|
||||
|
||||
/client/proc/set_macros(datum/preferences/prefs_override = prefs)
|
||||
/client/proc/set_macros(datum/game_preferences/prefs_override = preferences)
|
||||
set waitfor = FALSE
|
||||
|
||||
keys_held.Cut()
|
||||
@@ -81,10 +81,10 @@
|
||||
window.set_mouse_macro()
|
||||
|
||||
set_hotkeys_preference()
|
||||
set_hotkeys_button(prefs_override.hotkeys)
|
||||
set_hotkeys_button(prefs_override.is_hotkeys_mode())
|
||||
|
||||
/client/proc/set_hotkeys_preference(datum/preferences/prefs_override = prefs)
|
||||
if(prefs_override.hotkeys)
|
||||
/client/proc/set_hotkeys_preference(datum/game_preferences/prefs_override = preferences)
|
||||
if(prefs_override.is_hotkeys_mode())
|
||||
winset(src, null, "map.focus=true input.background-color=[COLOR_INPUT_DISABLED] mainwindow.macro=[SKIN_MACROSET_HOTKEYS]")
|
||||
else
|
||||
winset(src, null, "input.focus=true input.background-color=[COLOR_INPUT_ENABLED] mainwindow.macro=[SKIN_MACROSET_CLASSIC_INPUT]")
|
||||
|
||||
Reference in New Issue
Block a user