Changes on kicks and stomps
No stomping when grabbing
Fixes merge conflict, uses force
Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze

Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/human/unarmed_attack.dm
Merge branch 'combat_fixes' of https://github.com/Hubblenaut/Baystation12 into dev-freeze
Fixing weird directory structure stuff.
merging with future changes.
Compile fixes.
Updating a solitary map path.