diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3cd143ba82c..dcd6eaa1698 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1 @@ -**/_LostParadise/** @Flybik @Evgencheg -* @BL02DL +* @BL02DL @Flybik @Evgencheg diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs index 18f03cd7db0..8f1261034c8 100644 --- a/Content.Client/Chat/Managers/ChatManager.cs +++ b/Content.Client/Chat/Managers/ChatManager.cs @@ -47,6 +47,10 @@ public void SendMessage(string text, ChatSelectChannel channel) _consoleHost.ExecuteCommand($"me \"{CommandParsing.Escape(str)}\""); break; + case ChatSelectChannel.HiddenEmotes: + _consoleHost.ExecuteCommand($"hme \"{CommandParsing.Escape(str)}\""); + break; + case ChatSelectChannel.Dead: if (_systems.GetEntitySystemOrNull() is {IsGhost: true}) goto case ChatSelectChannel.Local; diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs index 68c937a7885..e1127307e30 100644 --- a/Content.Client/Chat/UI/SpeechBubble.cs +++ b/Content.Client/Chat/UI/SpeechBubble.cs @@ -20,6 +20,7 @@ public abstract class SpeechBubble : Control public enum SpeechType : byte { Emote, + HiddenEmote, Say, Whisper, Looc @@ -65,6 +66,9 @@ public static SpeechBubble CreateSpeechBubble(SpeechType type, ChatMessage messa case SpeechType.Emote: return new TextSpeechBubble(message, senderEntity, "emoteBox"); + case SpeechType.HiddenEmote: + return new TextSpeechBubble(message, senderEntity, "emoteBox", Color.FromHex("#ffd29e")); + case SpeechType.Say: return new FancyTextSpeechBubble(message, senderEntity, "sayBox"); diff --git a/Content.Client/Info/LinkBanner.cs b/Content.Client/Info/LinkBanner.cs index a30aa413761..f9c4a1ba76d 100644 --- a/Content.Client/Info/LinkBanner.cs +++ b/Content.Client/Info/LinkBanner.cs @@ -1,4 +1,6 @@ -using Content.Client.Changelog; +using Content.Client._LostParadise.Roadmap; +using Content.Client.Changelog; +using Content.Client.Stylesheets; using Content.Client.UserInterface.Systems.EscapeMenu; using Content.Client.UserInterface.Systems.Guidebook; using Content.Shared.CCVar; @@ -47,6 +49,14 @@ public LinkBanner() changelogButton.OnPressed += args => UserInterfaceManager.GetUIController().ToggleWindow(); buttons.AddChild(changelogButton); + var roadmapButton = new Button + { + Text = Loc.GetString("server-info-roadmap-button"), + StyleClasses = { StyleBase.ButtonCaution }, + }; + roadmapButton.OnPressed += _ => UserInterfaceManager.GetUIController().ToggleRoadmap(); + buttons.AddChild(roadmapButton); + void AddInfoButton(string loc, CVarDef cVar) { var button = new Button { Text = Loc.GetString(loc) }; diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 9a49c4e28c1..675330b0ebc 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -15,6 +15,7 @@ public static void SetupContexts(IInputContextContainer contexts) common.AddFunction(ContentKeyFunctions.FocusChat); common.AddFunction(ContentKeyFunctions.FocusLocalChat); common.AddFunction(ContentKeyFunctions.FocusEmote); + common.AddFunction(ContentKeyFunctions.FocusHiddenEmote); common.AddFunction(ContentKeyFunctions.FocusWhisperChat); common.AddFunction(ContentKeyFunctions.FocusRadio); common.AddFunction(ContentKeyFunctions.FocusLOOC); diff --git a/Content.Client/Options/UI/EscapeMenu.xaml b/Content.Client/Options/UI/EscapeMenu.xaml index c84954be649..5226be5f58c 100644 --- a/Content.Client/Options/UI/EscapeMenu.xaml +++ b/Content.Client/Options/UI/EscapeMenu.xaml @@ -6,6 +6,7 @@ Resizable="False"> +