Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Changed the vote sound as discussed by admins, and made it so that -all- votes (Not just crew transfer) automatically disable OOC.

Signed-off-by: Jim Apples <cheeckan@gmail.com>
Fix robotics on char setup screen

Robotics is no longer in engineering, but in medsci
Updated changelog
Re-enables....something...
huhuhuhu

Signed-off-by: Jim Apples <cheeckan@gmail.com>
Merge pull request #3122 from AppleMaster/bleeding-edge-freeze

Vote changes.
Merge pull request #3123 from Jupotter/BEF

Fix the robotiscist preview in the char setup screen
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Concept sprites
Stuff