Added "flags" : ["MODE_BURST"]" to battle rifle conversion mod as one potential solution to issue #6135
Merge remote-tracking branch 'frycarson/BRifleModJSONFix'
Added "flags" : ["MODE_BURST"] to auto-fire mechanism gunmod.
fix comma
Update mods.json
Smoking cigarettes now takes time
Added cig_lit, cig_butt, cigar_lit, cigar_butt items
Reduced cigar charges to 5
New types of smoke- cigarette smoke and weed smoke, can see through and
have no effect on anything
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cigaweed
Added smokable joints
Tweak pot smoke field
Cigarettes now get affected by tolerance and lightweight traits
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cigaweed
Random message now occasionally printed when smoking weed
Can now cancel smoking weed from pipe/joint menu
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cigaweed
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cigaweed
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cigaweed

Conflicts:
	SIGNOFF
Added rolling tobacco that can be rolled into a cigarette or smoked out of a pipe
If player has the shakes there's now a chance that they'll drop a cigarette they're smoking
Lit cigarettes now give off light and can start fires
Removed unnecessary erasing of some flags
Changed some professions to start with rolling tobacco
Change item groups to have rollable tobacco, pre-rolled joints, and cigarette butts.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into cigaweed
Add joints and glass pipes to weed basement