From: ElectroJr <leonsfriedrich@gmail.com>
Date: Sun, 16 Feb 2025 03:52:51 +0000 (+1300)
Subject: Merge branch 'master' of https://github.com/space-wizards/space-station-14 into map... 
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=eedc992d57efa57557cdd4bb2bbeb948c1c4698a;p=space-station-14.git

Merge branch 'master' of https://github.com/space-wizards/space-station-14 into map-load-refactor
---

eedc992d57efa57557cdd4bb2bbeb948c1c4698a
diff --cc Content.Server/Salvage/SalvageSystem.Magnet.cs
index f0520b6dc6,dd61aad274..523ac06e0b
--- a/Content.Server/Salvage/SalvageSystem.Magnet.cs
+++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs
@@@ -6,6 -6,8 +6,7 @@@ using Content.Shared.Mobs.Components
  using Content.Shared.Procedural;
  using Content.Shared.Radio;
  using Content.Shared.Salvage.Magnet;
 -using Robust.Server.Maps;
+ using Robust.Shared.Exceptions;
  using Robust.Shared.Map;
  
  namespace Content.Server.Salvage;
diff --cc Content.Shared/Follower/FollowerSystem.cs
index feea40fb2f,d1adaa014a..243886dbb7
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@@ -43,7 -44,8 +45,8 @@@ public sealed class FollowerSystem : En
          SubscribeLocalEvent<FollowedComponent, ComponentGetStateAttemptEvent>(OnFollowedAttempt);
          SubscribeLocalEvent<FollowerComponent, GotEquippedHandEvent>(OnGotEquippedHand);
          SubscribeLocalEvent<FollowedComponent, EntityTerminatingEvent>(OnFollowedTerminating);
 +        SubscribeLocalEvent<BeforeSerializationEvent>(OnBeforeSave);
+         SubscribeLocalEvent<FollowedComponent, PolymorphedEvent>(OnFollowedPolymorphed);
 -        SubscribeLocalEvent<BeforeSaveEvent>(OnBeforeSave);
      }
  
      private void OnFollowedAttempt(Entity<FollowedComponent> ent, ref ComponentGetStateAttemptEvent args)