Morb0 fd12440582 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/Species/slime.yml # Resources/Textures/Interface/Actions/meta.json # Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png # Resources/Textures/Interface/Alerts/human_alive.rsi/meta.json # Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png # Resources/Textures/Structures/Piping/disposal.rsi/mailing.png # Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png # Resources/Textures/Structures/Piping/disposal.rsi/meta.json		2024-01-03 13:37:55 +03:00
..
Tabs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-03 13:37:55 +03:00
EscapeMenu.xaml	Guidebook Revival (#13320)	2023-01-16 02:42:22 -06:00
EscapeMenu.xaml.cs	Merge more UI refactor stuff (#11277)	2022-09-14 14:34:48 -07:00
OptionsMenu.xaml	Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430)	2023-12-12 17:58:20 -08:00
OptionsMenu.xaml.cs	Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430)	2023-12-12 17:58:20 -08:00