From f2557a4834e44dd6d18173c5bd5772eaa7f6cc48 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 7 Mar 2021 15:02:48 -0500 Subject: [PATCH 1/2] Gateway for Heads, Pilot to Civ - Adds gateway access to all heads of staff - Moves pilot to Civilian department, though for PTO purposes they still count as exploration. This is the result of some staff discussions. --- code/game/jobs/job/captain_vr.dm | 4 +- code/game/jobs/job/engineering_vr.dm | 4 +- code/game/jobs/job/exploration_vr.dm | 17 ++--- code/game/jobs/job/medical_vr.dm | 4 +- code/game/jobs/job/science_vr.dm | 2 +- code/game/jobs/job/security_vr.dm | 4 +- code/game/jobs/jobs.dm | 12 ++-- .../objects/items/devices/radio/headset_vr.dm | 3 +- .../crates_lockers/closets/misc_vr.dm | 1 - maps/tether/tether-06-station2.dmm | 45 +++++++++----- maps/tether/tether-07-station3.dmm | 62 +++++++++---------- 11 files changed, 81 insertions(+), 77 deletions(-) diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index 4062775846d..dd057fff7bf 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/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_manager title = "Deputy Manager" diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm index 8799aa39058..39905f0bc85 100644 --- a/code/game/jobs/job/engineering_vr.dm +++ b/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 diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index 0e6e003f7db..5189ca39b0c 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/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) - department_flag = MEDSCI + departments = list(DEPARTMENT_CIVILIAN) + department_flag = CIVILIAN faction = "Station" - total_positions = 4 - spawn_positions = 4 - supervisors = "the Pathfinder and the Head of Personnel" - selection_color = "#999440" + total_positions = 5 + spawn_positions = 5 + supervisors = "the Head of Personnel" + selection_color = "#515151" economic_modifier = 5 minimal_player_age = 3 pto_type = PTO_EXPLORATION diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index 2679137cf0f..6d5ee57c4e4 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -5,11 +5,11 @@ access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, 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_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels, access_gateway) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, 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_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) /datum/alt_title/chief_physician diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index 0356656446b..52647422b4f 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -10,7 +10,7 @@ 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, - access_RC_announce, access_keycard_auth, access_tcomsat, access_xenoarch, access_eva, access_network, access_xenobotany) + 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) diff --git a/code/game/jobs/job/security_vr.dm b/code/game/jobs/job/security_vr.dm index e9b9017d9af..082531d944e 100644 --- a/code/game/jobs/job/security_vr.dm +++ b/code/game/jobs/job/security_vr.dm @@ -6,11 +6,11 @@ access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, 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_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks) minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, 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_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks) 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 diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 40f0fdb4a41..9312c84571d 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -26,7 +26,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) @@ -43,9 +46,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/MIME =(1<<14) //VOREStation Add -var/const/ENTERTAINER =(1<<15) //VOREStation Add +var/const/PILOT =(1<<13) //VOREStation Add +var/const/CLOWN =(1<<14) //VOREStation Add +var/const/MIME =(1<<15) //VOREStation Add +var/const/ENTERTAINER =(1<<16) //VOREStation Add //VOREStation Add var/const/TALON =(1<<3) diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm index 9204c81dd17..2682d9db97c 100644 --- a/code/game/objects/items/devices/radio/headset_vr.dm +++ b/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" diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index 2ee0c7915ee..aa7a55dff6f 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/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, diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 7da0a1e5139..5440ebf38ea 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -9964,14 +9964,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" = ( @@ -10010,13 +10010,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; @@ -14717,7 +14710,6 @@ /turf/simulated/floor, /area/maintenance/station/medbay) "yA" = ( -/obj/structure/closet/secure_closet/pilot, /obj/effect/floor_decal/borderfloor{ dir = 10 }, @@ -14728,6 +14720,7 @@ dir = 8; icon_state = "tube1" }, +/obj/structure/closet/secure_closet/sar, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "yB" = ( @@ -14735,7 +14728,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{ @@ -14744,6 +14736,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" = ( @@ -15047,7 +15040,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{ @@ -15056,6 +15048,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" = ( @@ -18264,6 +18273,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 @@ -32646,7 +32659,7 @@ jr kp kE lV -oF +pu yH kp mW @@ -32788,7 +32801,7 @@ iN kp kR lW -pu +FE zA kp mX @@ -32930,7 +32943,7 @@ ld LP Eq lX -pu +FE zA kp mZ diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 03a0f35db08..5bbd3567151 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/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" = ( @@ -6153,6 +6156,9 @@ d2 = 8; icon_state = "0-8" }, +/obj/effect/landmark/start{ + name = "Pilot" + }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration/pilot_office) "aoV" = ( @@ -18138,26 +18144,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) @@ -19005,7 +18991,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" = ( @@ -22219,10 +22205,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, @@ -23248,7 +23230,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" = ( @@ -23458,6 +23440,9 @@ icon_state = "alarm0"; pixel_y = -22 }, +/obj/effect/landmark/start{ + name = "Pilot" + }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration/pilot_office) "knm" = ( @@ -23912,6 +23897,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" = ( @@ -24255,6 +24243,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" = ( @@ -24854,6 +24846,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" = ( @@ -24962,10 +24957,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; @@ -25201,6 +25192,9 @@ dir = 1 }, /obj/machinery/light, +/obj/effect/landmark/start{ + name = "Pilot" + }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration/pilot_office) "uRY" = ( @@ -36547,7 +36541,7 @@ adj acK acK ams -aOz +amq abe amV aSg @@ -36689,7 +36683,7 @@ adj adj acK ams -aOz +amq abe aZP aRT @@ -37970,7 +37964,7 @@ ams amq abe aRQ -dIM +aRQ aRQ adV aSi @@ -38396,7 +38390,7 @@ ams eAm abe aRX -tmE +aRX aRX adV aSi From 0f07766015b24af36dbad988cafd098f08705118 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 7 Mar 2021 15:07:42 -0500 Subject: [PATCH 2/2] Fixes PF Office Access --- maps/tether/tether-06-station2.dmm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 5440ebf38ea..b0c6489d0ed 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/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_one_access = newlist() + req_access = list(62,43,67) }, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -7937,7 +7936,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" = (