Morb0 259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/CharacterSetupGui.xaml # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Resources/Prototypes/Catalog/Fills/Boxes/general.yml # Resources/Prototypes/Entities/Clothing/Back/satchel.yml # Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Textures/Objects/Storage/boxes.rsi/meta.json		2023-11-04 12:16:53 +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	2023-11-04 12:16:53 +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	Add admin Erase verb, add checkbox to erase from the ban panel (#20985)	2023-10-14 02:02:56 -07: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 'upstream/master' into upstream-sync	2023-10-11 16:56:19 +03:00