Mindshields break on Cosmic Cult members (funky-station#1313)

Co-authored-by: funkystationbot <funky@funkystation.org>
Co-authored-by: Tay <td12233a@gmail.com>

Author: 3 people

Content.Shared/Mindshield/Components/MindShieldComponent.cs

@@ -4,10 +4,12 @@
 // SPDX-FileCopyrightText: 2024 BombasterDS <115770678+BombasterDS@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2024 Tadeo <td12233a@gmail.com>
 // SPDX-FileCopyrightText: 2024 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
+// SPDX-FileCopyrightText: 2025 ferynn <witchy.girl.me@gmail.com>
 // SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
 //
 // SPDX-License-Identifier: MIT
 
+using Content.Shared._DV.CosmicCult;
 using Content.Shared.Revolutionary;
 using Robust.Shared.GameStates;
 using Content.Shared.StatusIcon;
@@ -18,7 +20,7 @@ namespace Content.Shared.Mindshield.Components;
 /// <summary>
 /// If a player has a Mindshield they will get this component to prevent conversion.
 /// </summary>
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedRevolutionarySystem))] //Goobstation - AutoGenerateComponentState
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedRevolutionarySystem),typeof(SharedCosmicCultSystem))] //Goobstation - AutoGenerateComponentState
 public sealed partial class MindShieldComponent : Component
 {
     [DataField, ViewVariables(VVAccess.ReadWrite)]

Content.Shared/Revolutionary/SharedRevolutionarySystem.cs

@@ -6,6 +6,7 @@
 // SPDX-FileCopyrightText: 2024 nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2025 Skye <57879983+Rainbeon@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2025 Tadeo <td12233a@gmail.com>
+// SPDX-FileCopyrightText: 2025 ferynn <witchy.girl.me@gmail.com>
 // SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
 //
 // SPDX-License-Identifier: MIT
@@ -21,6 +22,8 @@
 using Robust.Shared.Player;
 using Content.Shared.Antag;
 using Content.Shared.Strip.Components;
+using Content.Shared._DV.CosmicCult.Components;
+using Content.Shared._DV.Roles;
 
 namespace Content.Shared.Revolutionary;
 
@@ -70,6 +73,13 @@ private void MindShieldImplanted(EntityUid uid, MindShieldComponent comp, MapIni
             _sharedStun.TryParalyze(uid, stunTime, true);
             _popupSystem.PopupEntity(Loc.GetString("rev-break-control", ("name", name)), uid);
         }
+
+        if (HasComp<CosmicCultComponent>(uid) || HasComp<CosmicCultLeadComponent>(uid))
+        {
+            comp.Broken = true; // Goobstation - Broken mindshield implant instead of break it
+            Dirty(uid, comp);
+            return;
+        }
     }
 
     /// <summary>
@@ -104,7 +114,7 @@ private bool CanGetState(ICommonSession? player)
 
         return HasComp<ShowAntagIconsComponent>(uid);
     }
-    
+
     /// <summary>
     /// Dirties all the Rev components so they are sent to clients.
     ///
@@ -150,7 +160,7 @@ private bool TryCancelSelfMindshield(EntityUid user, EntityUid target, EntityUid
     {
         if (user != target)
             return false;
-        
+
         if (!TryComp<TagComponent>(implant, out var tagComp))
             return false;
 

Content.Shared/_DV/CosmicCult/SharedCosmicCultSystem.cs

@@ -1,5 +1,6 @@
 // SPDX-FileCopyrightText: 2025 corresp0nd <46357632+corresp0nd@users.noreply.github.com>
 // SPDX-FileCopyrightText: 2025 deltanedas <@deltanedas:kde.org>
+// SPDX-FileCopyrightText: 2025 ferynn <witchy.girl.me@gmail.com>
 // SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
@@ -12,6 +13,7 @@
 using Content.Shared._DV.Roles;
 using Robust.Shared.GameStates;
 using Robust.Shared.Player;
+using Content.Shared.Mindshield.Components;
 
 namespace Content.Shared._DV.CosmicCult;
 
@@ -26,8 +28,12 @@ public override void Initialize()
 
         SubscribeLocalEvent<CosmicCultComponent, ComponentGetStateAttemptEvent>(OnCosmicCultCompGetStateAttempt);
         SubscribeLocalEvent<CosmicCultLeadComponent, ComponentGetStateAttemptEvent>(OnCosmicCultCompGetStateAttempt);
-        SubscribeLocalEvent<CosmicCultComponent, ComponentStartup>(DirtyCosmicCultComps);
-        SubscribeLocalEvent<CosmicCultLeadComponent, ComponentStartup>(DirtyCosmicCultComps);
+        SubscribeLocalEvent<CosmicCultComponent, ComponentStartup>(OnCosmicCultConversion);
+        SubscribeLocalEvent<CosmicCultLeadComponent, ComponentStartup>(OnCosmicCultConversion);
+        SubscribeLocalEvent<CosmicCultComponent, ComponentRemove>(OnCosmicCultDeconversion);
+        SubscribeLocalEvent<CosmicCultLeadComponent, ComponentRemove>(OnCosmicCultDeconversion);
+
+
     }
 
     public bool EntityIsCultist(EntityUid user)
@@ -75,15 +81,16 @@ private bool CanGetState(ICommonSession? player)
         return HasComp<ShowAntagIconsComponent>(uid);
     }
 
-    /// <summary>
-    /// Dirties all the Cult components so they are sent to clients.
-    ///
-    /// We need to do this because if a Cult component was not earlier sent to a client and for example the client
-    /// becomes a Cult then we need to send all the components to it. To my knowledge there is no way to do this on a
-    /// per client basis so we are just dirtying all the components.
-    /// </summary>
-    private void DirtyCosmicCultComps<T>(EntityUid someUid, T someComp, ComponentStartup ev)
+    private void OnCosmicCultConversion<T>(EntityUid someUid, T someComp, ComponentStartup ev)
     {
+        ///DirtyCosmicCultComps
+        /// <summary>
+        /// Dirties all the Cult components so they are sent to clients.
+        ///
+        /// We need to do this because if a Cult component was not earlier sent to a client and for example the client
+        /// becomes a Cult then we need to send all the components to it. To my knowledge there is no way to do this on a
+        /// per client basis so we are just dirtying all the components.
+        /// </summary>
         var cosmicCultComps = AllEntityQuery<CosmicCultComponent>();
         while (cosmicCultComps.MoveNext(out var uid, out var comp))
         {
@@ -95,5 +102,25 @@ private void DirtyCosmicCultComps<T>(EntityUid someUid, T someComp, ComponentSta
         {
             Dirty(uid, comp);
         }
+        //If the cultist has a mindshield, break it //Funky
+        if (HasComp<MindShieldComponent>(someUid))
+        {
+            if (TryComp<MindShieldComponent>(someUid, out var mindShieldComp))
+            {
+                mindShieldComp.Broken = true;
+                Dirty(someUid, mindShieldComp);
+            }
+        }
+    }
+    private void OnCosmicCultDeconversion<T>(EntityUid uid, T someComp, ComponentRemove ev)
+    {
+        if (HasComp<MindShieldComponent>(uid))
+        {
+            if (TryComp<MindShieldComponent>(uid, out var mindShieldComp))
+            {
+                mindShieldComp.Broken = false;
+                Dirty(uid, mindShieldComp);
+            }
+        }
     }
 }