From: Mirio <opivy@hotmail.de>
Date: Sun, 6 Sep 2015 22:14:36 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/afterslime_2' into 'master'
X-Git-Tag: xonotic-v0.8.2~173
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=0ffe150d12d13e79b887969f89e0fe60940c8de8;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/afterslime_2' into 'master'

afterslime: add stuff outside of megaarmor area, fix minor item misplacement.

Added stuff outside near the megaarmor ![xonotic20150906190527-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/75c96e4c13f53bbb0397b4310374e8ca/xonotic20150906190527-00.jpg)
![xonotic20150906190504-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/0b13b1a7c7afca3c5ac500cbcd148be8/xonotic20150906190504-00.jpg)
![xonotic20150906190451-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/3a5dfc5b30bb3e73249a409a9c0648e5/xonotic20150906190451-00.jpg)

Also fix items being a little misplaced (before-screenshot): ![xonotic20150906191116-00](https://gitlab.com/xonotic/xonotic-maps.pk3dir/uploads/3ff85a02be7e54b2d9a17dbaf1f2ac59/xonotic20150906191116-00.jpg)

See merge request !34
---

0ffe150d12d13e79b887969f89e0fe60940c8de8