Continued working on weapons
Merge branch 'weapons'

Conflicts:
	Blankput.mot
	generator
	generator.c