Merge pull request #4462 from Novacat/nova-basicfixes

Expedition Job and Gear tweaks

code/game/jobs/jobs.dm

@@ -73,7 +73,7 @@ var/list/medical_positions = list(
 	"Geneticist",
 	"Psychiatrist",
 	"Chemist",
-	"Search and Rescue", // VOREStation Edit - Moved SAR from planetary -> medical
+	"Field Medic", // VOREStation Edit - Moved SAR from planetary -> medical
 	"Paramedic"
 )
 

code/game/objects/items/devices/PDA/PDA_vr.dm

@@ -6,4 +6,12 @@
 
 /obj/item/device/pda/pathfinder
 	default_cartridge = /obj/item/weapon/cartridge/signal/science
+	icon_state = "pda-lawyer-old"
+
+/obj/item/device/pda/explorer
+	default_cartridge = /obj/item/weapon/cartridge/signal/science
+	icon_state = "pda-det"
+
+/obj/item/device/pda/sar
+	default_cartridge = /obj/item/weapon/cartridge/medical
 	icon_state = "pda-h"

code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm

@@ -30,11 +30,36 @@
 	display_name = "collar, holo"
 	path = /obj/item/clothing/accessory/collar/holo
 
-/datum/gear/accessory/white_drop_pouches
+/datum/gear/accessory/holster
-	allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist")
+	display_name = "holster selection (Security, CD, HoP, Exploration)"
+	allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder")
+
+/datum/gear/accessory/brown_vest
+	display_name = "webbing, brown"
+	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
+
+/datum/gear/accessory/black_vest
+	display_name = "webbing, black"
+	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
 
 /datum/gear/accessory/white_vest
-	allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist")
+	display_name = "webbing, white (Medical)"
+	allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic")
+
+/datum/gear/accessory/brown_drop_pouches
+	display_name = "drop pouches, brown"
+	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
+
+/datum/gear/accessory/black_drop_pouches
+	display_name = "drop pouches, black"
+	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
+
+/datum/gear/accessory/white_drop_pouches
+	display_name = "drop pouches, white (Medical)"
+	allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic")
+
+/datum/gear/accessory/stethoscope
+	allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
 
 /datum/gear/accessory/khcrystal
 	display_name = "KH Life Crystal"

code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm

@@ -1,3 +1,10 @@
+/datum/gear/eyes/medical
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
+
+/datum/gear/eyes/meson
+	display_name = "Optical Meson Scanners (Engineering, Science)"
+	allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder")
+
 /datum/gear/eyes/arglasses
 	display_name = "AR glasses"
 	path = /obj/item/clothing/glasses/omnihud

code/modules/client/preference_setup/loadout/loadout_shoes_vr.dm

@@ -1,3 +1,9 @@
+/datum/gear/shoes/boots/winter/science
+	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder")
+
+/datum/gear/shoes/boots/winter/medical
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
+
 /datum/gear/shoes/black/cuffs
 	display_name = "legwraps, black"
 	path = /obj/item/clothing/shoes/black/cuffs

code/modules/client/preference_setup/loadout/loadout_suit_vr.dm

@@ -1,3 +1,21 @@
+/datum/gear/suit/roles/poncho/cloak/research
+	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder")
+
+/datum/gear/suit/roles/poncho/cloak/medical
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
+
+/datum/gear/suit/wintercoat/medical
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
+
+/datum/gear/suit/wintercoat/science
+	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder")
+
+/datum/gear/suit/snowsuit/medical
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
+
+/datum/gear/suit/snowsuit/science
+	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder")
+
 /datum/gear/suit/labcoat_colorable
 	display_name = "labcoat, colorable"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat

code/modules/client/preference_setup/loadout/loadout_utility_vr.dm

@@ -35,7 +35,7 @@
 /datum/gear/utility/dufflebag/med
     display_name = "medical dufflebag"
     path = /obj/item/weapon/storage/backpack/dufflebag/med
-    allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist","Search and Rescue")
+    allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist","Field Medic")
 
 /datum/gear/utility/dufflebag/med/emt
     display_name = "EMT dufflebag"
@@ -54,4 +54,4 @@
 /datum/gear/utility/dufflebag/sci
     display_name = "science dufflebag"
     path = /obj/item/weapon/storage/backpack/dufflebag/sci
-    allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Explorer")
+    allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Explorer","Pathfinder")

code/modules/clothing/suits/hooded_vr.dm

@@ -0,0 +1,3 @@
+// Field Medic Suit - Someone who can sprite should probably reskin this
+/obj/item/clothing/suit/storage/hooded/explorer/medic
+	starting_accessories = list(/obj/item/clothing/accessory/armband/med/cross)

code/modules/virus2/disease2.dm

@@ -88,6 +88,13 @@
 		else
 			resistance += rand(1,9)
 
+	//VOREStation Add Start - Corophazine can treat higher stages
+	var/antibiotics = mob.chem_effects[CE_ANTIBIOTIC]
+	if(antibiotics == ANTIBIO_SUPER)
+		if(prob(70))
+			src.cure(mob)
+	//VOREStation Add End
+
 	//Resistance is capped at 90 without being manually set to 100
 	if(resistance > 90 && resistance < 100)
 		resistance = 90

maps/southern_cross/items/encryptionkey_sc.dm

@@ -6,7 +6,7 @@
 /obj/item/device/encryptionkey/explorer
 	name = "explorer radio encryption key"
 	icon_state = "com_cypherkey"
-	channels = list("Science" = 1, "Explorer" = 1) //VOREStation Edit
+	channels = list("Explorer" = 1)
 
 /obj/item/device/encryptionkey/sar
 	name = "sar's encryption key"

maps/southern_cross/items/encryptionkey_vr.dm

@@ -1,3 +1,6 @@
 /obj/item/device/encryptionkey/pilot
 	icon_state = "cypherkey"
 	channels = list("Explorer" = 1)
+
+/obj/item/device/encryptionkey/explorer
+	channels = list("Science" = 1, "Explorer" = 1)

maps/southern_cross/items/headset_sc.dm

@@ -1,30 +1,25 @@
 /obj/item/device/radio/headset/pilot
 	name = "pilot's headset"
-	desc = "A headset used by pilots, has access to the explorer channel." //VOREStation Edit
+	desc = "A headset used by pilots, has access to supply and explorer channels."
 	icon_state = "pilot_headset"
 	adhoc_fallback = TRUE
 	ks2type = /obj/item/device/encryptionkey/pilot
 
 /obj/item/device/radio/headset/pilot/alt
 	name = "pilot's bowman headset"
-	desc = "A bowman headset used by pilots, has access to the explorer channel." //VOREStation Edit
+	desc = "A bowman headset used by pilots, has access to supply and explorer channels."
-	icon_state = "pilot_headset_alt"
-
-/obj/item/device/radio/headset/pilot/alt
-	name = "pilot's bowman headset"
-	desc = "A bowman headset used by pilots, has access to the explorer channel." //VOREStation Edit
 	icon_state = "pilot_headset_alt"
 
 /obj/item/device/radio/headset/explorer
 	name = "explorer's headset"
-	desc = "Headset used by explorers for exploring. Access to explorer and science channels." //VOREStation Edit
+	desc = "Headset used by explorers for exploring. Access to the explorer channel."
 	icon_state = "exp_headset"
 	adhoc_fallback = TRUE
 	ks2type = /obj/item/device/encryptionkey/explorer
 
 /obj/item/device/radio/headset/explorer/alt
 	name = "explorer's bowman headset"
-	desc = "Bowman headset used by explorers for exploring. Access to explorer and science channels." //VOREStation Edit
+	desc = "Bowman headset used by explorers for exploring. Access to the explorer channel."
 	icon_state = "exp_headset_alt"
 
 /obj/item/device/radio/headset/sar

maps/southern_cross/items/headset_vr.dm

@@ -1,3 +1,23 @@
+/obj/item/device/radio/headset/pilot
+	desc = "A headset used by pilots, has access to the explorer channel."
+
+/obj/item/device/radio/headset/pilot/alt
+	desc = "A bowman headset used by pilots, has access to the explorer channel."
+
+/obj/item/device/radio/headset/explorer
+	desc = "Headset used by explorers for exploring. Access to explorer and science channels."
+
+/obj/item/device/radio/headset/explorer/alt
+	desc = "Bowman headset used by explorers for exploring. Access to explorer and science channels."
+
+/obj/item/device/radio/headset/sar
+	name = "fm radio headset"
+	desc = "A headset for field medics."
+
+/obj/item/device/radio/headset/sar/alt
+	name = "fm radio bowman headset"
+	desc = "A bowman headset for field medics."
+
 /obj/item/device/radio/headset/volunteer
 	name = "volunteer's headset"
 	desc = "A headset used by volunteers to expedition teams, has access to the exploration channel."

maps/southern_cross/job/outfits.dm

@@ -13,8 +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
-	pda_type = /obj/item/device/pda/cargo // Brown looks more rugged
+	pda_type = /obj/item/device/pda/explorer //VORESTation Edit - Better Brown
-	id_type = /obj/item/weapon/card/id/civilian/explorer
+	id_type = /obj/item/weapon/card/id/explorer/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)
@@ -46,20 +46,21 @@ 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
-	pda_type = /obj/item/device/pda/cargo // Brown looks more rugged
+	pda_type = /obj/item/device/pda //VOREStation Edit - Civilian
-	id_type = /obj/item/weapon/card/id/civilian/pilot
+	id_type = /obj/item/weapon/card/id/explorer/pilot //VOREStation Edit
 	id_pda_assignment = "Pilot"
 	flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
 
 /decl/hierarchy/outfit/job/medical/sar
-	name = OUTFIT_JOB_NAME("Search and Rescue")
+	name = OUTFIT_JOB_NAME("Field Medic") //VOREStation Edit
 	uniform = /obj/item/clothing/under/utility/blue
-	suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar
+	//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
 	shoes = /obj/item/clothing/shoes/boots/winter/explorer
 	l_ear = /obj/item/device/radio/headset/sar
 	l_hand = /obj/item/weapon/storage/firstaid/regular
 	belt = /obj/item/weapon/storage/belt/medical/emt
 	pda_slot = slot_l_store
+	pda_type = /obj/item/device/pda/sar //VOREStation Add
 	id_type = /obj/item/weapon/card/id/medical/sar
-	id_pda_assignment = "Search and Rescue"
+	id_pda_assignment = "Field Medic" //VOREStation Edit
 	flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL

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/science/head/pathfinder
+	id_type = /obj/item/weapon/card/id/explorer/head/pathfinder
 	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.dm

@@ -1,9 +1,8 @@
-//VORESTATION EDIT!!! This whole file is being included by hand to get these jobs rather than using the map datum itself.
 // Pilots
 
 var/const/SAR 				=(1<<11)
-var/const/PILOT 			=(1<<15) //VOREStation Edit - Bumped up 2
+var/const/PILOT 			=(1<<13)
-var/const/EXPLORER 			=(1<<12) //VOREStation Edit - Moved to science
+var/const/EXPLORER 			=(1<<14)
 
 var/const/access_pilot = 67
 var/const/access_explorer = 43
@@ -77,28 +76,28 @@ var/const/access_explorer = 43
 	faction = "Station"
 	total_positions = 2
 	spawn_positions = 2
-	supervisors = "the pathfinder and the head of personnel" //VOREStation Edit
+	supervisors = "the head of personnel"
 	selection_color = "#515151"
 	idtype = /obj/item/weapon/card/id/civilian/pilot
-	economic_modifier = 5 //VOREStation Edit
+	economic_modifier = 4
-	access = list(access_pilot) //VOREStation Edit
+	access = list(access_pilot, access_cargo, access_mining, access_mining_station)
-	minimal_access = list(access_pilot) //VOREStation Edit
+	minimal_access = list(access_pilot, access_cargo, access_mining, access_mining_station)
 	outfit_type = /decl/hierarchy/outfit/job/pilot
 
 /datum/job/explorer
 	title = "Explorer"
 	flag = EXPLORER
-	department = "Science" //VOREStation Edit
+	department = "Civilian"
-	department_flag = MEDSCI //VOREStation Edit
+	department_flag = CIVILIAN
 	faction = "Station"
-	total_positions = 2 //VOREStation Edit
+	total_positions = 4
-	spawn_positions = 2 //VOREStation Edit
+	spawn_positions = 4
-	supervisors = "the pathfinder and the research director" //VOREStation Edit
+	supervisors = "the explorer leader and the head of personnel"
-	selection_color = "#633D63" //VOREStation Edit
+	selection_color = "#515151"
 	idtype = /obj/item/weapon/card/id/civilian/explorer
-	economic_modifier = 6 //VOREStation Edit
+	economic_modifier = 4
-	access = list(access_pilot, access_explorer, access_research) //VOREStation Edit
+	access = list(access_explorer)
-	minimal_access = list(access_pilot, access_explorer, access_research) //VOREStation Edit
+	minimal_access = list(access_explorer)
 	outfit_type = /decl/hierarchy/outfit/job/explorer2
 /*
 	alt_titles = list(
@@ -114,10 +113,10 @@ var/const/access_explorer = 43
 	faction = "Station"
 	total_positions = 2
 	spawn_positions = 2
-	supervisors = "the pathfinder and the chief medical officer" //VOREStation Edit
+	supervisors = "the chief medical officer"
-	selection_color = "#013D3B" //VOREStation Edit
+	selection_color = "#515151"
 	idtype = /obj/item/weapon/card/id/medical
-	economic_modifier = 6 //VOREStation Edit
+	economic_modifier = 4
 	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer)
 	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer)
 	outfit_type = /decl/hierarchy/outfit/job/medical/sar

maps/southern_cross/southern_cross_jobs_vr.dm

@@ -1,7 +1,54 @@
-var/const/PATHFINDER 		=(1<<13) //VOREStation Edit - Added Pathfinder
+var/const/SAR 				=(1<<11)
+var/const/PILOT 			=(1<<15)
+var/const/EXPLORER 			=(1<<12)
+var/const/PATHFINDER 		=(1<<13)
 
-/obj/item/weapon/card/id/science/head/pathfinder
+var/const/access_pilot = 67
+var/const/access_explorer = 43
+
+/datum/access/pilot
+	id = access_pilot
+	desc = "Pilot"
+	region = ACCESS_REGION_SUPPLY
+
+/datum/access/explorer
+	id = access_explorer
+	desc = "Explorer"
+	region = ACCESS_REGION_GENERAL
+
+/obj/item/weapon/card/id/medical/sar
+	assignment = "Field Medic"
+	rank = "Field Medic"
+	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"
+	desc = "A card issued to station exploration staff."
+	icon_state = "green"
+	primary_color = rgb(47,189,0)
+	secondary_color = rgb(127,223,95)
+
+/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/
+	name = "identification card"
 	desc = "A card which represents discovery of the unknown."
+	icon_state = "greenGold"
+	primary_color = rgb(47,189,0)
+	secondary_color = rgb(127,223,95)
+
+/obj/item/weapon/card/id/explorer/head/pathfinder
 	assignment = "Pathfinder"
 	rank = "Pathfinder"
 	job_access_type = /datum/job/pathfinder
@@ -16,9 +63,59 @@ var/const/PATHFINDER 		=(1<<13) //VOREStation Edit - Added Pathfinder
 	spawn_positions = 1
 	supervisors = "the research director"
 	selection_color = "#AD6BAD"
-	idtype = /obj/item/weapon/card/id/science/head/pathfinder
+	idtype = /obj/item/weapon/card/id/explorer/head/pathfinder
 	economic_modifier = 7
 	
 	access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_research, access_gateway)
 	minimal_access = list(access_eva, access_pilot, access_explorer, access_research, access_gateway)
 	outfit_type = /decl/hierarchy/outfit/job/pathfinder
+
+/datum/job/pilot
+	title = "Pilot"
+	flag = PILOT
+	department = "Civilian"
+	department_flag = CIVILIAN
+	faction = "Station"
+	total_positions = 2
+	spawn_positions = 2
+	supervisors = "the pathfinder and the head of personnel"
+	selection_color = "#515151"
+	idtype = /obj/item/weapon/card/id/explorer/pilot
+	economic_modifier = 5
+	minimal_player_age = 3
+	access = list(access_pilot)
+	minimal_access = list(access_pilot)
+	outfit_type = /decl/hierarchy/outfit/job/pilot
+
+/datum/job/explorer
+	title = "Explorer"
+	flag = EXPLORER
+	department = "Science"
+	department_flag = MEDSCI
+	faction = "Station"
+	total_positions = 2
+	spawn_positions = 2
+	supervisors = "the pathfinder and the research director"
+	selection_color = "#633D63"
+	idtype = /obj/item/weapon/card/id/explorer/explorer
+	economic_modifier = 6
+	access = list(access_explorer, access_research)
+	minimal_access = list(access_explorer, access_research)
+	outfit_type = /decl/hierarchy/outfit/job/explorer2
+
+/datum/job/sar
+	title = "Field Medic"
+	flag = SAR
+	department = "Medical"
+	department_flag = MEDSCI
+	faction = "Station"
+	total_positions = 2
+	spawn_positions = 2
+	supervisors = "the pathfinder and the chief medical officer"
+	selection_color = "#013D3B"
+	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)
+	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_pilot)
+	outfit_type = /decl/hierarchy/outfit/job/medical/sar

maps/southern_cross/structures/closets/misc.dm

@@ -36,15 +36,6 @@
 
 /obj/structure/closet/secure_closet/explorer
 	name = "explorer locker"
-	//VOREStation Add begin
-	icon = 'icons/obj/closet_vr.dmi' //VOREStation Add
-	icon_state = "secureexp1"
-	icon_closed = "secureexp"
-	icon_locked = "secureexp1"
-	icon_opened = "secureexpopen"
-	icon_broken = "secureexpbroken"
-	icon_off = "secureexpoff"
-	//VOREStation Add end
 	req_access = list(access_explorer)
 
 	starts_with = list(
@@ -60,11 +51,7 @@
 		/obj/item/device/geiger,
 		/obj/item/weapon/cell/device,
 		/obj/item/device/radio,
-		/obj/item/stack/marker_beacon/thirty,
+		/obj/item/stack/marker_beacon/thirty)
-		/obj/item/weapon/material/knife/tacknife/survival, //VOREStation Add,
-		/obj/item/weapon/material/knife/machete, //VOREStation Add,
-		/obj/item/clothing/accessory/holster/machete, //VOREStation Add,
-		/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2) //VOREStation Add
 
 /obj/structure/closet/secure_closet/explorer/initialize()
 	if(prob(50))
@@ -99,7 +86,6 @@
 		/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
 		/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
 		/obj/item/weapon/storage/belt/medical/emt,
-		/obj/item/weapon/material/knife/tacknife/survival, //VOREStation Add,
 		/obj/item/clothing/mask/gas,
 		/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar,
 		/obj/item/clothing/shoes/boots/winter/explorer,

maps/southern_cross/structures/closets/misc_vr.dm

@@ -1,3 +1,85 @@
+/obj/structure/closet/secure_closet/explorer
+	icon = 'icons/obj/closet_vr.dmi'
+	icon_state = "secureexp1"
+	icon_closed = "secureexp"
+	icon_locked = "secureexp1"
+	icon_opened = "secureexpopen"
+	icon_broken = "secureexpbroken"
+	icon_off = "secureexpoff"
+
+	starts_with = list(
+		/obj/item/clothing/under/explorer,
+		/obj/item/clothing/suit/storage/hooded/explorer,
+		/obj/item/clothing/mask/gas/explorer,
+		/obj/item/clothing/shoes/boots/winter/explorer,
+		/obj/item/clothing/gloves/black,
+		/obj/item/device/radio/headset/explorer,
+		/obj/item/device/flashlight,
+		/obj/item/device/gps/explorer,
+		/obj/item/weapon/storage/box/flare,
+		/obj/item/device/geiger,
+		/obj/item/weapon/cell/device,
+		/obj/item/device/radio,
+		/obj/item/stack/marker_beacon/thirty,
+		/obj/item/weapon/material/knife/tacknife/survival,
+		/obj/item/weapon/material/knife/machete,
+		/obj/item/clothing/accessory/holster/machete,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2)
+
+/obj/structure/closet/secure_closet/sar
+	name = "field medic locker"
+
+	starts_with = list(
+		/obj/item/weapon/storage/backpack/dufflebag/emt,
+		/obj/item/weapon/storage/box/autoinjectors,
+		/obj/item/weapon/storage/box/syringes,
+		/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,
+		/obj/item/weapon/reagent_containers/glass/bottle/antitoxin,
+		/obj/item/weapon/storage/belt/medical/emt,
+		/obj/item/weapon/material/knife/tacknife/survival,
+		/obj/item/weapon/gun/energy/frontier/locked/holdout,
+		/obj/item/clothing/mask/gas/explorer,
+		/obj/item/clothing/suit/storage/hooded/explorer/medic,
+		/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar,
+		/obj/item/clothing/shoes/boots/winter/explorer,
+		/obj/item/device/radio/headset/sar,
+		/obj/item/weapon/cartridge/medical,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/tank/emergency/oxygen/engi,
+		/obj/item/clothing/glasses/hud/health,
+		/obj/item/device/healthanalyzer,
+		/obj/item/device/radio/off,
+		/obj/random/medical,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 3,
+		/obj/item/weapon/tool/crowbar,
+		/obj/item/weapon/extinguisher/mini,
+		/obj/item/weapon/storage/box/freezer,
+		/obj/item/clothing/accessory/storage/white_vest,
+		/obj/item/taperoll/medical,
+		/obj/item/device/gps,
+		/obj/item/device/geiger,
+		/obj/item/bodybag/cryobag)
+
+/obj/structure/closet/secure_closet/pilot
+	starts_with = list(
+		/obj/item/weapon/storage/backpack/parachute,
+		/obj/item/weapon/material/knife/tacknife/survival,
+		/obj/item/weapon/gun/energy/frontier/locked/holdout,
+		/obj/item/clothing/head/pilot,
+		/obj/item/clothing/under/rank/pilot1,
+		/obj/item/clothing/suit/storage/toggle/bomber/pilot,
+		/obj/item/clothing/shoes/boots/winter/explorer,
+		/obj/item/clothing/mask/gas/half,
+		/obj/item/clothing/shoes/black,
+		/obj/item/clothing/gloves/fingerless,
+		/obj/item/device/radio/headset/pilot/alt,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2,
+		/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
+		/obj/item/weapon/storage/box/flare,
+		/obj/item/weapon/cell/device,
+		/obj/item/device/radio)
+
 /obj/structure/closet/secure_closet/pathfinder
 	name = "pathfinder locker"
 	icon = 'icons/obj/closet_vr.dmi'

maps/tether/tether-05-station1.dmm

@@ -21787,7 +21787,7 @@
 	icon_state = "1-8"
 	},
 /obj/effect/landmark/start{
-	name = "Search and Rescue"
+	name = "Field Medic"
 	},
 /turf/simulated/floor/tiled,
 /area/tether/station/explorer_meeting)
@@ -21851,7 +21851,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start{
-	name = "Search and Rescue"
+	name = "Field Medic"
 	},
 /turf/simulated/floor/tiled,
 /area/tether/station/explorer_meeting)
@@ -21912,7 +21912,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Search and Rescue"
+	name = "Field Medic"
 	},
 /turf/simulated/floor/tiled,
 /area/tether/station/explorer_meeting)

maps/tether/tether-06-station2.dmm

@@ -16384,7 +16384,7 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/landmark/start{
-	name = "Search and Rescue"
+	name = "Field Medic"
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medbreak)
@@ -16500,7 +16500,7 @@
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/effect/landmark/start{
-	name = "Search and Rescue"
+	name = "Field Medic"
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medbreak)

maps/tether/tether_shuttles.dm

@@ -174,7 +174,7 @@
 	name = "shuttle control console"
 	shuttle_tag = "Excursion Shuttle"
 	req_access = list()
-	req_one_access = list(access_explorer,access_pilot)
+	req_one_access = list(access_pilot)
 	var/wait_time = 45 MINUTES
 
 /obj/machinery/computer/shuttle_control/web/excursion/ui_interact()

maps/tether/tether_things.dm

@@ -396,8 +396,6 @@ var/global/list/latejoin_tram   = list()
 	..()
 	for(var/i = 1 to 3)
 		new /obj/item/weapon/gun/energy/frontier/locked(src)
-	for(var/i = 1 to 4)
-		new /obj/item/weapon/gun/energy/frontier/locked/holdout(src)
 
 // Underdark mob spawners
 /obj/tether_away_spawner/underdark_normal

vorestation.dme

@@ -1612,6 +1612,7 @@
 #include "code\modules\clothing\suits\bio.dm"
 #include "code\modules\clothing\suits\bio_vr.dm"
 #include "code\modules\clothing\suits\hooded.dm"
+#include "code\modules\clothing\suits\hooded_vr.dm"
 #include "code\modules\clothing\suits\jobs.dm"
 #include "code\modules\clothing\suits\labcoat.dm"
 #include "code\modules\clothing\suits\miscellaneous.dm"
@@ -2957,7 +2958,6 @@
 #include "maps\RandomZLevels\listeningpost.dm"
 #include "maps\RandomZLevels\snowfield.dm"
 #include "maps\RandomZLevels\zoo.dm"
-#include "maps\southern_cross\southern_cross_jobs.dm"
 #include "maps\southern_cross\southern_cross_jobs_vr.dm"
 #include "maps\southern_cross\items\encryptionkey_sc.dm"
 #include "maps\southern_cross\items\encryptionkey_vr.dm"