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
..
Commands	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Managers	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-12 02:17:14 +03:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-26 15:14:44 +03:00
TypingIndicator	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-17 14:01:54 +03:00
AnnounceOnSpawnComponent.cs	nar'sie fake (#20299)	2023-12-06 20:24:33 -05:00
AutoEmoteComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
ChatUser.cs	Fix erase verb not removing chat messages in some cases (#21355)	2023-11-05 19:19:59 -07:00
EmoteOnDamageComponent.cs	Use new ComponentPauseGenerator (#25183)	2024-02-26 14:36:19 +11:00
SuicideSystem.cs	Kill SharedEntityExtensions and all popup extensions (#20909)	2023-10-16 16:56:09 +11:00