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
..
BanList	Add role bans tab to the bans admin window (#20388)	2023-09-22 14:08:28 -07:00
Commands	Merge remote-tracking branch 'upstream/master' into upstream-sync	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
Logs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Managers	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Notes	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Systems	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Toolshed	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
UI	Moves SolutionContainerManagerComponent to Shared. (#20944)	2023-10-15 03:45:28 +11:00
AdminCommandAttribute.cs	Toolshed (#17895)	2023-08-02 16:09:08 -05:00
AdminPermsChangedEventArgs.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
AdminRank.cs	Remove redundant #nullable enable (#4275)	2021-07-16 17:37:09 -07:00
BanPanelEui.cs	Add admin Erase verb, add checkbox to erase from the ban panel (#20985)	2023-10-14 02:02:56 -07:00
ContentNetworkResourceManager.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
PlayerLocator.cs	Cache HTTP client in player locator (#12555)	2022-11-11 19:56:47 -06:00
QuickDialogSystem.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
QuickDialogSystem.OpenDialog.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00