diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index ca1b2070f7..a4806f5cd4 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -12,6 +12,7 @@ using Content.Server.Speech.Prototypes; using Content.Server.Speech.EntitySystems; using Content.Server.Station.Components; using Content.Server.Station.Systems; +using Content.Shared._Sunrise.Antags.Abductor; using Content.Shared._Sunrise.CollectiveMind; using Content.Shared.ActionBlocker; using Content.Shared.Administration; @@ -183,6 +184,12 @@ public sealed partial class ChatSystem : SharedChatSystem bool isFormatted = false //sunrise-edit ) { + if (TryComp(source, out var comp)) + { + _prototypeManager.TryIndex(comp.AbductorCollectiveMindProto, out var channel); + SendCollectiveMindChat(source, message, channel); + return; + } if (HasComp(source)) { // Ghosts can only send dead chat messages, so we'll forward it to InGame OOC. diff --git a/Content.Shared/_Sunrise/Antags/Abductor/Components/AbductorsComponents.General.cs b/Content.Shared/_Sunrise/Antags/Abductor/Components/AbductorsComponents.General.cs index 347ba9fa77..5d35b63f12 100644 --- a/Content.Shared/_Sunrise/Antags/Abductor/Components/AbductorsComponents.General.cs +++ b/Content.Shared/_Sunrise/Antags/Abductor/Components/AbductorsComponents.General.cs @@ -1,3 +1,4 @@ +using Content.Shared._Sunrise.CollectiveMind; using Content.Shared.Actions; using Content.Shared.Communications; using Content.Shared.Ninja.Systems; @@ -69,6 +70,8 @@ public sealed partial class AbductorDispencerComponent : Component [RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem))] public sealed partial class AbductorComponent : Component { + [ValidatePrototypeId] + public string AbductorCollectiveMindProto = "Abductor"; } [RegisterComponent, NetworkedComponent, Access(typeof(SharedAbductorSystem)), AutoGenerateComponentState]