Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
Upped the capacity of Eleanor Stone/RKF's custom teapot item to 150 units, by request.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Beakers and other glass containers now hide their contents, only showing the amount.
Additionally, they can be labeled with a pen, up to a max of 10 characters.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Merge pull request #3334 from Mloc/beakers

Beaker changes
Merge branch 'dev' into dev-freeze