mirror of
https://github.com/corvax-team/ss14-wl.git
synced 2026-02-15 03:31:38 +01:00
# Resolved Conflicts: # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs # Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs # Resources/Credits/GitHub.txt # Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml # Resources/Prototypes/GameRules/events.yml