(143d158cb) Merge branch 'dev' into human-ai

2019-05-16 05:25:02 +03:00
parent 9fab69663b
commit e4f41789b0
18 changed files with 594 additions and 814 deletions
@@ -428,17 +428,17 @@ namespace Barotrauma
                            //prevent rewiring
                            connectionPanel.Locked = true;
                        }
-                        else if (ic is Pickable pickable)
+                        else if (ic is Holdable holdable && holdable.Attached)
                        {
-                            //prevent picking up (or deattaching) items
+                            //prevent deattaching items from walls
 #if CLIENT
                            if (GameMain.GameSession?.GameMode is TutorialMode)
                            {
                                continue;
                            }
 #endif
-                            pickable.CanBePicked = false;
-                            pickable.CanBeSelected = false;
+                            holdable.CanBePicked = false;
+                            holdable.CanBeSelected = false;
                        }
                    }
                }