NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-11 03:11:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
CatStation/Content.Client/Options/UI/Tabs
History
Exact
Morb0 8572f60456 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
#	Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Medical/Chemist.xml
#	Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml
#	Resources/ServerInfo/Guidebook/Science/APE.xml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/ServerInfo/Guidebook/Survival.xml
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2024-08-19 08:18:59 +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/upstream/master' into master-syndie 2024-06-27 13:40:52 +03:00
AudioTab.xaml.cs Return TTS volume slider 2024-06-27 13:45:18 +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 keybinds for rotating and flipping objects (#30540) 2024-08-13 23:36:41 +10:00
MiscTab.xaml Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
MiscTab.xaml.cs Localization hud layout (#31013) 2024-08-16 22:04:33 -04:00