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

2019-05-07 16:24:58 +03:00
parent cc22268f0e
commit 96a5875b9a
8 changed files with 33 additions and 13 deletions
@@ -73,6 +73,7 @@
  <Character file="Content/Characters/Watcher/Watcher.xml" />
  <Character file="Content/Characters/Hammerhead/Hammerhead.xml" />
  <Outpost file="Content/Map/Outposts/Outpost.sub" />
+  <Outpost file="Content/Map/Outposts/Outpost2.sub" />
  <Submarine file="Submarines/Orca.sub" />
  <Submarine file="Submarines/Typhon.sub" />
  <Submarine file="Submarines/Selkie.sub" />