Merge branch 'glyphs' of git://github.com/tasetase/DDAtase
Merge branch 'master' of git://github.com/TheDarklingWolf/Cataclysm-DDA
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Merge branch 'hotfix/highway_spawn' of github.com:benjamg/Cataclysm-DDA
Merge github.com:TheDarklingWolf/Cataclysm-DDA
indentation without changes
added a search function to crafting
fix a bug that was accidentally introduced
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Merge remote-tracking branch 'base/master' into basemaster
fix recraft bug not checking morale
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Watered down the beer
Leather trenchcoat made craftable
A few new items made available as fitted.
Also, dress shirts.
Fitted items appearing in world.
tailoring provides fitted gear
Merge branch 'weak-beer'