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

2023-06-15 12:13:50 -03:00
parent 6b461e1026 f95be0511c
commit 15daa64f66
210 changed files with 4491 additions and 2580 deletions
@@ -170,9 +170,9 @@ namespace Barotrauma.Items.Components
            return characterUsable || character == null;
        }

-        public override void Drop(Character dropper)
+        public override void Drop(Character dropper, bool setTransform = true)
        {
-            base.Drop(dropper);
+            base.Drop(dropper, setTransform);
            hitting = false;
            hitPos = 0.0f;
        }