Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GUI/GUI.cs
	Subsurface/Source/GUI/LoadingScreen.cs

Subsurface/Source/Properties.cs

@@ -264,11 +264,11 @@ namespace Barotrauma
                 {
                     //only save 
                     //  - if the attribute is saveable and it's different from the default value
-                    //  - or can be changed in the editor
+                    //  - or can be changed in-game or in the editor
                     bool save = false;
                     foreach (var attribute in property.Attributes.OfType<HasDefaultValue>())
                     {
-                        if ((!attribute.isSaveable && !attribute.defaultValue.Equals(value)) || 
+                        if ((attribute.isSaveable && !attribute.defaultValue.Equals(value)) || 
                             property.Attributes.OfType<Editable>().Any())
                         {
                             save = true;