Morbo a93a3fb752 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/bar.png # Resources/Textures/Tiles/clown.png # Resources/Textures/Tiles/dark.png # Resources/Textures/Tiles/hydro.png # Resources/Textures/Tiles/kitchen.png # Resources/Textures/Tiles/laundry.png # Resources/Textures/Tiles/steel.png # Resources/Textures/Tiles/steel_dirty.png # Resources/Textures/Tiles/white.png		2022-10-23 17:55:21 +03:00
..
Commands	Merge remote-tracking branch 'upstream/master' into upstream-sync	2022-10-23 17:55:21 +03:00
Components	Adds even more smites and a bunch of tools. (#9825)	2022-07-21 17:30:00 -05:00
Logs	Pools admin log lists (#11462)	2022-10-17 00:00:30 +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	ECS and cleanup body system, merge body templates and presets into body prototypes (#11991)	2022-10-22 15:46:28 -07: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