Morb0 32a8d1a21e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Server/Power/Generator/GeneratorSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png		2024-02-03 03:38:29 +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	Screen Shake Intensity Slider in Accessibility Settings (#24749)	2024-02-02 13:39:12 +01:00
MiscTab.xaml.cs	Screen Shake Intensity Slider in Accessibility Settings (#24749)	2024-02-02 13:39:12 +01: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