Merge pull request #3561 from X0-11/experimental-combat-changes #1893

Job	Run time
map-tests (operation_trebuchet)	1m 53s
map-tests (slayer)	1m 44s
code-tests (CODE)	4m 30s
code-tests (WEB)	2m 46s
map-tests (firefight)	2m 2s
map-tests (crusade)	1m 50s
map-tests (stranded)	1m 43s
map-tests (first_contact)	2m 15s
map-tests (ks7_elmsville)	3m 28s
map-tests (ks7_elmsville_spaceodp)	3m 17s
map-tests (base_assault)	2m 10s
map-tests (base_assault_unsc_defend_vs_urf)	2m 17s
map-tests (unsc_achlys)	1m 59s
map-tests (base_assault_neutral_base)	2m 11s
map-tests (base_assault_neutral_base_taurus)	2m 19s
map-tests (geminus_city)	3m 6s
map-tests (geminus_city_urf_active)	3m 3s
map-tests (system_conquest)	8m 38s
	51m 11s

Provide feedback