- items can be equipped/unequipped by double clicking

- items inside the respawn shuttle
- using the teleport method when moving a character into or out from a sub
- removing dropped items from the respawn shuttle when respawning
This commit is contained in:
Regalis
2016-07-29 21:22:08 +03:00
parent 4252f4b9d0
commit 1a0451d0a8
4 changed files with 36 additions and 7 deletions

View File

@@ -314,6 +314,16 @@ namespace Barotrauma.Networking
shuttleTransportTimer = maxTransportTime;
shuttleReturnTimer = maxTransportTime;
foreach (Item item in Item.ItemList)
{
if (item.Submarine != respawnShuttle) continue;
if (item.body != null && item.body.Enabled && item.ParentInventory == null)
{
Item.Remover.QueueItem(item);
}
}
foreach (Structure wall in Structure.WallList)
{
if (wall.Submarine != respawnShuttle) continue;
@@ -397,7 +407,7 @@ namespace Barotrauma.Networking
var divingSuit = new Item(divingSuitPrefab, pos, respawnShuttle);
var oxyTank = new Item(oxyPrefab, pos, respawnShuttle);
oxyTank.Combine(divingSuit);
divingSuit.Combine(oxyTank);
spawnedItems.Add(divingSuit);
spawnedItems.Add(oxyTank);