mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-13 20:31:10 +03:00
# Conflicts: # Content.Server/GameTicking/GameTicker.Player.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json |
||
|---|---|---|
| .. | ||
| AudioTab.xaml | ||
| AudioTab.xaml.cs | ||
| GraphicsTab.xaml | ||
| GraphicsTab.xaml.cs | ||
| KeyRebindTab.xaml | ||
| KeyRebindTab.xaml.cs | ||
| MiscTab.xaml | ||
| MiscTab.xaml.cs | ||