Morbo 143d408c81 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Shared/CCVar/CCVars.cs # Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml		2022-09-16 19:22:52 +03:00
..
Commands	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-09-16 19:22:52 +03:00
Components	Adds even more smites and a bunch of tools. (#9825)	2022-07-21 17:30:00 -05:00
Logs	Disable admin logs next button when there are no more logs (#9277)	2022-06-29 10:38:24 +02:00
Managers	Disable re-adminning infinitely (#11174)	2022-09-10 06:07:35 -07:00
Notes	Admin notes (#7259)	2022-04-16 20:57:50 +02:00
Systems	BwoinkSystem improvements (#11258)	2022-09-14 12:19:32 -05:00
UI	Fix station announcements (#9380)	2022-07-04 16:00:51 +10:00
AdminCommandAttribute.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10: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
GamePrototypeLoadManager.cs	Remove usage of CreateNetMessage. (#7563)	2022-04-15 11:55:49 -07:00
NetworkResourceManager.cs	Remove usage of CreateNetMessage. (#7563)	2022-04-15 11:55:49 -07:00
PlayerLocator.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
QuickDialogSystem.cs	Adds even more smites and a bunch of tools. (#9825)	2022-07-21 17:30:00 -05:00
QuickDialogSystem.OpenDialog.cs	Adds even more smites and a bunch of tools. (#9825)	2022-07-21 17:30:00 -05:00