tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chat fix (#832)

Browse Source
This commit is contained in:
Sam
2020-04-21 08:26:53 +10:00
committed by GitHub
parent a448c4f75b
commit d5d21e7079
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Chat/ChatCommands.cs
View File

@@ -1,6 +1,6 @@
using Content.Server.GameObjects.Components.Observer; using Content.Server.GameObjects.Components.Observer;
using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.Chat;
using Content.Server.Observer; using Content.Server.Players;
using Robust.Server.Interfaces.Console; using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using Robust.Shared.Enums; using Robust.Shared.Enums;
@@ -29,7 +29,11 @@ namespace Content.Server.Chat
if (player.AttachedEntity.HasComponent<GhostComponent>()) if (player.AttachedEntity.HasComponent<GhostComponent>())
chat.SendDeadChat(player, message); chat.SendDeadChat(player, message);
else else
chat.EntitySay(player.AttachedEntity, message); {
var mindComponent = player.ContentData().Mind;
chat.EntitySay(mindComponent.OwnedEntity, message);
}
} }
} }
@@ -51,14 +55,15 @@ namespace Content.Server.Chat
var action = string.Join(" ", args); var action = string.Join(" ", args);
chat.EntityMe(player.AttachedEntity, action); var mindComponent = player.ContentData().Mind;
chat.EntityMe(mindComponent.OwnedEntity, action);
} }
} }
internal class OOCCommand : IClientCommand internal class OOCCommand : IClientCommand
{ {
public string Command => "ooc"; public string Command => "ooc";
public string Description => "Send Out of Character chat messages."; public string Description => "Send Out Of Character chat messages.";
public string Help => "ooc <text>"; public string Help => "ooc <text>";
public void Execute(IConsoleShell shell, IPlayerSession player, string[] args) public void Execute(IConsoleShell shell, IPlayerSession player, string[] args)