From 0b2245ff2c1b779f2ffdb384c807c817f1086f64 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Mon, 31 Aug 2026 19:03:50 +0000
Subject: [PATCH] Bugfix: Station AI's Comms Console UI is missing a screen
 (#45663)

* Add a default screen to the comms console BUI

* Return to Screen, ScreenDummy is dead

* margin adjustment
---
 .../CommunicationsConsoleComponent.cs              |  2 +-
 .../UI/CommunicationsConsoleBoundUserInterface.cs  |  4 ++++
 .../UI/Widgets/MessagingControls.xaml              | 14 ++++++++------
 .../Wallmounts/WallmountMachines/screen.yml        |  8 --------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Content.Client/Communications/CommunicationsConsoleComponent.cs b/Content.Client/Communications/CommunicationsConsoleComponent.cs
index d3db95d5bd..2c3f696653 100644
--- a/Content.Client/Communications/CommunicationsConsoleComponent.cs
+++ b/Content.Client/Communications/CommunicationsConsoleComponent.cs
@@ -15,5 +15,5 @@ public sealed partial class CommunicationsConsoleComponent : SharedCommunication
     /// If this isn't true, create a dummy entity or adjust the margins/scale in MessagingControls.xaml.
     /// </remarks>
     [DataField]
-    public EntProtoId ScreenDisplayId = "ScreenDummy";
+    public EntProtoId ScreenDisplayId = "Screen";
 }
diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
index cc0e06c9da..f382de1e79 100644
--- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
@@ -24,6 +24,8 @@ public sealed partial class CommunicationsConsoleBoundUserInterface(EntityUid ow
     [ViewVariables]
     private CommunicationsConsoleMenu? _menu;
 
+    private static readonly EntProtoId FallbackScreen = "Screen";
+
     /// <inheritdoc/>
     protected override void Open()
     {
@@ -38,6 +40,8 @@ public sealed partial class CommunicationsConsoleBoundUserInterface(EntityUid ow
 
         if (EntMan.TryGetComponent<CommunicationsConsoleComponent>(Owner, out var console))
             _menu.SetBroadcastDisplayEntity(console.ScreenDisplayId);
+        else
+            _menu.SetBroadcastDisplayEntity(FallbackScreen);
     }
 
     public void AlertLevelSelected(ProtoId<AlertLevelPrototype> level)
diff --git a/Content.Client/Communications/UI/Widgets/MessagingControls.xaml b/Content.Client/Communications/UI/Widgets/MessagingControls.xaml
index 284da9774d..4120b33fd2 100644
--- a/Content.Client/Communications/UI/Widgets/MessagingControls.xaml
+++ b/Content.Client/Communications/UI/Widgets/MessagingControls.xaml
@@ -25,12 +25,14 @@
         <Label StyleClasses="StatusFieldTitle" Align="Center" VAlign="Top"
             VerticalAlignment="Top"
             Text="{Loc 'comms-console-station-broadcast-header'}" />
-        <Label Name="BroadcastTopCharLimitLabel"
-            StyleClasses="CommsConsoleCharLimit" HorizontalAlignment="Center" Margin="0 10 0 0" />
-        <SpriteView Name="BroadcastEntityDisplay" Scale="8 8" SpriteOffset="True"
-            VerticalExpand="True" Margin="0 -124 0 -112" /> <!-- Forgive me for negamargin but there's just too much goddamn space - whatstone -->
-        <Label Name="BroadcastBottomCharLimitLabel"
-            StyleClasses="CommsConsoleCharLimit" HorizontalAlignment="Center" />
+        <BoxContainer Orientation="Vertical" VerticalExpand="True" VerticalAlignment="Center">
+            <Label Name="BroadcastTopCharLimitLabel"
+                StyleClasses="CommsConsoleCharLimit" HorizontalAlignment="Center" Margin="0 10 0 0" />
+            <SpriteView Name="BroadcastEntityDisplay" Scale="8 8" SpriteOffset="True"
+                Margin="0 -56 0 -56" /> <!-- Forgive me for negamargin but there's just too much goddamn space - whatstone -->
+            <Label Name="BroadcastBottomCharLimitLabel"
+                StyleClasses="CommsConsoleCharLimit" HorizontalAlignment="Center" />
+        </BoxContainer>
         <PanelContainer StyleClasses="BackgroundDark" Margin="10 6 6 6"
             HorizontalExpand="True" VerticalExpand="True">
             <TextEdit Name="ScreenMessageInput" MinHeight="40"
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
index 983ead5ac3..a92e139227 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml
@@ -39,14 +39,6 @@
     deviceNetId: Wireless
     receiveFrequencyId: ShuttleTimer
 
-# Dummy screen for comms console
-- type: entity
-  parent: Screen
-  id: ScreenDummy
-  categories: [HideSpawnMenu]
-  components:
-  - type: Sprite
-
 - type: entity
   id: ArrivalsShuttleTimer
   parent: Screen