Morbo 5a14c570aa Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml # Resources/Prototypes/typing_indicator.yml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png # Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png # Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png # Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png # Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png # Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png		2023-04-15 19:12:31 +03:00
..
BanList	Add ban list window (#12574)	2022-11-14 20:06:55 +01:00
Commands	Allow increase play time only with Permissions flag	2023-04-13 13:44:20 +03:00
Components	Cuffable/Handcuff ECS (#14382)	2023-03-13 19:34:26 -04:00
Logs	Add non-players button to log viewer (#14097)	2023-02-28 08:09:35 -08:00
Managers	Equipment verbs & admin inventory access. (#14315)	2023-03-06 04:12:08 +11:00
Notes	Revert "Show ban and note count in ahelp window" (#15347)	2023-04-12 19:43:33 +10:00
Systems	Revert "Show ban and note count in ahelp window" (#15347)	2023-04-12 19:43:33 +10: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	Fix resource &prototype upload recording (#15003)	2023-03-30 22:55:06 -05:00
NetworkResourceManager.cs	Fix resource &prototype upload recording (#15003)	2023-03-30 22:55:06 -05: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