(c12fe7d80) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-15 12:00:49 +03:00
parent b4ec36f5bb
commit b705b1579c
4 changed files with 140 additions and 70 deletions
@@ -417,7 +417,10 @@ namespace Barotrauma
                if (me.Submarine != this) { continue; }
                if (me is Item item)
                {
-                    item.Indestructible = true;
+                    if (item.GetComponent<Repairable>() != null)
+                    {
+                        item.Indestructible = true;
+                    }
                    foreach (ItemComponent ic in item.Components)
                    {
                        if (ic is ConnectionPanel connectionPanel)