From: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Date: Fri, 25 Oct 2024 04:06:38 +0000 (-0500) Subject: Fix multiplying colors of differing nullabilities (#32991) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=5ff5a72a7c37a5fee7f7cdb9e9b0f70a25665d19;p=space-station-14.git Fix multiplying colors of differing nullabilities (#32991) --- diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs index 64068d6dbb..1caba06ff0 100644 --- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs +++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs @@ -292,7 +292,7 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow if (!TryGetSensorRegionColor(regionOwner, alarmState, out var regionColor)) continue; - regionOverlay.Color = regionColor.Value; + regionOverlay.Color = regionColor; var priority = (_trackedEntity == regionOwner) ? 999 : (int)alarmState; prioritizedRegionOverlays.Add(regionOverlay, priority); @@ -331,9 +331,9 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow NavMap.TrackedEntities[metaData.NetEntity] = blip; } - private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, [NotNullWhen(true)] out Color? color) + private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, out Color color) { - color = null; + color = Color.White; var blip = GetBlipTexture(alarmState);