mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Create client preference for if hotkey mode is enabled by default on login or not.
* Adds preference setting for wether hotkeys should default to enabled or disabled. * Fixes bug for CTRL+NUMPAD8 using old verb name for toggling head.
This commit is contained in:
@@ -104,6 +104,13 @@ var/list/_client_preferences_by_type
|
|||||||
enabled_description = "Show"
|
enabled_description = "Show"
|
||||||
disabled_description = "Hide"
|
disabled_description = "Hide"
|
||||||
|
|
||||||
|
/datum/client_preference/hotkeys_default
|
||||||
|
description ="Hotkeys Default"
|
||||||
|
key = "HUD_HOTKEYS"
|
||||||
|
enabled_description = "Enabled"
|
||||||
|
disabled_description = "Disabled"
|
||||||
|
enabled_by_default = FALSE // Backwards compatibility
|
||||||
|
|
||||||
/datum/client_preference/show_typing_indicator
|
/datum/client_preference/show_typing_indicator
|
||||||
description ="Typing indicator"
|
description ="Typing indicator"
|
||||||
key = "SHOW_TYPING"
|
key = "SHOW_TYPING"
|
||||||
|
|||||||
@@ -5,7 +5,8 @@
|
|||||||
|
|
||||||
show_laws(0)
|
show_laws(0)
|
||||||
|
|
||||||
winset(src, null, "mainwindow.macro=borgmacro hotkey_toggle.is-checked=false input.focus=true input.background-color=#D3B5B5")
|
// Override the DreamSeeker macro with the borg version!
|
||||||
|
client.set_hotkeys_macro("borgmacro", "borghotkeymode")
|
||||||
|
|
||||||
// Forces synths to select an icon relevant to their module
|
// Forces synths to select an icon relevant to their module
|
||||||
if(!icon_selected)
|
if(!icon_selected)
|
||||||
|
|||||||
@@ -56,4 +56,4 @@
|
|||||||
recalculate_vis()
|
recalculate_vis()
|
||||||
|
|
||||||
//set macro to normal incase it was overriden (like cyborg currently does)
|
//set macro to normal incase it was overriden (like cyborg currently does)
|
||||||
winset(src, null, "mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true input.background-color=#D3B5B5")
|
client.set_hotkeys_macro("macro", "hotkeymode")
|
||||||
|
|||||||
5
html/changelogs/Leshana - hotkeys-qol.yml
Normal file
5
html/changelogs/Leshana - hotkeys-qol.yml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
author: Leshana
|
||||||
|
delete-after: True
|
||||||
|
changes:
|
||||||
|
- rscadd: "Added a client preference setting for wether Hotkeys Mode should be enabled or disabled by default."
|
||||||
|
- bugfix: "CTRL+NUMPAD8 while playing a robot won't runtime anymore."
|
||||||
@@ -188,3 +188,14 @@ Any-Mode: (hotkey doesn't need to be on)
|
|||||||
src << other
|
src << other
|
||||||
if(holder)
|
if(holder)
|
||||||
src << admin
|
src << admin
|
||||||
|
|
||||||
|
// Set the DreamSeeker input macro to the type appropriate for its mob
|
||||||
|
/client/proc/set_hotkeys_macro(macro_name = "macro", hotkey_macro_name = "hotkeymode", hotkeys_enabled = null)
|
||||||
|
// If hotkeys mode was not specified, fall back to choice of default in client preferences.
|
||||||
|
if(isnull(hotkeys_enabled))
|
||||||
|
hotkeys_enabled = is_preference_enabled(/datum/client_preference/hotkeys_default)
|
||||||
|
|
||||||
|
if(hotkeys_enabled)
|
||||||
|
winset(src, null, "mainwindow.macro=[hotkey_macro_name] hotkey_toggle.is-checked=true mapwindow.map.focus=true")
|
||||||
|
else
|
||||||
|
winset(src, null, "mainwindow.macro=[macro_name] hotkey_toggle.is-checked=false input.focus=true")
|
||||||
|
|||||||
@@ -991,7 +991,7 @@ macro "borgmacro"
|
|||||||
is-disabled = false
|
is-disabled = false
|
||||||
elem
|
elem
|
||||||
name = "CTRL+NUMPAD8"
|
name = "CTRL+NUMPAD8"
|
||||||
command = "body-head-toggle"
|
command = "body-toggle-head"
|
||||||
is-disabled = false
|
is-disabled = false
|
||||||
elem
|
elem
|
||||||
name = "F1"
|
name = "F1"
|
||||||
|
|||||||
Reference in New Issue
Block a user