From 2281035ffaaebecb05af67e9db0f642a5c1b6877 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu, 28 Mar 2019 18:11:10 +0200
Subject: [PATCH] (05ee3bb5f) Merge branch 'dev' of
 https://github.com/Regalis11/Barotrauma-development into dev

---
 .../Items/Components/Machines/Reactor.cs      |  5 ++-
 .../Source/Items/Components/ItemContainer.cs  |  2 +-
 .../Source/Items/ItemPrefab.cs                | 33 +++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs
index d0e98ead9..d46b2029a 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs
@@ -107,7 +107,10 @@ namespace Barotrauma.Items.Components
             {
                 var warningBtn = new GUIButton(new RectTransform(new Point(buttonWidth, buttonHeight), columnLeft.RectTransform)
                 { AbsoluteOffset = new Point((i % buttonsPerRow) * (buttonWidth + spacing), (int)Math.Floor(i / (float)buttonsPerRow) * (buttonHeight + spacing)) },
-                    TextManager.Get(warningTexts[i]), style: "IndicatorButton");
+                    TextManager.Get(warningTexts[i]), style: "IndicatorButton")
+                {
+                    CanBeFocused = false
+                };
 
                 var btnText = warningBtn.GetChild<GUITextBlock>();
                 btnText.Font = GUI.SmallFont;
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs
index 11a3ea4e0..aac7bf9df 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs
@@ -155,7 +155,7 @@ namespace Barotrauma.Items.Components
         {
             if (item.Container != null) { return false; }
 
-            if (AutoInteractWithContained)
+            if (AutoInteractWithContained && character.SelectedConstruction == null)
             {
                 foreach (Item contained in Inventory.Items)
                 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs b/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs
index 6b479da1d..4569eb0b6 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs
@@ -719,6 +719,39 @@ namespace Barotrauma
 
             AllowedLinks = element.GetAttributeStringArray("allowedlinks", new string[0], convertToLowerInvariant: true).ToList();
 
+            if (sprite == null)
+            {
+                DebugConsole.ThrowError("Item \"" + Name + "\" has no sprite!");
+#if SERVER
+                sprite = new Sprite("", Vector2.Zero);
+                sprite.SourceRect = new Rectangle(0, 0, 32, 32);
+#else
+                sprite = new Sprite(TextureLoader.PlaceHolderTexture, null, null)
+                {
+                    Origin = TextureLoader.PlaceHolderTexture.Bounds.Size.ToVector2() / 2
+                };
+#endif
+                size = sprite.size;
+                sprite.EntityID = identifier;
+            }
+            
+            if (!category.HasFlag(MapEntityCategory.Legacy) && string.IsNullOrEmpty(identifier))
+            {
+                DebugConsole.ThrowError(
+                    "Item prefab \"" + name + "\" has no identifier. All item prefabs have a unique identifier string that's used to differentiate between items during saving and loading.");
+            }
+            if (!string.IsNullOrEmpty(identifier))
+            {
+                MapEntityPrefab existingPrefab = List.Find(e => e.Identifier == identifier);
+                if (existingPrefab != null)
+                {
+                    DebugConsole.ThrowError(
+                        "Map entity prefabs \"" + name + "\" and \"" + existingPrefab.Name + "\" have the same identifier!");
+                }
+            }
+
+            AllowedLinks = element.GetAttributeStringArray("allowedlinks", new string[0], convertToLowerInvariant: true).ToList();
+
             List.Add(this);
         }