From 2f86991ce5ddbecbaf42662c609bd0f6f6f80e7d Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu, 11 Apr 2019 18:27:41 +0300
Subject: [PATCH] (fdf8cfbbe) Merge branch 'dev' of
 https://github.com/Regalis11/Barotrauma-development into dev

---
 Barotrauma/BarotraumaClient/Source/Items/Item.cs           | 2 +-
 .../Source/Items/Components/Holdable/Holdable.cs           | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/Items/Item.cs b/Barotrauma/BarotraumaClient/Source/Items/Item.cs
index ff4dc9d98..f468574f7 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Item.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Item.cs
@@ -795,7 +795,7 @@ namespace Barotrauma
             {
                 if (!ic.CanBeSelected) { continue; }
 
-                bool useAlternativeLayout = ic.Item != this;
+                bool useAlternativeLayout = activeHUDs.Count > 1;
                 bool wasUsingAlternativeLayout = ic.UseAlternativeLayout;
                 ic.UseAlternativeLayout = useAlternativeLayout;
                 needsLayoutUpdate |= ic.UseAlternativeLayout != wasUsingAlternativeLayout;
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs
index 2b38622e6..ffb107200 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs
@@ -58,13 +58,6 @@ namespace Barotrauma.Items.Components
             set;
         }
 
-        [Serialize(true, true)]
-        public bool Aimable
-        {
-            get;
-            set;
-        }
-
         [Serialize(false, false)]
         public bool ControlPose
         {