diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs index f618cea785..125a09c299 100644 --- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs +++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs @@ -21,6 +21,8 @@ public abstract partial class SharedBorgSystem : EntitySystem [Dependency] protected readonly SharedContainerSystem Container = default!; [Dependency] protected readonly ItemSlotsSystem ItemSlots = default!; [Dependency] protected readonly SharedPopupSystem Popup = default!; + [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; + [Dependency] protected readonly IRobustRandom RobustRandom = default!; /// public override void Initialize() @@ -40,12 +42,13 @@ public abstract partial class SharedBorgSystem : EntitySystem private void RandomTTS(EntityUid uid, SharedTTSComponent component, ComponentStartup args) { - if (TryComp(uid, out var borgChassis) && borgChassis.Initialized) - { - var voices = IoCManager.Resolve().EnumeratePrototypes().ToList(); - var voice = IoCManager.Resolve().Pick(voices); - component.VoicePrototypeId = voice.ID; - } + if (TryComp(uid, out _)) + return; + + var voiceList = PrototypeManager.EnumeratePrototypes().ToHashSet(); + var voice = RobustRandom.Pick(voiceList); + component.VoicePrototypeId = voice.ID; + } private void OnItemSlotInsertAttempt(EntityUid uid, BorgChassisComponent component, ref ItemSlotInsertAttemptEvent args)