Boop
Merge remote-tracking branch 'upstream/master' into TC-Green-Text
Merge remote-tracking branch 'upstream/master' into Morgue-Slab-Fix
Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk

Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/modules/reagents/Chemistry-Reagents.dm

resolved with Theirs, must manually reapply fixes
Removes the ventcrawl verb, all ventcrawlers are still ventcrawlers and can use ventcrawling with the alt click. This is simutaniously less buggy and far easier to do on the fly.

The meat of ventcrawling is now stored in the vent pump, meaning anything can ventcrawl if it has ventcrawling on.

Ventcrawling 0 is no crawling, Ventcrawling 1 is naked crawling, Ventcrawling 2 and above is always crawling.

Yes you can var edit humans to be able to ventcrawl with this, great if you want to reenact diehard!

Simple animals that logically should fit in a vent can now ventcrawl. Note that this only is relevent for player controlled simple animals (staff of change/badminry), it won't be used by the mob AI.
Fixes conflicts
Always forget to add the DME
Merge pull request #2917 from Cheridan/master

Conflict fixes of #2857
Merge pull request #2901 from Miauw62/aijgdiajgiojdaigjapgijsgdipjagiojaranisafagaidpjgiaopjgdoiadjgaipgjpijadgijagipjadijigpaijgdipajgdipajdgpiadjgpajgd

Fixed #2899 (NODROP and closets doing weird shit)
stop making retarded branch names miauw
Merge pull request #2902 from Miauw62/actualbranchnamesyounerd

Fixes NODROP not playing nice with tables.
Merge branch 'master' of https://github.com/Kelenius/-tg-station into Kelenius-master

Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/game/machinery/vending.dm
	code/modules/hydroponics/hydroponics.dm
haha oops thanks travis
Merge pull request #2919 from Cheridan/master

Conflict fix of #2842 Hydro Tray Upgrades
Merge pull request #2850 from MrPerson/revenge_of_kitty_ears

Return of kitty ears
Revert "Removes radio from pAI"

This reverts commit 0dc364a6b11da9ac18be698f6273e6644d4c2d33.
Fixed #2920
Merge pull request #2910 from Jordie0608/whatgiacomactuallylookslike

Fixes #2864
Made it a button
Merge branch 'master' of https://github.com/tgstation/-tg-station into AtmosComputers