From 6b4bed8a97fa7d921a790efa158e8f63dd86fd94 Mon Sep 17 00:00:00 2001 From: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com> Date: Sat, 6 Jul 2024 02:15:29 -0600 Subject: [PATCH] Mining Base additions/changes, fix medical access to telepad (#6574) ## About The Pull Request - Allows medical to access the quantum telepad to Surt again. Not sure why this got taken away. This otherwise makes a few changes to the mining base. - Clears access restrictions on a large handful of the airlocks, particularly the ones involved with the dormitories, break room, and bathroom. The storage's access is also cleared. - The janitor can access the custodial closet. - Engineers and the usual group allowed to access the mining base can access the engine room. - Expands the storage room, adds a section for xenoarcheology equipment. Locks mining equipment behind windoors, and xenoarch equipment also behind windoors. Appropriate access required to open the doors. - Adds a high-capacity cell at the cell charger. You will still need security, medical, science, mining, or exploration to let you into the mining base to begin with as a civillian/engineering job. This primarily just helps the appropriate jobs perform maintenance where they're required, if they're needed. ## Why It's Good For The Game Making the mining base increasingly more of a place of operation for not just mining, but also scientists feels like an appropriate step in the right direction. A lot of the access restrictions otherwise felt unnecessary. They're just dormitories and a break room. What're people gonna do? Drink and sleep? ## Changelog :cl: tweak: The mining base on Surt has had a few access restrictions cleared out to make it more convenient for those who need to do maintenance there. There's also now a xenoarcheology section in storage. fix: Medical now has access to the Surt telepad again. /:cl: --- .../map_helpers/access_helper/airlock.dm | 1 + .../lavaland_192/levels/lavaland_192.dmm | 405 ++++++++++++------ 2 files changed, 273 insertions(+), 133 deletions(-) diff --git a/code/modules/mapping/map_helpers/access_helper/airlock.dm b/code/modules/mapping/map_helpers/access_helper/airlock.dm index 6b1160e04d3..1ce2cb9de5b 100644 --- a/code/modules/mapping/map_helpers/access_helper/airlock.dm +++ b/code/modules/mapping/map_helpers/access_helper/airlock.dm @@ -43,6 +43,7 @@ ACCESS_SECURITY_MAIN, ACCESS_SCIENCE_MAIN, ACCESS_SUPPLY_MAIN, + ACCESS_MEDICAL_MAIN, ACCESS_COMMAND_IAA, ) diff --git a/maps/sectors/lavaland_192/levels/lavaland_192.dmm b/maps/sectors/lavaland_192/levels/lavaland_192.dmm index 60b6fa26726..688c5e1163c 100644 --- a/maps/sectors/lavaland_192/levels/lavaland_192.dmm +++ b/maps/sectors/lavaland_192/levels/lavaland_192.dmm @@ -7,6 +7,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/lavaland/central/base/common) +"aX" = ( +/obj/structure/anomaly_container, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "bG" = ( /mob/living/simple_mob/animal/space/bats/surt, /turf/simulated/floor/outdoors/lavaland, @@ -68,8 +72,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Dorms"; - req_access = null; - req_one_access = list(1,5,31,38,47,48) + req_access = null }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -82,6 +85,16 @@ }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) +"dP" = ( +/obj/machinery/recharge_station, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/recharger/wallcharger{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "dX" = ( /obj/machinery/shower{ dir = 8 @@ -351,7 +364,7 @@ "iA" = ( /obj/machinery/door/airlock/maintenance{ name = "SMES Access"; - req_access = list(48) + req_one_access = list(10,24,11,1,5,31,38,47,48) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -471,7 +484,7 @@ }, /obj/machinery/door/airlock/maintenance{ name = "SMES Access"; - req_access = list(48) + req_one_access = list(10,24,11,1,5,31,38,47,48) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -507,7 +520,7 @@ master_tag = "mining_engine"; pixel_x = -10; pixel_y = -25; - req_one_access = list(48) + req_one_access = list(10,24,11,1,5,31,38,47,48) }, /obj/structure/fans/tiny, /turf/simulated/floor/plating, @@ -680,6 +693,10 @@ }, /turf/simulated/floor/plating, /area/lavaland/central/base/common) +"ob" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "oj" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 4 @@ -769,6 +786,31 @@ }, /turf/simulated/floor/carpet/oracarpet, /area/lavaland/central/base/common) +"pv" = ( +/obj/structure/table/rack, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/window/eastright{ + name = "Xenoarcheology Storage"; + req_access = list(65) + }, +/obj/item/storage/excavation, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/measuring_tape, +/obj/item/stack/flag/yellow, +/obj/item/gps/science, +/obj/item/gun/energy/phasegun/pistol, +/obj/item/storage/belt/archaeology, +/obj/item/ano_scanner, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/anomaly, +/obj/item/clothing/head/helmet/space/anomaly, +/obj/item/clothing/glasses/meson, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "pz" = ( /obj/structure/cable{ icon_state = "1-2" @@ -801,7 +843,7 @@ frequency = 1384; id_tag = "mining_engine"; pixel_x = 25; - req_one_access = list(48) + req_one_access = list(10,24,11,1,5,31,38,47,48) }, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; @@ -1028,8 +1070,7 @@ req_one_access = list(48) }, /obj/machinery/door/airlock/glass{ - name = "Storage"; - req_access = list(48) + name = "Storage" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1093,6 +1134,25 @@ }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) +"tN" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/suspension_gen{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/eastleft{ + name = "Xenoarcheology Storage"; + req_access = list(65) + }, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "tU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -1278,7 +1338,7 @@ "wY" = ( /obj/machinery/door/airlock/maintenance{ name = "Mining Engine Room"; - req_access = list(48) + req_one_access = list(10,24,11,1,5,31,38,47,48) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1300,10 +1360,13 @@ }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) +"xH" = ( +/obj/structure/ore_box, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "xJ" = ( /obj/machinery/door/airlock{ - name = "Showers"; - req_one_access = list(48) + name = "Showers" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1322,18 +1385,9 @@ /turf/simulated/floor/wood, /area/lavaland/central/base/common) "xV" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/air_alarm/alarms_hidden{ - dir = 1; - pixel_y = -23; - req_one_access = list(48) - }, /obj/machinery/fire_alarm/west_mount{ pixel_x = -26 }, -/obj/structure/ore_box, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "yp" = ( @@ -1449,10 +1503,17 @@ master_tag = "mining_engine"; pixel_x = 22; pixel_y = 25; - req_one_access = list(48) + req_one_access = list(10,24,11,1,5,31,38,47,48) }, /turf/simulated/floor/plating, /area/lavaland/central/base/common) +"Ab" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/ore_box, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "Ak" = ( /obj/structure/bed/chair/sofa/left, /obj/effect/floor_decal/spline/fancy/wood{ @@ -1464,8 +1525,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Lounge"; - req_access = null; - req_one_access = list(1,5,31,38,47,48) + req_access = null }, /obj/machinery/door/firedoor/glass{ dir = 8 @@ -1540,7 +1600,7 @@ "Dx" = ( /obj/machinery/door/airlock{ name = "Custodial Supplies"; - req_one_access = list(48) + req_one_access = list(26,1,5,31,38,47,48) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1647,6 +1707,25 @@ /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) +"Hk" = ( +/obj/structure/table/rack, +/obj/item/storage/bag/ore, +/obj/item/gun/energy/kinetic_accelerator, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/pickaxe, +/obj/item/gps/mining, +/obj/machinery/door/window/westright{ + req_one_access = list(48); + name = "Mining Storage" + }, +/obj/item/clothing/glasses/material, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "Hr" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, @@ -1688,6 +1767,10 @@ dir = 4 }, /obj/structure/table/steel, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, +/obj/item/radio, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "Iq" = ( @@ -1716,16 +1799,35 @@ /turf/simulated/floor/carpet/purcarpet, /area/lavaland/central/base/common) "Iy" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/ore_box, +/obj/machinery/door/window/eastleft{ + name = "Xenoarcheology Storage"; + req_access = list(65) + }, +/obj/structure/table/rack, +/obj/item/storage/excavation, +/obj/item/pickaxe, +/obj/item/tool/wrench, +/obj/item/measuring_tape, +/obj/item/stack/flag/yellow, +/obj/item/gps/science, +/obj/item/gun/energy/phasegun/pistol, +/obj/item/storage/belt/archaeology, +/obj/item/ano_scanner, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/anomaly, +/obj/item/clothing/head/helmet/space/anomaly, +/obj/item/clothing/glasses/meson, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "IR" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Lounge"; - req_one_access = list(1,5,31,38,47,48) + name = "Lounge" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/wood, @@ -1739,6 +1841,10 @@ }, /turf/simulated/floor/tiled/dark, /area/lavaland/central/base/common) +"Jw" = ( +/obj/structure/table/steel, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "Jz" = ( /obj/machinery/light/small{ dir = 8 @@ -1757,6 +1863,9 @@ /area/lavaland/central/explored) "Kj" = ( /obj/machinery/recharge_station, +/obj/machinery/recharger/wallcharger{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "KC" = ( @@ -1836,6 +1945,17 @@ }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) +"MO" = ( +/obj/structure/table/steel, +/obj/item/geiger_counter, +/obj/item/geiger_counter, +/obj/item/geiger_counter, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/obj/item/suit_cooling_unit, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "MV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1859,13 +1979,17 @@ }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) +"NN" = ( +/obj/structure/table/steel, +/obj/machinery/cell_charger, +/turf/simulated/floor/tiled, +/area/lavaland/central/base/common) "NW" = ( /obj/spawner/window/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/lavaland/central/base/common) "Ob" = ( -/obj/machinery/light/small, -/obj/structure/ore_box, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "Og" = ( @@ -2034,8 +2158,7 @@ "Ru" = ( /obj/machinery/door/airlock{ id_tag = "mine_orange"; - name = "Dormitory"; - req_access = list(48) + name = "Dormitory" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2062,8 +2185,7 @@ "RS" = ( /obj/machinery/door/airlock{ id_tag = "mine_purp"; - name = "Dormitory"; - req_access = list(48) + name = "Dormitory" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2213,16 +2335,24 @@ /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "Vw" = ( -/obj/structure/flora/pottedplant/subterranean, /obj/machinery/camera/network/mining{ dir = 1 }, +/obj/structure/flora/pottedplant/subterranean, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "VA" = ( -/obj/structure/table/rack, -/obj/item/storage/bag/ore, -/obj/item/gun/energy/kinetic_accelerator, +/obj/machinery/suspension_gen{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/window/eastright{ + name = "Xenoarcheology Storage"; + req_access = list(65) + }, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "VC" = ( @@ -2262,6 +2392,7 @@ }, /obj/structure/table/steel, /obj/machinery/cell_charger, +/obj/item/cell/high, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "VX" = ( @@ -2289,8 +2420,7 @@ "Wd" = ( /obj/machinery/door/airlock{ id_tag = "mine_blue"; - name = "Dormitory"; - req_access = list(48) + name = "Dormitory" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2303,8 +2433,7 @@ "Wf" = ( /obj/machinery/door/airlock{ id_tag = "mine_black"; - name = "Dormitory"; - req_access = list(48) + name = "Dormitory" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2335,10 +2464,20 @@ /turf/simulated/wall/sandstone/lavaland, /area/lavaland/central/explored) "Wv" = ( -/obj/item/geiger_counter, -/obj/item/geiger_counter, -/obj/item/geiger_counter, -/obj/structure/table/steel, +/obj/structure/table/rack, +/obj/item/storage/bag/ore, +/obj/item/gun/energy/kinetic_accelerator, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/pickaxe, +/obj/item/gps/mining, +/obj/machinery/door/window/westleft{ + req_one_access = list(48); + name = "Mining Storage" + }, +/obj/item/clothing/glasses/material, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "Wy" = ( @@ -9740,7 +9879,7 @@ ew YJ eM NW -ZK +gy ZK ZK ZK @@ -9934,7 +10073,7 @@ ew Zh VC NW -ZK +gy ZK ZK ZK @@ -10128,7 +10267,7 @@ ew Zw Cg NW -ZK +gy ZK ZK ZK @@ -10322,7 +10461,7 @@ ew YJ ut NW -ZK +gy ZK ZK ZK @@ -11682,10 +11821,10 @@ oX YS ew NW -ZK -ZK gy -tV +gy +gy +gy tV tV tV @@ -11876,7 +12015,7 @@ bH uh ew NW -ZK +gy gy gy gy @@ -12059,7 +12198,7 @@ db zl ew db -Hr +Hz Zw VD ew @@ -12072,8 +12211,8 @@ ew NW gy gy -ZK -tV +gy +gy tV tV tV @@ -12253,7 +12392,7 @@ Yb zm ew db -Hz +Hr Mw ew Vw @@ -12266,7 +12405,7 @@ SL AO gy gy -ZK +gy gy tV tV @@ -12458,10 +12597,10 @@ sV AO AO AO -gy -gy -gy -tV +AO +AO +AO +ZK tV tV tV @@ -12647,16 +12786,16 @@ ew VT AO KZ -ew -tU xV +Mw +NN +tN +VA +Iy +pv AO ZK tV -tV -tV -tV -tV ZK tV Md @@ -12842,17 +12981,17 @@ AO AO xf ew -Pv +ND Ob +VD +ew +ew +We AO ZK tV tV tV -tV -tV -tV -tV Md "} (54,1,1) = {" @@ -13034,15 +13173,15 @@ ND VD VX AO -Kj +dP ew -ub -Iy +Pv +ew +ew +ew +ew +aX NW -gy -gy -ZK -ZK tV tV tV @@ -13215,12 +13354,12 @@ ZK ZK ZK ZK -gy -gy -gy -gy ZK ZK +ZK +ZK +ZK +gy gy AO sH @@ -13228,15 +13367,15 @@ Pv ew ew AO -Wv -VA -VA -mq +Kj +ew +ub +ob +Ay +ew +ew +aX NW -ZK -gy -ZK -ZK tV tV tV @@ -13415,23 +13554,23 @@ ZK ZK ZK ZK -ZK +gy NW kp ub Ay sJ AO -AO -AO -NW -NW +MO +Hk +Wv +mq +Ab +xH +xH +Jw AO ZK -ZK -ZK -ZK -tV tV tV tV @@ -13609,23 +13748,23 @@ ZK ZK ZK ZK -ZK +gy AO AO RE RE AO AO -gy -gy -gy -gy +AO +AO +NW +NW +AO +AO +AO +AO +AO ZK -ZK -ZK -ZK -ZK -tV tV tV tV @@ -13800,10 +13939,10 @@ RL RL ZK ZK -gy -gy -gy ZK +ZK +ZK +gy gy Iq gy @@ -13812,14 +13951,14 @@ VY gy gy gy +gy +gy ZK ZK ZK ZK ZK ZK -ZK -tV tV tV tV @@ -13996,8 +14135,8 @@ ZK ZK ZK ZK -gy -gy +ZK +ZK gy gy gy @@ -14013,7 +14152,7 @@ ZK ZK ZK ZK -tV +ZK tV tV tV @@ -14191,8 +14330,8 @@ ZK ZK ZK ZK -gy -gy +ZK +ZK ZK ZK ZK @@ -14207,7 +14346,7 @@ ZK ZK ZK ZK -tV +ZK tV tV tV @@ -14401,7 +14540,7 @@ ZK ZK ZK ZK -tV +ZK tV tV tV @@ -14589,13 +14728,13 @@ gy gy gy gy -gy -gy +ZK +ZK ZK RL RL ZK -tV +ZK tV tV tV @@ -14783,13 +14922,13 @@ ZK gy gy gy -gy +ZK ZK ZK RL RL ZK -tV +ZK tV tV tV @@ -14977,13 +15116,13 @@ RL gy gy gy -gy +ZK ZK RL ZK ZK ZK -tV +ZK tV tV tV @@ -15177,7 +15316,7 @@ RL ZK ZK ZK -tV +ZK tV tV tV @@ -15371,7 +15510,7 @@ ZK ZK ZK RL -tV +ZK tV tV tV