89b91d1c3e
# Conflicts: # Barotrauma/BarotraumaClient/ClientSource/Characters/Character.cs # Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs # Barotrauma/BarotraumaClient/ClientSource/GUI/Store.cs # Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs # Barotrauma/BarotraumaClient/ClientSource/Items/Item.cs # Barotrauma/BarotraumaClient/ClientSource/Map/Map/Radiation.cs # Barotrauma/BarotraumaClient/ClientSource/Map/MapEntity.cs # Barotrauma/BarotraumaClient/ClientSource/Networking/ServerList/ServerInfo.cs # Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen/MainMenuScreen.cs # Barotrauma/BarotraumaClient/ClientSource/Screens/ServerListScreen/ServerListScreen.cs # Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs # Barotrauma/BarotraumaClient/ClientSource/Serialization/SerializableEntityEditor.cs # Barotrauma/BarotraumaClient/ClientSource/Settings/SettingsMenu.cs # Barotrauma/BarotraumaClient/ClientSource/SpamServerFilter.cs # Barotrauma/BarotraumaClient/ClientSource/Sprite/Sprite.cs # Barotrauma/BarotraumaClient/ClientSource/Steam/Lobby.cs # Barotrauma/BarotraumaClient/LinuxClient.csproj # Barotrauma/BarotraumaClient/MacClient.csproj # Barotrauma/BarotraumaClient/WindowsClient.csproj # Barotrauma/BarotraumaServer/LinuxServer.csproj # Barotrauma/BarotraumaServer/MacServer.csproj # Barotrauma/BarotraumaServer/ServerSource/GameMain.cs # Barotrauma/BarotraumaServer/ServerSource/Steam/SteamManager.cs # Barotrauma/BarotraumaServer/ServerSource/Traitors/TraitorManager.cs # Barotrauma/BarotraumaServer/WindowsServer.csproj # Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/HumanoidAnimController.cs # Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/Ragdoll.cs # Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs # Barotrauma/BarotraumaShared/SharedSource/Extensions/IEnumerableExtensions.cs # Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs # Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs # Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs # Barotrauma/BarotraumaShared/SharedSource/Serialization/Editable/ConditionallyEditable.cs # Barotrauma/BarotraumaShared/SharedSource/Settings/GameSettings.cs # Barotrauma/BarotraumaShared/changelog.txt # Libraries/BarotraumaLibs/BarotraumaCore/Utils/MathUtils.cs