Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Source/Events/MonsterEvent.cs

Subsurface/Source/Map/MapEntity.cs

@@ -463,7 +463,11 @@ namespace Barotrauma
                     Vector2 moveAmount = Submarine.VectorToWorldGrid(cam.WorldViewCenter - center);
 
                     selectedList = new List<MapEntity>(clones);
-                    selectedList.ForEach(c => c.Move(moveAmount));                    
+                    foreach (MapEntity clone in selectedList)
+                    {
+                        clone.Move(moveAmount);
+                        clone.Submarine = Submarine.MainSub;
+                    }                    
                 }
             }