added defs for firebomb
Merge branch 'Firebomb'
updating local workflow
Merge branch 'Firebomb'

Conflicts:
	Defs/ThingDefs/Buildings_Traps.xml