From b0f4304b8317a0f2ec03dcf2845f3d58ae261b38 Mon Sep 17 00:00:00 2001 From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com> Date: Wed, 8 May 2024 22:36:44 -0700 Subject: [PATCH] Mirror: Make radio jammer block suit sensors (#201) ## Mirror of PR #26046: [Make radio jammer block suit sensors](https://github.com/space-wizards/space-station-14/pull/26046) from space-wizards [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `dce24dfd03b3ddfe1044297edf9d35bc9f75c523` PR opened by nikthechampiongr at 2024-03-12 17:11:18 UTC --- PR changed 5 files with 36 additions and 5 deletions. The PR had the following labels: - Status: Needs Review ---

Original Body

 > > > > ## About the PR > > Radio jammers will now additionally block suit sensors. > > When someone with suit sensors is in range of an active radio jammer, their suit sensor output will be jammed. This will lead to them appearing as frozen on any crew monitors for roughly 10 seconds before they completely disappear from it. > > ## Why / Balance > > > This gives syndies more stealth options when doing their objectives, and provides an interesting use for the radio jammer. > > Now on the implementation details: > > With this current implementation you drop off suit sensors after roughly 10 seconds of being jammed. This means you get a 10 second period before anyone actively watching crew monitors can even suspect something's wrong. The reason I have it like this is: > a) It's the simplest way to implement this feature. > b) It's more realistic while still providing a pretty significant advantage. > > Alternatively this could be changed to make the suit sensors submit outdated info indefinitely until the jammer has stopped. > > ## Technical details > > Added a new event which the suit sensors system calls before actually constructing the message it will send to the crew monitoring server. If it is cancelled then the message is not sent. I also intentionally made it so this is checked after a new update time has been set, but if it's a problem it can just be moved above it. > > > ## Media > > > - [x] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > https://github.com/space-wizards/space-station-14/assets/32041239/3bc815ac-5ec1-4ef1-8594-b390da657d29 > > **Changelog** > > > > :cl: > - tweak: The radio jammer is now able to jam the signal of suit sensors.
Co-authored-by: SimpleStation14 --- .../SuitSensors/SuitSensorComponent.cs | 6 +++++ .../Medical/SuitSensors/SuitSensorSystem.cs | 5 ++++ .../Radio/EntitySystems/JammerSystem.cs | 26 ++++++++++++++++--- .../Locale/en-US/store/uplink-catalog.ftl | 2 +- .../Entities/Objects/Tools/jammer.yml | 2 +- 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs b/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs index 9079655c80..8d75d3840a 100644 --- a/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs +++ b/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs @@ -87,3 +87,9 @@ public sealed partial class SuitSensorComponent : Component [DataField, ViewVariables] public bool PreviousControlsLocked = false; } + +[ByRefEvent] +public record struct SuitSensorsSendAttemptEvent +{ + public bool Cancelled; +}; diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs index b807b63e21..f19b3d5b81 100644 --- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs +++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs @@ -73,6 +73,11 @@ public sealed class SuitSensorSystem : EntitySystem // TODO: This would cause imprecision at different tick rates. sensor.NextUpdate = curTime + sensor.UpdateRate; + var canEv = new SuitSensorsSendAttemptEvent(); + RaiseLocalEvent(uid, ref canEv); + if (canEv.Cancelled) + continue; + // get sensor status var status = GetSensorState(uid, sensor); if (status == null) diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs index dc6f476416..fdf02f94df 100644 --- a/Content.Server/Radio/EntitySystems/JammerSystem.cs +++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs @@ -1,3 +1,4 @@ +using Content.Server.Medical.SuitSensors; using Content.Server.Popups; using Content.Server.Power.EntitySystems; using Content.Server.PowerCell; @@ -23,6 +24,7 @@ public sealed class JammerSystem : EntitySystem SubscribeLocalEvent(OnPowerCellChanged); SubscribeLocalEvent(OnExamine); SubscribeLocalEvent(OnRadioSendAttempt); + SubscribeLocalEvent(OnSensorSendAttempt); } public override void Update(float frameTime) @@ -76,15 +78,33 @@ public sealed class JammerSystem : EntitySystem private void OnRadioSendAttempt(ref RadioSendAttemptEvent args) { - var source = Transform(args.RadioSource).Coordinates; + if (ShouldCancelSend(args.RadioSource)) + { + args.Cancelled = true; + } + } + + private void OnSensorSendAttempt(EntityUid uid, SuitSensorComponent comp, ref SuitSensorsSendAttemptEvent args) + { + if (ShouldCancelSend(uid)) + { + args.Cancelled = true; + } + } + + private bool ShouldCancelSend(EntityUid sourceUid) + { + var source = Transform(sourceUid).Coordinates; var query = EntityQueryEnumerator(); + while (query.MoveNext(out _, out _, out var jam, out var transform)) { if (source.InRange(EntityManager, _transform, transform.Coordinates, jam.Range)) { - args.Cancelled = true; - return; + return true; } } + + return false; } } diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index efdf5465c9..e834039429 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -146,7 +146,7 @@ uplink-clothing-eyes-hud-syndicate-name = Syndicate Visor uplink-clothing-eyes-hud-syndicate-desc = The syndicate's professional head-up display, designed for better detection of humanoids and their subsequent elimination. uplink-radio-jammer-name = Radio Jammer -uplink-radio-jammer-desc = This device will disrupt any nearby outgoing radio communication when activated. +uplink-radio-jammer-desc = This device will disrupt any nearby outgoing radio communication as well as suit sensors when activated. uplink-syndicate-weapon-module-name = Weapon Cyborg Module uplink-syndicate-weapon-module-desc = This module will give a cyborg advanced laser and machete diff --git a/Resources/Prototypes/Entities/Objects/Tools/jammer.yml b/Resources/Prototypes/Entities/Objects/Tools/jammer.yml index e0a68156e0..beb3695627 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jammer.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jammer.yml @@ -2,7 +2,7 @@ name: radio jammer parent: BaseItem id: RadioJammer - description: This device will disrupt any nearby outgoing radio communication when activated. + description: This device will disrupt any nearby outgoing radio communication as well as suit sensors when activated. components: - type: Sprite sprite: Objects/Devices/jammer.rsi