Morb0 75443d7fb6 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Communications/CommunicationsConsoleSystem.cs # README.md # Resources/Prototypes/Entities/Mobs/Species/reptilian.yml # Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json		2023-10-11 16:56:19 +03:00
..
Prototypes	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
TypingIndicator	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-08-24 22:01:46 +03:00
ChatChannel.cs	Misc replay related changes (#17102)	2023-06-05 14:33:49 +10: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	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
SharedChatSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-11 16:56:19 +03:00