Rebindable menu + move menu to default F10 (#15287)

* Rebindable menu + move menu to default f11

* Moved to F10

* Specify which menu gets toggled by the EscapeMenu button

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index 28ec8d93923eb6fd6f05f97eec1c7f487eccbfb9..74aaf466aa3dffd1d0c3dcd86f76c400aa541006 100644 (file)
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -147,6 +147,7 @@ namespace Content.Client.Options.UI.Tabs
             AddButton(ContentKeyFunctions.OpenAdminMenu);
             AddButton(EngineKeyFunctions.WindowCloseAll);
             AddButton(EngineKeyFunctions.WindowCloseRecent);
+            AddButton(EngineKeyFunctions.EscapeMenu);
 
             AddHeader("ui-options-header-misc");
             AddButton(ContentKeyFunctions.TakeScreenshot);

diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 86e4b613367b506c4c699b9d10ab642bb32d4361..9808110ea2de2587dd7c781786d9b85b090117d2 100644 (file)
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -137,6 +137,7 @@ ui-options-function-open-admin-menu = Open admin menu
 ui-options-function-open-guidebook = Open guidebook
 ui-options-function-window-close-all = Close all windows
 ui-options-function-window-close-recent = Close recent window
+ui-options-function-show-escape-menu = Toggle game menu
 
 ui-options-function-take-screenshot = Take screenshot
 ui-options-function-take-screenshot-no-ui = Take screenshot (without UI)

diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml
index b76d62116634f4f2670e4b5b3a1c7af204cf233d..493dc9bb73e86dc6815a3e02a9bcbe2c6ac33205 100644 (file)
--- a/Resources/keybinds.yml
+++ b/Resources/keybinds.yml
@@ -79,7 +79,7 @@ binds:
 # Misc
 - function: ShowEscapeMenu
   type: State
-  key: F12
+  key: F10
 - function: CycleChatChannelForward
   type: State
   key: Tab