fish-station/Content.Client/Options/UI/Tabs
VigersRay 8fedc6f64a Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Options/UI/Tabs/AudioTab.xaml
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/Prototypes/lobbyscreens.yml
#	Resources/migration.yml
2024-06-23 21:07:25 +03:00
..
AccessibilityTab.xaml Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
AccessibilityTab.xaml.cs Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
AudioTab.xaml Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-23 21:07:25 +03:00
AudioTab.xaml.cs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-23 21:07:25 +03:00
GraphicsTab.xaml Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
GraphicsTab.xaml.cs Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
KeyRebindTab.xaml Add scroll zooming for admins and ghosts (#14061) 2023-04-22 04:26:41 -06:00
KeyRebindTab.xaml.cs Add keybind option for the Emote Menu (#28083) 2024-05-17 21:46:45 +02:00
MiscTab.xaml Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
MiscTab.xaml.cs Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00