Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
Manually merged over working files for rapid prototyping from repo.
Added basic vendor trash generation/definitions.
Working files for R&D
Merge branch 'rndrewrite' of https://github.com/Zuhayr/Baystation12 into dev
Added in icons from MrSnapwalk, care of Goofball. Thanks guys.
Large-scale refactoring of rapid prototyping code, addition of basic scanner. Code does not currently compile.
Finished refactoring construction for rapid prototyping, added some test objects.
Working files. Need them committed to pull them down at Uni.
Merge branch 'rndrewrite' of https://github.com/Zuhayr/Baystation12 into dev
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Moved engineering, research and mining shuttles to a generalized system with its own directory structure.
Updated consoles on the map for new shuttle console path.
Some cleanup stuff for prior commits.
Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn.
Update shuttle.dm

Corrected a mistake.
Merge branch 'shuttlecontroller' of https://github.com/Zuhayr/Baystation12 into dev