откат (AdventureTimeSS14#861)

🆑 Inconnu - tweak: Хедрева вновь ломает мш, а обычный революционер деконвертируется
Bolper · Dec 1, 2024 · c43939c · c43939c
2 parents 2a6af13 + 7e1bba7
commit c43939c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/Content.Server/Mindshield/MindShieldSystem.cs b/Content.Server/Mindshield/MindShieldSystem.cs
@@ -39,10 +39,10 @@ public void ImplantCheck(EntityUid uid, SubdermalImplantComponent comp, ref Impl
         if (_tag.HasTag(ev.Implant, MindShieldTag) && ev.Implanted != null)
         {
             EnsureComp<MindShieldComponent>(ev.Implanted.Value);
-            //MindShieldRemovalCheck(ev.Implanted.Value, ev.Implant); // ADT TWEAK
+            MindShieldRemovalCheck(ev.Implanted.Value, ev.Implant);
         }
     }
-    /* ADT TWEAK START
+
     /// <summary>
     /// Checks if the implanted person was a Rev or Head Rev and remove role or destroy mindshield respectively.
     /// </summary>
@@ -61,6 +61,4 @@ public void MindShieldRemovalCheck(EntityUid implanted, EntityUid implant)
             _adminLogManager.Add(LogType.Mind, LogImpact.Medium, $"{ToPrettyString(implanted)} was deconverted due to being implanted with a Mindshield.");
         }
     }
-
-    */// ADT TWEAK END
 }
diff --git a/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs b/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
@@ -1,6 +1,6 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Mindshield.Components;
-// using Content.Shared.Popups; // ADT TWEAK
+using Content.Shared.Popups;
 using Content.Shared.Revolutionary.Components;
 using Content.Shared.Stunnable;
 using Robust.Shared.GameStates;
@@ -12,7 +12,7 @@ namespace Content.Shared.Revolutionary;
 
 public abstract class SharedRevolutionarySystem : EntitySystem
 {
-    //[Dependency] private readonly SharedPopupSystem _popupSystem = default!; // ADT TWEAK: лишнее так как попап закомментирован
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedStunSystem _sharedStun = default!;
 
     public override void Initialize()
@@ -32,8 +32,6 @@ public override void Initialize()
     /// </summary>
     private void MindShieldImplanted(EntityUid uid, MindShieldComponent comp, MapInitEvent init)
     {
-
-        /* - ADT TWEAK START
         if (HasComp<HeadRevolutionaryComponent>(uid))
         {
             RemCompDeferred<MindShieldComponent>(uid);
@@ -48,7 +46,6 @@ private void MindShieldImplanted(EntityUid uid, MindShieldComponent comp, MapIni
             _sharedStun.TryParalyze(uid, stunTime, true);
             _popupSystem.PopupEntity(Loc.GetString("rev-break-control", ("name", name)), uid);
         }
-        */// - ADT TWEAK END
 
         // who and why have done it THIS way
         // ADT phantom start