Release 1.9.7.0 - Summer Update 2025

2025-06-17 16:38:11 +03:00
parent 22227f13e5
commit ea5a2bc693
297 changed files with 7344 additions and 2421 deletions
@@ -787,6 +787,13 @@ namespace Barotrauma
                foreach (Item item in Character.HeldItems)
                {
                    if (item == null || !item.IsInteractable(Character)) { continue; }
+                    if (!item.UnequipAutomatically) { continue; }
+                    //NPC set to operate the item they're holding, don't put it away
+                    if (ObjectiveManager.CurrentObjective is AIObjectiveOperateItem operateItem && 
+                        (operateItem.OperateTarget == item || operateItem.Component?.Item == item)) 
+                    { 
+                        continue; 
+                    }
                    if (Character.TryPutItemInAnySlot(item)) { continue; }
                    if (Character.TryPutItemInBag(item)) { continue; }
                    if (item.HasTag(Tags.Weapon))