Fixes wound merging

Fixes wound merging completely ignoring things like bleed_timers,
bandaged and salved states, etc.
Fixes bruises not having the right damage_type set