Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station
-Added electric razors to the prison wing, captain's office, and locker room
-Updated changelog
Merge branch 'master' of https://github.com/tgstation/-tg-station into razors
-Moved headgear and mask check up and used get_location_accessible()
-Updated skinhead sprite to be more transparent
-Updated razor sprites
-Updated Changelog
Added a razor module to service borgs
Merge branch 'razors' of git://github.com/Ikarrus/-tg-station into ikkyrazors
Updating razors to reduce code duplication. Adjusts text styling.
Merge branch 'master' of github.com:tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station