Changes and Fixes for unarmed_attacks kick and stomp

Same as #7485, still without the reimplementation of the magboot stomp.
These commits left here are fixes and rebalances that should be merged before the dev-freeze branch gets merged.