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

Barotrauma/BarotraumaShared/Source/Map/Structure.cs

@@ -301,6 +301,10 @@ namespace Barotrauma
 #endif
             spriteColor = prefab.SpriteColor;
             if (sp.IsHorizontal.HasValue)
+            {
+                IsHorizontal = sp.IsHorizontal.Value;
+            }
+            else if (ResizeHorizontal && !ResizeVertical)
             {
                 IsHorizontal = true;
             }
@@ -345,7 +349,7 @@ namespace Barotrauma
             }
 
             // Only add ai targets automatically to submarine/outpost walls 
-            if (aiTarget == null && HasBody && Tags.Contains("wall") && submarine != null)
+            if (aiTarget == null && HasBody && Tags.Contains("wall") && submarine != null && !Prefab.NoAITarget)
             {
                 aiTarget = new AITarget(this);
             }

Barotrauma/BarotraumaShared/Source/Map/StructurePrefab.cs

@@ -184,6 +184,11 @@ namespace Barotrauma
                 sp.Tags.Add(tag.Trim().ToLowerInvariant());
             }
 
+            if (element.Attribute("ishorizontal") != null)
+            {
+                sp.IsHorizontal = element.GetAttributeBool("ishorizontal", false);
+            }
+
             foreach (XElement subElement in element.Elements())
             {
                 switch (subElement.Name.ToString())