Bug fixes, implements new copying/faxing system from Bay
Fix cyborg zippo's
Lets not forget debugging again
Merge branch 'master' of https://github.com/ZomgPonies/Paradise

Conflicts:
	icons/obj/weapons.dmi
	maps/cyberiad.dmm
And re-add the fax machine update
And a map fix
Fix Supermatter message spam
Cloning and deathsquad fixes
Default stunbaton back to 1500
Minor borg fix
Merge pull request #533 from Markolie/master

Bug fixes, implements new copying/faxing system from Bay