(0b88fdd81) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-16 06:49:30 +03:00
parent af7fcb823d
commit 970a5a8732
34 changed files with 432 additions and 182 deletions
@@ -115,6 +115,7 @@ namespace Barotrauma
                Linkable = true
            };
            ep.AllowedLinks.Add("hull");
+            ep.Aliases = new HashSet<string> { "hull" };
            List.Add(ep);

            ep = new MapEntityPrefab