mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-13 20:31:10 +03:00
# Conflicts: # Content.Client/Entry/EntryPoint.cs # Content.Client/Preferences/ClientPreferencesManager.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml |
||
|---|---|---|
| .. | ||
| AudioTab.xaml | ||
| AudioTab.xaml.cs | ||
| GraphicsTab.xaml | ||
| GraphicsTab.xaml.cs | ||
| KeyRebindTab.xaml | ||
| KeyRebindTab.xaml.cs | ||
| NetworkTab.xaml | ||
| NetworkTab.xaml.cs | ||