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
..
AudioTab.xaml	TTS (Text-To-Speech) (#618)	2023-01-10 18:01:20 -08:00
AudioTab.xaml.cs	TTS (Text-To-Speech) (#618)	2023-01-10 18:01:20 -08:00
GraphicsTab.xaml	Oldchat (#11913)	2022-10-17 17:13:41 -05:00
GraphicsTab.xaml.cs	Rename cvars (#14001)	2023-02-12 16:51:21 +00:00
KeyRebindTab.xaml	Minor UI refactor (#11212)	2022-09-11 20:42:12 -07:00
KeyRebindTab.xaml.cs	Add EscapeContext keybind (#15301)	2023-04-13 18:10:44 -07:00
NetworkTab.xaml	Add new PVS options slider (#12146)	2022-10-26 14:19:11 +11:00
NetworkTab.xaml.cs	Fix warnings and code cleanup/fixes (#13570)	2023-01-19 13:56:45 +11:00