Merge https://github.com/Regalis11/Barotrauma

2022-10-20 12:14:02 -03:00
parent 032572de52 a6ee9eadf3
commit 599db6be5e
63 changed files with 579 additions and 339 deletions
@@ -186,8 +186,8 @@ namespace Barotrauma
                    {
                        if (character.SelectedItem != Item)
                        {
-                            if (Item.TryInteract(character, ignoreRequiredItems: true, forceSelectKey: true) ||
-                                Item.TryInteract(character, ignoreRequiredItems: true, forceUseKey: true))
+                            if (Item.TryInteract(character, ignoreRequiredItems: true, forceUseKey: true) ||
+                                Item.TryInteract(character, ignoreRequiredItems: true, forceSelectKey: true))
                            {
                                character.SelectedItem = Item;
                            }