Fix sloshing electricity & enable SpeechVerb masking (#24238)

* Implemented electricity speech verb masking

* Handle speech verb override elsewhere in the system, even though we're not using it

* Fix that protoId business

* No nullable component fields

* Use ProtoId, and try going back to a nullable.
Specifiy DataFields on VoiceMaskComponent.
This commit is contained in:
Tayrtahn
2024-01-23 17:12:18 -05:00
committed by GitHub
parent 1fb9d79c62
commit b4046bc2bb
7 changed files with 62 additions and 10 deletions

View File

@@ -1,9 +1,23 @@
using Content.Shared.Speech;
using Robust.Shared.Prototypes;
namespace Content.Server.VoiceMask;
[RegisterComponent]
public sealed partial class VoiceMaskComponent : Component
{
[ViewVariables(VVAccess.ReadWrite)] public bool Enabled = true;
[DataField]
[ViewVariables(VVAccess.ReadWrite)]
public bool Enabled = true;
[ViewVariables(VVAccess.ReadWrite)] public string VoiceName = "Unknown";
[DataField]
[ViewVariables(VVAccess.ReadWrite)]
public string VoiceName = "Unknown";
/// <summary>
/// If EnableSpeechVerbModification is true, overrides the speech verb used when this entity speaks.
/// </summary>
[DataField]
[ViewVariables(VVAccess.ReadWrite)]
public ProtoId<SpeechVerbPrototype>? SpeechVerb;
}