Merge branch 'master' of https://github.com/Baystation12/Baystation12
Minor Food Fix: Made basic salad nonhallucinogenic, uses 2 cabbage 1 tomato 1 carrot 1 apple for recipe. Moved Valid Salad's Doctor's Delight to the Aesir Salad.
Merge branch 'master' of https://github.com/DJSnapshot/Baystation12-Luna
Temporary patch so aliums can use magboots until the hardsuit rework gets merged.
Merge pull request #3782 from DJSnapshot/hotfix

Whitelist species able to use magboots until new hardsuit rework is complete
Fixes #3779
Mask for lying state was named wrong - "chest2" instead of "torso2"
Fixed #3776
Missed update_body calls
Fixes #3781
Magical thingies now go zzap instead of click click when empty.
Merge pull request #3783 from comma/master

Couple o fixes
Fixes #3777

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

Beamfix
Quillsfix.
Volume fix.
Smallfix.
Cardfix.
Roundend declaration.
Merge pull request #3788 from Segrain/master

Voxfixes.
Adding the dispensers to the cargo lists.
Making a sub-type of the dispensers so that they spawn disconnected from the ground.
Merge pull request #3789 from jack-fractal/dev

Adding the dispensers to the cargo lists.
Smallfix.