merge resolution, mostly removing attack_alien() from modified files.
Merge pull request #6662 from Zuhayr/dev

Dev
Merge pull request #6661 from PsiOmegaDelta/Fire

Can now de-construct fire alarms.
Merge pull request #6658 from Zuhayr/dev-freeze

Fixes
Move NanoUI cache update to client/New()
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into working

Conflicts:
	nano/images/nanomap_z1.png
Merge
Merge pull request #6666 from GinjaNinja32/nanoui

Move NanoUI cache update to client/New()
Fixes #6665

Another missing data reference.
Merge pull request #6667 from PsiOmegaDelta/NanoMoney

Fixes #6665
Merge pull request #6637 from Gamerofthegame/mapwork

Map update - Powerstations and more!
Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it.
Merge pull request #6670 from Zuhayr/dev-freeze

Dev freeze
Thought I had done these before, turned out I did. Single-linebreak conflicts woo.
Added goddamn atrocious wig for Earthcrusher.
Merge pull request #6663 from Zuhayr/dev

Updating dev
Merge pull request #6669 from Baystation12/dev

Moving substation mapfixes onto dev-freeze
Fixes humans being able to shred everything with their teeth.
Merge pull request #6675 from Zuhayr/dev-freeze

Fixes humans being able to shred everything with their teeth.
Hopefully fixes #6674

Breaker boxes would not always place down all the cables necessary to connect power grids on server start.
Moving initialization from the New() to the initialize() appears to have resolved this.