Merge branch 'master' into BEF-staging

Conflicts:
	config/config.txt

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Merge pull request #3250 from Zuhayr/feature

Fixes
Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into BEF-staging

Conflicts:
	config/config.txt
readjusted composition of syndie bombs

set them to produce a 1-2-5 explosion for the fire changes
changed variable settings for the change in fire.dm

added one new variable
deleted three variables that are no longer used
changed how fire works

-fire switched to release energy by burning fuel and generating heat from that
- reorganzied the fire process in a saner manner
Commenting out ninja mode, as it is broken.