mirror of
https://github.com/wega-team/ss14-wega.git
synced 2026-02-15 03:31:44 +01:00
# Conflicts: # .github/CODEOWNERS # Content.Client/Options/UI/Tabs/AudioTab.xaml # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Server/Connection/ConnectionManager.cs # Content.Shared/Preferences/Loadouts/RoleLoadout.cs # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Prototypes/SoundCollections/NukeMusic.yml # Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png # Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_gay.png