]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix multiplying colors of differing nullabilities (#32991)
authorchromiumboy <50505512+chromiumboy@users.noreply.github.com>
Fri, 25 Oct 2024 04:06:38 +0000 (23:06 -0500)
committerGitHub <noreply@github.com>
Fri, 25 Oct 2024 04:06:38 +0000 (21:06 -0700)
Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs

index 64068d6dbbf1f478e4cb4e350a623bd45a59acc7..1caba06ff0b690a96bbbf68b093b33478e14161b 100644 (file)
@@ -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);