Resolve conflicts, fix compile errors

code/game/jobs/job/special_vr.dm

@@ -7,7 +7,6 @@
 	spawn_positions = 1
 	supervisors = "company officials and Corporate Regulations"
 	selection_color = "#1D1D4F"
-	idtype = /obj/item/weapon/card/id/centcom
 	access = list()
 	minimal_access = list()
 	minimal_player_age = 14

code/game/objects/items/weapons/id cards/station_ids.dm

@@ -265,14 +265,8 @@
 	rank = "Quartermaster"
 
 /obj/item/weapon/card/id/assistant
-<<<<<<< HEAD
 	assignment = USELESS_JOB //VOREStation Edit - Visitor not Assistant
 	rank = USELESS_JOB //VOREStation Edit - Visitor not Assistant
-	job_access_type = /datum/job/assistant
-=======
-	assignment = "Assistant"
-	rank = "Assistant"
->>>>>>> 7b9bc5b... Merge pull request #6520 from Meghan-Rossi/idcleanup
 
 /obj/item/weapon/card/id/civilian
 	name = "identification card"

maps/southern_cross/job/outfits.dm

@@ -13,13 +13,8 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
 	l_ear = /obj/item/device/radio/headset/explorer
 	id_slot = slot_wear_id
 	pda_slot = slot_l_store
-<<<<<<< HEAD
 	pda_type = /obj/item/device/pda/explorer //VORESTation Edit - Better Brown
-	id_type = /obj/item/weapon/card/id/explorer/explorer //VOREStation Edit
-=======
-	pda_type = /obj/item/device/pda/cargo // Brown looks more rugged
-	id_type = /obj/item/weapon/card/id/civilian
->>>>>>> 7b9bc5b... Merge pull request #6520 from Meghan-Rossi/idcleanup
+	id_type = /obj/item/weapon/card/id/explorer //VOREStation Edit
 	id_pda_assignment = "Explorer"
 	flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
 	backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
@@ -51,13 +46,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
 	l_ear = /obj/item/device/radio/headset/pilot/alt
 	id_slot = slot_wear_id
 	pda_slot = slot_belt
-<<<<<<< HEAD
 	pda_type = /obj/item/device/pda //VOREStation Edit - Civilian
-	id_type = /obj/item/weapon/card/id/explorer/pilot //VOREStation Edit
-=======
-	pda_type = /obj/item/device/pda/cargo // Brown looks more rugged
-	id_type = /obj/item/weapon/card/id/civilian
->>>>>>> 7b9bc5b... Merge pull request #6520 from Meghan-Rossi/idcleanup
 	id_pda_assignment = "Pilot"
 	flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
 
@@ -70,13 +59,6 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
 	l_hand = /obj/item/weapon/storage/firstaid/regular
 	belt = /obj/item/weapon/storage/belt/medical/emt
 	pda_slot = slot_l_store
-<<<<<<< HEAD
 	pda_type = /obj/item/device/pda/sar //VOREStation Add
-	id_type = /obj/item/weapon/card/id/medical/sar
 	id_pda_assignment = "Field Medic" //VOREStation Edit
 	flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
-=======
-	id_type = /obj/item/weapon/card/id/medical
-	id_pda_assignment = "Search and Rescue"
-	flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
->>>>>>> 7b9bc5b... Merge pull request #6520 from Meghan-Rossi/idcleanup

maps/southern_cross/job/outfits_vr.dm

@@ -6,7 +6,7 @@
 	id_slot = slot_wear_id
 	pda_slot = slot_l_store
 	pda_type = /obj/item/device/pda/pathfinder
-	id_type = /obj/item/weapon/card/id/explorer/head/pathfinder
+	id_type = /obj/item/weapon/card/id/explorer/head
 	id_pda_assignment = "Pathfinder"
 	flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
 	backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)

maps/southern_cross/southern_cross_jobs_vr.dm

@@ -9,7 +9,6 @@ var/const/SAR 				=(1<<14)
 	icon_state = "cyan"
 	primary_color = rgb(47,189,189)
 	secondary_color = rgb(127,223,223)
-	job_access_type = /datum/job/sar
 
 /obj/item/weapon/card/id/explorer
 	name = "identification card"
@@ -18,28 +17,13 @@ var/const/SAR 				=(1<<14)
 	primary_color = rgb(47,189,189)
 	secondary_color = rgb(127,223,223)
 
-/obj/item/weapon/card/id/explorer/pilot
-	assignment = "Pilot"
-	rank = "Pilot"
-	job_access_type = /datum/job/pilot
-
-/obj/item/weapon/card/id/explorer/explorer
-	assignment = "Explorer"
-	rank = "Explorer"
-	job_access_type = /datum/job/explorer
-
-/obj/item/weapon/card/id/explorer/head/
+/obj/item/weapon/card/id/explorer/head
 	name = "identification card"
 	desc = "A card which represents discovery of the unknown."
 	icon_state = "cyanGold"
 	primary_color = rgb(47,189,189)
 	secondary_color = rgb(127,223,223)
 
-/obj/item/weapon/card/id/explorer/head/pathfinder
-	assignment = "Pathfinder"
-	rank = "Pathfinder"
-	job_access_type = /datum/job/pathfinder
-
 /datum/job/pathfinder
 	title = "Pathfinder"
 	flag = PATHFINDER
@@ -51,7 +35,6 @@ var/const/SAR 				=(1<<14)
 	spawn_positions = 1
 	supervisors = "the research director"
 	selection_color = "#d6d05c"
-	idtype = /obj/item/weapon/card/id/explorer/head/pathfinder
 	economic_modifier = 7
 	minimal_player_age = 7
 
@@ -69,7 +52,6 @@ var/const/SAR 				=(1<<14)
 	spawn_positions = 2
 	supervisors = "the pathfinder and the head of personnel"
 	selection_color = "#999440"
-	idtype = /obj/item/weapon/card/id/explorer/pilot
 	economic_modifier = 5
 	minimal_player_age = 3
 	access = list(access_pilot)
@@ -86,7 +68,6 @@ var/const/SAR 				=(1<<14)
 	spawn_positions = 2
 	supervisors = "the pathfinder and the research director"
 	selection_color = "#999440"
-	idtype = /obj/item/weapon/card/id/explorer/explorer
 	economic_modifier = 6
 	access = list(access_explorer, access_research)
 	minimal_access = list(access_explorer, access_research)
@@ -102,7 +83,6 @@ var/const/SAR 				=(1<<14)
 	spawn_positions = 2
 	supervisors = "the pathfinder and the chief medical officer"
 	selection_color = "#999440"
-	idtype = /obj/item/weapon/card/id/medical/sar
 	economic_modifier = 6
 	minimal_player_age = 3
 	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_eva, access_maint_tunnels, access_external_airlocks, access_pilot)