diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index acd16b0b23..6a2be02f02 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -40,12 +40,13 @@ namespace Content.Client.Input common.AddFunction(ContentKeyFunctions.ResetZoom); common.AddFunction(ContentKeyFunctions.InspectEntity); common.AddFunction(ContentKeyFunctions.ToggleRoundEndSummaryWindow); - // DeltaV - Begin NanoChat keybinds + // Begin DeltaV Additions + common.AddFunction(ContentKeyFunctions.OpenAHelpCuratorChat); common.AddFunction(ContentKeyFunctions.NanoChatNavigateUp); common.AddFunction(ContentKeyFunctions.NanoChatNavigateDown); common.AddFunction(ContentKeyFunctions.NanoChatNavigateUpUnread); common.AddFunction(ContentKeyFunctions.NanoChatNavigateDownUnread); - // DeltaV - End NanoChat keybinds + // End DeltaV Additions // Not in engine, because engine cannot check for sanbox/admin status before starting placement. common.AddFunction(ContentKeyFunctions.EditorCopyObject); diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index 5a8fe55dc9..aaca79f101 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -227,6 +227,7 @@ namespace Content.Client.Options.UI.Tabs AddButton(ContentKeyFunctions.OpenGuidebook); AddButton(ContentKeyFunctions.OpenInventoryMenu); AddButton(ContentKeyFunctions.OpenAHelp); + AddButton(ContentKeyFunctions.OpenAHelpCuratorChat); // DeltaV AddButton(ContentKeyFunctions.OpenActionsMenu); AddButton(ContentKeyFunctions.OpenEmotesMenu); AddButton(ContentKeyFunctions.ToggleRoundEndSummaryWindow); diff --git a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml index 8147cb8720..aa9ee5262f 100644 --- a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml +++ b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml @@ -98,8 +98,9 @@ Access="Internal" Icon="{xe:Tex '/Textures/Interface/info.svg.192dpi.png'}" BoundKey = "{x:Static is:ContentKeyFunctions.OpenAHelp}" - ToolTip="{Loc 'ui-options-function-open-staff-chats-deltav'}" MinSize="42 64" + ToolTip="{Loc 'ui-options-function-open-staff-chats-deltav'}" + MinSize="42 64" HorizontalExpand="True" AppendStyleClass="{x:Static style:StyleBase.ButtonOpenLeft}" - /> + /> diff --git a/Content.Client/_RMC14/Mentor/StaffHelpUIController.cs b/Content.Client/_RMC14/Mentor/StaffHelpUIController.cs index f161ac3756..57c5d66567 100644 --- a/Content.Client/_RMC14/Mentor/StaffHelpUIController.cs +++ b/Content.Client/_RMC14/Mentor/StaffHelpUIController.cs @@ -123,7 +123,7 @@ public sealed class StaffHelpUIController : UIController, IOnSystemChanged ToggleWindow()), typeof(AHelpUIController)) .Register(); diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index 018cab4dc8..f6661c5ba8 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -24,12 +24,13 @@ namespace Content.Shared.Input public static readonly BoundKeyFunction CycleChatChannelForward = "CycleChatChannelForward"; public static readonly BoundKeyFunction CycleChatChannelBackward = "CycleChatChannelBackward"; public static readonly BoundKeyFunction EscapeContext = "EscapeContext"; - // DeltaV - Begin NanoChat keybinds + // Begin DeltaV Additions + public static readonly BoundKeyFunction OpenAHelpCuratorChat = "OpenAHelpCuratorChat"; public static readonly BoundKeyFunction NanoChatNavigateUp = "NanoChatNavigateUp"; public static readonly BoundKeyFunction NanoChatNavigateDown = "NanoChatNavigateDown"; public static readonly BoundKeyFunction NanoChatNavigateUpUnread = "NanoChatNavigateUpUnread"; public static readonly BoundKeyFunction NanoChatNavigateDownUnread = "NanoChatNavigateDownUnread"; - // DeltaV - End NanoChat keybinds + // End DeltaV Additions public static readonly BoundKeyFunction OpenCharacterMenu = "OpenCharacterMenu"; public static readonly BoundKeyFunction OpenEmotesMenu = "OpenEmotesMenu"; public static readonly BoundKeyFunction OpenCraftingMenu = "OpenCraftingMenu"; diff --git a/Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml b/Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml index 75dee8ef99..37bddfb344 100644 --- a/Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml +++ b/Resources/ServerInfo/Guidebook/NewPlayer/NewPlayer.xml @@ -6,7 +6,7 @@ You and your fellow crewmates are tasked with working together, surviving, and h [bold]Make sure to follow all server rules.[/bold] You can ask questions or report rule breaks to the [color=#EB2D3A][bold]admin team[/bold][/color] by using the [bold]admin help menu[/bold]. ([italic]accessible by pressing [/italic][color=yellow][bold][keybind="OpenAHelp"/][/bold][/color]) -Curators' goal is to present an interesting and enjoyable game experience. They may do this through influencing the round as a spectator through events. You can contact a curator for an event or need general game help by using the Curator Chat menu. ([italic]accessible by pressing [/italic][color=yellow][bold][keybind="OpenAHelp"/][/bold][/color]) +Curators' goal is to present an interesting and enjoyable game experience. They may do this through influencing the round as a spectator through events. You can contact a curator for an event or if you need general game help by using the Curator Chat menu. ([italic]accessible by pressing [/italic][color=yellow][bold][keybind="OpenAHelp"/][/bold][/color]) More detailed guides about [italic]specific jobs[/italic] and [italic]mechanics[/italic] can be found [textlink="here." link="SS14"/] diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index a7d9a57946..6b5dec7a6b 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -266,6 +266,10 @@ binds: - function: OpenAHelp type: State key: F1 +- function: OpenAHelpCuratorChat # DeltaV + type: State + key: F1 + mod1: Shift - function: OpenInventoryMenu type: State key: I