From 90cc22d0df41df1efb979905bec3ee47d7cdcf3f Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Mon, 14 Nov 2022 21:39:58 +0100 Subject: [PATCH] Operations Machinist Access (#15090) --- code/game/jobs/job/civilian.dm | 4 +-- code/game/jobs/job/science.dm | 8 +++--- html/changelogs/machinist_access_tweaks.yml | 6 +++++ maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 22 ++++++++--------- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 27 +++++++++------------ 5 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 html/changelogs/machinist_access_tweaks.yml diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 9422d6e3dbd..00f0259cc87 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -558,8 +558,8 @@ SPECIES_SKRELL_AXIORI = 55 ) - access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research, access_mailsorting) - minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_mailsorting) + access = list(access_robotics, access_tech_storage, access_mailsorting) + minimal_access = list(access_robotics, access_tech_storage, access_mailsorting) minimal_player_age = 7 diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 7035d99ab1b..1263b1e88af 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -81,7 +81,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(access_robotics, access_tox, access_tox_storage, access_research, access_intrepid) + access = list(access_tox, access_tox_storage, access_research, access_intrepid) minimal_access = list(access_tox, access_tox_storage, access_research, access_intrepid) minimal_player_age = 14 @@ -133,7 +133,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenoarch, access_intrepid) + access = list(access_tox, access_tox_storage, access_research, access_xenoarch, access_intrepid) minimal_access = list(access_research, access_xenoarch, access_tox, access_tox_storage, access_intrepid) minimal_player_age = 14 @@ -164,7 +164,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology) + access = list(access_tox, access_tox_storage, access_research, access_xenobiology) minimal_access = list(access_research, access_xenobiology, access_tox_storage) minimal_player_age = 14 @@ -196,7 +196,7 @@ SPECIES_SKRELL_AXIORI = 60 ) - access = list(access_tox_storage, access_research, access_xenobotany, access_robotics, access_tox) + access = list(access_tox_storage, access_research, access_xenobotany, access_tox) minimal_access = list(access_tox_storage, access_research, access_xenobotany) minimal_player_age = 14 diff --git a/html/changelogs/machinist_access_tweaks.yml b/html/changelogs/machinist_access_tweaks.yml new file mode 100644 index 00000000000..dc94384f3b2 --- /dev/null +++ b/html/changelogs/machinist_access_tweaks.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - bugfix: "Gives the machinist access to operations." \ No newline at end of file diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index db4e58db9a8..79aba5f1289 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -2711,7 +2711,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /turf/simulated/floor/tiled/full, /area/operations/storage) @@ -3508,7 +3508,7 @@ /obj/machinery/door/airlock/glass_mining{ name = "Cargo Bay"; req_access = null; - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/effect/map_effect/door_helper/unres{ dir = 1 @@ -12063,7 +12063,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Maintenance Passthrough"; - req_one_access = list(12,26,31,48,67) + req_one_access = list(12,26,29,31,48,67) }, /turf/simulated/floor/tiled, /area/horizon/stairwell/central) @@ -17714,7 +17714,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /turf/simulated/floor/tiled/full, /area/operations/loading) @@ -22425,7 +22425,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_mining{ name = "Warehouse"; - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/map_effect/door_helper/unres{ @@ -24791,7 +24791,7 @@ autoclose = 0; dir = 1; name = "Warehouse Elevator"; - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/machinery/door/firedoor/multi_tile{ dir = 1 @@ -25413,7 +25413,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ autoclose = 0; name = "Warehouse Elevator"; - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/machinery/door/firedoor/multi_tile, /turf/simulated/floor/tiled/dark, @@ -25688,7 +25688,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/airlock/glass_mining{ name = "Warehouse"; - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/effect/map_effect/door_helper/unres{ dir = 8 @@ -26468,7 +26468,7 @@ "vdZ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /turf/simulated/floor/tiled/full, /area/operations/storage) @@ -27871,9 +27871,9 @@ name = "Hangar Lockdown" }, /obj/machinery/door/airlock/glass_mining{ - name = "Cargo Bay"; + name = "Mining Equipment"; req_access = null; - req_one_access = list(12,26,31,48,67) + req_one_access = list(12,26,29,31,48,67) }, /obj/structure/cable{ icon_state = "4-8" diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index aa6d55575fb..9991685a453 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -771,7 +771,7 @@ autoclose = 0; dir = 2; name = "Warehouse Elevator"; - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/machinery/door/firedoor/multi_tile{ dir = 2 @@ -1997,7 +1997,7 @@ /area/hallway/engineering) "aSB" = ( /obj/machinery/door/airlock/maintenance{ - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -6197,7 +6197,7 @@ /obj/machinery/door/airlock/glass_mining{ name = "Break Room"; req_access = null; - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -6605,7 +6605,7 @@ /obj/machinery/door/airlock/glass_mining{ name = "Operations Bay"; req_access = null; - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -7099,7 +7099,7 @@ /area/horizon/zta) "dyU" = ( /obj/machinery/door/airlock/maintenance{ - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, @@ -13566,7 +13566,7 @@ /obj/machinery/door/airlock/glass_mining{ name = "Operations Bay"; req_access = null; - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/effect/map_effect/door_helper/unres{ dir = 1 @@ -14769,8 +14769,7 @@ /area/engineering/storage_hard) "hlM" = ( /obj/machinery/door/airlock/mining{ - name = "Showers"; - req_one_access = list(26,31,48,67) + name = "Showers" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16912,7 +16911,7 @@ /obj/machinery/door/airlock/glass_mining{ name = "Operations Bay"; req_access = null; - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/effect/map_effect/door_helper/unres{ dir = 1 @@ -20780,8 +20779,7 @@ /area/turret_protected/ai) "krl" = ( /obj/machinery/door/airlock/mining{ - name = "Washroom and Showers"; - req_one_access = list(26,31,48,67) + name = "Washroom and Showers" }, /turf/simulated/floor/tiled/white, /area/operations/break_room) @@ -21891,7 +21889,7 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, @@ -33608,8 +33606,7 @@ /area/horizon/maintenance/deck_two/fore/port) "qPn" = ( /obj/machinery/door/airlock/mining{ - name = "Washroom"; - req_one_access = list(26,31,48,67) + name = "Washroom" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -35076,7 +35073,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ autoclose = 0; name = "Warehouse Elevator"; - req_one_access = list(26,31,48,67) + req_one_access = list(26,29,31,48,67) }, /obj/machinery/door/firedoor/multi_tile, /turf/simulated/floor/tiled/dark,