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

2019-05-16 06:42:08 +03:00
parent 42f287e254
commit 114fada396
23 changed files with 295 additions and 306 deletions
@@ -225,12 +225,6 @@ namespace Barotrauma
            string nonTranslatedName = element.GetAttributeString("name", null) ?? element.Name.ToString();
            sp.Aliases.Add(nonTranslatedName.ToLowerInvariant());

-            SerializableProperty.DeserializeProperties(sp, element);
-            if (sp.Body)
-            {
-                sp.Tags.Add("wall");
-            }
-
            SerializableProperty.DeserializeProperties(sp, element);
            if (sp.Body)
            {