Gateway for Heads, Pilot to Civ

code/game/jobs/job/captain_vr.dm

@@ -26,13 +26,13 @@
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
-			            access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth)
+			            access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth, access_gateway)
 	minimal_access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers,
 			            access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
-			            access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth)
+			            access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth, access_gateway)
 
 /datum/alt_title/deputy_director
 	title = "Deputy Director"

code/game/jobs/job/engineering_vr.dm

@@ -6,12 +6,12 @@
 	access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
 			            access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
 			            access_heads, access_construction,
-			            access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload)
+			            access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway)
 
 	minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels,
 			            access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva,
 			            access_heads, access_construction,
-			            access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload)
+			            access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway)
 	alt_titles = list("Head Engineer" = /datum/alt_title/head_engineer, "Foreman" = /datum/alt_title/foreman, "Maintenance Manager" = /datum/alt_title/maintenance_manager)
 
 /datum/alt_title/head_engineer

code/game/jobs/job/exploration_vr.dm

@@ -1,8 +1,3 @@
-var/const/PATHFINDER 		=(1<<11)
-var/const/EXPLORER 			=(1<<12)
-var/const/PILOT 			=(1<<13)
-var/const/SAR 				=(1<<14)
-
 /obj/item/weapon/card/id/medical/sar
 	assignment = "Field Medic"
 	rank = "Field Medic"
@@ -64,13 +59,13 @@ var/const/SAR 				=(1<<14)
 /datum/job/pilot
 	title = "Pilot"
 	flag = PILOT
-	departments = list(DEPARTMENT_PLANET)
+	departments = list(DEPARTMENT_CIVILIAN)
-	department_flag = MEDSCI
+	department_flag = CIVILIAN
 	faction = "Station"
-	total_positions = 4
+	total_positions = 5
-	spawn_positions = 4
+	spawn_positions = 5
-	supervisors = "the Pathfinder and the Head of Personnel"
+	supervisors = "the Head of Personnel"
-	selection_color = "#999440"
+	selection_color = "#515151"
 	economic_modifier = 5
 	minimal_player_age = 3
 	pto_type = PTO_EXPLORATION

code/game/jobs/job/medical_vr.dm

@@ -4,13 +4,31 @@
 	dept_time_required = 60
 
 	access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads,
+<<<<<<< HEAD
 			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_teleporter, //CHOMPEdit
 			access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels)
+||||||| parent of e6f50c920a... Merge pull request #9868 from Novacat/nova-pathfinder
+			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
+			access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels)
+=======
+			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
+			access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels, access_gateway)
+>>>>>>> e6f50c920a... Merge pull request #9868 from Novacat/nova-pathfinder
 
 	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads,
+<<<<<<< HEAD
 			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_teleporter,//CHOMPEdit
 			access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels)
 	alt_titles = list("Chief Physician" = /datum/alt_title/chief_physician, "Medical Director" = /datum/alt_title/medical_director, /*CHOMPEdit Removal"Healthcare Manager" = /datum/alt_title/healthcare_manager*/)
+||||||| parent of e6f50c920a... Merge pull request #9868 from Novacat/nova-pathfinder
+			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
+			access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels)
+	alt_titles = list("Chief Physician" = /datum/alt_title/chief_physician, "Medical Director" = /datum/alt_title/medical_director, "Healthcare Manager" = /datum/alt_title/healthcare_manager)
+=======
+			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
+			access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels, access_gateway)
+	alt_titles = list("Chief Physician" = /datum/alt_title/chief_physician, "Medical Director" = /datum/alt_title/medical_director, "Healthcare Manager" = /datum/alt_title/healthcare_manager)
+>>>>>>> e6f50c920a... Merge pull request #9868 from Novacat/nova-pathfinder
 
 /datum/alt_title/chief_physician
 	title = "Chief Physician"

code/game/jobs/job/science_vr.dm

@@ -11,8 +11,20 @@
 	minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
 			            access_tox_storage, access_teleporter,
 			            access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage,
+<<<<<<< HEAD
 			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network,
 			            access_explorer, access_pathfinder, access_xenobotany) //YW Edit access_gateway, _explorer, _pathfinder, and _xenobotany
+||||||| parent of e6f50c920a... Merge pull request #9868 from Novacat/nova-pathfinder
+			            access_RC_announce, access_keycard_auth, access_tcomsat, access_xenoarch, access_eva, access_network, access_xenobotany)
+	alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor, "Research Manager" = /datum/alt_title/research_manager,
+						"Head of Development" = /datum/alt_title/head_of_development,"Head Scientist" = /datum/alt_title/head_scientist)
+
+=======
+			            access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_eva, access_network, access_xenobotany)
+	alt_titles = list("Research Supervisor" = /datum/alt_title/research_supervisor, "Research Manager" = /datum/alt_title/research_manager,
+						"Head of Development" = /datum/alt_title/head_of_development,"Head Scientist" = /datum/alt_title/head_scientist)
+
+>>>>>>> e6f50c920a... Merge pull request #9868 from Novacat/nova-pathfinder
 /datum/alt_title/research_manager
 	title = "Research Manager"
 

code/game/jobs/job/security_vr.dm

@@ -4,13 +4,33 @@
 	dept_time_required = 60
 
 	access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory,
+<<<<<<< HEAD
 			            access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
 			            access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting,
 			            access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, access_teleporter) //CHOMP Edit: Restores what access is given in security.dm.
+||||||| parent of e6f50c920a... Merge pull request #9868 from Novacat/nova-pathfinder
+						access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
+						access_construction,
+						access_heads, access_hos, access_RC_announce, access_keycard_auth, access_external_airlocks)
+=======
+						access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
+						access_construction,
+						access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks)
+>>>>>>> e6f50c920a... Merge pull request #9868 from Novacat/nova-pathfinder
 	minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory,
+<<<<<<< HEAD
 			            access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
 			            access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting,
 			            access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, access_teleporter) //CHOMP Edit: Restores what access is given in security.dm.
+||||||| parent of e6f50c920a... Merge pull request #9868 from Novacat/nova-pathfinder
+						access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
+						access_construction,
+						access_heads, access_hos, access_RC_announce, access_keycard_auth, access_external_airlocks)
+=======
+						access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
+						access_construction,
+						access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks)
+>>>>>>> e6f50c920a... Merge pull request #9868 from Novacat/nova-pathfinder
 	alt_titles = list("Security Commander" = /datum/alt_title/sec_commander, "Chief of Security" = /datum/alt_title/sec_chief, "Security Manager" = /datum/alt_title/security_manager)
 
 /datum/alt_title/security_manager

code/game/jobs/jobs.dm

@@ -28,7 +28,10 @@ var/const/PSYCHIATRIST		=(1<<7)
 var/const/ROBOTICIST		=(1<<8)
 var/const/XENOBIOLOGIST		=(1<<9)
 var/const/PARAMEDIC			=(1<<10)
-var/const/XENOBOTANIST		=(1<<15) //VOREStation Add
+var/const/PATHFINDER 		=(1<<11) //VOREStation Add
+var/const/EXPLORER 			=(1<<12) //VOREStation Add
+var/const/SAR 				=(1<<13) //VOREStation Add
+var/const/XENOBOTANIST		=(1<<14) //VOREStation Add
 
 var/const/CIVILIAN			=(1<<2)
 
@@ -45,9 +48,10 @@ var/const/LAWYER			=(1<<9)
 var/const/CHAPLAIN			=(1<<10)
 var/const/ASSISTANT			=(1<<11)
 var/const/BRIDGE			=(1<<12)
-var/const/CLOWN				=(1<<13) //VOREStation Add
+var/const/PILOT 			=(1<<13) //VOREStation Add
-var/const/MIME				=(1<<14) //VOREStation Add
+var/const/CLOWN				=(1<<14) //VOREStation Add
-var/const/ENTERTAINER		=(1<<15) //VOREStation Add
+var/const/MIME				=(1<<15) //VOREStation Add
+var/const/ENTERTAINER		=(1<<16) //VOREStation Add
 
 var/list/assistant_occupations = list(
 )

code/game/objects/items/devices/radio/headset_vr.dm

@@ -84,7 +84,6 @@
 	desc = "A headset used by pilots, has access to the explorer channel."
 	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"
@@ -120,7 +119,7 @@
 	desc = "A headset used by volunteers to expedition teams, has access to the exploration channel."
 	icon_state = "pilot_headset"
 	adhoc_fallback = TRUE
-	ks2type = /obj/item/device/encryptionkey/pilot
+	ks2type = /obj/item/device/encryptionkey/explorer
 
 /obj/item/device/radio/headset/talon
 	name = "talon headset"

code/game/objects/structures/crates_lockers/closets/misc_vr.dm

@@ -133,7 +133,6 @@
 		/obj/item/clothing/gloves/fingerless,
 		/obj/item/device/radio/headset/pilot,
 		/obj/item/device/radio/headset/pilot/alt,
-		/obj/item/weapon/cartridge/explorer,
 		/obj/item/device/flashlight,
 		/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
 		/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,

maps/tether/tether-06-station2.dmm

@@ -7054,8 +7054,7 @@
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/airlock/science{
 	name = "Pathfinder";
-	req_access = list(62);
+	req_access = list(62,43,67)
-	req_one_access = newlist()
 	},
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
@@ -7994,7 +7993,9 @@
 /obj/effect/floor_decal/corner/purple/bordercorner2{
 	dir = 1
 	},
-/obj/structure/closet/secure_closet/pathfinder,
+/obj/structure/closet/secure_closet/pathfinder{
+	req_access = list(62,43,67)
+	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/pathfinder_office)
 "lI" = (
@@ -10021,14 +10022,14 @@
 	dir = 5
 	},
 /obj/structure/table/bench/wooden,
-/obj/effect/landmark/start{
-	name = "Pilot"
-	},
 /obj/machinery/alarm{
 	dir = 4;
 	icon_state = "alarm0";
 	pixel_x = -22
 	},
+/obj/effect/landmark/start{
+	name = "Field Medic"
+	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/equipment)
 "oC" = (
@@ -10067,13 +10068,6 @@
 /turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
 /area/shuttle/large_escape_pod1)
-"oF" = (
-/obj/structure/table/bench/wooden,
-/obj/effect/landmark/start{
-	name = "Pilot"
-	},
-/turf/simulated/floor/tiled,
-/area/tether/exploration/equipment)
 "oG" = (
 /obj/structure/shuttle/engine/propulsion{
 	dir = 8;
@@ -14774,7 +14768,6 @@
 /turf/simulated/floor,
 /area/maintenance/station/medbay)
 "yA" = (
-/obj/structure/closet/secure_closet/pilot,
 /obj/effect/floor_decal/borderfloor{
 	dir = 10
 	},
@@ -14785,6 +14778,7 @@
 	dir = 8;
 	icon_state = "tube1"
 	},
+/obj/structure/closet/secure_closet/sar,
 /turf/simulated/floor/tiled,
 /area/tether/exploration/equipment)
 "yB" = (
@@ -14792,7 +14786,6 @@
 /turf/simulated/floor,
 /area/medical/psych)
 "yH" = (
-/obj/structure/closet/secure_closet/pilot,
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/purple/border,
 /obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -14801,6 +14794,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 8
 	},
+/obj/structure/closet/secure_closet/sar,
 /turf/simulated/floor/tiled,
 /area/tether/exploration/equipment)
 "yJ" = (
@@ -15104,7 +15098,6 @@
 /turf/simulated/floor,
 /area/maintenance/station/medbay)
 "zA" = (
-/obj/structure/closet/secure_closet/sar,
 /obj/effect/floor_decal/borderfloor,
 /obj/effect/floor_decal/corner/purple/border,
 /obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -15113,6 +15106,23 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 8
 	},
+/obj/structure/table/rack/shelf,
+/obj/item/weapon/storage/backpack/parachute{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/weapon/storage/backpack/parachute{
+	pixel_x = -4;
+	pixel_y = 4
+	},
+/obj/item/weapon/storage/backpack/parachute{
+	pixel_x = 4;
+	pixel_y = -6
+	},
+/obj/item/weapon/storage/backpack/parachute{
+	pixel_x = -4;
+	pixel_y = -6
+	},
 /turf/simulated/floor/tiled,
 /area/tether/exploration/equipment)
 "zB" = (
@@ -18321,6 +18331,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/station/stairs_two)
+"FE" = (
+/obj/structure/table/bench/wooden,
+/turf/simulated/floor/tiled,
+/area/tether/exploration/equipment)
 "FH" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -32703,7 +32717,7 @@ jr
 kp
 kE
 lV
-oF
+pu
 yH
 kp
 mW
@@ -32845,7 +32859,7 @@ iN
 kp
 kR
 lW
-pu
+FE
 zA
 kp
 mX
@@ -32987,7 +33001,7 @@ ld
 LP
 Eq
 lX
-pu
+FE
 zA
 kp
 mZ

maps/tether/tether-07-station3.dmm

@@ -516,6 +516,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
+/obj/effect/landmark/start{
+	name = "Pilot"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration/pilot_office)
 "aaY" = (
@@ -6141,6 +6144,9 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
+/obj/effect/landmark/start{
+	name = "Pilot"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration/pilot_office)
 "aoV" = (
@@ -18126,26 +18132,6 @@
 "aOx" = (
 /turf/simulated/open,
 /area/tether/exploration)
-"aOz" = (
-/obj/structure/table/rack/shelf,
-/obj/item/weapon/storage/backpack/parachute{
-	pixel_x = -4;
-	pixel_y = -6
-	},
-/obj/item/weapon/storage/backpack/parachute{
-	pixel_x = 4;
-	pixel_y = -6
-	},
-/obj/item/weapon/storage/backpack/parachute{
-	pixel_x = -4;
-	pixel_y = 4
-	},
-/obj/item/weapon/storage/backpack/parachute{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration)
 "aOL" = (
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock)
@@ -18993,7 +18979,7 @@
 /turf/simulated/floor,
 /area/maintenance/station/elevator)
 "aRQ" = (
-/obj/structure/closet/secure_closet/personal,
+/obj/structure/closet/secure_closet/pilot,
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration/pilot_office)
 "aRT" = (
@@ -22215,10 +22201,6 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration)
-"dIM" = (
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration/pilot_office)
 "dLI" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/wall,
@@ -23237,7 +23219,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/station/upper)
 "iPK" = (
-/obj/machinery/suit_cycler/exploration,
+/obj/machinery/suit_cycler/pilot,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/excursion/general)
 "iQS" = (
@@ -23447,6 +23429,9 @@
 	icon_state = "alarm0";
 	pixel_y = -22
 	},
+/obj/effect/landmark/start{
+	name = "Pilot"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration/pilot_office)
 "knm" = (
@@ -23901,6 +23886,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
+/obj/effect/landmark/start{
+	name = "Pilot"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration/pilot_office)
 "ndd" = (
@@ -24244,6 +24232,10 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/outline/blue,
+/obj/item/weapon/storage/backpack/parachute,
+/obj/item/weapon/storage/backpack/parachute,
+/obj/item/weapon/storage/backpack/parachute,
+/obj/item/weapon/storage/backpack/parachute,
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/excursion/general)
 "owU" = (
@@ -24843,6 +24835,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/landmark/start{
+	name = "Pilot"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration/pilot_office)
 "rLd" = (
@@ -24951,10 +24946,6 @@
 /obj/effect/map_helper/airlock/door/ext_door,
 /turf/simulated/floor/tiled/eris/techmaint_panels,
 /area/shuttle/securiship/general)
-"tmE" = (
-/obj/machinery/suit_cycler/pilot,
-/turf/simulated/floor/tiled/monotile,
-/area/tether/exploration/pilot_office)
 "tnc" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -25190,6 +25181,9 @@
 	dir = 1
 	},
 /obj/machinery/light,
+/obj/effect/landmark/start{
+	name = "Pilot"
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration/pilot_office)
 "uRY" = (
@@ -36536,7 +36530,7 @@ adj
 acK
 acK
 ams
-aOz
+amq
 abe
 amV
 aSg
@@ -36678,7 +36672,7 @@ adj
 adj
 acK
 ams
-aOz
+amq
 abe
 aZP
 aRT
@@ -37959,7 +37953,7 @@ ams
 amq
 abe
 aRQ
-dIM
+aRQ
 aRQ
 adV
 aSi
@@ -38385,7 +38379,7 @@ ams
 eAm
 abe
 aRX
-tmE
+aRX
 aRX
 adV
 aSi