Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge branch 'master' of https://github.com/DJSnapshot/Baystation12-Luna
* Should fix bar shutters not working.
* Switches floor tiles in beach holodeck because the water effect wasn't working correctly.
Fixes to icons of snorkel and inflatable to make them appear correctly on sprite.
Merge pull request #3807 from fauxki/dev

Dev - Map and Icon Fixes
New working supermatter engine! Virgil and Skymarshal's work. Functional! Uguu!
Del rework, as requested.
Merge pull request #3816 from Nanai/dev

Supermatter Engine Code Replacement
Added the ability to send faxes between departments
Gave fax machines on the map their "department" variables
Fiddling with cooldown times
Removed a silly duplicate entry in the changelog
Merge pull request #3819 from Kilakk/dev

Added the ability to send faxes between departments
Fixes #3801, C4 will no longer destroy the analyzer it's inside of

Committed to dev-freeze because the fix doesn't work with the click code on master
Merge remote-tracking branch 'upstream/master' into dev
Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker.
Actually added the new beakers. Yay for git.
Removed a useless variable, and changed the lists modifications to use += and -=
Small fix so voting isn't always shouting at you for not being an admin or mod.
Added vending machine stocking

* Now with more del() than ever before
* Only works if you have the maintenance panel open