"In Combat" State lasts too long once you're outside of combat

Title. Don't make the game worse for the sake of Assault's training perk feeling more impactful.

It's so hard to spawn on teammates in this game. It's miserable.