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
..
AdminbusTab	Made ColorSelectorSliders use SpinBox instead of FloatSpinBox (#13702)	2023-03-06 10:07:49 -08:00
AdminTab	Fix shuttle call window (#898)	2023-03-18 16:14:44 -07:00
AtmosTab	Changes for prototype load parallelization (#13066)	2022-12-20 14:25:34 -08:00
ObjectsTab	Fix warnings and code cleanup/fixes (#13570)	2023-01-19 13:56:45 +11:00
PlayerTab	Add show disconnected button to admin player tab (#15326)	2023-04-12 23:30:03 +10:00
RoundTab.xaml	Ghost roles create new minds, better tracking of roles at round end screen (#5175)	2021-11-15 11:14:34 -07:00
RoundTab.xaml.cs	Seal/abstract/virtual everything (#6739)	2022-02-16 18:23:23 +11:00
ServerTab.xaml	Add panic bunker toggle to admin menu (#13450)	2023-01-20 07:25:35 -08:00
ServerTab.xaml.cs	Add panic bunker toggle to admin menu (#13450)	2023-01-20 07:25:35 -08:00