(b7893662b) Changed small font to Exo2 Medium (a bit more readable than the light version) + merge fix

This commit is contained in:
Joonas Rikkonen
2019-04-25 17:51:10 +03:00
parent 52991e1ded
commit 99344e4031
3 changed files with 1 additions and 65 deletions
@@ -120,14 +120,6 @@ namespace Barotrauma.Items.Components
outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true);
}
}
if (targetItem.Prefab.DeconstructItems.Any())
{
inputContainer.Inventory.RemoveItem(targetItem);
Entity.Spawner.AddToRemoveQueue(targetItem);
MoveInputQueue();
PutItemsToLinkedContainer();
}
if (inputContainer.Inventory.Items.Any(i => i != null))
{