CatStation/Content.Server/Chat
Morb0 2af666368b Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/MassMedia/Systems/NewsSystem.cs
#	Resources/Prototypes/Catalog/uplink_catalog.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-10-20 01:50:09 +03:00
..
Commands Move minds, roles, jobs and objectives to shared (#19679) 2023-08-30 21:46:11 -07:00
Managers Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-10-18 13:22:26 +03:00
Systems Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-10-20 01:50:09 +03:00
TypingIndicator Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-06-19 21:06:28 +03:00
AutoEmoteComponent.cs Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
EmoteOnDamageComponent.cs Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
SuicideSystem.cs Kill SharedEntityExtensions and all popup extensions (#20909) 2023-10-16 16:56:09 +11:00