More borg tweaks (#19143)

* borg tweaks but i'm gonna go code fun stuff first

* werkin' on it

* a ton of tweaks

* fuck everyone and then myself

Content.Shared/Silicons/Borgs/Components/BorgChassisComponent.cs

@@ -1,11 +1,7 @@
-using Content.Shared.Roles;
-using Content.Shared.Whitelist;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.GameStates;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Silicons.Borgs.Components;
 
@@ -17,12 +13,6 @@ namespace Content.Shared.Silicons.Borgs.Components;
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedBorgSystem)), AutoGenerateComponentState]
 public sealed partial class BorgChassisComponent : Component
 {
-    /// <summary>
-    /// Whether or not the borg currently has a player occupying it
-    /// </summary>
-    [DataField("hasPlayer")]
-    public bool HasPlayer;
-
     /// <summary>
     /// Whether or not the borg is activated, meaning it has access to modules and a heightened movement speed
     /// </summary>
@@ -43,15 +33,9 @@ public sealed partial class BorgChassisComponent : Component
     public string BrainContainerId = "borg_brain";
 
     [ViewVariables(VVAccess.ReadWrite)]
-    public ContainerSlot BrainContainer = default!;
+    public ContainerSlot BrainContainer = new();
 
     public EntityUid? BrainEntity => BrainContainer.ContainedEntity;
-
-    /// <summary>
-    /// A brain entity that fills the <see cref="BrainContainer"/> on roundstart
-    /// </summary>
-    [DataField("startingBrain", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    public string? StartingBrain;
     #endregion
 
     #region Modules
@@ -77,33 +61,14 @@ public sealed partial class BorgChassisComponent : Component
     public Container ModuleContainer = default!;
 
     public int ModuleCount => ModuleContainer.ContainedEntities.Count;
-
-    /// <summary>
-    /// A list of modules that fill the borg on round start.
-    /// </summary>
-    [DataField("startingModules", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
-    public List<string> StartingModules = new();
     #endregion
 
-    /// <summary>
-    /// The job that corresponds to borgs
-    /// </summary>
-    [DataField("borgJobId", customTypeSerializer: typeof(PrototypeIdSerializer<JobPrototype>))]
-    public string BorgJobId = "Borg";
-
     /// <summary>
     /// The currently selected module
     /// </summary>
     [DataField("selectedModule")]
     public EntityUid? SelectedModule;
 
-    /// <summary>
-    /// The access this cyborg has when a player is inhabiting it.
-    /// </summary>
-    [DataField("access"), ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public string AccessGroup = "AllAccess";
-
     #region Visuals
     [DataField("hasMindState")]
     public string HasMindState = string.Empty;

Content.Shared/Silicons/Borgs/Components/MMIComponent.cs

@@ -24,12 +24,21 @@ public sealed class MMIComponent : Component
     [ViewVariables(VVAccess.ReadWrite)]
     public ItemSlot BrainSlot = default!;
 
+    /// <summary>
+    /// The sprite state when the brain inserted has a mind.
+    /// </summary>
     [DataField("hasMindState")]
     public string HasMindState = "mmi_alive";
 
+    /// <summary>
+    /// The sprite state when the brain inserted doesn't have a mind.
+    /// </summary>
     [DataField("noMindState")]
     public string NoMindState = "mmi_dead";
 
+    /// <summary>
+    /// The sprite state when there is no brain inserted.
+    /// </summary>
     [DataField("noBrainState")]
     public string NoBrainState = "mmi_off";
 }

Content.Shared/Silicons/Borgs/Components/MMILinkedComponent.cs

@@ -7,11 +7,12 @@ namespace Content.Shared.Silicons.Borgs.Components;
 /// Mostly for receiving events.
 /// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(SharedBorgSystem))]
-public sealed class MMILinkedComponent : Component
+[AutoGenerateComponentState]
+public sealed partial class MMILinkedComponent : Component
 {
     /// <summary>
     /// The MMI this entity is linked to.
     /// </summary>
-    [DataField("linkedMMI")]
+    [DataField("linkedMMI"), AutoNetworkedField]
     public EntityUid? LinkedMMI;
 }

Content.Shared/Silicons/Borgs/SharedBorgSystem.cs

@@ -30,7 +30,6 @@ public abstract partial class SharedBorgSystem : EntitySystem
         SubscribeLocalEvent<BorgChassisComponent, EntInsertedIntoContainerMessage>(OnInserted);
         SubscribeLocalEvent<BorgChassisComponent, EntRemovedFromContainerMessage>(OnRemoved);
         SubscribeLocalEvent<BorgChassisComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeedModifiers);
-        SubscribeLocalEvent<BorgChassisComponent, GetAccessTagsEvent>(OnGetAccessTags);
 
         InitializeRelay();
     }
@@ -69,7 +68,8 @@ public abstract partial class SharedBorgSystem : EntitySystem
 
     private void OnStartup(EntityUid uid, BorgChassisComponent component, ComponentStartup args)
     {
-        var containerManager = EnsureComp<ContainerManagerComponent>(uid);
+        if (!TryComp<ContainerManagerComponent>(uid, out var containerManager))
+            return;
 
         component.BrainContainer = Container.EnsureContainer<ContainerSlot>(uid, component.BrainContainerId, containerManager);
         component.ModuleContainer = Container.EnsureContainer<Container>(uid, component.ModuleContainerId, containerManager);
@@ -96,12 +96,4 @@ public abstract partial class SharedBorgSystem : EntitySystem
         var sprintDif = movement.BaseWalkSpeed / movement.BaseSprintSpeed;
         args.ModifySpeed(1f, sprintDif);
     }
-
-    private void OnGetAccessTags(EntityUid uid, BorgChassisComponent component, ref GetAccessTagsEvent args)
-    {
-        if (!component.HasPlayer)
-            return;
-        args.AddGroup(component.AccessGroup);
-    }
-
 }

Content.Shared/Silicons/Laws/Components/EmagSiliconLawComponent.cs

@@ -1,14 +1,31 @@
-namespace Content.Shared.Silicons.Laws.Components;
+using Content.Shared.Roles;
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared.Silicons.Laws.Components;
 
 /// <summary>
 /// This is used for an entity that grants a special "obey" law when emagge.d
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedSiliconLawSystem))]
 public sealed class EmagSiliconLawComponent : Component
 {
     /// <summary>
     /// The name of the person who emagged this law provider.
     /// </summary>
-    [DataField("ownerName")]
+    [DataField("ownerName"), ViewVariables(VVAccess.ReadWrite)]
     public string? OwnerName;
+
+    /// <summary>
+    /// Does the panel need to be open to EMAG this law provider.
+    /// </summary>
+    [DataField("requireOpenPanel"), ViewVariables(VVAccess.ReadWrite)]
+    public bool RequireOpenPanel = true;
+
+    /// <summary>
+    /// A role given to entities with this component when they are emagged.
+    /// Mostly just for admin purposes.
+    /// </summary>
+    [DataField("antagonistRole", customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
+    public string? AntagonistRole = "SubvertedSilicon";
 }

Content.Shared/Silicons/Laws/Components/SiliconLawBoundComponent.cs

@@ -8,7 +8,7 @@ namespace Content.Shared.Silicons.Laws.Components;
 /// <summary>
 /// This is used for entities which are bound to silicon laws and can view them.
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, Access(typeof(SharedSiliconLawSystem))]
 public sealed class SiliconLawBoundComponent : Component
 {
     /// <summary>
@@ -30,6 +30,14 @@ public sealed class SiliconLawBoundComponent : Component
     public EntityUid? LastLawProvider;
 }
 
+/// <summary>
+/// Event raised to get the laws that a law-bound entity has.
+///
+/// Is first raised on the entity itself, then on the
+/// entity's station, then on the entity's grid,
+/// before being broadcast.
+/// </summary>
+/// <param name="Entity"></param>
 [ByRefEvent]
 public record struct GetSiliconLawsEvent(EntityUid Entity)
 {

Content.Shared/Silicons/Laws/Components/SiliconLawProviderComponent.cs

@@ -5,7 +5,7 @@ namespace Content.Shared.Silicons.Laws.Components;
 /// <summary>
 /// This is used for an entity which grants laws to a <see cref="SiliconLawBoundComponent"/>
 /// </summary>
-[RegisterComponent]
+[RegisterComponent, Access(typeof(SharedSiliconLawSystem))]
 public sealed class SiliconLawProviderComponent : Component
 {
     /// <summary>

Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs

@@ -1,5 +1,7 @@
 using Content.Shared.Emag.Systems;
+using Content.Shared.Popups;
 using Content.Shared.Silicons.Laws.Components;
+using Content.Shared.Wires;
 
 namespace Content.Shared.Silicons.Laws;
 
@@ -8,6 +10,8 @@ namespace Content.Shared.Silicons.Laws;
 /// </summary>
 public abstract class SharedSiliconLawSystem : EntitySystem
 {
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -16,6 +20,14 @@ public abstract class SharedSiliconLawSystem : EntitySystem
 
     protected virtual void OnGotEmagged(EntityUid uid, EmagSiliconLawComponent component, ref GotEmaggedEvent args)
     {
+        if (component.RequireOpenPanel &&
+            TryComp<WiresPanelComponent>(uid, out var panel) &&
+            !panel.Open)
+        {
+            _popup.PopupClient(Loc.GetString("law-emag-require-panel"), uid, args.UserUid);
+            return;
+        }
+
         component.OwnerName = Name(args.UserUid);
         args.Handled = true;
     }