Merge branch 'inventory-fix'
Merge branch 'vehcile-parts-two'
Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA
Fixed an issue where fuel would not be drained for plasma/gas engines
Merge branch 'vehcile-parts-two'
Merge branch 'master' of github.com:wito/Cataclysm-DDA
Merge branch 'inventory-fix'
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Merge branch 'nail-droprate' of github.com:ethankaminski/Cataclysm-DDA
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Merge branch 'power-armor'
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Merge branch 'power-armor'
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Power armor hauling frame
Hauling frame added to spawn lists
Merge branch 'power-armor'
Merge branch 'gunmod-fix'
Merge branch 'one-handed-guns'
Merge branch 'wito-changelog'