weird merge

code/game/jobs/job/marine/squad/standard.dm

@@ -10,12 +10,12 @@
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
 	gear_preset = /datum/equipment_preset/uscm/pfc
 
+	job_options = list(PFC_VARIANT = "PFC", PVT_VARIANT = "PVT")
+
 /datum/job/marine/standard/on_config_load()
 	entry_message_body = "You are a rank-and-file <a href='[CONFIG_GET(string/wikiarticleurl)]/[URL_WIKI_MARINE_QUICKSTART]'>Marine of the USCM</a>, and that is your strength. What you lack alone, you gain standing shoulder to shoulder with the men and women of the corps. Ooh-rah!"
 	return ..()
 
-	job_options = list(PFC_VARIANT = "PFC", PVT_VARIANT = "PVT")
-
 /datum/job/marine/standard/set_spawn_positions(count)
 	spawn_positions = max((round(count * STANDARD_MARINE_TO_TOTAL_SPAWN_RATIO)), 8)