Reapply "OBT1.1.0 Merge branch 'dev_pte' into dev"

This reverts commit 046483b9da.
2026-04-30 21:59:54 +08:00
parent 02689d0d86
commit 25683dcf39
85 changed files with 2413 additions and 779 deletions
@@ -128,7 +128,7 @@ namespace Barotrauma
                        {
                            foreach (var stackedItem in item.GetStackedItems())
                            {
-                                Item.DeconstructItems.Add(stackedItem);
+                                Item.MarkForDeconstruction(stackedItem);
                            }
 #if CLIENT
                            HintManager.OnItemMarkedForDeconstruction(order.OrderGiver);
@@ -138,7 +138,7 @@ namespace Barotrauma
                        {
                            foreach (var stackedItem in item.GetStackedItems())
                            {
-                                Item.DeconstructItems.Remove(stackedItem);
+                                Item.UnmarkForDeconstruction(stackedItem);
                            }
                        }
                    }