v0.19.0.0 (unstable)

2022-07-20 18:47:07 +03:00
parent 2e2663a175
commit 6b55adcdd9
170 changed files with 2769 additions and 1634 deletions
@@ -512,6 +512,23 @@ namespace Barotrauma
            foreach (var weapon in weaponList)
            {
                float priority = weapon.CombatPriority;
+                if (weapon is RepairTool repairTool)
+                {
+                    switch (repairTool.UsableIn)
+                    {
+                        case RepairTool.UseEnvironment.Air:
+                            if (character.InWater) { continue; }
+                            break;
+                        case RepairTool.UseEnvironment.Water:
+                            if (!character.InWater) { continue; }
+                            break;
+                        case RepairTool.UseEnvironment.None:
+                            continue;
+                        case RepairTool.UseEnvironment.Both:
+                        default:
+                            break;
+                    }
+                }
                if (prioritizeMelee)
                {
                    if (weapon is MeleeWeapon)