Intrinsic radio fixes (#9378)

* Inherent radio fixes

* rename
This commit is contained in:
Kara
2022-07-03 01:36:40 -07:00
committed by GitHub
parent c5e2752a06
commit 2df203b1e4
4 changed files with 22 additions and 19 deletions

View File

@@ -12,26 +12,14 @@ namespace Content.Server.Ghost.Components
/// </summary> /// </summary>
[RegisterComponent] [RegisterComponent]
[ComponentReference(typeof(IRadio))] [ComponentReference(typeof(IRadio))]
public sealed class GhostRadioComponent : Component, IRadio public sealed class IntrinsicRadioComponent : Component, IRadio
{ {
// TODO: This class is yuck // TODO: This class is yuck
[Dependency] private readonly IServerNetManager _netManager = default!; [Dependency] private readonly IServerNetManager _netManager = default!;
[Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IEntityManager _entMan = default!;
[DataField("channels", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<RadioChannelPrototype>))] [DataField("channels", customTypeSerializer: typeof(PrototypeIdHashSetSerializer<RadioChannelPrototype>), required: true)]
private HashSet<string> _channels = new() private HashSet<string> _channels = new();
{
"Common",
"Command",
"CentCom",
"Engineering",
"Medical",
"Science",
"Security",
"Service",
"Supply",
"Syndicate"
};
public void Receive(string message, RadioChannelPrototype channel, EntityUid speaker) public void Receive(string message, RadioChannelPrototype channel, EntityUid speaker)
{ {

View File

@@ -61,7 +61,9 @@
attributes: attributes:
proper: true proper: true
- type: Examiner - type: Examiner
- type: GhostRadio - type: IntrinsicRadio
channels:
- Common
- type: DoAfter - type: DoAfter
- type: Actions - type: Actions
- type: MobState - type: MobState
@@ -70,7 +72,7 @@
# criticalThreshold: 50 # criticalThreshold: 50
# deadThreshold: 120 # deadThreshold: 120
- type: entity - type: entity
id: LeftArmSkeleton id: LeftArmSkeleton

View File

@@ -29,7 +29,18 @@
- type: Examiner - type: Examiner
DoRangeCheck: false DoRangeCheck: false
- type: Ghost - type: Ghost
- type: GhostRadio - type: IntrinsicRadio
channels:
- Common
- Command
- CentCom
- Engineering
- Medical
- Science
- Security
- Service
- Supply
- Syndicate
- 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

View File

@@ -33,7 +33,9 @@
event: !type:OpenUiActionEvent event: !type:OpenUiActionEvent
key: enum.InstrumentUiKey.Key key: enum.InstrumentUiKey.Key
- type: Examiner - type: Examiner
- type: GhostRadio - type: IntrinsicRadio
channels:
- Common
- type: DoAfter - type: DoAfter
- type: Actions - type: Actions
- type: TypingIndicator - type: TypingIndicator