Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
Hydroponics Plant Size Scaling!

Plants now get resized, based on their potency!
(Except for logs and sunflowers because they're snowflakes)

screenshot:
http://puu.sh/5iJws.png
Jesus Christ it compiles
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets

Conflicts:
	code/modules/projectiles/guns/magic/wand.dm
Scattershot ho!
Syringe guns can suck it.
It works for humans!
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets

Conflicts:
	code/modules/projectiles/guns/magic.dm
Mysterious compile errors gone.
Unless it's spontaneously generated more problems, we done here.
More armor touchups. I think I found all the relevant calls, but... mob code.
Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-determinism
Rads finally work. War never changes.
Fixed revolver/shotgun dual loading messages, fixed e-gun and automatic display issues.
Emagged Cyborgs, when destroyed via the Robotics Console, will not only have a large explosion but their MMI will die with them. This will promote locking down the cyborg, instead, to discover who emagged it via cyborg deconstruction. This commit was brought to you by the feedback thread, which made it happen.
Added spider meat recipes
Added spider butchery
Third time's the charm.

Self-respiration will now properly keep you from dying of oxygen loss.
Stimulant's activation chance was increased so you had a constant flow of hyperzine.
fixes server-breaking lagloops of disposal tiles.