v0.11.0.9

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Holdable/Holdable.cs

@@ -2,9 +2,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Barotrauma.Items.Components
 {
@@ -15,10 +12,16 @@ namespace Barotrauma.Items.Components
             get { return item.Rect.Size.ToVector2(); }
         }
 
+        
+
         public void Draw(SpriteBatch spriteBatch, bool editing, float itemDepth = -1)
         {
-            if (!IsActive || picker == null || !CanBeAttached(picker) || !picker.IsKeyDown(InputType.Aim) || picker != Character.Controlled) { return; }
-
+            if (!IsActive || picker == null || !CanBeAttached(picker) || !picker.IsKeyDown(InputType.Aim) || picker != Character.Controlled) 
+            {
+                Drawable = false;
+                return; 
+            }
+            
             Vector2 gridPos = picker.Position;
             Vector2 roundedGridPos = new Vector2(
                 MathUtils.RoundTowardsClosest(picker.Position.X, Submarine.GridSize.X),

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Holdable/IdCard.cs

@@ -0,0 +1,13 @@
+using Microsoft.Xna.Framework;
+using System.Collections.Generic;
+
+namespace Barotrauma.Items.Components
+{
+    partial class IdCard
+    {
+        public Sprite StoredPortrait;
+        public Vector2 StoredSheetIndex;
+        public JobPrefab StoredJobPrefab;
+        public List<WearableSprite> StoredAttachments;
+    }
+}

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Holdable/Sprayer.cs

@@ -55,13 +55,8 @@ namespace Barotrauma.Items.Components
         {
             if (character == null || !character.IsKeyDown(InputType.Aim)) return;
 
-#if DEBUG
             if (PlayerInput.KeyHit(InputType.PreviousFireMode))
-#else
-            if (PlayerInput.MouseWheelDownClicked())
-#endif
             {
-
                 if (spraySetting > 0)
                 {
                     spraySetting--;
@@ -74,11 +69,7 @@ namespace Barotrauma.Items.Components
                 targetSections.Clear();
             }
 
-#if DEBUG
             if (PlayerInput.KeyHit(InputType.NextFireMode))
-#else
-            if (PlayerInput.MouseWheelUpClicked())
-#endif
             {
                 if (spraySetting < 2)
                 {