Merge pull request #6 from ParadiseSS13/master

Merge from Master
Major Overhaul of the Engie sat: Take three

http://i.imgur.com/CwEjbAk.png
Re-add stamp images, add more holopads
Adds some additional photocopiers
Minor fixes
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
Merge pull request #7 from ParadiseSS13/master

Merge from Master
Re-apply my map fixes
Missing copier
Actually unlock the vault to access the nuke during Blob critical mass
Merge pull request #32 from Markolie/master

Re-add stamp images, add more holopads
Production and Mecha Tweaks
Merge pull request #34 from Fox-McCloud/Production-Tweaks

Production tweaks
Dance Bar Update
Area Tag Fix, Bar Is No Longer Space

The bar is no longer exposed to space via a tile under the booze-o-mat,
fix the area to be unpowered by default.
Merge pull request #35 from SamCroswell/master

Dance Bar Update
Dualsword Inhand Fix, Adds Dark Lord Costume Preset
You cannot use the force, Luke!
Merge pull request #8 from ParadiseSS13/master

Merge from Master