fix

Content.Client/Antag/AntagStatusIconSystem.cs

@@ -25,8 +25,9 @@ public override void Initialize()
 
         //start-backmen: antag
         SubscribeLocalEvent<Shared.Backmen.Flesh.FleshCultistComponent, GetStatusIconsEvent>(GetIcon);
-        SubscribeLocalEvent<Shared.Backmen.Blob.BlobObserverComponent, GetStatusIconsEvent>(GetIcon);
-        SubscribeLocalEvent<Shared.Backmen.Blob.BlobCarrierComponent, GetStatusIconsEvent>(GetIcon);
+        SubscribeLocalEvent<Shared.Backmen.Blob.Components.BlobObserverComponent, GetStatusIconsEvent>(GetIcon);
+        SubscribeLocalEvent<Shared.Backmen.Blob.Components.BlobCarrierComponent, GetStatusIconsEvent>(GetIcon);
+        SubscribeLocalEvent<Shared.Backmen.Blob.Components.ZombieBlobComponent, GetStatusIconsEvent>(GetIcon);
         SubscribeLocalEvent<Shared.Backmen.Vampiric.BkmVampireComponent, GetStatusIconsEvent>(GetIcon);
         //end-backmen: antag
     }

Content.Client/Backmen/Blob/BlobCarrierSystem.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 
 namespace Content.Client.Backmen.Blob;
 

Content.Client/Backmen/Blob/BlobChemSwapBoundUserInterface.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 

Content.Client/Backmen/Blob/BlobChemSwapMenu.xaml.cs

@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Client.Stylesheets;
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;

Content.Client/Backmen/Blob/BlobObserverSystem.cs

@@ -1,5 +1,6 @@
 using Content.Shared.Antag;
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using Content.Shared.GameTicking;
 using Content.Shared.Ghost;
 using Content.Shared.StatusIcon.Components;
@@ -21,6 +22,7 @@ public override void Initialize()
 
         SubscribeLocalEvent<BlobCarrierComponent, CanDisplayStatusIconsEvent>(OnCanShowBlobIcon);
         SubscribeLocalEvent<BlobObserverComponent, CanDisplayStatusIconsEvent>(OnCanShowBlobIcon);
+        SubscribeLocalEvent<ZombieBlobComponent, CanDisplayStatusIconsEvent>(OnCanShowBlobIcon);
 
         SubscribeNetworkEvent<RoundRestartCleanupEvent>(RoundRestartCleanup);
     }
@@ -38,6 +40,9 @@ private bool CanDisplayIcon(EntityUid? uid, bool visibleToGhost)
         if (HasComp<BlobCarrierComponent>(uid))
             return true;
 
+        if (HasComp<ZombieBlobComponent>(uid))
+            return true;
+
         if (visibleToGhost && HasComp<GhostComponent>(uid))
             return true;
 

Content.Client/Backmen/Blob/BlobPodSystem.cs

@@ -0,0 +1,13 @@
+using Content.Shared.Backmen.Blob.Components;
+using Content.Shared.Backmen.Blob.NPC.BlobPod;
+
+namespace Content.Client.Backmen.Blob;
+
+public sealed class BlobPodSystem : SharedBlobPodSystem
+{
+    public override bool NpcStartZombify(EntityUid uid, EntityUid argsTarget, BlobPodComponent component)
+    {
+        // do nothing
+        return false;
+    }
+}

Content.Client/Backmen/LightHandleSystem.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Mobs.Components;
 using Robust.Client.Console;

Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs

@@ -57,7 +57,7 @@ private void AddAntagVerbs(GetVerbsEvent<Verb> args)
             Icon = new SpriteSpecifier.Rsi(new("/Textures/Backmen/Interface/Actions/blob.rsi"), "blobFactory"),
             Act = () =>
             {
-                EnsureComp<Shared.Backmen.Blob.BlobCarrierComponent>(args.Target).HasMind = HasComp<ActorComponent>(args.Target);
+                EnsureComp<Shared.Backmen.Blob.Components.BlobCarrierComponent>(args.Target).HasMind = HasComp<ActorComponent>(args.Target);
             },
             Impact = LogImpact.High,
             Message = Loc.GetString("admin-verb-text-make-blob"),

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

@@ -11,6 +11,7 @@
 using Content.Server.GameTicking;
 using Content.Shared.Backmen.Abilities.Psionics;
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using Content.Shared.Backmen.Psionics.Events;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mindshield.Components;
@@ -205,7 +206,7 @@ public bool Swap(EntityUid performer, EntityUid target, bool end = false)
                 return false;
             }
 
-            if (HasComp<BlobCarrierComponent>(target))
+            if (HasComp<BlobCarrierComponent>(target) || HasComp<BlobCarrierComponent>(performer))
             {
                 _popupSystem.PopupCursor("Ошибка! Ваша цель не стабильна!", performer);
                 return false;

Content.Server/Backmen/Blob/BlobCarrierSystem.cs

@@ -4,6 +4,7 @@
 using Content.Server.Ghost.Roles.Components;
 using Content.Server.Mind;
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
 using Content.Shared.Popups;

Content.Server/Backmen/Blob/BlobObserverMover.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using Robust.Shared.CPUJob.JobQueues;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;

Content.Server/Backmen/Blob/BlobSpawnerSystem.cs

@@ -1,5 +1,6 @@
 using Content.Server.Backmen.Blob.Components;
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Player;
 

Content.Server/Backmen/Blob/NPC/BlobPod/BlobPodSystem.cs

@@ -5,17 +5,21 @@
 using Content.Server.Popups;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using Content.Shared.Backmen.Blob.NPC.BlobPod;
 using Content.Shared.CombatMode;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
 using Content.Shared.Humanoid;
 using Content.Shared.Interaction.Components;
+using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;
+using Content.Shared.Inventory.Events;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Verbs;
 using Robust.Server.Audio;
+using Robust.Shared.Containers;
 using Robust.Shared.Player;
 
 namespace Content.Server.Backmen.Blob.NPC.BlobPod;
@@ -29,12 +33,26 @@ public sealed class BlobPodSystem : SharedBlobPodSystem
     [Dependency] private readonly AudioSystem _audioSystem = default!;
     [Dependency] private readonly InventorySystem _inventory = default!;
     [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
+
     public override void Initialize()
     {
         base.Initialize();
 
         SubscribeLocalEvent<BlobPodComponent, BlobPodZombifyDoAfterEvent>(OnZombify);
         SubscribeLocalEvent<BlobPodComponent, DestructionEventArgs>(OnDestruction);
+        SubscribeLocalEvent<BlobPodComponent, EntGotRemovedFromContainerMessage>(OnUnequip);
+
+    }
+
+    private void OnUnequip(Entity<BlobPodComponent> ent, ref EntGotRemovedFromContainerMessage args)
+    {
+        if(args.Container.ID != "head")
+            return;
+
+        if (!HasComp<HumanoidAppearanceComponent>(args.Container.Owner) || !HasComp<ZombieBlobComponent>(args.Container.Owner))
+            return;
+
+        RemCompDeferred<ZombieBlobComponent>(args.Container.Owner);
     }
 
     private void OnDestruction(EntityUid uid, BlobPodComponent component, DestructionEventArgs args)
@@ -71,8 +89,12 @@ private void OnZombify(EntityUid uid, BlobPodComponent component, BlobPodZombify
         if (!equipped)
             return;
 
-        _popups.PopupEntity(Loc.GetString("blob-mob-zombify-second-end", ("pod", uid)), args.Args.Target.Value, args.Args.Target.Value, Shared.Popups.PopupType.LargeCaution);
-        _popups.PopupEntity(Loc.GetString("blob-mob-zombify-third-end", ("pod", uid), ("target", args.Args.Target.Value)), args.Args.Target.Value, Filter.PvsExcept(args.Args.Target.Value), true, Shared.Popups.PopupType.LargeCaution);
+        _popups.PopupEntity(Loc.GetString("blob-mob-zombify-second-end", ("pod", uid)), args.Args.Target.Value,
+            args.Args.Target.Value, Shared.Popups.PopupType.LargeCaution);
+        _popups.PopupEntity(
+            Loc.GetString("blob-mob-zombify-third-end", ("pod", uid), ("target", args.Args.Target.Value)),
+            args.Args.Target.Value, Filter.PvsExcept(args.Args.Target.Value), true,
+            Shared.Popups.PopupType.LargeCaution);
 
         RemComp<CombatModeComponent>(uid);
         RemComp<HTNComponent>(uid);
@@ -111,8 +133,10 @@ public void StartZombify(EntityUid uid, EntityUid target, BlobPodComponent? comp
             return;
 
         component.ZombifyTarget = target;
-        _popups.PopupEntity(Loc.GetString("blob-mob-zombify-second-start", ("pod", uid)), target, target, Shared.Popups.PopupType.LargeCaution);
-        _popups.PopupEntity(Loc.GetString("blob-mob-zombify-third-start", ("pod", uid), ("target", target)), target, Filter.PvsExcept(target), true, Shared.Popups.PopupType.LargeCaution);
+        _popups.PopupEntity(Loc.GetString("blob-mob-zombify-second-start", ("pod", uid)), target, target,
+            Shared.Popups.PopupType.LargeCaution);
+        _popups.PopupEntity(Loc.GetString("blob-mob-zombify-third-start", ("pod", uid), ("target", target)), target,
+            Filter.PvsExcept(target), true, Shared.Popups.PopupType.LargeCaution);
 
         component.ZombifyStingStream = _audioSystem.PlayPvs(component.ZombifySoundPath, target);
         component.IsZombifying = true;

Content.Server/Backmen/Blob/Rule/BlobRuleSystem.cs

@@ -10,6 +10,7 @@
 using Content.Shared.Actions;
 using Content.Shared.Antag;
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using Content.Shared.Backmen.CCVar;
 using Content.Shared.Humanoid;
 using Content.Shared.Preferences;

Content.Server/Backmen/Blob/ZombieBlobSystem.cs

@@ -5,14 +5,17 @@
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Chat.Managers;
+using Content.Server.Explosion.EntitySystems;
 using Content.Server.Mind;
 using Content.Server.NPC;
 using Content.Server.NPC.Components;
 using Content.Server.NPC.HTN;
 using Content.Server.NPC.Systems;
+using Content.Server.Roles;
 using Content.Server.Speech.Components;
 using Content.Server.Temperature.Components;
 using Content.Shared.Atmos;
+using Content.Shared.Backmen.Blob.Components;
 using Content.Shared.Damage;
 using Content.Shared.Mind.Components;
 using Content.Shared.Mobs;
@@ -33,6 +36,8 @@ public sealed class ZombieBlobSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly IChatManager _chatMan = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+    [Dependency] private readonly RoleSystem _roleSystem = default!;
+    [Dependency] private readonly TriggerSystem _trigger = default!;
 
     private const int ClimbingCollisionGroup = (int) (CollisionGroup.BlobImpassable);
 
@@ -140,11 +145,22 @@ private void OnStartup(EntityUid uid, ZombieBlobComponent component, ComponentSt
         }
 
         var mindComp = EnsureComp<MindContainerComponent>(uid);
-        if (_mind.TryGetSession(mindComp.Mind, out var session))
+        if (mindComp.Mind != null)
         {
-            _chatMan.DispatchServerMessage(session, Loc.GetString("blob-zombie-greeting"));
-
-            _audio.PlayGlobal(component.GreetSoundNotification, session);
+            /*
+            if (!_roleSystem.MindHasRole<BlobRoleComponent>(mindComp.Mind.Value))
+            {
+                _roleSystem.MindAddRole(mindComp.Mind.Value, new BlobRoleComponent
+                {
+                    PrototypeId = "Blob"
+                });
+            }
+*/
+            if (_mind.TryGetSession(mindComp.Mind, out var session))
+            {
+                _chatMan.DispatchServerMessage(session, Loc.GetString("blob-zombie-greeting"));
+                _audio.PlayGlobal(component.GreetSoundNotification, session);
+            }
         }
         else
         {
@@ -176,6 +192,14 @@ private void OnShutdown(EntityUid uid, ZombieBlobComponent component, ComponentS
 
         _tagSystem.RemoveTag(uid, "BlobMob");
 
+        /*
+        var mindComp = EnsureComp<MindContainerComponent>(uid);
+        if (mindComp.Mind != null)
+        {
+            _roleSystem.MindTryRemoveRole<BlobRoleComponent>(mindComp.Mind.Value);
+        }
+*/
+        _trigger.Trigger(component.BlobPodUid);
         QueueDel(component.BlobPodUid);
 
         EnsureComp<NpcFactionMemberComponent>(uid);

Content.Server/Backmen/GameTicking/Rules/BlobRuleSystem.cs

@@ -14,6 +14,7 @@
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using Content.Shared.Objectives.Components;
 using Robust.Shared.Audio;
 

Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/BlobPodZombifyOperator.cs

@@ -1,4 +1,5 @@
 using Content.Server.Backmen.Blob.NPC.BlobPod;
+using Content.Shared.Backmen.Blob.Components;
 using Content.Shared.Backmen.Blob.NPC.BlobPod;
 
 namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific;

Content.Server/StationEvents/Events/BlobSpawn.cs

@@ -6,6 +6,7 @@
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Shuttles.Components;
 using Content.Shared.Backmen.Blob;
+using Content.Shared.Backmen.Blob.Components;
 using Robust.Server.Player;
 
 namespace Content.Server.StationEvents.Events;

Content.Shared/Backmen/Blob/Components/BlobCarrerComponent.cs

@@ -5,7 +5,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Backmen.Blob;
+namespace Content.Shared.Backmen.Blob.Components;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class BlobCarrierComponent : Component, IAntagStatusIconComponent

Content.Shared/Backmen/Blob/Components/BlobCoreComponent.cs

@@ -6,7 +6,7 @@
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Backmen.Blob;
+namespace Content.Shared.Backmen.Blob.Components;
 
 [RegisterComponent]
 public sealed partial class BlobCoreComponent : Component

Content.Shared/Backmen/Blob/Components/BlobObserverComponent.cs

@@ -7,7 +7,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Backmen.Blob;
+namespace Content.Shared.Backmen.Blob.Components;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(false)]
 public sealed partial class BlobObserverComponent : Component, IAntagStatusIconComponent