Misc Marine Changes and Fixes #1693

Job	Run time
Lint with OpenDream	23s
Compile Maps	44s
Run Linters	1m 13s
Find Maps to Test	8s
Windows Build	1m 6s
Alternate Tests	0s
Check Alternate Tests	0s
Unit Tests (new_varadero_repaired) / run_unit_tests	2m 57s
Unit Tests (runtime) / run_unit_tests	2m 49s
Unit Tests (runtime_multiz) / run_unit_tests	2m 41s
Unit Tests (rover) / run_unit_tests	2m 48s
Unit Tests (shivas_snowball) / run_unit_tests	2m 55s
Unit Tests (sorokyne_strata) / run_unit_tests	3m 1s
Unit Tests (whiskey_outpost_v2) / run_unit_tests	2m 46s
Unit Tests (almayer) / run_unit_tests	3m 0s
Unit Tests (bigredv2) / run_unit_tests	3m 6s
Unit Tests (corsat) / run_unit_tests	2m 57s
Unit Tests (chapaev) / run_unit_tests	2m 43s
Unit Tests (chinook) / run_unit_tests	2m 51s
Unit Tests (derelict_almayer) / run_unit_tests	3m 5s
Unit Tests (desert_dam) / run_unit_tests	2m 58s
Unit Tests (fiorina_sciannex) / run_unit_tests	2m 54s
Unit Tests (golden_arrow) / run_unit_tests	2m 49s
Unit Tests (golden_arrow_classic) / run_unit_tests	2m 40s
Unit Tests (ice_colony_v1) / run_unit_tests	2m 54s
Unit Tests (ice_colony_v2) / run_unit_tests	3m 1s
Unit Tests (kutjevo) / run_unit_tests	2m 50s
Unit Tests (lv522_chances_claim) / run_unit_tests	2m 57s
Unit Tests (lv624) / run_unit_tests	2m 54s
Unit Tests (lv624_repaired) / run_unit_tests	2m 55s
Unit Tests (new_varadero) / run_unit_tests	2m 48s
Unit Tests (prison_station_fop) / run_unit_tests	2m 53s
	1h 15m 46s

Provide feedback