Morb0 b1550d7db0 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png		2023-09-05 00:12:02 +03:00
..
BanList	Admin notes bugfixes (#18189)	2023-07-21 15:43:47 +02:00
Commands	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-05 00:12: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	Toolshed part 2 (#18997)	2023-08-23 16:03:41 -05:00
Notes	Move minds, roles, jobs and objectives to shared (#19679)	2023-08-30 21:46:11 -07:00
Systems	Weldable cleanup (#19809)	2023-09-05 00:07:01 +10:00
Toolshed	Toolshed part 2 (#18997)	2023-08-23 16:03:41 -05:00
UI	Ensure EUIs close themselves (#15860)	2023-04-29 13:16:24 +10: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	Better notes and bans (#14228)	2023-07-21 13:38:52 +02: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