From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Mon, 1 Apr 2024 02:13:51 +0000 (+0000)
Subject: Fix radio jammer not blocking suit sensors. (#26632)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=29c81bcc052ab53c5b10d9a5dbe1c761745e3d1e;p=space-station-14.git

Fix radio jammer not blocking suit sensors. (#26632)

As it turns out, they are not in fact on their own netid. They are
actually just on wireless. The way I had tested my previous pr led to
this mistake being made. I originally had the radio jammer block
wireless as well, but decided to take out under the flase assumption
that it suit sensors were actually on their own netid and did not
require the ability to block all wireless packets at the last moment.
---

diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs
index 1258cc10fa..5a2a854017 100644
--- a/Content.Server/Radio/EntitySystems/JammerSystem.cs
+++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs
@@ -54,14 +54,10 @@ public sealed class JammerSystem : EntitySystem
         if (activated)
         {
             EnsureComp<ActiveRadioJammerComponent>(uid);
-            var stationId = _stationSystem.GetOwningStation(uid);
-            if (stationId != null && _singletonServerSystem.TryGetActiveServerAddress<CrewMonitoringServerComponent>(stationId.Value, out var netId))
-            {
-                EnsureComp<DeviceNetworkJammerComponent>(uid, out var jammingComp);
-                jammingComp.Range = comp.Range;
-                jammingComp.JammableNetworks.Add(netId);
-                Dirty(uid, jammingComp);
-            }
+            EnsureComp<DeviceNetworkJammerComponent>(uid, out var jammingComp);
+            jammingComp.Range = comp.Range;
+            jammingComp.JammableNetworks.Add(DeviceNetworkComponent.DeviceNetIdDefaults.Wireless.ToString());
+            Dirty(uid, jammingComp);
         }
         else
         {