comestible tweaks
Merge pull request #6261 from fr0z3d/flammable-gaspumps

data/json/terrain.json: Added FLAMMABLE flag to gas pumps
Merge pull request #6234 from BevapDin/fix-something

Prevent usage of pseudo items from vehicle parts
Conflicts:
	src/inventory.cpp
Merge branch 'more-fixes' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into Rivet-the-Zombie-more-fixes

Conflicts:
	src/bionics.cpp
Merge branch 'fix-lost-ammo' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-fix-lost-ammo
Merge branch 'sokoban' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-games
Merge branch 'snake' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-games
Merge branch 'IM_UNLOADING_MY_LAZER' of https://github.com/Soyweiser/Cataclysm-DDA into Soyweiser-IM_UNLOADING_MY_LAZER

Conflicts:
	data/json/items/ranged.json
more onhit changes

Conflicts:
	src/player.cpp
Smarter code.

Conflicts:
	src/bionics.cpp
ignore the pointer to the menu window when it's NULL
undid some iteminfo compression, increased iteminfo height more

Conflicts:
	src/game.cpp
	src/item.cpp
compress iteminfo

Conflicts:
	src/item.cpp
undid some iteminfo compression, increased iteminfo height more

Conflicts:
	src/item.cpp