Merge pull request #29 from Markolie/master

Bot port from /tg/
Major Overhaul of the Engie sat: Take three

http://i.imgur.com/CwEjbAk.png
Merge pull request #31 from fj45/master

Major Overhaul of the Engie sat: Take three
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Conflicts:
	maps/cyberiad.dmm