Improvements to the split of weapons and vehicles, fixes for logspam

Signed-off-by: GreatEmerald <pastas4@gmail.com>