diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs index 59560cc151..9341071447 100644 --- a/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs +++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml.cs @@ -22,7 +22,7 @@ public sealed partial class MainMenuControl : Control LayoutContainer.SetMarginTop(VBox, 30); LayoutContainer.SetGrowHorizontal(VBox, LayoutContainer.GrowDirection.Begin); - var logoTexture = resCache.GetResource("/Textures/_Sunrise/Logo/logo-sunrise.png"); // Sunrise-Edit + var logoTexture = resCache.GetResource("/Textures/_Sunrise/Logo/logo-sunrise-slim.png"); // Sunrise-Edit Logo.Texture = logoTexture; var currentUserName = configMan.GetCVar(CVars.PlayerName); diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index ea490a2069..8f14a05b67 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -238,17 +238,18 @@ internal sealed partial class ChatManager : IChatManager private void SendOOC(ICommonSession player, string message) { - if (_adminManager.IsAdmin(player)) + if (!_oocEnabled) { - if (!_adminOocEnabled) + if (_adminManager.IsAdmin(player)) + { + if (!_adminOocEnabled) + return; + } + else { return; } } - else if (!_oocEnabled) - { - return; - } Color? colorOverride = null; var wrappedMessage = Loc.GetString("chat-manager-send-ooc-wrap-message", ("playerName",player.Name), ("message", FormattedMessage.EscapeText(message))); diff --git a/Resources/Textures/_Sunrise/Logo/logo-sunrise-slim.png b/Resources/Textures/_Sunrise/Logo/logo-sunrise-slim.png new file mode 100644 index 0000000000..3b27454b96 Binary files /dev/null and b/Resources/Textures/_Sunrise/Logo/logo-sunrise-slim.png differ diff --git a/Resources/Textures/_Sunrise/Logo/logo-sunrise.png b/Resources/Textures/_Sunrise/Logo/logo-sunrise-splash.png similarity index 100% rename from Resources/Textures/_Sunrise/Logo/logo-sunrise.png rename to Resources/Textures/_Sunrise/Logo/logo-sunrise-splash.png diff --git a/Resources/manifest.yml b/Resources/manifest.yml index 2aed293377..1d9d362215 100644 --- a/Resources/manifest.yml +++ b/Resources/manifest.yml @@ -1,5 +1,5 @@ defaultWindowTitle: Sunrise Station windowIconSet: /Textures/Logo/icon -splashLogo: /Textures/_Sunrise/Logo/logo-sunrise.png # Sunrise-Edit +splashLogo: /Textures/_Sunrise/Logo/logo-sunrise-splash.png # Sunrise-Edit # PJB PLEASE