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 id to ban list, make ids label a button (#12700)	2022-11-21 20:04:24 +01:00
Bwoink	Revert "Show ban and note count in ahelp window" (#15347)	2023-04-12 19:43:33 +10:00
CustomControls	Fix not being able to message players that weren't filtered by the ahelp menu (#13553)	2023-01-17 16:11:20 -06:00
Logs	Made ColorSelectorSliders use SpinBox instead of FloatSpinBox (#13702)	2023-03-06 10:07:49 -08:00
ManageSolutions	Solution rejig (#12428)	2023-01-12 14:41:40 +11:00
Notes	Add ban list window (#12574)	2022-11-14 20:06:55 +01:00
SetOutfit	Seal/abstract/virtual everything (#6739)	2022-02-16 18:23:23 +11:00
SpawnExplosion	Fix warnings and code cleanup/fixes (#13570)	2023-01-19 13:56:45 +11:00
Tabs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-04-15 19:12:31 +03:00
AdminAnnounceWindow.xaml	Multiline edit everywhere (#15216)	2023-04-14 12:57:47 -07:00
AdminAnnounceWindow.xaml.cs	Multiline edit everywhere (#15216)	2023-04-14 12:57:47 -07:00
AdminMenuWindow.xaml	Adds even more smites and a bunch of tools. (#9825)	2022-07-21 17:30:00 -05:00
AdminMenuWindow.xaml.cs	Repository cleanup (#631)	2022-12-10 12:10:27 -08:00
AdminMenuWindowEui.cs	Multiline edit everywhere (#15216)	2023-04-14 12:57:47 -07:00
PermissionsEui.cs	Order permissions panel admins by username (#9782)	2022-07-17 14:23:26 +10:00