medipens to default boxes
Merge branch 'master' of https://github.com/tgstation/-tg-station into plasmadoorfix

Conflicts:
	code/game/machinery/doors/airlock.dm
Fixing mistake so Travis can compile.
Reduces decon time to 35 and adds a missed init_dirs
Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix

Conflicts:
	code/modules/admin/admin_verbs.dm
Pumpkin meteors
Merge pull request #3 from RemieRichards/2spooky2

Pumpkin meteors
Spacemen can now skim.
Eyeball migration
Melee armor value increases time it takes to strip
Changes flip/rotation, better diagonal handling
Added changelog
changelog
readds large crossbro to protolathe
sprite
copy pasting is a bad idea
Changelog as I suspect a binary update soon
ports megacarps!!!
Fixes restarted borgs hearing cult chat
Merge pull request #5105 from JJRcop/changelog-5/10/2014

Changelog as I suspect a binary update soon