Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix not removing RevolutionaryRoleComponent from minds on mindshield application (#20832)

Browse Source 
* Fix not removing RevolutionaryRoleComponent from minds on mindshield application

* Simplify other part of the mindshield code

* Fix being able to mindshield head revs

* Other way around
This commit is contained in:
DrSmugleaf
2023-10-11 15:14:00 -07:00
committed by GitHub
parent 0afc035585
commit b53f10fbb2
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Shared/Revolutionary/SharedRevolutionarySystem.cs
View File

@@ -1,7 +1,7 @@
using Content.Shared.Revolutionary.Components;
using Content.Shared.IdentityManagement;
using Content.Shared.Mindshield.Components;
using Content.Shared.Popups;
using Content.Shared.Revolutionary.Components;
using Content.Shared.Stunnable;
namespace Content.Shared.Revolutionary;
@@ -22,7 +22,13 @@ public sealed class SharedRevolutionarySystem : EntitySystem
/// </summary>
private void MindShieldImplanted(EntityUid uid, MindShieldComponent comp, MapInitEvent init)
{
if (HasComp<RevolutionaryComponent>(uid) && !HasComp<HeadRevolutionaryComponent>(uid))
if (HasComp<HeadRevolutionaryComponent>(uid))
{
RemCompDeferred<MindShieldComponent>(uid);
return;
}
if (HasComp<RevolutionaryComponent>(uid))
{
var stunTime = TimeSpan.FromSeconds(4);
var name = Identity.Entity(uid, EntityManager);
@@ -30,9 +36,5 @@ public sealed class SharedRevolutionarySystem : EntitySystem
_sharedStun.TryParalyze(uid, stunTime, true);
_popupSystem.PopupEntity(Loc.GetString("rev-break-control", ("name", name)), uid);
}
else if (HasComp<HeadRevolutionaryComponent>(uid))
{
RemCompDeferred<MindShieldComponent>(uid);
}
}
}