From: Skye <22365940+Skyedra@users.noreply.github.com>
Date: Tue, 11 Apr 2023 03:40:07 +0000 (-0700)
Subject: Rebindable menu + move menu to default F10 (#15287)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=405ea8ae49c8abab01ad83a2e95c0b7b90a4a8d8;p=space-station-14.git

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 28ec8d9392..74aaf466aa 100644
--- 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 86e4b61336..9808110ea2 100644
--- 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 b76d621166..493dc9bb73 100644
--- 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