Finishing the map modifications, and binoculars have a real sprite, not a placeholder now. Adds the ninja clan place onto CentCom, and a (yet) non-working shuttle, just the map for it.
Merge pull request #32 from SueTheCake/mapchange

Updates brig layout and adds two-handed rifles.
Fixed some area bugs.
Merge remote-tracking branch 'master/master'

Conflicts:
	maps/tgstation2.dmm
'Tis the final part of ze merge. We really need some kind of system for the map freeze though.
Merge pull request #33 from Roland410/master

Finishing the map modifications, and binoculars have a real sprite, not ...
Brig updates

Tweaked map for new brig.
Added Prisoner Timer code
Tweaked personal door code to allow for prison doors.
Minor fixes
Trying to make the timers stay at 0

Ugh, too tired... going to bed. Hope this works.
Places hydroponics in the science wing. Old botany is now a public garden.

Fixed sprite issue with Tajarans.

Updated L6 Saw and Pulse Rifle sprites to be less old.