Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Cleanup speech and emoting comps (#13194)

Browse Source 
Networks speech and removes the shared prefix from emoting.
I have no idea if emoting is even being used or plan to be used in the interim.
This commit is contained in:
metalgearsloth
2022-12-28 04:03:25 +11:00
committed by GitHub
parent 2a8e5d9096
commit 0d7423c01d
8 changed files with 112 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Mind/Commands/MakeSentientCommand.cs
View File

@@ -54,8 +54,8 @@ namespace Content.Server.Mind.Commands
if (allowSpeech)
{
entityManager.EnsureComponent<SharedSpeechComponent>(uid);
entityManager.EnsureComponent<SharedEmotingComponent>(uid);
entityManager.EnsureComponent<SpeechComponent>(uid);
entityManager.EnsureComponent<EmotingComponent>(uid);
}
entityManager.EnsureComponent<ExaminerComponent>(uid);

4
Content.Server/Speech/SpeechNoiseSystem.cs
View File

@@ -19,10 +19,10 @@ namespace Content.Server.Speech
{
base.Initialize();
SubscribeLocalEvent<SharedSpeechComponent, EntitySpokeEvent>(OnEntitySpoke);
SubscribeLocalEvent<SpeechComponent, EntitySpokeEvent>(OnEntitySpoke);
}
private void OnEntitySpoke(EntityUid uid, SharedSpeechComponent component, EntitySpokeEvent args)
private void OnEntitySpoke(EntityUid uid, SpeechComponent component, EntitySpokeEvent args)
{
if (component.SpeechSounds == null) return;

2
Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
View File

@@ -36,7 +36,7 @@ public sealed class SurveillanceCameraSpeakerSystem : EntitySystem
// this part's mostly copied from speech
if (time - component.LastSoundPlayed < cd
&& TryComp<SharedSpeechComponent>(args.Speaker, out var speech)
&& TryComp<SpeechComponent>(args.Speaker, out var speech)
&& speech.SpeechSounds != null
&& _prototypeManager.TryIndex(speech.SpeechSounds, out SpeechSoundsPrototype? speechProto))
{