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
Thermal Protection Overhaul.

Shortened the defines for cold & protection because I thought they were overly long
Updated all references to defines to match the new names
Added missing defines for protection ratings that were missing (firesuit cold and spacesuit heat)
Added cold protection to firesuits to restore they ghetto space suit functionality
Restored the CE RIG's firesuit equivalent protection
Added heat protection and cold to protection to items that only had one aspect
Fixed incorrect thermal coverage for armors that covered more than the groin and torso

Bombs suits are pretty useless atm so I made them into ghetto riot gear; my line of thinking being that its a big heavy suit with lots of padding, its going to be half-decent against people trying to beat you.
TELEPORTER UPDATE!
-Adds monstrous housefly mutation.
-Teleporter malfunctions have been changed to something more !FUN! than random spacing. Instead, you get irradiated and horribly mutated. To prevent this, one should Test Fire to ensure the teleporter is properly calibrated. Recalibrations will be necessary with frequent teleporter use.
updated my journal
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
Merge branch 'master' of https://github.com/tgstation/-tg-station
Insulation changes: Base file

-Shortened temp protection defines
-Added missing temp protection defines, firesuit protection currently set to same as armor
-Added two way insulation to items missing it (spacesuits, firesuits)
-Fixed temperature protection coverage of several armor items to match their coverage

-Commented out CE Rig firesuit protection
-Reverted ghetto riot armor bomb suits
Added a razor module to service borgs
Fixes freeform module logging from logging the player who input the law as both the uploader and the uploadee.
Merge pull request #353 from Nodrak/freeformlogfix

Fixes freeform module logging
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
A collection of small map changes.
-Added several dead-ends, loops, and miscellaneous loot in maintenance
-Moved captain's dresser and locker into his quarters
-Moved captain's laser to his office
-Made toxins windows slightly smaller to be consistent with the other labs (Looks better)
-Fixed missing scrubber unit in telecoms
Added clipboards to Detective and Warden lockers.
Added a signaller to prison wing
Merge pull request #364 from Ikarrus/map_maint

[MAP] A collection of small map changes
-Added several dead-ends, loops, and miscellaneous loot in maintenance
-Moved captain's dresser and locker into his quarters
-Moved captain's laser to his office
-Made toxins windows slightly smaller to be consistent with the other labs (Looks better)
-Fixed missing scrubber unit in telecoms
-Added a signaller to prison wing for the electropack