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
..
Components	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Managers	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Systems	Move view variables verb to the top of the list with no category and localize it (#20546)	2023-09-30 13:22:07 -07:00
UI	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-28 14:14:36 +03:00
AdminNameOverlay.cs	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +10:00
QuickDialogSystem.cs	Move/Rename stuff (#11209)	2022-09-11 18:56:21 -07:00