Baystation12/Baystation12 — pull request #3825 by Kilakk (2013-10-27 05:55:20+00:00)
Title: Added vending machine stocking

* Stock vending machines with items when the maintenance panel is open
* ~~Accidental~~ intentional merge from master into dev (oops)