Various changes and weapons added.

Signed-off-by: samjudge <sam.m.w.judge@googlemail.com>