Merge pull request #309 from SamCroswell/master

Minor map tweaks
Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.

Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/alien.dm
	code/modules/projectiles/guns/projectile/crossbow.dm
	code/modules/projectiles/guns/projectile/pneumatic.dm
	icons/mob/back.dmi
	maps/tgstation2.dmm
Forgot dmi
Reverts hyperzine to its previous state, keep its addictivness

Revert "Made hyperzine same color as salt, because HAHA"

This reverts commit b23b5b62d98ab5b70a7cc6a198c6fce6ba43e1b7.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

Revert "Made hyperzine harder to make properly."

This reverts commit 489cdf00962f444f1e87f72171b16a6021353c7a.

Removes Benazine

Revert "Nerfs for OD"

This reverts commit 4b94406efb60c523099ffe8606de8917459b78b9.

Revert "Hyperzine fix"

This reverts commit d6702496f92e6915639bc9d7cfc760657dd9bd9f.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

Revert "Made Cyanide more deadly, added OD to Hyperzine"

This reverts commit 1cb87e07cfdddc89c9452fe58ae41629226dea65.
removes second sleeping notification
Merge pull request #310 from IcyV/testing

Reverts hyperzine to its previous state, keep its addictivness.
Made wizard spells into various subtypes
Xeno nerf
rewrite for DF/CM and grill

rewrite cos damn!

No more spam names... worst they can get is one of each type in a name.
CM won't accept anything that's been cerealized (at any point), DF and
grill will accept things that have been in them before, but you'll end
up with a burned mess, a cloud of smoke, and the chance of a small fire
NanoUI updates.
* Map gen verb is now limited to those with server access.
* Added Z layer support.

Conflicts:
	code/modules/admin/admin_verbs.dm
	nano/images/nanomap.png
Fixes specops shuttle messages

Specops messages were reversed due to paradise using a different values
for specops shuttle location.
Fluff items

Ion chef medal and purple zippo
Minor map tweaks

Moved blueshield's laptop, added proper area tag for recruiter
More map tweaks

Arrivals teleport beacon, HoS office light and moving keycard auth
Removed gun and armour from HoP closet

Removed egun, helmet and armour from HoP because they are NOT sec.
Merge pull request #311 from mwerezak/paradise-docking

Fixes specops shuttle messages
fix for grill addition #2

ok, this one works
borer mindcontrol release hotfix

forgot to remove this remnant ckey check
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Spider nerf