Merge pull request #3418 from X0-11/unsc-cargo-weapons #1470

Job	Run time
code-tests (CODE)	5m 28s
code-tests (WEB)	3m 14s
map-tests (operation_trebuchet)	3m 0s
map-tests (slayer)	2m 7s
map-tests (firefight)	2m 38s
map-tests (crusade)	2m 24s
map-tests (stranded)	2m 50s
map-tests (first_contact)	2m 57s
map-tests (ks7_elmsville)	5m 54s
map-tests (ks7_elmsville_spaceodp)	3m 56s
map-tests (base_assault)	3m 3s
map-tests (base_assault_unsc_defend_vs_urf)	3m 29s
map-tests (unsc_achlys)	3m 0s
map-tests (base_assault_neutral_base)	4m 6s
map-tests (base_assault_neutral_base_taurus)	3m 11s
map-tests (geminus_city)	4m 12s
map-tests (geminus_city_urf_active)	3m 29s
map-tests (system_conquest)	9m 13s
	1h 8m 11s

Provide feedback