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

ChatManager murder (#7337)

Browse Source
This commit is contained in:
mirrorcult
2022-03-30 22:21:58 -07:00
committed by GitHub
parent a11e8b676c
commit 70f0fffed2
16 changed files with 587 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Administration/Commands/DSay.cs
View File

@@ -1,3 +1,4 @@
using Content.Server.Chat;
using Content.Server.Chat.Managers;
using Content.Shared.Administration;
using Robust.Server.Player;
@@ -25,6 +26,9 @@ namespace Content.Server.Administration.Commands
return;
}
if (player.AttachedEntity is not { Valid: true } entity)
return;
if (args.Length < 1)
return;
@@ -32,10 +36,8 @@ namespace Content.Server.Administration.Commands
if (string.IsNullOrEmpty(message))
return;
var chat = IoCManager.Resolve<IChatManager>();
chat.SendAdminDeadChat(player, message);
var chat = EntitySystem.Get<ChatSystem>();
chat.TrySendInGameOOCMessage(entity, message, InGameOOCChatType.Dead, false, shell, player);
}
}
}