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

2019-05-18 17:41:06 +03:00
parent 3635568b6a
commit 84b034b34d
8 changed files with 103 additions and 120 deletions
@@ -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);
            }