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

Merge remote-tracking branch 'upstream/master' into ups

Browse Source
This commit is contained in:
Jabak
2024-08-03 22:32:36 +03:00
parent 64ad5900c8 76b15fd787
commit 1adca3107a
77 changed files with 791 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Chat/Systems/ChatSystem.cs
View File

@@ -24,6 +24,7 @@ using Content.Shared.Mobs.Systems;
using Content.Shared.Players;
using Content.Shared.Radio;
using Content.Shared._White;
using Content.Shared._White.Cult.Components;
using Content.Shared.Speech;
using Content.Shared._White.Cult.Systems;
using Robust.Server.Player;
@@ -807,6 +808,7 @@ public sealed partial class ChatSystem : SharedChatSystem
return Filter.Empty()
.AddWhereAttachedEntity(HasComp<GhostComponent>)
.AddWhereAttachedEntity(HasComp<CultistComponent>)
.AddWhereAttachedEntity(HasComp<ConstructComponent>)
.Recipients
.Union(_adminManager.ActiveAdmins)
.Select(p => p.Channel);