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
..
AudioTab.xaml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-29 16:58:52 +03:00
AudioTab.xaml.cs	Fix TTS volume is same check	2023-12-29 16:59:54 +03:00
GraphicsTab.xaml	Move HUD options to general options tab (#22884)	2023-12-22 23:32:56 -07:00
GraphicsTab.xaml.cs	Move HUD options to general options tab (#22884)	2023-12-22 23:32:56 -07:00
KeyRebindTab.xaml	Add scroll zooming for admins and ghosts (#14061)	2023-04-22 04:26:41 -06:00
KeyRebindTab.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
MiscTab.xaml	Blindness rework - damaged eyes are now a stylized simulation of legal blindness (#23212)	2024-01-03 01:07:02 -08:00
MiscTab.xaml.cs	Blindness rework - damaged eyes are now a stylized simulation of legal blindness (#23212)	2024-01-03 01:07:02 -08: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