Merge pull request #3558 from X0-11/experimental-combat-changes #1871

Job	Run time
code-tests (CODE)	4m 42s
map-tests (operation_trebuchet)	2m 37s
code-tests (WEB)	3m 11s
map-tests (slayer)	1m 50s
map-tests (firefight)	1m 47s
map-tests (crusade)	1m 41s
map-tests (stranded)	2m 2s
map-tests (first_contact)	2m 20s
map-tests (ks7_elmsville)	3m 29s
map-tests (ks7_elmsville_spaceodp)	3m 23s
map-tests (base_assault)	2m 20s
map-tests (base_assault_unsc_defend_vs_urf)	2m 10s
map-tests (unsc_achlys)	2m 15s
map-tests (base_assault_neutral_base)	2m 13s
map-tests (base_assault_neutral_base_taurus)	2m 20s
map-tests (geminus_city)	3m 50s
map-tests (geminus_city_urf_active)	3m 31s
map-tests (system_conquest)	8m 36s
	54m 17s

Provide feedback