Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge pull request #3825 from Kilakk/dev

Added vending machine stocking
(hopefully) Final fix for ZAS for 0.1.4.

Signed-off-by: Mloc <colmohici@gmail.com>
Merge pull request #3824 from DJSnapshot/dev-freeze

small fix to autotransfer voting
Merge pull request #3827 from Mloc/weirdair

(hopefully) Final fix for ZAS for 0.1.4.
Hopefully.  Hopefully was the key word.

Signed-off-by: Mloc <colmohici@gmail.com>
Merge pull request #3828 from Mloc/zas

Hopefully.  Hopefully was the key word.
Merge remote-tracking branch 'upstream/master' into dev-freeze
Fix for #3826.
Fix for acid pouring.
Merge pull request #3829 from Segrain/dev-freeze

Dev-freeze attackby() returns.
Fixed the Glass.dm can_be_placed_into list.
Fixed beakers not going into DNA scannners.
Fixed the absent/removed sprite on experimental welding tools.
Added in two new manuals by Magmaram for atmospherics and EVA.
Seekrit halloween update
Added two new manuals by MagmaRam to the default engineering manual bookcase.
Updated sprites for the Captain and Centcomm stamps to look a bit more distinctive and official.
Added in sprites for two new manuals by MagmaRam.
Merge pull request #3830 from DJSnapshot/master

Seekrit update