Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop-unstable

This commit is contained in:
EvilFactory
2022-12-14 12:10:23 -03:00
13 changed files with 104 additions and 63 deletions
@@ -762,7 +762,6 @@ namespace Barotrauma.Items.Components
var relatedItem = FindContainableItem(contained);
if (relatedItem != null)
{
if (relatedItem.Hide.HasValue && relatedItem.Hide.Value) { continue; }
if (relatedItem.ItemPos.HasValue)
{
Vector2 pos = relatedItem.ItemPos.Value;