Unstable 1.1.14.0

2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -13,7 +13,7 @@ namespace Barotrauma.Items.Components
            get { return item.Rect.Size.ToVector2(); }
        }

-        public void Draw(SpriteBatch spriteBatch, bool editing, float itemDepth = -1)
+        public void Draw(SpriteBatch spriteBatch, bool editing, float itemDepth = -1, Color? overrideColor = null)
        {
            if (!IsActive || picker == null || !CanBeAttached(picker) || !picker.IsKeyDown(InputType.Aim) || picker != Character.Controlled)
            {
@@ -50,7 +50,17 @@ namespace Barotrauma.Items.Components

            Submarine.DrawGrid(spriteBatch, 14, gridPos, roundedGridPos, alpha: 0.4f);

-            item.Sprite.Draw(
+            Sprite sprite = item.Sprite;
+            foreach (ContainedItemSprite containedSprite in item.Prefab.ContainedSprites)
+            {
+                if (containedSprite.UseWhenAttached)
+                {
+                    sprite = containedSprite.Sprite;
+                    break;
+                }
+            }
+
+            sprite.Draw(
                spriteBatch,
                new Vector2(attachPos.X, -attachPos.Y),
                item.SpriteColor * 0.5f,