Unstable 0.15.11.0 + the last 2 unstables I missed

Barotrauma/BarotraumaShared/SharedSource/Items/Components/GeneticMaterial.cs

@@ -158,7 +158,7 @@ namespace Barotrauma.Items.Components
             if (!CanBeCombinedWith(otherGeneticMaterial)) { return false; }
 
             float conditionIncrease = Rand.Range(ConditionIncreaseOnCombineMin, ConditionIncreaseOnCombineMax);
-            conditionIncrease *= 1.0f + user.GetStatValue(StatTypes.GeneticMaterialRefineBonus);
+            conditionIncrease += user.GetStatValue(StatTypes.GeneticMaterialRefineBonus);
             if (item.Prefab == otherGeneticMaterial.item.Prefab)
             {
                 item.Condition = Math.Max(item.Condition, otherGeneticMaterial.item.Condition) + conditionIncrease;

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs

@@ -781,7 +781,7 @@ namespace Barotrauma.Items.Components
                 if (!aim)
                 {
                     var rope = GetRope();
-                    if (rope != null && rope.SnapWhenNotAimed)
+                    if (rope != null && rope.SnapWhenNotAimed && rope.Item.ParentInventory == null)
                     {
                         rope.Snap();
                     }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RangedWeapon.cs

@@ -198,7 +198,11 @@ namespace Barotrauma.Items.Components
                     Vector2 barrelPos = TransformedBarrelPos + item.body.SimPosition;
                     float rotation = (Item.body.Dir == 1.0f) ? Item.body.Rotation : Item.body.Rotation - MathHelper.Pi;
                     float spread = GetSpread(character) * Rand.Range(-0.5f, 0.5f);
-                    LastProjectile?.Item.GetComponent<Rope>()?.Snap();
+                    var lastProjectile = LastProjectile;
+                    if (lastProjectile != projectile)
+                    {
+                        lastProjectile?.Item.GetComponent<Rope>()?.Snap();
+                    }
                     float damageMultiplier = 1f + item.GetQualityModifier(Quality.StatType.AttackMultiplier);
                     projectile.Shoot(character, character.AnimController.AimSourceSimPos, barrelPos, rotation + spread, ignoredBodies: limbBodies.ToList(), createNetworkEvent: false, damageMultiplier);
                     projectile.Item.GetComponent<Rope>()?.Attach(Item, projectile.Item);

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Reactor.cs

@@ -494,15 +494,12 @@ namespace Barotrauma.Items.Components
             {
                 float prevFireTimer = fireTimer;
                 fireTimer += MathHelper.Lerp(deltaTime * 2.0f, deltaTime, item.Condition / item.MaxCondition);
-
-
 #if SERVER
                 if (fireTimer > Math.Min(5.0f, FireDelay / 2) && blameOnBroken?.Character?.SelectedConstruction == item)
                 {
-                    GameMain.Server.KarmaManager.OnReactorOverHeating(blameOnBroken.Character, deltaTime);
+                    GameMain.Server.KarmaManager.OnReactorOverHeating(item, blameOnBroken.Character, deltaTime);
                 }
 #endif
-
                 if (fireTimer >= FireDelay && prevFireTimer < fireDelay)
                 {
                     new FireSource(item.WorldPosition);
@@ -591,7 +588,7 @@ namespace Barotrauma.Items.Components
             GameServer.Log("Reactor meltdown!", ServerLog.MessageType.ItemInteraction);
             if (GameMain.Server != null)
             {
-                GameMain.Server.KarmaManager.OnReactorMeltdown(blameOnBroken?.Character);
+                GameMain.Server.KarmaManager.OnReactorMeltdown(item, blameOnBroken?.Character);
             }
 #endif
         }

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

@@ -614,10 +614,17 @@ namespace Barotrauma.Items.Components
                 return;
             }
 
+            //target very far from the item -> update the item's transform to make sure it's inside the same sub as the target (or outside)
+            if (Math.Abs(stickJoint.JointTranslation) > 100.0f)
+            {
+                item.UpdateTransform();
+            }
+
             if (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer)
             {
                 if (StickTargetRemoved() ||
-                    (!StickPermanently && (stickJoint.JointTranslation < stickJoint.LowerLimit * 0.9f || stickJoint.JointTranslation > stickJoint.UpperLimit * 0.9f)))
+                    (!StickPermanently && (stickJoint.JointTranslation < stickJoint.LowerLimit * 0.9f || stickJoint.JointTranslation > stickJoint.UpperLimit * 0.9f)) ||
+                    Math.Abs(stickJoint.JointTranslation) > 100.0f) //failsafe unstick if the target is still extremely far
                 {
                     Unstick();
 #if SERVER

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

@@ -406,15 +406,7 @@ namespace Barotrauma.Items.Components
             fixDuration /= 1 + CurrentFixer.GetStatValue(StatTypes.RepairSpeed) + currentRepairItem?.Prefab.AddedRepairSpeedMultiplier ?? 0f;
             fixDuration /= 1 + item.GetQualityModifier(Quality.StatType.RepairSpeed);
 
-            // kind of rough to keep this in update, but seems most robust
-            if (requiredSkills.Any(s => s != null && s.Identifier.Equals("mechanical", StringComparison.OrdinalIgnoreCase)))
-            {
-                item.MaxRepairConditionMultiplier = 1 + CurrentFixer.GetStatValue(StatTypes.MaxRepairConditionMultiplierMechanical);
-            }
-            if (requiredSkills.Any(s => s != null && s.Identifier.Equals("electrical", StringComparison.OrdinalIgnoreCase)))
-            {
-                item.MaxRepairConditionMultiplier = 1 + CurrentFixer.GetStatValue(StatTypes.MaxRepairConditionMultiplierElectrical);
-            }
+            item.MaxRepairConditionMultiplier = GetMaxRepairConditionMultiplier(CurrentFixer);
 
             if (currentFixerAction == FixActions.Repair)
             {
@@ -489,6 +481,21 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        private float GetMaxRepairConditionMultiplier(Character character)
+        {
+            if (character == null) { return 1.0f; }
+            // kind of rough to keep this in update, but seems most robust
+            if (requiredSkills.Any(s => s != null && s.Identifier.Equals("mechanical", StringComparison.OrdinalIgnoreCase)))
+            {
+                return 1 + character.GetStatValue(StatTypes.MaxRepairConditionMultiplierMechanical);
+            }
+            if (requiredSkills.Any(s => s != null && s.Identifier.Equals("electrical", StringComparison.OrdinalIgnoreCase)))
+            {
+                return 1 + character.GetStatValue(StatTypes.MaxRepairConditionMultiplierElectrical);
+            }
+            return 1.0f;
+        }
+
         private bool IsTinkerable(Character character)
         {
             if (!character.HasAbilityFlag(AbilityFlags.CanTinker)) { return false; }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Rope.cs

@@ -95,6 +95,10 @@ namespace Barotrauma.Items.Components
                     }
                 }
                 snapped = value;
+                if (!snapped)
+                {
+                    snapTimer = 0;
+                }
             }
         }
 
@@ -113,6 +117,7 @@ namespace Barotrauma.Items.Components
             System.Diagnostics.Debug.Assert(target != null);
             this.source = source;
             this.target = target;
+            Snapped = false;
             ApplyStatusEffects(ActionType.OnUse, 1.0f, worldPosition: item.WorldPosition);
             IsActive = true;
         }
@@ -148,6 +153,7 @@ namespace Barotrauma.Items.Components
 #endif
             var projectile = target.GetComponent<Projectile>();
             if (projectile == null) { return; }
+
             if (SnapOnCollision)
             {
                 raycastTimer += deltaTime;