Engine update v283.1

Content.Client/Backmen/AirDrop/AirDropSystem.cs

@@ -240,7 +240,7 @@ private void Apply(Entity<AirDropVisualizerComponent> ent)
             if (compName == "Sprite")
                 continue;
 
-            if (EntityManager.TryGetComponent(renderedItem, comp.Component.GetType(), out var sourceComp))
+            if (TryComp(renderedItem, comp.Component.GetType(), out var sourceComp))
                 CopyComp(renderedItem, ent, sourceComp);
         }
 

Content.Server/Administration/Commands/SetAdminOOC.cs

@@ -28,19 +28,18 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             if (string.IsNullOrEmpty(colorArg))
                 return;
 
-            var color = Color.TryFromHex(colorArg);
-            if (!color.HasValue)
+            if (!Color.TryFromHex(colorArg, out var color))
             {
                 shell.WriteError(Loc.GetString("shell-invalid-color-hex"));
                 return;
             }
 
             var userId = shell.Player.UserId;
             // Save the DB
-            _dbManager.SaveAdminOOCColorAsync(userId, color.Value);
+            _dbManager.SaveAdminOOCColorAsync(userId, color);
             // Update the cached preference
             var prefs = _preferenceManager.GetPreferences(userId);
-            prefs.AdminOOCColor = color.Value;
+            prefs.AdminOOCColor = color;
         }
     }
 }

Content.Server/Administration/Logs/AdminLogManager.cs

@@ -251,18 +251,42 @@ private async Task SaveLogs()
 
         _sawmill.Debug($"Saving {copy.Count} admin logs.");
 
-        if (_metricsEnabled)
+        try
         {
-            LogsSent.Inc(copy.Count);
+            if (_metricsEnabled)
+            {
+                LogsSent.Inc(copy.Count);
 
-            using (DatabaseUpdateTime.NewTimer())
+                using (DatabaseUpdateTime.NewTimer())
+                {
+                    await task;
+                }
+            }
+            else
             {
                 await task;
-                return;
             }
         }
+        catch (Exception ex)
+        {
+            _sawmill.Error($"Failed to save logs: {ex.Message}");
+            _sawmill.Warning("Re-enqueueing logs and retrying at the next update.");
 
-        await task;
+            foreach (var log in copy)
+            {
+                if (log.RoundId == _currentRoundId)
+                {
+                    _logQueue.Enqueue(log);
+                }
+                else
+                {
+                    _preRoundLogQueue.Enqueue(log);
+                }
+            }
+
+            Queue.Set(_logQueue.Count);
+            PreRoundQueue.Set(_preRoundLogQueue.Count);
+        }
     }
 
     public void RoundStarting(int id)

Content.Server/Administration/UI/PermissionsEui.cs

@@ -240,6 +240,12 @@ private async Task HandleUpdateAdmin(UpdateAdmin ua)
                 return;
             }
 
+            var (bad, rankName) = await FetchAndCheckRank(ua.RankId);
+            if (bad)
+            {
+                return;
+            }
+
             var admin = await _db.GetAdminDataForAsync(ua.UserId);
             if (admin == null)
             {
@@ -261,12 +267,6 @@ private async Task HandleUpdateAdmin(UpdateAdmin ua)
             await _db.UpdateAdminAsync(admin);
 
             var playerRecord = await _db.GetPlayerRecordByUserId(ua.UserId);
-            var (bad, rankName) = await FetchAndCheckRank(ua.RankId);
-            if (bad)
-            {
-                return;
-            }
-
             var name = playerRecord?.LastSeenUserName ?? ua.UserId.ToString();
             var title = ua.Title ?? "<no title>";
             var flags = AdminFlagsHelper.PosNegFlagsText(ua.PosFlags, ua.NegFlags);

Content.Server/Antag/AntagSelectionSystem.API.Assignment.cs

@@ -341,7 +341,7 @@ public void SpawnGhostRoles(List<AntagRule> antagRules, bool assert = false)
         }
     }
 
-    /// <inheritdoc cref="SpawnGhostRoles(Entity{AntagSelectionComponent},AntagCount[],bool)"/>
+    /// <inheritdoc cref="SpawnGhostRoles(Entity{AntagSelectionComponent},List{AntagCount},bool)"/>
     [PublicAPI]
     public void SpawnGhostRoles(Entity<AntagSelectionComponent> gameRule, int playerCount, bool assert = false)
     {
@@ -355,7 +355,7 @@ public void SpawnGhostRoles(Entity<AntagSelectionComponent> gameRule, int player
     /// <param name="antagRules">Antags we want to make into ghost roles, with paired counts we need to spawn</param>
     /// <param name="assert">Whether we should throw if the spawner prototype doesn't exist.</param>
     [PublicAPI]
-    public void SpawnGhostRoles(Entity<AntagSelectionComponent> gameRule, AntagCount[] antagRules, bool assert = false)
+    public void SpawnGhostRoles(Entity<AntagSelectionComponent> gameRule, List<AntagCount> antagRules, bool assert = false)
     {
         foreach (var rule in antagRules)
         {

Content.Server/Antag/AntagSelectionSystem.cs

@@ -312,24 +312,22 @@ private void AddGameRuleDefinitions(Entity<AntagSelectionComponent> gameRule,
         }
     }
 
-    private AntagCount[]  GetAntags(Entity<AntagSelectionComponent> gameRule,
+    private List<AntagCount> GetAntags(Entity<AntagSelectionComponent> gameRule,
         int playerCount)
     {
         var runningCount = 0;
-        var antags = new AntagCount[gameRule.Comp.Antags.Length];
+        var antags = new List<AntagCount>(gameRule.Comp.Antags.Length);
 
         // We assume that antag definitions are prioritized by order, and take up slots that other roles may take.
         // I.E for Nukies, it selects 1 commander which takes up 10 players, then one corpsman which takes up another 10, then we select X nukies based on the remaining player count.
         // This is how the system worked when I got here, and I decided not to change it to avoid fucking with team antag balance
-        var i = 0;
         foreach (var antag in gameRule.Comp.Antags)
         {
             if (!Proto.Resolve(antag.Proto, out var definition))
                 continue;
 
             // We do it this way in case our resolve fails.
-            antags[i] = (definition, GetTargetAntagCount(antag, playerCount, ref runningCount));
-            i++;
+            antags.Add((definition, GetTargetAntagCount(antag, playerCount, ref runningCount)));
         }
 
         return antags;
@@ -364,19 +362,19 @@ private void AssignAntags(Entity<AntagSelectionComponent> gameRule, IList<ICommo
         gameRule.Comp.PreSelectionsComplete = true;
     }
 
-    private void AssignAntags(Entity<AntagSelectionComponent> gameRule, IList<ICommonSession> players, AntagCount[] antags)
+    private void AssignAntags(Entity<AntagSelectionComponent> gameRule, IList<ICommonSession> players, List<AntagCount> antags)
     {
         AssignAntags(gameRule, GetWeightedPlayerPool(players), antags);
     }
 
-    private void AssignAntags(Entity<AntagSelectionComponent> gameRule, Dictionary<ICommonSession, float> weightedPool, AntagCount[] antags)
+    private void AssignAntags(Entity<AntagSelectionComponent> gameRule, Dictionary<ICommonSession, float> weightedPool, List<AntagCount> antags)
     {
         while (RobustRandom.TryPickAndTake(weightedPool, out var session))
         {
             AssignAntag(gameRule, session, ref antags);
 
             // Assignment complete, return early.
-            if (antags.Length == 0)
+            if (antags.Count == 0)
                 return;
         }
 
@@ -500,13 +498,13 @@ private bool AssignAntag(ICommonSession player, ref List<AntagRule> antags)
     /// Selects and assigns antags from a list.
     /// Is private because it has it should only ever be run in very specific scenarios.
     /// </summary>
-    private bool AssignAntag(Entity<AntagSelectionComponent> gameRule, ICommonSession player, ref AntagCount[] antags)
+    private bool AssignAntag(Entity<AntagSelectionComponent> gameRule, ICommonSession player, ref List<AntagCount> antags)
     {
         // If this session cannot be an antag, then get the next session!
         if (!TryGetValidAntagPreferences(player, out var prefs))
             return false;
 
-        for (var i = antags.Length - 1; i >= 0; i--)
+        for (var i = antags.Count - 1; i >= 0; i--)
         {
             var antag = antags[i];
 

Content.Server/Backmen/Abilities/Psionics/PsionicAbilitiesSystem.cs

@@ -115,7 +115,7 @@ public void RemovePsionics(EntityUid uid, bool noEffect = false)
         {
             // component moment
             var comp = _componentFactory.GetComponent(compName);
-            if (EntityManager.TryGetComponent(uid, comp.GetType(), out var psionicPower))
+            if (TryComp(uid, comp.GetType(), out var psionicPower))
                 RemComp(uid, psionicPower);
         }
         if (psionic.PsionicAbility != null)

Content.Server/Backmen/Sponsors/SponsorsManager.cs

@@ -57,8 +57,14 @@ public bool TryGetServerOocColor(NetUserId userId, [NotNullWhen(true)] out Color
     {
         if (_cachedSponsors.TryGetValue(userId, out var sponsor))
         {
-            color = Color.TryFromHex(sponsor.OOCColor);
-            return color != null;
+            if (sponsor.OOCColor != null && Color.TryFromHex(sponsor.OOCColor, out var parsed))
+            {
+                color = parsed;
+                return true;
+            }
+
+            color = null;
+            return false;
         }
 
         color = null;
@@ -214,9 +220,14 @@ public bool TryGetOocColor(NetUserId userId, [NotNullWhen(true)] out Color? colo
             return false;
         }
 
-        color = Color.TryFromHex(_cachedSponsors[userId].OOCColor);
+        if (Color.TryFromHex(_cachedSponsors[userId].OOCColor, out var parsed))
+        {
+            color = parsed;
+            return true;
+        }
 
-        return color != null;
+        color = null;
+        return false;
     }
 
     public int GetExtraCharSlots(NetUserId userId)

Content.Server/Backmen/Surgery/Pain/Systems/ServerPainSystem.cs

@@ -416,19 +416,29 @@ public override void RefreshNerveSystem(EntityUid nerveSystemUid, EntityUid body
 
     private void UpdateNerveSystemNerves(EntityUid uid, EntityUid body, NerveSystemComponent component)
     {
+        var previousNerves = component.Nerves.Keys.ToHashSet();
         component.Nerves.Clear();
         foreach (var bodyPartId in _body.GetWoundableTargets(body))
         {
             if (!NerveQuery.TryComp(bodyPartId, out var nerve))
                 continue;
 
             component.Nerves.Add(bodyPartId, nerve);
+            previousNerves.Remove(bodyPartId);
 
             nerve.ParentedNerveSystem = uid;
-            DirtyField(bodyPartId, nerve, nameof(NerveOrganComponent.ParentedNerveSystem));
             UpdatePainFeels(bodyPartId, nerve);
         }
 
+        foreach (var orphan in previousNerves)
+        {
+            if (!NerveQuery.TryComp(orphan, out var nerve))
+                continue;
+
+            if (nerve.ParentedNerveSystem == uid)
+                nerve.ParentedNerveSystem = EntityUid.Invalid;
+        }
+
         CleanupOrphanPainModifiers(uid, body, component);
     }
 
@@ -516,7 +526,9 @@ private void UpdateNerveSystemPain(EntityUid uid, NerveSystemComponent? nerveSys
             nerveSys.ReactionUpdateTime = Timing.CurTime + nerveSys.PainReactionTime;
         nerveSys.Pain = newPain;
 
-        DirtyField(uid, nerveSys, nameof(NerveSystemComponent.Pain));
+        // Full Dirty (not DirtyField): RT 283.1 (#6685) can emit field deltas when the client's
+        // fromTick <= CreationTick, which PVS asserts against. Unclassified dirty forces a full state.
+        Dirty(uid, nerveSys);
 
         if (!_consciousness.SetConsciousnessModifier(
                 organ.Body.Value,

Content.Server/Cloning/CloningSystem.cs

@@ -132,7 +132,7 @@ public override void CloneComponents(
 
             // If the original does not have the component, then the clone shouldn't have it either.
             RemComp(clone, componentRegistration.Type);
-            if (EntityManager.TryGetComponent(original, componentRegistration.Type, out var sourceComp)) // Does the original have this component?
+            if (TryComp(original, componentRegistration.Type, out var sourceComp)) // Does the original have this component?
             {
                 CopyComp(original, clone, sourceComp);
             }

Content.Server/Database/ServerDbBase.cs

@@ -856,7 +856,7 @@ public async Task AddAdminLogs(List<AdminLog> logs)
                     if (attempt >= maxRetryAttempts)
                     {
                         _opsLog.Error($"Max retry attempts reached. Failed to save {logs.Count} admin logs.");
-                        return;
+                        throw;
                     }
 
                     _opsLog.Warning($"Retrying in {retryDelay.TotalSeconds} seconds...");

Content.Server/Electrocution/ElectrocutionSystem.cs

@@ -1,4 +1,5 @@
 using Content.Server.Administration.Logs;
+using Content.Server.Doors.Systems;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -79,6 +80,8 @@ public override void Initialize()
         SubscribeLocalEvent<ElectrifiedComponent, AttackedEvent>(OnElectrifiedAttacked);
         SubscribeLocalEvent<ElectrifiedComponent, InteractHandEvent>(OnElectrifiedHandInteract);
         SubscribeLocalEvent<ElectrifiedComponent, InteractUsingEvent>(OnElectrifiedInteractUsing);
+        SubscribeLocalEvent<ElectrifiedComponent, ActivateInWorldEvent>(OnElectrifiedActivateInWorld, before: [typeof(AirlockSystem), typeof(DoorSystem)]);
+
         SubscribeLocalEvent<RandomInsulationComponent, MapInitEvent>(OnRandomInsulationMapInit);
         SubscribeLocalEvent<PoweredLightComponent, AttackedEvent>(OnLightAttacked);
 
@@ -198,6 +201,15 @@ private void OnElectrifiedInteractUsing(EntityUid uid, ElectrifiedComponent elec
         TryDoElectrifiedAct(uid, args.User, siemens, electrified);
     }
 
+    private void OnElectrifiedActivateInWorld(EntityUid uid, ElectrifiedComponent electrified, ActivateInWorldEvent args)
+    {
+        if (!electrified.OnActivateInWorld || args.Handled)
+            return;
+
+        if (TryDoElectrifiedAct(uid, args.User, 1, electrified))
+            args.Handled = true;
+    }
+
     public bool TryDoElectrifiedAct(EntityUid uid, EntityUid targetUid,
         float siemens = 1,
         ElectrifiedComponent? electrified = null,

Content.Server/Materials/MaterialReclaimerSystem.cs

@@ -200,6 +200,8 @@ public override void Reclaim(EntityUid uid,
                 SpawnChemicalsFromComposition(uid, item, completion, true, component, xform);
         }
 
+        var eventArgs = new DestructionEventArgs();
+        RaiseLocalEvent(item, eventArgs);
         QueueDel(item);
     }
 

Content.Server/Mind/MindSystem.cs

@@ -241,6 +241,11 @@ public override void TransferTo(EntityUid mindId, EntityUid? entity, bool ghostC
             // Yes this control flow sucks.
             mind.VisitingEntity = null;
             RemComp<VisitingMindComponent>(entity!.Value);
+            // If you are transferring to your own ghost then you can no longer return to body
+            if (TryComp(entity.Value, out GhostComponent? ghostComponent))
+            {
+                _ghosts.SetCanReturnToBody((entity.Value, ghostComponent), false);
+            }
         }
         else if (mind.VisitingEntity != null
               && (ghostCheckOverride // to force mind transfer, for example from ControlMobVerb
@@ -261,6 +266,10 @@ public override void TransferTo(EntityUid mindId, EntityUid? entity, bool ghostC
 
         if (entity != null)
         {
+            if (component!.Mind.HasValue && TryComp(component!.Mind.Value, out MindComponent? newMind))
+            {
+                TransferTo(component!.Mind.Value, newMind?.VisitingEntity);
+            }
             component!.Mind = mindId;
             component.HasMind = true;
             mind.OwnedEntity = entity;

Content.Server/Physics/Controllers/MoverController.cs

@@ -60,20 +60,6 @@ private void OnEntityUnpaused(Entity<InputMoverComponent> ent, ref EntityUnpause
         UpdateMoverStatus((ent, ent.Comp));
     }
 
-    protected override void OnInputMoverCanMoveUpdated(Entity<InputMoverComponent> ent, ref CanMoveUpdatedEvent args)
-    {
-        base.OnInputMoverCanMoveUpdated(ent, ref args);
-
-        if (!args.CanMove)
-        {
-            // Remove from active mover query when entity cannot move
-            RemCompDeferred<ActiveInputMoverComponent>(ent);
-            return;
-        }
-
-        UpdateMoverStatus((ent, ent.Comp));
-    }
-
     protected override void OnMoverStartup(Entity<InputMoverComponent> ent, ref ComponentStartup args)
     {
         base.OnMoverStartup(ent, ref args);

Content.Server/Sandbox/Commands/ColorNetworkCommand.cs

@@ -56,14 +56,13 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
                 return;
             }
 
-            var color = Color.TryFromHex(args[2]);
-            if (!color.HasValue)
+            if (!Color.TryFromHex(args[2], out var color))
             {
                 shell.WriteError(Loc.GetString("shell-invalid-color-hex"));
                 return;
             }
 
-            PaintNodes(nodeContainerComponent, nodeGroupId, color.Value);
+            PaintNodes(nodeContainerComponent, nodeGroupId, color);
         }
 
         private void PaintNodes(NodeContainerComponent nodeContainerComponent, NodeGroupID nodeGroupId, Color color)