Unstable 0.1500.4.0 (Shrek edition)

2021-09-23 21:29:31 +09:00
parent 5a6bbcc79e
commit 3043a9a7bc
124 changed files with 3571 additions and 1848 deletions
@@ -88,7 +88,7 @@ namespace Barotrauma
                    return GameMain.NetworkMember?.ServerSettings?.AllowLinkingWifiToChat ?? true;
                case ConditionType.IsSwappableItem:
                    {
-                        return entity is Item item && item.Prefab.SwappableItem != null;
+                        return entity is Item item && item.Prefab.SwappableItem != null && Screen.Selected == GameMain.SubEditorScreen;
                    }
                case ConditionType.AllowRotating:
                    {