Merge pull request #1 from ZomgPonies/master

Update
Ninja objects minor edit
Minor map tweaks
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
Merge pull request #306 from ZomgPonies/master

Patch