(d9829ac) v0.9.4.0

2019-10-24 18:05:42 +02:00
parent 9aa12bcac2
commit b39922a074
319 changed files with 12516 additions and 6815 deletions
@@ -192,7 +192,7 @@ namespace Barotrauma
                    {
                        return;
                    }
-                    Combine(combineTarget);
+                    Combine(combineTarget, c.Character);
                    break;
            }
        }