Merge pull request #1 from JJRcop/master

UPDATE YOUR MASTER FOR FUCKS SAKE
Merge branch 'watertank' of https://github.com/fleure/-tg-station into watertank
Added watertank to map