Morb0 28edee0fe2 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Administration/Commands/AdminWhoCommand.cs # Content.Server/Administration/Commands/PlayTimeCommands.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml		2024-06-01 23:06:19 +03:00
..
Prototypes	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
TypingIndicator	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
V2	Chatfactor: Chat Repository, Admin Commands, Chat Created Events (#26113)	2024-04-18 14:59:10 +10:00
ChatChannel.cs	News UI overhaul and PDA notifications (#19610)	2024-02-26 21:38:00 -04:00
ChatChannelExtensions.cs	Add admin alerts (#13589)	2023-03-23 11:10:49 -04:00
ChatSelectChannel.cs	Modify admin chat (#13050)	2022-12-19 21:39:01 -06:00
EmotesEvents.cs	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
MsgChatMessage.cs	Make chat & examine systems use FormattedMessage.EscapeText() (#28431)	2024-05-31 16:05:34 -04:00
MsgDeleteChatMessagesBy.cs	Add admin Erase verb, add checkbox to erase from the ban panel (#20985)	2023-10-14 02:02:56 -07:00
SharedChatSystem.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-17 10:07:13 +03:00