Morb0 782d82c0cd Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusEffects/job.yml # Resources/Prototypes/StatusEffects/security.yml # Resources/Textures/Decals/bricktile.rsi/white_box.png		2024-04-12 02:17:14 +03:00
..
Prototypes	Make all prototype types partial (#21374)	2023-11-01 19:56:23 -07:00
TypingIndicator	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-12 02:17:14 +03:00
V2/Moderation	SS14-17313 Chatfactor: Chat Censorship Systems (#25908)	2024-03-26 10:50:20 +11: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
MsgChatMessage.cs	Update NetMessage to pass in MemoryStream (#21796)	2023-11-28 19:11:16 +11: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	TTS optimization (#1873)	2024-02-16 13:34:14 +03:00