diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkPanel.xaml b/Content.Client/Administration/UI/Bwoink/BwoinkPanel.xaml index 31f46c5500..b1bd283ab8 100644 --- a/Content.Client/Administration/UI/Bwoink/BwoinkPanel.xaml +++ b/Content.Client/Administration/UI/Bwoink/BwoinkPanel.xaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Orientation="Vertical" HorizontalExpand="True"> + diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index efc3e8caf9..4fc346e375 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -26,7 +26,8 @@ namespace Content.Client.Input common.AddFunction(ContentKeyFunctions.CycleChatChannelBackward); common.AddFunction(ContentKeyFunctions.EscapeContext); common.AddFunction(ContentKeyFunctions.ExamineEntity); - common.AddFunction(ContentKeyFunctions.OpenAHelp); + // Sunrise-Edit + //common.AddFunction(ContentKeyFunctions.OpenAHelp); common.AddFunction(ContentKeyFunctions.TakeScreenshot); common.AddFunction(ContentKeyFunctions.TakeScreenshotNoUI); common.AddFunction(ContentKeyFunctions.ToggleFullscreen); @@ -49,6 +50,11 @@ namespace Content.Client.Input // Not in engine so that the RCD can rotate objects common.AddFunction(EngineKeyFunctions.EditorRotateObject); + // Sunrise-Start + common.AddFunction(ContentKeyFunctions.OpenMentorHelp); + common.AddFunction(ContentKeyFunctions.OpenHelpChoice); + // Sunrise-End + var human = contexts.GetContext("human"); human.AddFunction(EngineKeyFunctions.MoveUp); human.AddFunction(EngineKeyFunctions.MoveDown); diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml index 4963b9b1bf..fd775f5c45 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml +++ b/Content.Client/Lobby/UI/LobbyGui.xaml @@ -177,6 +177,8 @@ HorizontalAlignment="Right" SizeFlagsStretchRatio="1">