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

2019-04-06 17:49:31 +03:00
parent 45c1ed499a
commit 14d0daf16d
18 changed files with 333 additions and 180 deletions
@@ -75,7 +75,6 @@
  <Submarine file="Submarines/Bunyip.sub" />
  <Submarine file="Submarines/Humpback.sub" />
  <Submarine file="Submarines/Dugong.sub" />
-  <Submarine file="Submarines/PAX.sub" />
  <Submarine file="Submarines/Remora.sub" />
  <Submarine file="Submarines/RemoraDrone.sub" />
  <Text file="Content/Texts/EnglishVanilla.xml" />