(a410fd46c) Trying to help the merge script through a jungle of merges

Barotrauma/BarotraumaShared/Source/Items/Components/DockingPort.cs

@@ -33,6 +33,7 @@ namespace Barotrauma.Items.Components
         private Body doorBody;
 
         private bool docked;
+        private bool obstructedWayPointsDisabled;
 
         private float forceLockTimer;
         //if the submarine isn't in the correct position to lock within this time after docking has been activated,
@@ -732,6 +733,9 @@ namespace Barotrauma.Items.Components
                 bodies = null;
             }
 
+            Item.Submarine.EnableObstructedWaypoints();
+            obstructedWayPointsDisabled = false;
+
 #if SERVER
             if (GameMain.Server != null)
             {
@@ -813,6 +817,11 @@ namespace Barotrauma.Items.Components
                     dockingState = MathHelper.Lerp(dockingState, 1.0f, deltaTime * 10.0f);
                 }
             }
+            if (!obstructedWayPointsDisabled && dockingState >= 0.99f)
+            {
+                Item.Submarine.DisableObstructedWayPoints(DockingTarget?.Item.Submarine);
+                obstructedWayPointsDisabled = true;
+            }
         }
 
         protected override void RemoveComponentSpecific()
@@ -983,6 +992,5 @@ namespace Barotrauma.Items.Components
                 Undock();
             }
         }
-
     }
 }

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -413,7 +413,7 @@ namespace Barotrauma.Items.Components
             {
                 target = ConvertUnits.ToSimUnits(Level.Loaded.StartPosition);
             }
-            steeringPath = pathFinder.FindPath(ConvertUnits.ToSimUnits(controlledSub == null ? item.WorldPosition : controlledSub.WorldPosition), target, "(Autopilot, target: " + target + ")");
+            steeringPath = pathFinder.FindPath(ConvertUnits.ToSimUnits(controlledSub == null ? item.WorldPosition : controlledSub.WorldPosition), target, errorMsgStr: "(Autopilot, target: " + target + ")");
         }
 
         public void SetDestinationLevelStart()

Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs

@@ -174,6 +174,12 @@ namespace Barotrauma.Items.Components
 
         private void Launch(Vector2 impulse)
         {
+            if (item.AiTarget != null)
+            {
+                item.AiTarget.SightRange = item.AiTarget.MaxSightRange;
+                item.AiTarget.SoundRange = item.AiTarget.MaxSoundRange;
+            }
+
             item.Drop(null);
 
             item.body.Enabled = true;            

Barotrauma/BarotraumaShared/Source/Items/Components/Repairable.cs

@@ -122,6 +122,16 @@ namespace Barotrauma.Items.Components
             Update(deltaTime, cam);
         }
 
+        public void ResetDeterioration()
+        {
+            deteriorationTimer = Rand.Range(MinDeteriorationDelay, MaxDeteriorationDelay);
+            item.Condition = item.Prefab.Health;
+#if SERVER
+            //let the clients know the initial deterioration delay
+            item.CreateServerEvent(this);
+#endif
+        }
+
         public override void Update(float deltaTime, Camera cam)
         {
             UpdateProjSpecific(deltaTime);

Barotrauma/BarotraumaShared/Source/Items/Components/Signal/Wire.cs

@@ -338,9 +338,15 @@ namespace Barotrauma.Items.Components
                 canPlaceNode = true;
             }
 
+            Vector2 relativeNodePos = newNodePos - item.Position;
+            if (sub != null)
+            {
+                relativeNodePos += sub.HiddenSubPosition;
+            }
+
             sectionExtents = new Vector2(
-                Math.Max(Math.Abs((newNodePos.X + sub.HiddenSubPosition.X) - item.Position.X), sectionExtents.X),
-                Math.Max(Math.Abs((newNodePos.Y + sub.HiddenSubPosition.Y) - item.Position.Y), sectionExtents.Y));
+                Math.Max(Math.Abs(relativeNodePos.X), sectionExtents.X),
+                Math.Max(Math.Abs(relativeNodePos.Y), sectionExtents.Y));
         }
         
         public override bool Use(float deltaTime, Character character = null)

Barotrauma/BarotraumaShared/Source/Items/Components/Wearable.cs

@@ -286,6 +286,23 @@ namespace Barotrauma.Items.Components
                 if (!equipLimb.WearingItems.Contains(wearableSprite))
                 {
                     equipLimb.WearingItems.Add(wearableSprite);
+                    equipLimb.WearingItems.Sort((i1, i2) => { return i2.Sprite.Depth.CompareTo(i1.Sprite.Depth); });
+                    equipLimb.WearingItems.Sort((i1, i2) => 
+                    {
+                        if (i1?.WearableComponent == null && i2?.WearableComponent == null)
+                        {
+                            return 0;
+                        }
+                        else if (i1?.WearableComponent == null)
+                        {
+                            return -1;
+                        }
+                        else if (i2?.WearableComponent == null)
+                        {
+                            return 1;
+                        }
+                        return i1.WearableComponent.AllowedSlots.Contains(InvSlotType.OuterClothes).CompareTo(i2.WearableComponent.AllowedSlots.Contains(InvSlotType.OuterClothes));
+                    });
                 }
             }
         }