Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 25 insertions, 0 deletions

diff --git a/world/map/news.d/21-tulimshar-caves.txt b/world/map/news.d/21-tulimshar-caves.txt
new file mode 100644
index 00000000..382c3cbe
--- /dev/null
+++ b/world/map/news.d/21-tulimshar-caves.txt
@@ -0,0 +1,25 @@
+{date:2013-06-29}
+
+This release brings a few new additions to the game:
+
+Wushin overhauled the desert caves with an awesome
+new cave tileset. Also the sewers below Tulimshar are
+now accessible. Make sure to check them out!
+
+Malivox took the occasion to stop camping in the
+desert and moved into a small house south of
+Tulimshar.
+
+Frozenbeard has expanded his ferry service in
+Nivalis. You can now go between Nivalis and
+the other major docks both ways. Proper docks for
+Nivalis are being worked on.
+
+With a ferry now serving Nivalis, Dyrin will send you
+somehwere else in Kaizei instead, away from Nivalis.
+
+As usual there are also a lot of smaller fixes and
+changes. Thanks to everyone who reported issues
+and helped fix these things!
+
+{author:TMW Development Team}