(683b11c00) High-res shuttle preview images + merge fix

2019-05-16 07:05:08 +03:00
parent 5438a65852
commit f605651966
43 changed files with 34 additions and 3476 deletions
@@ -49,9 +49,7 @@ namespace Barotrauma
                    return new AIObjectiveGetItem(character, gearTag, objectiveManager, equip: true);
                });
            }
-            if (getDivingGear != null) { return; }
-            var containedItems = item.ContainedItems;
-            if (containedItems == null)
+            else
            {
                var containedItems = item.ContainedItems;
                if (containedItems == null)