Morb0 681762aca7 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/GameTicker.Player.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs # Resources/Prototypes/Objectives/objectiveGroups.yml		2023-10-28 14:14:36 +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	2023-10-28 14:14:36 +03:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-28 14:14:36 +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