diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 9b45d63b60..0684bb7c49 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -14,8 +14,10 @@ namespace Content.Client.Input var common = contexts.GetContext("common"); common.AddFunction(ContentKeyFunctions.FocusChat); common.AddFunction(ContentKeyFunctions.FocusLocalChat); + common.AddFunction(ContentKeyFunctions.FocusEmote); common.AddFunction(ContentKeyFunctions.FocusWhisperChat); common.AddFunction(ContentKeyFunctions.FocusRadio); + common.AddFunction(ContentKeyFunctions.FocusLOOC); common.AddFunction(ContentKeyFunctions.FocusOOC); common.AddFunction(ContentKeyFunctions.FocusAdminChat); common.AddFunction(ContentKeyFunctions.FocusConsoleChat); diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index c693f6f1ab..93c34e9530 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -129,8 +129,10 @@ namespace Content.Client.Options.UI.Tabs AddHeader("ui-options-header-ui"); AddButton(ContentKeyFunctions.FocusChat); AddButton(ContentKeyFunctions.FocusLocalChat); + AddButton(ContentKeyFunctions.FocusEmote); AddButton(ContentKeyFunctions.FocusWhisperChat); AddButton(ContentKeyFunctions.FocusRadio); + AddButton(ContentKeyFunctions.FocusLOOC); AddButton(ContentKeyFunctions.FocusOOC); AddButton(ContentKeyFunctions.FocusAdminChat); AddButton(ContentKeyFunctions.FocusDeadChat); diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index 64d9b05a32..691725dd4d 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -161,9 +161,15 @@ public sealed class ChatUIController : UIController _input.SetInputCommand(ContentKeyFunctions.FocusLocalChat, InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.Local))); + _input.SetInputCommand(ContentKeyFunctions.FocusEmote, + InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.Emotes))); + _input.SetInputCommand(ContentKeyFunctions.FocusWhisperChat, InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.Whisper))); + _input.SetInputCommand(ContentKeyFunctions.FocusLOOC, + InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.LOOC))); + _input.SetInputCommand(ContentKeyFunctions.FocusOOC, InputCmdHandler.FromDelegate(_ => FocusChannel(ChatSelectChannel.OOC))); diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index 2492aba347..d9b3d090ea 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -13,8 +13,10 @@ namespace Content.Shared.Input public static readonly BoundKeyFunction ExamineEntity = "ExamineEntity"; public static readonly BoundKeyFunction FocusChat = "FocusChatInputWindow"; public static readonly BoundKeyFunction FocusLocalChat = "FocusLocalChatWindow"; + public static readonly BoundKeyFunction FocusEmote = "FocusEmote"; public static readonly BoundKeyFunction FocusWhisperChat = "FocusWhisperChatWindow"; public static readonly BoundKeyFunction FocusRadio = "FocusRadioWindow"; + public static readonly BoundKeyFunction FocusLOOC = "FocusLOOCWindow"; public static readonly BoundKeyFunction FocusOOC = "FocusOOCWindow"; public static readonly BoundKeyFunction FocusAdminChat = "FocusAdminChatWindow"; public static readonly BoundKeyFunction FocusDeadChat = "FocusDeadChatWindow"; 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 27fd788b7c..9359b7ca21 100644 --- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl @@ -118,8 +118,10 @@ ui-options-function-point = Point at location ui-options-function-focus-chat-input-window = Focus chat ui-options-function-focus-local-chat-window = Focus chat (IC) +ui-options-function-focus-emote = Focus chat (Emote) ui-options-function-focus-whisper-chat-window = Focus chat (Whisper) ui-options-function-focus-radio-window = Focus chat (Radio) +ui-options-function-focus-looc-window = Focus chat (LOOC) ui-options-function-focus-ooc-window = Focus chat (OOC) ui-options-function-focus-admin-chat-window = Focus chat (Admin) ui-options-function-focus-dead-chat-window = Focus chat (Dead) diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index f30e9dea37..9c5bf8ae18 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -103,12 +103,20 @@ binds: - function: FocusLocalChatWindow type: State key: Period +- function: FocusEmote + type: State + mod1: Shift + key: Apostrophe - function: FocusWhisperChatWindow type: State key: Comma - function: FocusRadioWindow type: State key: SemiColon +- function: FocusLOOCWindow + type: State + mod1: Shift + key: Num9 - function: FocusOOCWindow type: State key: LBracket