(6f8f26a84) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-15 11:57:43 +03:00
parent 4675f969f1
commit c3a248e527
2 changed files with 1 additions and 1 deletions
--- a/Barotrauma/BarotraumaClient/Source/Screens/CharacterEditorScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/CharacterEditorScreen.cs
@@ -4343,7 +4343,7 @@ namespace Barotrauma
                    GUITextBox xmlPathElement = null;
                    void UpdatePaths()
                    {
-                        string pathBase = $"Content/Characters/{Name}/{Name}";
+                        string pathBase = $"Mods/Characters/{Name}/{Name}";
                        XMLPath = $"{pathBase}.xml";
                        TexturePath = $"{pathBase}.png";
                        texturePathElement.Text = TexturePath;
--- a/Barotrauma/BarotraumaShared/Submarines/Dugong.sub
+++ b/Barotrauma/BarotraumaShared/Submarines/Dugong.sub