NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-21 07:41:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
CatStation/Content.Client/Options/UI/Tabs
History
Morb0 33942c412a Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
2023-12-14 00:57:14 +03:00
..
AudioTab.xaml Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-05-31 03:26:01 +03:00
AudioTab.xaml.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-12-10 10:43:49 +03:00
GraphicsTab.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
GraphicsTab.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
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 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.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
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