From a635429d3ee7d472b118c5a688efd6386804ea4d Mon Sep 17 00:00:00 2001 From: pathetic meowmeow Date: Thu, 27 Aug 2026 14:37:40 -0400 Subject: [PATCH] Communications console & screens overhaul (#5954) * i'm going insane from screens * some wiring * screemes * holy shit adhd lock-in * incomplete * its FUCKING DONE * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * zeta * mrrrp * test fix * fix arrivals * fix misnetwork * Fix iteration outline. Fixed all headers showing if all options where hidden. Added access requirement to keycard auth mechnism. Added countdown. Fixed ninja and fugitive. Fixed AI and aghost. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Vanessa --- ...CommunicationsConsoleBoundUserInterface.cs | 15 - .../UI/CommunicationsConsoleMenu.xaml | 9 - .../UI/CommunicationsConsoleMenu.xaml.cs | 31 -- .../UserInterface/Controls/ConfirmButton.cs | 7 +- ...CommunicationsConsoleBoundUserInterface.cs | 30 ++ .../DVCommunicationsConsoleMenu.xaml | 117 +++++++ .../DVCommunicationsConsoleMenu.xaml.cs | 320 ++++++++++++++++++ .../DVCommunicationsConsoleSystem.cs | 26 ++ .../DVKeycardAuthenticationDeviceSystem.cs | 5 + Content.Client/_DV/Screens/DVScreenSystem.cs | 103 ++++++ .../_DV/Screens/DVTextRenderingOverlay.cs | 140 ++++++++ .../_DV/Screens/DVTextVisualsComponent.cs | 43 +++ .../_DV/Screens/DVTextVisualsSystem.cs | 73 ++++ .../Sheetlets/DVLineEditSheetlet.cs | 23 ++ .../Communications/CommsHackerSystem.cs | 3 +- .../CommunicationsConsoleSystem.cs | 14 +- .../Components/EmergencyLightComponent.cs | 11 + .../CommunicationsConsoleSystem.cs | 32 -- .../DVCommunicationsConsoleSystem.cs | 184 ++++++++++ ...tationKeycardAuthenticationDeviceSystem.cs | 88 +++++ Content.Server/_DV/Screens/DVScreenSystem.cs | 111 ++++++ .../Systems/StationExfiltrationSystem.cs | 10 +- .../StationEvents/GameRules/FugitiveRule.cs | 4 +- .../SharedCommunicationsConsoleComponent.cs | 4 +- ...ationsConsoleExfiltrationShuttleMessage.cs | 9 - .../DVCommunicationsConsoleComponent.cs | 136 ++++++++ .../DVCommunicationsConsoleSystem.cs | 148 ++++++++ ...henticationDeviceAlreadySwipedComponent.cs | 7 + ...ionKeycardAuthenticationDeviceComponent.cs | 50 +++ ...tationKeycardAuthenticationDeviceSystem.cs | 124 +++++++ .../_DV/Screens/DVScreenComponent.cs | 55 +++ .../_DV/Screens/DVSharedScreenSystem.cs | 13 + .../_DV/Screens/DVTextScreenVisualLayers.cs | 10 + .../_DV/Announcements/Alerts/code_zeta.ogg | Bin 0 -> 658900 bytes Resources/Audio/_Starlight/misc/orange.ogg | Bin 184126 -> 0 bytes Resources/Fonts/_DV/TinyUnicode.ttf | Bin 0 -> 23280 bytes .../communications-console-component.ftl | 57 +++- .../keycard-authentication-device.ftl | 2 + .../en-US/_DV/station-events/screens.ftl | 3 + .../_Starlight/alert-levels/alert-levels.ftl | 3 - .../en-US/alert-levels/alert-levels.ftl | 4 + Resources/Maps/ovni.yml | 2 - Resources/Migrations/deltaMigrations.yml | 6 +- .../Prototypes/AlertLevels/alert_levels.yml | 21 +- .../Entities/Mobs/Player/admin_ghost.yml | 37 +- .../Entities/Mobs/Player/silicon.yml | 29 +- .../Entities/Stations/nanotrasen.yml | 1 + .../Machines/Computers/computers.yml | 88 +++-- .../Wallmounts/WallmountMachines/screen.yml | 4 +- .../Prototypes/_DV/Entities/Stations/base.yml | 9 + .../Structures/Wallmounts/status_display.yml | 105 ++++++ Resources/Prototypes/_DV/shaders.yml | 5 + .../Guidebook/_DV/AlertProcedure.xml | 38 +-- Resources/Textures/_DV/Shaders/mask.swsl | 15 + .../screen.rsi/alert_border_blue.png | Bin 0 -> 252 bytes .../screen.rsi/alert_border_delta.png | Bin 0 -> 382 bytes .../screen.rsi/alert_border_epsilon.png | Bin 0 -> 320 bytes .../screen.rsi/alert_border_gamma.png | Bin 0 -> 317 bytes .../screen.rsi/alert_border_green.png | Bin 0 -> 250 bytes .../screen.rsi/alert_border_octarine.png | Bin 0 -> 203 bytes .../screen.rsi/alert_border_red.png | Bin 0 -> 237 bytes .../screen.rsi/alert_border_violet.png | Bin 0 -> 204 bytes .../screen.rsi/alert_border_white.png | Bin 0 -> 191 bytes .../screen.rsi/alert_border_yellow.png | Bin 0 -> 192 bytes .../screen.rsi/alert_border_zeta.png | Bin 0 -> 197 bytes .../Wallmounts/screen.rsi/frame.png | Bin 0 -> 261 bytes .../Wallmounts/screen.rsi/frame_broken.png | Bin 0 -> 440 bytes .../Structures/Wallmounts/screen.rsi/mask.png | Bin 0 -> 149 bytes .../Wallmounts/screen.rsi/meta.json | 269 +++++++++++++++ .../Wallmounts/screen.rsi/radiation.png | Bin 0 -> 792 bytes .../screen.rsi/status_display_blue.png | Bin 0 -> 494 bytes .../screen.rsi/status_display_delta.png | Bin 0 -> 957 bytes .../screen.rsi/status_display_epsilon.png | Bin 0 -> 910 bytes .../screen.rsi/status_display_gamma.png | Bin 0 -> 798 bytes .../screen.rsi/status_display_green.png | Bin 0 -> 453 bytes .../screen.rsi/status_display_octarine.png | Bin 0 -> 966 bytes .../screen.rsi/status_display_red.png | Bin 0 -> 1209 bytes .../screen.rsi/status_display_violet.png | Bin 0 -> 2369 bytes .../screen.rsi/status_display_white.png | Bin 0 -> 449 bytes .../screen.rsi/status_display_yellow.png | Bin 0 -> 459 bytes .../screen.rsi/status_display_zeta.png | Bin 0 -> 610 bytes 81 files changed, 2454 insertions(+), 199 deletions(-) create mode 100644 Content.Client/_DV/Communications/DVCommunicationsConsoleBoundUserInterface.cs create mode 100644 Content.Client/_DV/Communications/DVCommunicationsConsoleMenu.xaml create mode 100644 Content.Client/_DV/Communications/DVCommunicationsConsoleMenu.xaml.cs create mode 100644 Content.Client/_DV/Communications/DVCommunicationsConsoleSystem.cs create mode 100644 Content.Client/_DV/KeycardAuthenticationDevice/DVKeycardAuthenticationDeviceSystem.cs create mode 100644 Content.Client/_DV/Screens/DVScreenSystem.cs create mode 100644 Content.Client/_DV/Screens/DVTextRenderingOverlay.cs create mode 100644 Content.Client/_DV/Screens/DVTextVisualsComponent.cs create mode 100644 Content.Client/_DV/Screens/DVTextVisualsSystem.cs create mode 100644 Content.Client/_DV/Stylesheets/Sheetlets/DVLineEditSheetlet.cs delete mode 100644 Content.Server/_DV/Communications/CommunicationsConsoleSystem.cs create mode 100644 Content.Server/_DV/Communications/DVCommunicationsConsoleSystem.cs create mode 100644 Content.Server/_DV/KeycardAuthenticationDevice/DVStationKeycardAuthenticationDeviceSystem.cs create mode 100644 Content.Server/_DV/Screens/DVScreenSystem.cs delete mode 100644 Content.Shared/_DV/Communications/CommunicationsConsoleExfiltrationShuttleMessage.cs create mode 100644 Content.Shared/_DV/Communications/DVCommunicationsConsoleComponent.cs create mode 100644 Content.Shared/_DV/Communications/DVCommunicationsConsoleSystem.cs create mode 100644 Content.Shared/_DV/KeycardAuthenticationDevice/DVStationKeycardAuthenticationDeviceAlreadySwipedComponent.cs create mode 100644 Content.Shared/_DV/KeycardAuthenticationDevice/DVStationKeycardAuthenticationDeviceComponent.cs create mode 100644 Content.Shared/_DV/KeycardAuthenticationDevice/SharedDVStationKeycardAuthenticationDeviceSystem.cs create mode 100644 Content.Shared/_DV/Screens/DVScreenComponent.cs create mode 100644 Content.Shared/_DV/Screens/DVSharedScreenSystem.cs create mode 100644 Content.Shared/_DV/Screens/DVTextScreenVisualLayers.cs create mode 100644 Resources/Audio/_DV/Announcements/Alerts/code_zeta.ogg delete mode 100644 Resources/Audio/_Starlight/misc/orange.ogg create mode 100644 Resources/Fonts/_DV/TinyUnicode.ttf create mode 100644 Resources/Locale/en-US/_DV/station-events/keycard-authentication-device.ftl create mode 100644 Resources/Locale/en-US/_DV/station-events/screens.ftl delete mode 100644 Resources/Locale/en-US/_Starlight/alert-levels/alert-levels.ftl create mode 100644 Resources/Prototypes/_DV/Entities/Structures/Wallmounts/status_display.yml create mode 100644 Resources/Textures/_DV/Shaders/mask.swsl create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/alert_border_blue.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/alert_border_delta.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/alert_border_epsilon.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/alert_border_gamma.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/alert_border_green.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/alert_border_octarine.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/alert_border_red.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/alert_border_violet.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/alert_border_white.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/alert_border_yellow.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/alert_border_zeta.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/frame.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/frame_broken.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/mask.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/meta.json create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/radiation.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/status_display_blue.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/status_display_delta.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/status_display_epsilon.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/status_display_gamma.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/status_display_green.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/status_display_octarine.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/status_display_red.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/status_display_violet.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/status_display_white.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/status_display_yellow.png create mode 100644 Resources/Textures/_DV/Structures/Wallmounts/screen.rsi/status_display_zeta.png diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs index 1a372bdba1f..89dcd788151 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs @@ -28,7 +28,6 @@ namespace Content.Client.Communications.UI _menu.OnBroadcast += BroadcastButtonPressed; _menu.OnAlertLevel += AlertLevelSelected; _menu.OnEmergencyLevel += EmergencyShuttleButtonPressed; - _menu.OnExfiltrationLevel += ExfiltrationShuttleButtonPressed; // DeltaV - Exfiltration shuttle } public void AlertLevelSelected(string level) @@ -48,13 +47,6 @@ namespace Content.Client.Communications.UI CallShuttle(); } - // Begin DeltaV - Exfiltration Shuttle - public void ExfiltrationShuttleButtonPressed() - { - SendMessage(new CommunicationsConsoleExfiltrationShuttleMessage(!_menu!.CountdownStarted)); - } - // End DeltaV - Exfiltration Shuttle - public void AnnounceButtonPressed(string message) { var maxLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength); @@ -94,13 +86,6 @@ namespace Content.Client.Communications.UI _menu.CurrentLevel = commsState.CurrentAlert; _menu.CountdownEnd = commsState.ExpectedCountdownEnd; - - // Begin DeltaV - Exfiltration Shuttle - _menu.CanExfiltrate = commsState.CanCall; - _menu.ExfiltrationCountdownEnd = commsState.ExpectedExfiltrationCountdownEnd; - _menu.ExfiltrationShuttleButton.Disabled = !_menu.CanExfiltrate; - // End DeltaV - Exfiltration Shuttle - _menu.UpdateCountdown(); _menu.UpdateAlertLevels(commsState.AlertLevels, _menu.CurrentLevel); _menu.AlertLevelButton.Disabled = !_menu.AlertLevelSelectable; diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml index 9132f3f5029..b74df979cf4 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml @@ -52,19 +52,10 @@ - - -