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

diff --cc Content.Benchmarks/MapLoadBenchmark.cs
Simple merge

diff --cc Content.IntegrationTests/Tests/PostMapInitTest.cs
Simple merge

diff --cc Content.Server/Salvage/SalvageSystem.Magnet.cs
index f0520b6dc6caeb369be40c09b0dd065059a3d302,dd61aad2742f417065d04f12641b4074862dc938..523ac06e0b550aa44123eb4cbd12c3fcd00d492a
--- 1/Content.Server/Salvage/SalvageSystem.Magnet.cs
--- 2/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 feea40fb2ff1e18b509b876eae3c552f421e7da3,d1adaa014a0f75c5d6e85d776c48813bde8e742f..243886dbb72f9d2fe01bf9bc7f2bdc3d28445c5f
--- 1/Content.Shared/Follower/FollowerSystem.cs
--- 2/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<BeforeSaveEvent>(OnBeforeSave);
 +        SubscribeLocalEvent<BeforeSerializationEvent>(OnBeforeSave);
+         SubscribeLocalEvent<FollowedComponent, PolymorphedEvent>(OnFollowedPolymorphed);
      }
  
      private void OnFollowedAttempt(Entity<FollowedComponent> ent, ref ComponentGetStateAttemptEvent args)