Morb0 38506f90df Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Entities/Clothing/Hands/specific.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml		2024-04-27 13:24:36 +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	Adds the option to fit the viewport to vertical screenspace (#27061)	2024-04-20 16:46:02 +10:00
GraphicsTab.xaml.cs	Adds the option to fit the viewport to vertical screenspace (#27061)	2024-04-20 16:46:02 +10:00
KeyRebindTab.xaml	Add scroll zooming for admins and ghosts (#14061)	2023-04-22 04:26:41 -06:00
KeyRebindTab.xaml.cs	Added hotkey and controller to re-open end of round scoreboard (#25884)	2024-04-26 14:39:56 +02:00
MiscTab.xaml	OOC Patron Color Toggle (#26653)	2024-04-04 18:20:06 +11:00
MiscTab.xaml.cs	Fix options menu crashing in replays (#26911)	2024-04-14 09:10:37 +02: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