Xenoborg Port

Content.Client/Remotes/UI/DoorRemoteStatusControl.cs

@@ -38,6 +38,7 @@ protected override void FrameUpdate(FrameEventArgs args)
             OperatingMode.OpenClose => "door-remote-open-close-text",
             OperatingMode.ToggleBolts => "door-remote-toggle-bolt-text",
             OperatingMode.ToggleEmergencyAccess => "door-remote-emergency-access-text",
+            OperatingMode.ToggleOvercharge => "door-remote-toggle-eletrify-text",
             _ => "door-remote-invalid-text"
         });
 

Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs

@@ -27,6 +27,8 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow
     private Dictionary<string, CyborgControlData> _cyborgs = new();
 
     public EntityUid Entity;
+
+    private bool _allowBorgControl = true;
 
     public RoboticsConsoleWindow()
     {
@@ -72,6 +74,7 @@ public void SetEntity(EntityUid uid)
     public void UpdateState(RoboticsConsoleState state)
     {
         _cyborgs = state.Cyborgs;
+        _allowBorgControl = state.AllowBorgControl;
 
         // clear invalid selection
         if (_selected is {} selected && !_cyborgs.ContainsKey(selected))
@@ -95,8 +98,8 @@ public void UpdateState(RoboticsConsoleState state)
         PopulateData();
 
         var locked = _lock.IsLocked(Entity);
-        DangerZone.Visible = !locked;
-        LockedMessage.Visible = locked;
+        DangerZone.Visible = !locked && _allowBorgControl;
+        LockedMessage.Visible = locked && _allowBorgControl; // Only show if locked AND control is allowed
     }
 
     private void PopulateCyborgs()
@@ -147,7 +150,8 @@ private void PopulateData()
         BorgInfo.SetMessage(text);
 
         // how the turntables
-        DisableButton.Disabled = !(data.HasBrain && data.CanDisable);
+        DisableButton.Disabled = !_allowBorgControl || !(data.HasBrain && data.CanDisable);
+        DestroyButton.Disabled = !_allowBorgControl;
     }
 
     protected override void FrameUpdate(FrameEventArgs args)

Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs

@@ -38,5 +38,4 @@ private void BeforePacketSent(Entity<TransformComponent> xform, ref BeforePacket
             }
         }
     }
-
 }

Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs

@@ -349,7 +349,7 @@ private void SendToConnections(ReadOnlySpan<DeviceNetworkComponent> connections,
                 if (connection.Owner == packet.Sender)
                     continue;
 
-                BeforePacketSentEvent beforeEv = new(packet.Sender, xform, senderPos, connection.NetIdEnum.ToString());
+                BeforePacketSentEvent beforeEv = new(packet.Sender, xform, senderPos, connection.NetIdEnum.ToString(), packet.Frequency);
                 RaiseLocalEvent(connection.Owner, beforeEv, false);
 
                 if (!beforeEv.Cancelled)

Content.Server/Radio/EntitySystems/JammerSystem.cs

@@ -1,5 +1,6 @@
 using Content.Server.Power.EntitySystems;
 using Content.Server.PowerCell;
+using Content.Server.Radio;
 using Content.Shared.DeviceNetwork.Components;
 using Content.Shared.Interaction;
 using Content.Shared.PowerCell.Components;
@@ -51,70 +52,103 @@ public override void Update(float frameTime)
                     };
                     ChangeChargeLevel(uid, chargeLevel);
                 }
-
             }
-
         }
     }
 
     private void OnActivate(Entity<RadioJammerComponent> ent, ref ActivateInWorldEvent args)
     {
+
         if (args.Handled || !args.Complex)
             return;
 
-        var activated = !HasComp<ActiveRadioJammerComponent>(ent) &&
-            _powerCell.TryGetBatteryFromSlot(ent.Owner, out var battery) &&
-            battery.CurrentCharge > GetCurrentWattage(ent);
-        if (activated)
-        {
-            ChangeLEDState(ent.Owner, true);
-            EnsureComp<ActiveRadioJammerComponent>(ent);
-            EnsureComp<DeviceNetworkJammerComponent>(ent, out var jammingComp);
-            _jammer.SetRange((ent, jammingComp), GetCurrentRange(ent));
-            _jammer.AddJammableNetwork((ent, jammingComp), DeviceNetworkComponent.DeviceNetIdDefaults.Wireless.ToString());
-        }
-        else
-        {
-            ChangeLEDState(ent.Owner, false);
-            RemCompDeferred<ActiveRadioJammerComponent>(ent);
-            RemCompDeferred<DeviceNetworkJammerComponent>(ent);
-        }
-        var state = Loc.GetString(activated ? "radio-jammer-component-on-state" : "radio-jammer-component-off-state");
-        var message = Loc.GetString("radio-jammer-component-on-use", ("state", state));
-        Popup.PopupEntity(message, args.User, args.User);
-        args.Handled = true;
-    }
+    var activated = !HasComp<ActiveRadioJammerComponent>(ent) &&
+        _powerCell.TryGetBatteryFromSlot(ent.Owner, out var battery) &&
+        battery.CurrentCharge > GetCurrentWattage(ent);
 
-    private void OnPowerCellChanged(Entity<ActiveRadioJammerComponent> ent, ref PowerCellChangedEvent args)
+    if (activated)
     {
-        if (args.Ejected)
+        ChangeLEDState(ent.Owner, true);
+
+        EnsureComp<ActiveRadioJammerComponent>(ent);
+        EnsureComp<DeviceNetworkJammerComponent>(ent, out var jammingComp);
+
+        _jammer.SetRange((ent, jammingComp), GetCurrentRange(ent));
+
+        _jammer.AddJammableNetwork(
+            (ent, jammingComp),
+            DeviceNetworkComponent.DeviceNetIdDefaults.Wireless.ToString()
+        );
+
+        /// Sync excluded frequencies from RadioJammerComponent
+        /// into DeviceNetworkJammerComponen
+
+        _jammer.ClearExcludedFrequency((ent, jammingComp));
+
+        foreach (var freq in ent.Comp.FrequenciesExcluded)
         {
-            ChangeLEDState(ent.Owner, false);
-            RemCompDeferred<ActiveRadioJammerComponent>(ent);
+            _jammer.AddExcludedFrequency((ent, jammingComp), (uint) freq);
         }
     }
+    else
+    {
+        ChangeLEDState(ent.Owner, false);
+
+        RemCompDeferred<ActiveRadioJammerComponent>(ent);
+        RemCompDeferred<DeviceNetworkJammerComponent>(ent);
+    }
+
+    var state = Loc.GetString(activated
+        ? "radio-jammer-component-on-state"
+        : "radio-jammer-component-off-state");
+
+    var message = Loc.GetString(
+        "radio-jammer-component-on-use",
+        ("state", state)
+    );
+
+    Popup.PopupEntity(message, args.User, args.User);
+    args.Handled = true;
+    }
 
     private void OnRadioSendAttempt(ref RadioSendAttemptEvent args)
     {
-        if (ShouldCancelSend(args.RadioSource))
+
+    if (!TryComp<TransformComponent>(args.RadioSource, out var sourceTransform))
+        return;
+
+    var source = sourceTransform.Coordinates;
+
+    var query = EntityQueryEnumerator<
+        ActiveRadioJammerComponent,
+        RadioJammerComponent,
+        TransformComponent>();
+
+    while (query.MoveNext(out var uid, out _, out var jammer, out var transform))
+    {
+        // Excluded channels are allowed through.
+        if (jammer.FrequenciesExcluded.Contains(args.Frequency))
+            continue;
+
+        if (_transform.InRange(
+                source,
+                transform.Coordinates,
+                GetCurrentRange((uid, jammer))))
         {
             args.Cancelled = true;
+            return;
         }
     }
+}
 
-    private bool ShouldCancelSend(EntityUid sourceUid)
+    private void OnPowerCellChanged(Entity<ActiveRadioJammerComponent> ent, ref PowerCellChangedEvent args)
     {
-        var source = Transform(sourceUid).Coordinates;
-        var query = EntityQueryEnumerator<ActiveRadioJammerComponent, RadioJammerComponent, TransformComponent>();
 
-        while (query.MoveNext(out var uid, out _, out var jam, out var transform))
+        if (args.Ejected)
         {
-            if (_transform.InRange(source, transform.Coordinates, GetCurrentRange((uid, jam))))
-            {
-                return true;
-            }
+            ChangeLEDState(ent.Owner, false);
+            RemCompDeferred<ActiveRadioJammerComponent>(ent.Owner);
+            RemCompDeferred<DeviceNetworkJammerComponent>(ent.Owner);
         }
-
-        return false;
     }
-}
+}

Content.Server/Radio/EntitySystems/RadioSystem.cs

@@ -193,9 +193,16 @@ public void SendRadioMessage(
         var ev = new RadioReceiveEvent(messageSource, channel, msg, notUdsMsg, language, radioSource);
         // Einstein Engines - Language end
 
-        var sendAttemptEv = new RadioSendAttemptEvent(channel, radioSource);
+        var transmitFrequency = frequency ?? GetFrequency(messageSource, channel);
+
+        var sendAttemptEv = new RadioSendAttemptEvent(
+            channel,
+            radioSource,
+            transmitFrequency);
+
         RaiseLocalEvent(ref sendAttemptEv);
         RaiseLocalEvent(radioSource, ref sendAttemptEv);
+
         var canSend = !sendAttemptEv.Cancelled;
 
         var sourceMapId = Transform(radioSource).MapID;

Content.Server/Radio/RadioEvent.cs

@@ -37,9 +37,10 @@ public record struct RadioReceiveAttemptEvent(RadioChannelPrototype Channel, Ent
 /// Use this event to cancel sending message to every receiver
 /// </summary>
 [ByRefEvent]
-public record struct RadioSendAttemptEvent(RadioChannelPrototype Channel, EntityUid RadioSource)
+public record struct RadioSendAttemptEvent(RadioChannelPrototype Channel, EntityUid RadioSource, int Frequency)
 {
     public readonly RadioChannelPrototype Channel = Channel;
     public readonly EntityUid RadioSource = RadioSource;
+    public readonly int Frequency = Frequency;
     public bool Cancelled = false;
 }

Content.Server/Remotes/DoorRemoteSystem.cs

@@ -1,5 +1,6 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Doors.Systems;
+using Content.Shared.Electrocution;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Access.Components;
 using Content.Shared.Database;
@@ -8,15 +9,18 @@
 using Content.Shared.Interaction;
 using Content.Shared.Remotes.Components;
 using Content.Shared.Remotes.EntitySystems;
+using Robust.Shared.Audio.Systems;
 
 namespace Content.Shared.Remotes
 {
-    public sealed partial class DoorRemoteSystem : SharedDoorRemoteSystem
+    public sealed class DoorRemoteSystem : SharedDoorRemoteSystem
     {
-        [Dependency] private IAdminLogManager _adminLogger = default!;
-        [Dependency] private AirlockSystem _airlock = default!;
-        [Dependency] private DoorSystem _doorSystem = default!;
-        [Dependency] private ExamineSystemShared _examine = default!;
+        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly AirlockSystem _airlock = default!;
+        [Dependency] private readonly DoorSystem _doorSystem = default!;
+        [Dependency] private readonly ExamineSystemShared _examine = default!;
+        [Dependency] private readonly SharedElectrocutionSystem _electrify = default!;
+        [Dependency] private readonly SharedAudioSystem _audio = default!;
 
         public override void Initialize()
         {
@@ -90,6 +94,22 @@ private void OnBeforeInteract(Entity<DoorRemoteComponent> entity, ref BeforeRang
                             $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to set emergency access {(airlockComp.EmergencyAccess ? "on" : "off")}");
                     }
 
+                    break;
+                case OperatingMode.ToggleOvercharge:
+                    {
+                    if (!TryComp<ElectrifiedComponent>(args.Target, out var electrifiedComp))
+                    break;
+                        var newState = !electrifiedComp.Enabled;
+                        _electrify.SetElectrified((args.Target.Value, electrifiedComp), newState);
+                        var soundToPlay = newState
+                        ? electrifiedComp.AirlockElectrifyDisabled
+                        : electrifiedComp.AirlockElectrifyEnabled;
+                        _audio.PlayPvs(soundToPlay, args.Target.Value);
+                        _adminLogger.Add(LogType.Action,
+                            LogImpact.Medium,
+                            $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(electrifiedComp.Enabled ? "" : "un")}electrify it");
+                }
+
                     break;
                 default:
                     throw new InvalidOperationException(

Content.Server/Robotics/Systems/RoboticsConsoleSystem.cs

@@ -95,7 +95,10 @@ private void OnOpened(Entity<RoboticsConsoleComponent> ent, ref BoundUIOpenedEve
 
     private void OnDisable(Entity<RoboticsConsoleComponent> ent, ref RoboticsConsoleDisableMessage args)
     {
-        if (_lock.IsLocked(ent.Owner))
+        if (!ent.Comp.AllowBorgControl)
+            return;
+
+		if (_lock.IsLocked(ent.Owner))
             return;
 
         if (!ent.Comp.Cyborgs.TryGetValue(args.Address, out var data))
@@ -112,7 +115,10 @@ private void OnDisable(Entity<RoboticsConsoleComponent> ent, ref RoboticsConsole
 
     private void OnDestroy(Entity<RoboticsConsoleComponent> ent, ref RoboticsConsoleDestroyMessage args)
     {
-        if (_lock.IsLocked(ent.Owner))
+        if (!ent.Comp.AllowBorgControl)
+            return;
+
+		if (_lock.IsLocked(ent.Owner))
             return;
 
         var now = _timing.CurTime;
@@ -139,7 +145,7 @@ private void OnDestroy(Entity<RoboticsConsoleComponent> ent, ref RoboticsConsole
 
     private void UpdateUserInterface(Entity<RoboticsConsoleComponent> ent)
     {
-        var state = new RoboticsConsoleState(ent.Comp.Cyborgs);
+        var state = new RoboticsConsoleState(ent.Comp.Cyborgs, ent.Comp.AllowBorgControl);
         _ui.SetUiState(ent.Owner, RoboticsConsoleUiKey.Key, state);
     }
 }

Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs

@@ -53,9 +53,7 @@ protected override void SelectBorgModule(Entity<BorgSwitchableTypeComponent> ent
                 (ent.Owner, transponder),
                 new SpriteSpecifier.Rsi(new ResPath("Mobs/Silicon/chassis.rsi"), prototype.SpriteBodyState));
 
-            _borgSystem.SetTransponderName(
-                (ent.Owner, transponder),
-                Loc.GetString($"borg-type-{borgType}-transponder"));
+            _borgSystem.SetTransponderName((ent.Owner, transponder),Loc.GetString($"borg-type-{borgType}-name"));
         }
 
         // Configure modules

Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs

@@ -83,7 +83,7 @@ private void OnPacketReceived(EntityUid uid, SurveillanceCameraComponent compone
             {
                 { DeviceNetworkConstants.Command, string.Empty },
                 { CameraAddressData, deviceNet.Address },
-                { CameraNameData, component.CameraId },
+                { CameraNameData, component.UseEntityNameAsCameraId ? MetaData(uid).EntityName : component.CameraId },
                 { CameraSubnetData, string.Empty }
             };
 
@@ -215,7 +215,8 @@ private void UpdateSetupInterface(EntityUid uid, SurveillanceCameraComponent? ca
                 return;
             }
         }
-
+
+        var name = camera.UseEntityNameAsCameraId ? MetaData(uid).EntityName : camera.CameraId;
         var state = new SurveillanceCameraSetupBoundUiState(camera.CameraId, deviceNet.ReceiveFrequency ?? 0,
             camera.AvailableNetworks, camera.NameSet, camera.NetworkSet);
         _userInterface.SetUiState(uid, SurveillanceCameraSetupUiKey.Camera, state);