Morb0 55a91108c1 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Managers/ChatManager.cs # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json		2023-10-15 17:52:02 +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-15 17:52:02 +03:00
Components	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
Logs	add info to entity coordinate logs (#19257)	2023-08-22 22:01:18 +10:00
Managers	Fix role unbans not applying in real time (#20547)	2023-09-28 16:46:39 -07:00
Notes	Move minds, roles, jobs and objectives to shared (#19679)	2023-08-30 21:46:11 -07:00
Systems	Moves SolutionContainerManagerComponent to Shared. (#20944)	2023-10-15 03:45:28 +11:00
Toolshed	Moves SolutionContainerManagerComponent to Shared. (#20944)	2023-10-15 03:45:28 +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	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10: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	Move upload commands to engine (#16582)	2023-05-20 11:53:09 +10:00
PlayerLocator.cs	Cache HTTP client in player locator (#12555)	2022-11-11 19:56:47 -06:00
QuickDialogSystem.cs	Fixes quick dialog exception (#13189)	2023-01-05 06:27:25 +11:00
QuickDialogSystem.OpenDialog.cs	Adds even more smites and a bunch of tools. (#9825)	2022-07-21 17:30:00 -05:00