Morb0 5a4438ca85 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json		2023-10-05 19:37:38 +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-02 02:18:19 +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	Revolutionaries (#18477)	2023-10-04 18:47:33 -07:00
Toolshed	Allow solutions to store extra reagent data (#19323)	2023-09-05 07:55:10 +10:00
UI	Content update for NetEntities (#18935)	2023-09-11 09:42:41 +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	Fix role bans having no confirmation (#20544)	2023-09-27 10:27:08 -05: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