tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
nikthechampiongr
2024-04-01 02:13:51 +00:00
committed by GitHub
parent adaaf0fefc
commit 29c81bcc05
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Radio/EntitySystems/JammerSystem.cs
View File

@@ -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
{