From 6a533f2feacd7f610f401c41f65f70028f2c321e Mon Sep 17 00:00:00 2001
From: deltanedas <@deltanedas:kde.org>
Date: Thu, 24 Oct 2024 02:36:25 +0100
Subject: [PATCH] :trollface:

---
 .../Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs       | 7 +++++--
 .../DeltaV/StationEvents/Events/ParadoxClonerRule.cs       | 2 +-
 Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs | 2 +-
 Resources/Prototypes/Catalog/Fills/Lockers/heads.yml       | 2 +-
 RobustToolbox                                              | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
index 64068d6dbb..5416f73e70 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
+++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
@@ -340,11 +340,14 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow
         if (blip == null)
             return false;
 
+        // DeltaV: fix client until upstream does
         // Color the region based on alarm state and entity tracking
-        color = blip.Value.Item2 * new Color(154, 154, 154);
+        var output = blip.Value.Item2 * new Color(154, 154, 154);
 
         if (_trackedEntity != null && _trackedEntity != regionOwner)
-            color *= Color.DimGray;
+            output *= Color.DimGray;
+
+        color = output;
 
         return true;
     }
diff --git a/Content.Server/DeltaV/StationEvents/Events/ParadoxClonerRule.cs b/Content.Server/DeltaV/StationEvents/Events/ParadoxClonerRule.cs
index bc05225f3e..27129e49e9 100644
--- a/Content.Server/DeltaV/StationEvents/Events/ParadoxClonerRule.cs
+++ b/Content.Server/DeltaV/StationEvents/Events/ParadoxClonerRule.cs
@@ -67,7 +67,7 @@ public sealed class ParadoxClonerRule : StationEventSystem<ParadoxClonerRuleComp
                 mindContainer.Mind is {} mindId &&
                 !_role.MindIsAntagonist(mindId) &&
                 _role.MindHasRole<JobRoleComponent>(mindId, out var role) &&
-                role?.Comp.JobPrototype is {} job)
+                role?.Comp1.JobPrototype is {} job)
             {
                 candidates.Add((uid, mindId, job, profile));
             }
diff --git a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
index 1f7d7314d5..bee14cc277 100644
--- a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
+++ b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs
@@ -107,7 +107,7 @@ public sealed class OracleSystem : EntitySystem
         if (HasComp<MobStateComponent>(args.Used))
             return;
 
-        if (!TryComp(args.Used, out MetaDataComponent meta))
+        if (!TryComp(args.Used, out MetaDataComponent? meta))
             return;
 
         if (HasComp<BorgChassisComponent>(args.User))
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 2a0cb8e120..5329c957b5 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -273,7 +273,7 @@
     children:
     - !type:NestedSelector # DeltaV
       tableId: LockerFillResearchDirectorDeltaV
-    - id: Intellicard
+    #- id: Intellicard # DeltaV: temporarily removed until AI is enabled
     - id: BoxEncryptionKeyScience
     - id: CircuitImprinterMachineCircuitboard
     - id: ClothingBeltUtilityFilled
diff --git a/RobustToolbox b/RobustToolbox
index d1d43f834b..32bca7cfd4 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit d1d43f834b8845da698ef1898e8191ab159ee367
+Subproject commit 32bca7cfd417edcad9a60c2b1703eba8675f56af