Merged branch combat-mission into combat-mission

2016-10-10 09:58:06 -03:00
parent 0125ff0f5c 74a9453676
commit cb1b975f9f
25 changed files with 201 additions and 228 deletions
@@ -70,7 +70,7 @@ namespace Barotrauma

            Vector2 position = new Vector2(
                cargoSpawnPos.Position.X + Rand.Range(-20.0f, 20.0f, false),
-                cargoRoom.Rect.Y - cargoRoom.Rect.Height);
+                cargoRoom.Rect.Y - cargoRoom.Rect.Height + itemPrefab.Size.Y / 2);

            var item = new Item(itemPrefab, position, cargoRoom.Submarine);
            item.FindHull();