Еще одни фиксы апстрима (#671)

* wizard appearance system refactor

* new helper method for drop anything from inventory

* fix wizard and nukie inventory saving

* remove wieldable from laser rifle

* replace comment with todo

Content.Server/Antag/AntagSelectionSystem.cs

@@ -26,6 +26,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Content.Server._Miracle.GulagSystem;
+using Content.Server.Inventory;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Antag;
@@ -43,6 +44,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
     [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
     [Dependency] private readonly GulagSystem _gulag = default!; // WD
+    [Dependency] private readonly ServerInventorySystem _inventory = default!; // WD
 
     // arbitrary random number to give late joining some mild interest.
     public const float LateJoinRandomChance = 0.5f;
@@ -274,6 +276,11 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem<AntagSelection
         if (antagEnt is not { } player)
             return;
 
+        // WD edit start - preventing wizard with previous entity`s gear
+        if (def.DropInventory)
+            _inventory.DropAnything(player);
+        // WD edit end
+
         var getPosEv = new AntagSelectLocationEvent(session, ent);
         RaiseLocalEvent(ent, ref getPosEv, true);
         if (getPosEv.Handled)

Content.Server/Antag/Components/AntagSelectionComponent.cs

@@ -2,7 +2,6 @@ using Content.Server.Administration.Systems;
 using Content.Server.Destructible.Thresholds;
 using Content.Shared.Antag;
 using Content.Shared.Roles;
-using Content.Shared.Storage;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Player;
@@ -164,6 +163,9 @@ public partial struct AntagSelectionDefinition()
 
     [DataField]
     public string? MoodEffect; // WD
+
+    [DataField]
+    public bool DropInventory; // WD
 }
 
 /// <summary>