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

2019-03-29 17:24:17 +02:00
parent ca08b803dc
commit ddfd7274e9
22 changed files with 230 additions and 99 deletions
@@ -75,6 +75,7 @@
  <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" />