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

Allow ghosts to hear radio message globally (#15078)

Browse Source
This commit is contained in:
adamsong
2023-04-02 19:56:07 -04:00
committed by GitHub
parent 4e978d54a4
commit bcb07142ae
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Radio/Components/ActiveRadioComponent.cs
View File

@@ -14,4 +14,10 @@ public sealed class ActiveRadioComponent : Component
/// </summary> /// </summary>
[DataField("channels", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<RadioChannelPrototype>))] [DataField("channels", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<RadioChannelPrototype>))]
public HashSet<string> Channels = new(); public HashSet<string> Channels = new();
/// <summary>
/// If this radio can hear all messages on all maps
/// </summary>
[DataField("globalReceive")]
public bool GlobalReceive = false;
} }

2
Content.Server/Radio/EntitySystems/RadioSystem.cs
View File

@@ -90,7 +90,7 @@ public sealed class RadioSystem : EntitySystem
if (!radio.Channels.Contains(channel.ID)) if (!radio.Channels.Contains(channel.ID))
continue; continue;
if (!channel.LongRange && transform.MapID != sourceMapId) if (!channel.LongRange && transform.MapID != sourceMapId && !radio.GlobalReceive)
continue; continue;
// don't need telecom server for long range channels or handheld radios and intercoms // don't need telecom server for long range channels or handheld radios and intercoms

1
Resources/Prototypes/Entities/Mobs/Player/observer.yml
View File

@@ -41,6 +41,7 @@
- Service - Service
- Supply - Supply
- Syndicate - Syndicate
globalReceive: true
- type: Sprite - type: Sprite
overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained. overrideContainerOcclusion: true # Ghosts always show up regardless of where they're contained.
netsync: false netsync: false