mirror of
https://github.com/wega-team/ss14-wega.git
synced 2026-02-15 03:31:44 +01:00
# Conflicts: # Content.Client/Preferences/ClientPreferencesManager.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/ICharacterProfile.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml # Resources/Prototypes/Datasets/Names/fortunes.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # SpaceStation14.sln