diff --git a/Content.Server/Speech/EntitySystems/VocalSystem.cs b/Content.Server/Speech/EntitySystems/VocalSystem.cs index 7c8ec21a94b..645d4026c15 100644 --- a/Content.Server/Speech/EntitySystems/VocalSystem.cs +++ b/Content.Server/Speech/EntitySystems/VocalSystem.cs @@ -34,7 +34,8 @@ public override void Initialize() private void OnMapInit(EntityUid uid, VocalComponent component, MapInitEvent args) { // try to add scream action when vocal comp added - _actions.AddAction(uid, ref component.ScreamActionEntity, component.ScreamAction); + if (component.ScreamAction != null) // For borgs and others that can emote but shouldn't scream + _actions.AddAction(uid, ref component.ScreamActionEntity, component.ScreamAction); LoadSounds(uid, component); } diff --git a/Content.Shared/Speech/Components/VocalComponent.cs b/Content.Shared/Speech/Components/VocalComponent.cs index e5d2c9997fa..a520da4354a 100644 --- a/Content.Shared/Speech/Components/VocalComponent.cs +++ b/Content.Shared/Speech/Components/VocalComponent.cs @@ -37,7 +37,7 @@ public sealed partial class VocalComponent : Component [DataField("screamAction", customTypeSerializer: typeof(PrototypeIdSerializer))] [AutoNetworkedField] - public string ScreamAction = "ActionScream"; + public string? ScreamAction = "ActionScream"; [DataField("screamActionEntity")] [AutoNetworkedField] diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index e353c02c731..f0842eca485 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -155,6 +155,7 @@ - type: Vocal sounds: Unsexed: UnisexSilicon + screamAction: null - type: UnblockableSpeech - type: FootstepModifier footstepSoundCollection: