Misc Marine Changes and Fixes #1249

Job	Run time
Lint with OpenDream	29s
Compile Maps	1m 10s
Find Maps to Test	9s
Run Linters	1m 15s
Windows Build	1m 22s
Unit Tests (kutjevo) / run_unit_tests	5m 52s
Unit Tests (lv522_chances_claim) / run_unit_tests	7m 37s
Unit Tests (lv624) / run_unit_tests	5m 49s
Unit Tests (lv624_repaired) / run_unit_tests	51s
Unit Tests (new_varadero) / run_unit_tests	25s
Unit Tests (new_varadero_repaired) / run_unit_tests	27s
Unit Tests (prison_station_fop) / run_unit_tests	5m 7s
Unit Tests (rover) / run_unit_tests	29s
Unit Tests (runtime_multiz) / run_unit_tests	30s
Unit Tests (runtime) / run_unit_tests	5m 45s
Unit Tests (shivas_snowball) / run_unit_tests	5m 51s
Unit Tests (sorokyne_strata) / run_unit_tests	5m 52s
Unit Tests (whiskey_outpost_v2) / run_unit_tests	5m 54s
Alternate Tests (515, 1610, lv624) / run_unit_tests	5m 53s
Unit Tests (almayer) / run_unit_tests	6m 5s
Unit Tests (bigredv2) / run_unit_tests	6m 7s
Unit Tests (chinook) / run_unit_tests	5m 49s
Unit Tests (chapaev) / run_unit_tests	5m 51s
Unit Tests (corsat) / run_unit_tests	6m 17s
Unit Tests (derelict_almayer) / run_unit_tests	6m 1s
Unit Tests (desert_dam) / run_unit_tests	6m 2s
Unit Tests (fiorina_sciannex) / run_unit_tests	6m 29s
Unit Tests (golden_arrow) / run_unit_tests	5m 54s
Unit Tests (ice_colony_v1) / run_unit_tests	5m 57s
Unit Tests (ice_colony_v2) / run_unit_tests	5m 59s
Check Alternate Tests	1s
	2h 7m 19s

Provide feedback