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
..
Commands	Adds uploadfolder command (#15102)	2023-04-05 17:37:05 -06:00
Components	Adds even more smites and a bunch of tools. (#9825)	2022-07-21 17:30:00 -05:00
Managers	Equipment verbs & admin inventory access. (#14315)	2023-03-06 04:12:08 +11:00
Systems	Fix rsi sprite access for verbs (#14284)	2023-02-26 18:48:57 +11:00
UI	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-04-15 19:12:31 +03:00
AdminNameOverlay.cs	Ahelp / player list changes (#11392)	2022-10-15 14:26:29 -07:00
QuickDialogSystem.cs	Move/Rename stuff (#11209)	2022-09-11 18:56:21 -07:00