modified:   code/game/mecha/mecha.dm
Update code/game/mecha/mecha.dm
Merge pull request #1545 from Mloc/dev

Fix for Tian's dress.
Fixed cryo pressure damage
Merge pull request #1546 from Mloc/dev

Null checks, fixed cael's derp.
Update code/game/mecha/mecha.dm
Flashkirby99's tajaran

Kirby's kitties are now chopped up and ready for action with their
hairstyles added to the face file. Also tidied up the south human female
chest and torso to be more consistent with both their other directions
and the male's.
Merge pull request #1551 from FireFishie/cats

Flashkirby99's tajaran
Update config/alienwhitelist.txt
fak
Merge pull request #4 from Baystation12/master

Update master
	modified:   code/modules/customitems/item_defines.dm
	modified:   code/modules/customitems/item_spawning.dm
	modified:   icons/obj/custom_items.dmi
Update code/modules/customitems/item_spawning.dm
Merge pull request #1554 from Nerezza/asherspock

Asher Spock's custom items.
	modified:   code/game/jobs/job/engineering.dm
	modified:   code/game/objects/closets/wardrobe.dm
Merge pull request #1556 from Nerezza/atmosgear

Red hardhats for atmos!
Changed all entries of "Nanotrasen" to "NanoTrasen" and corrected the misspelling of "apologize" in the gravity toggle messages.
Added the warden jacket and pepperspray to the warden's wardrobe, and added fingerless gloves to the cargo technician and shaft miner wardrobes.

The janitor spawns with a portalathe but doesn't have one in his wardrobe, so this adds that. If the librarian gets a barcode scanner in his, then the janitor's should include the portalathe.

The captain has taken a few lessons from the head of security! When joining, the captain will now start with matching gloves, a pair of jackboots, and the more sensible captain's cap. The old Napoleonic hat is still available in the captain's closet, and both the closets and wardrobes were updated to reflect this change.

The quartermaster started with brown shoes, but only had black ones available in his wardrobes. This change should make his starting equipment more consistent.

The head of personnel should no longer be so paranoid, and now spawns without wearing body armor or a helmet. Additionally, the body armor and helmet from the wardrobe closet and bag were removed. A gun, helmet, and body armor are still available in the secure locker for emergencies.

The breath mask inside the engineer box included with the ERT backpack looked terrible when worn with the ERT helmet, yet was required if any of the team were operating near a breach or anything. This change only returns the removed SWAT mask (which leaves the helmet sprite intact) to the response team's basic equipment.

Both the secure closet and the wardrobe bag have the medsci headset in it, and the chemist lab is conjoined with research, so why shouldn't the chemist start with that headset? This commit also moves the chemist to Medical on the roster because that's where the job shows up everywhere else.
Clipboard added to the head of personnel's wardrobes and starting items. If the quartermaster has a clipboard on him and in his wardrobe bag, then his boss should too.
"Space Law" on the wiki is always capitalized, so now it should be in-game too.