Morb0 ac51af0830 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/GameTicker.Player.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json		2024-05-26 13:10:11 +03:00
..
Commands	Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936)	2024-05-12 20:34:52 -04:00
Managers	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-26 13:10:11 +03:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-30 21:12:31 +03:00
TypingIndicator	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-17 14:01:54 +03:00
V2	Chatfactor: Chat Repository, Admin Commands, Chat Created Events (#26113)	2024-04-18 14:59:10 +10: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