diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 10c623e0260..31149d557fe 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -6799,15 +6799,6 @@ /turf/simulated/floor/plasteel, /area/janitor) "azl" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/window/westleft{ - name = "Janitoral Delivery"; - req_access_txt = "26" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/janitor) @@ -7384,6 +7375,9 @@ dir = 8; location = "Janitor" }, +/obj/machinery/door/window/eastright, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/service/janitor, /turf/simulated/floor/plating, /area/janitor) "aAB" = ( @@ -10490,6 +10484,9 @@ dir = 4; location = "Bar" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/service/bar, +/obj/machinery/door/window/westright, /turf/simulated/floor/plasteel/grimy, /area/crew_quarters/bar) "aHJ" = ( @@ -13008,8 +13005,6 @@ pixel_x = -10 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/arrow, -/obj/effect/decal/warning_stripes/yellow/partial, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -17806,6 +17801,8 @@ opacity = 1 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/window/westright, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, /turf/simulated/floor/plasteel, /area/quartermaster/office) "aXL" = ( @@ -19995,6 +19992,9 @@ location = "Kitchen" }, /obj/effect/decal/warning_stripes/yellow, +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/machinery/door/window/westright, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bcp" = ( @@ -20929,6 +20929,9 @@ opacity = 1 }, /obj/effect/decal/warning_stripes/yellow, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/supply/mining, +/obj/machinery/door/window/southright, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bem" = ( @@ -26669,6 +26672,16 @@ /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall, /area/maintenance/starboard) +"bqI" = ( +/obj/effect/decal/warning_stripes/yellow/partial, +/obj/machinery/door/window/northleft, +/obj/effect/decal/warning_stripes/arrow, +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/airlock/access/any/supply/general, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/quartermaster/sorting) "bqJ" = ( /obj/structure/table, /obj/item/camera{ @@ -28416,18 +28429,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) -"buG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/arrow{ - dir = 1 - }, -/obj/effect/decal/warning_stripes/yellow/partial{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/atmos) "buH" = ( /obj/structure/cable{ d2 = 2; @@ -28991,17 +28992,6 @@ }, /area/atmos) "bvR" = ( -/obj/machinery/door/window{ - base_state = "right"; - dir = 1; - icon_state = "right"; - name = "Atmospherics Deliveries"; - req_access_txt = "24" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -29036,6 +29026,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/window/eastright, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, /turf/simulated/floor/plasteel, /area/atmos) "bvT" = ( @@ -48752,13 +48745,6 @@ name = "west bump"; pixel_x = -24 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window{ - dir = 1; - req_access_txt = "63" - }, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -49324,9 +49310,13 @@ }, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=1"; - location = "Security" + location = "Security"; + dir = 1 }, /obj/effect/decal/warning_stripes/yellow, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/door/window/southleft, /turf/simulated/floor/plasteel, /area/security/range) "cnT" = ( @@ -49586,7 +49576,6 @@ /obj/machinery/door/airlock/command{ id_tag = "hopofficedoor"; name = "Head of Personnel"; - req_access = null; req_access_txt = "57" }, /obj/structure/cable{ @@ -56386,15 +56375,6 @@ /turf/simulated/floor/plasteel, /area/engine/engine_smes) "cDD" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window/eastleft{ - req_access_txt = "10" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -56731,9 +56711,13 @@ }, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=1"; - location = "Engineering" + location = "Engineering"; + dir = 1 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/window/southright, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, /turf/simulated/floor/plasteel, /area/engine/engineering) "cEC" = ( @@ -60310,6 +60294,9 @@ dir = 8; location = "Medbay" }, +/obj/machinery/door/window/eastright, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, /turf/simulated/floor/plasteel, /area/medical/medbay2) "cMG" = ( @@ -65178,10 +65165,6 @@ icon_state = "neutral" }, /area/medical/medbay3) -"cXI" = ( -/obj/effect/spawner/random_spawners/wall_rusted_always, -/turf/simulated/wall, -/area/medical/surgery) "cXJ" = ( /turf/simulated/wall, /area/medical/surgery1) @@ -77316,12 +77299,16 @@ "dyP" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=1"; - location = "Robotics" + location = "Robotics"; + dir = 1 }, /obj/structure/plasticflaps{ opacity = 1 }, /obj/effect/decal/warning_stripes/yellow, +/obj/effect/mapping_helpers/airlock/access/any/science/robotics, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/machinery/door/window/southright, /turf/simulated/floor/plasteel, /area/assembly/robotics) "dyR" = ( @@ -89816,6 +89803,9 @@ /obj/structure/plasticflaps{ opacity = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/science/research, +/obj/machinery/door/window/northleft, /turf/simulated/floor/plating, /area/toxins/misc_lab) "iiM" = ( @@ -96230,6 +96220,9 @@ dir = 8; location = "Hydroponics" }, +/obj/machinery/door/window/eastright, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, /turf/simulated/floor/plasteel, /area/hydroponics) "wjm" = ( @@ -125400,7 +125393,7 @@ aOg btw brR btw -buG +buD bvR bxc byD @@ -137711,7 +137704,7 @@ aDL ayA ayA aIh -aEN +bqI aNx aQl aCF @@ -148066,7 +148059,7 @@ imS aFt cSY dDE -cXI +iwk cZb cZY dcG diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 37db10f65d4..e49be43f024 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -3744,6 +3744,7 @@ req_access_txt = "31" }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /turf/simulated/floor/plating, /area/maintenance/disposal) "aug" = ( @@ -6793,14 +6794,13 @@ opacity = 1 }, /obj/effect/turf_decal/bot, +/obj/machinery/door/window/westleft, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, /turf/simulated/floor/plasteel, /area/maintenance/fsmaint) "aEy" = ( /obj/effect/turf_decal/delivery, -/obj/machinery/door/window/eastleft{ - name = "Engineering Deliveries" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plasteel, /area/engine/engineering) "aEz" = ( @@ -10847,8 +10847,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_x = 24; - req_access_txt = "10"; - req_one_access = null + req_access_txt = "10" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -15262,8 +15261,7 @@ /area/maintenance/fsmaint) "baE" = ( /obj/machinery/door/airlock/external{ - name = "Escape Pod Four"; - req_access = null + name = "Escape Pod Four" }, /turf/simulated/floor/plating, /area/maintenance/engimaint) @@ -23689,12 +23687,7 @@ /turf/simulated/floor/plasteel, /area/quartermaster/office) "buw" = ( -/obj/machinery/door/window/westleft{ - dir = 4; - name = "Bridge Deliveries" - }, /obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/poddoor/preopen{ id_tag = "bridge blast"; name = "Bridge Blast Doors" @@ -24040,6 +24033,9 @@ opacity = 1 }, /obj/effect/turf_decal/bot, +/obj/effect/mapping_helpers/airlock/access/any/command/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/machinery/door/window/westleft, /turf/simulated/floor/plasteel, /area/maintenance/maintcentral) "bvo" = ( @@ -26458,8 +26454,7 @@ /area/bridge) "bAg" = ( /obj/machinery/door/airlock/command{ - name = "Command Desk"; - req_access = null + name = "Command Desk" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -27977,8 +27972,7 @@ "bDX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ - name = "Council Chamber"; - req_access = null + name = "Council Chamber" }, /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/simulated/floor/plasteel{ @@ -28235,6 +28229,9 @@ id_tag = "atmos"; name = "Atmospherics Blast Door" }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plating, /area/atmos/control) "bEL" = ( @@ -28424,7 +28421,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock{ - id_tag = null; name = "Vacant Office" }, /obj/effect/mapping_helpers/airlock/autoname, @@ -28841,7 +28837,6 @@ }, /obj/machinery/navbeacon{ codes_txt = "delivery"; - dir = 4; location = "Atmospherics" }, /obj/structure/disposalpipe/segment, @@ -28850,6 +28845,11 @@ id_tag = "atmos"; name = "Atmospherics Blast Door" }, +/obj/machinery/door/window/northright{ + name = "Atmospherics Access" + }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos, /turf/simulated/floor/plating, /area/atmos/control) "bGE" = ( @@ -33999,6 +33999,9 @@ /obj/structure/plasticflaps{ opacity = 1 }, +/obj/machinery/door/window/southright, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/service/bar, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "bVy" = ( @@ -34048,10 +34051,6 @@ name = "north bump"; pixel_y = 24 }, -/obj/machinery/door/window/eastleft{ - name = "Kitchen Delivery" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -34066,6 +34065,11 @@ /obj/structure/plasticflaps{ opacity = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/machinery/door/window/eastleft{ + name = "Kitchen Delivery" + }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -35226,6 +35230,8 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/machinery/door/window/westright, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -36190,13 +36196,6 @@ "cbm" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/northright{ - name = "Hydroponics Delivery" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /obj/structure/sign/poster/official/random{ pixel_x = 32 }, @@ -41392,11 +41391,9 @@ /turf/simulated/floor/plating, /area/toxins/lab) "cqo" = ( -/obj/machinery/door/window/eastright, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/science/research, /obj/machinery/light_switch{ name = "north bump"; pixel_y = 24 @@ -41620,16 +41617,6 @@ /area/quartermaster/office) "cqZ" = ( /obj/effect/decal/warning_stripes/blue, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/southright{ - name = "Medical Deliveries" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -42501,6 +42488,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -43184,7 +43174,6 @@ /area/hallway/primary/fore) "cvY" = ( /obj/effect/turf_decal/delivery, -/obj/structure/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -44912,13 +44901,13 @@ "cBw" = ( /obj/machinery/navbeacon{ codes_txt = "delivery"; - dir = 4; location = "Medbay" }, -/obj/structure/plasticflaps{ - opacity = 1 - }, /obj/effect/turf_decal/bot, +/obj/machinery/door/window/northright, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/structure/plasticflaps, /turf/simulated/floor/plating, /area/maintenance/apmaint) "cBx" = ( @@ -45320,6 +45309,7 @@ req_access_txt = "50"; name = "MuleBot Access" }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/maintenance/apmaint) "cCD" = ( @@ -54710,7 +54700,6 @@ id = "Processing"; name = "processing tint control"; req_access_txt = "63"; - tag = null; pixel_y = 24; pixel_x = -6 }, @@ -68385,12 +68374,15 @@ /obj/effect/turf_decal/bot, /obj/machinery/navbeacon{ codes_txt = "delivery"; - dir = 8; + dir = 1; location = "Hydroponics" }, /obj/structure/plasticflaps{ opacity = 1 }, +/obj/machinery/door/window/southright, +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "kJT" = ( @@ -72477,10 +72469,6 @@ /obj/effect/turf_decal/loading_area, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/door/window/northright{ - name = "Atmospherics Access" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -82947,9 +82935,7 @@ /area/security/permabrig) "sbM" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - req_access = null - }, +/obj/machinery/door/airlock/security, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -83607,6 +83593,9 @@ opacity = 1 }, /obj/effect/turf_decal/bot, +/obj/effect/mapping_helpers/airlock/access/any/science/research, +/obj/machinery/door/window/northright, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, /turf/simulated/floor/plasteel, /area/maintenance/starboard2) "svH" = ( @@ -86276,18 +86265,11 @@ }) "tMV" = ( /obj/effect/turf_decal/delivery, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window/southleft{ - dir = 8; - name = "Bar Delivery" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/bar, /obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/plasteel, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "tNw" = ( /obj/structure/table/wood, @@ -86529,6 +86511,9 @@ id_tag = "Secure Gate"; name = "brig shutters" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/door/window/eastright, /turf/simulated/floor/plasteel, /area/maintenance/fore) "tUn" = ( @@ -89015,7 +89000,6 @@ "vmA" = ( /obj/machinery/door/airlock/security{ name = "Execution Room"; - req_access = null; id_tag = "prisonereducation" }, /obj/machinery/door/firedoor, @@ -89169,7 +89153,6 @@ "vsx" = ( /obj/machinery/door/airlock/security{ name = "Detective's Office"; - req_access = null; req_access_txt = "4" }, /obj/machinery/door/firedoor, @@ -93093,13 +93076,6 @@ }, /area/medical/surgeryobs) "xyP" = ( -/obj/machinery/door/window/eastright{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Security Delivery"; - req_access_txt = "1" - }, /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/security/main) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 71a5dd8e0cd..62887c7c7c4 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -2848,7 +2848,6 @@ "akl" = ( /obj/machinery/door/airlock/security{ name = "Warden's office"; - req_access = null; req_access_txt = "3" }, /turf/simulated/floor/plasteel{ @@ -2963,7 +2962,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Evidence Storage"; - req_access = null; req_access_txt = "63" }, /turf/simulated/floor/plasteel{ @@ -2977,19 +2975,6 @@ icon_state = "darkredcorners" }, /area/security/brig) -"akE" = ( -/obj/machinery/door/window/eastright{ - dir = 1; - name = "Security Delivery"; - req_access_txt = "1" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/security/brig) "akF" = ( /obj/machinery/power/apc{ dir = 1; @@ -3508,7 +3493,6 @@ "alL" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -3860,6 +3844,9 @@ id_tag = "Secure Gate"; name = "Security Blast Door" }, +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/machinery/door/window/southright, /turf/simulated/floor/plating, /area/maintenance/fore) "amy" = ( @@ -8063,8 +8050,7 @@ name = "processing tint control"; pixel_x = -24; pixel_y = -8; - req_access_txt = "63"; - tag = null + req_access_txt = "63" }, /turf/simulated/floor/plasteel, /area/security/processing) @@ -8676,7 +8662,6 @@ "awa" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -8762,7 +8747,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Prisoner Processing"; - req_access = null; req_access_txt = "63" }, /turf/simulated/floor/plasteel{ @@ -9156,7 +9140,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Execution Room"; - req_access = null; req_access_txt = "1" }, /obj/structure/cable{ @@ -9356,7 +9339,6 @@ }, /obj/machinery/door/airlock/security{ name = "Evidence Storage"; - req_access = null; req_access_txt = "63" }, /turf/simulated/floor/plasteel{ @@ -9437,7 +9419,6 @@ "axI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ - id_tag = null; name = "Brig"; req_access_txt = "63" }, @@ -9510,7 +9491,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Prisoner Processing"; - req_access = null; req_access_txt = "63" }, /turf/simulated/floor/plasteel{ @@ -10188,7 +10168,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Interrogation"; - req_access = null; req_access_txt = "63" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12047,9 +12026,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/fore) "aDq" = ( @@ -13028,7 +13005,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Detective's Office"; - req_access = null; req_access_txt = "4" }, /obj/structure/cable{ @@ -13698,9 +13674,7 @@ /turf/simulated/floor/plating, /area/maintenance/fpmaint) "aHs" = ( -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/fpmaint) "aHt" = ( @@ -14777,9 +14751,7 @@ /area/maintenance/fpmaint2) "aKa" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "aKb" = ( @@ -15211,7 +15183,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Detective"; - req_access = null; req_access_txt = "4" }, /turf/simulated/floor/plasteel{ @@ -15313,18 +15284,14 @@ /area/maintenance/fpmaint2) "aLp" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "aLq" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 10 }, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "aLr" = ( @@ -15713,9 +15680,7 @@ /area/maintenance/fsmaint) "aMj" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/fore) "aMk" = ( @@ -15786,9 +15751,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) "aMv" = ( -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "aMw" = ( @@ -16087,9 +16050,7 @@ /area/maintenance/fsmaint) "aNh" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/fsmaint) "aNi" = ( @@ -16226,9 +16187,7 @@ /area/maintenance/fpmaint2) "aNA" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/fpmaint2) "aNB" = ( @@ -17527,9 +17486,7 @@ /area/crew_quarters/dorms) "aQC" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/fsmaint) "aQD" = ( @@ -19074,9 +19031,7 @@ /area/maintenance/fsmaint) "aUb" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/fsmaint) "aUc" = ( @@ -22176,7 +22131,6 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "baM" = ( -/obj/structure/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -23178,7 +23132,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ name = "Security Checkpoint"; - req_access = null; req_access_txt = "1" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23568,10 +23521,6 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "bdL" = ( -/obj/machinery/door/window/southleft{ - name = "Kitchen Delivery"; - req_access_txt = "28" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" @@ -23585,9 +23534,6 @@ name = "CondiMaster Neo"; pixel_x = -5 }, -/obj/structure/window/reinforced{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -31924,11 +31870,6 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "bwe" = ( -/obj/machinery/door/window/eastright{ - dir = 1; - name = "Bridge Delivery"; - req_access_txt = "19" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/bridge/meeting_room) @@ -34255,6 +34196,9 @@ opacity = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/door/window/southleft, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/command/general, /turf/simulated/floor/plasteel, /area/bridge/meeting_room) "bBf" = ( @@ -34699,7 +34643,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Conference Room"; - req_access = null; req_access_txt = "19" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -34740,7 +34683,6 @@ /obj/machinery/door/airlock/command{ id_tag = "captainofficedoor"; name = "Captain's Office"; - req_access = null; req_access_txt = "20" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -36290,7 +36232,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - id_tag = null; name = "Paramedic"; req_access_txt = "66" }, @@ -38675,7 +38616,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Conference Room"; - req_access = null; req_access_txt = "19" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -40501,7 +40441,6 @@ "bOx" = ( /obj/machinery/door/airlock/command{ name = "Captain's Quarters"; - req_access = null; req_access_txt = "20" }, /obj/structure/cable{ @@ -40520,9 +40459,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/command{ - id_tag = null; name = "Captain's Office"; - req_access = null; req_access_txt = "20" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -40925,21 +40862,14 @@ /obj/structure/plasticflaps{ opacity = 1 }, +/obj/machinery/door/window/eastright, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/science/research, /turf/simulated/floor/plasteel{ icon_state = "bot" }, /area/medical/research) "bPk" = ( -/obj/machinery/door/window/eastright{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Research Division Delivery"; - req_access_txt = "47" - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -41446,7 +41376,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Head of Personnel"; - req_access = null; req_access_txt = "57" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -41766,7 +41695,6 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/medical/glass{ - id_tag = null; name = "Paramedic"; req_access_txt = "66" }, @@ -42554,7 +42482,6 @@ "bSt" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - id_tag = null; name = "Medbay Reception"; req_access_txt = "5" }, @@ -42596,7 +42523,6 @@ "bSx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - id_tag = null; name = "Chemistry Lab"; req_access_txt = "33" }, @@ -44830,16 +44756,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/office) "bWX" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/eastright{ - base_state = "left"; - dir = 1; - icon_state = "left"; - name = "Medical Delivery"; - req_access_txt = "5" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 10; @@ -45674,10 +45590,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bYF" = ( -/obj/machinery/door/window/westleft{ - name = "Janitoral Delivery"; - req_access_txt = "26" - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -45795,10 +45707,13 @@ d2 = 8; icon_state = "4-8" }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/door/window/eastright, +/obj/effect/mapping_helpers/airlock/access/any/service/janitor, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, /obj/structure/plasticflaps{ opacity = 1 }, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/maintenance/aft) "bYR" = ( @@ -47359,6 +47274,9 @@ /obj/structure/plasticflaps{ opacity = 1 }, +/obj/machinery/door/window/westleft, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, /turf/simulated/floor/plating, /area/medical/sleeper) "cbu" = ( @@ -48271,7 +48189,6 @@ /obj/machinery/door/airlock/command{ id_tag = "hopofficedoor"; name = "Head of Personnel"; - req_access = null; req_access_txt = "57" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -48291,6 +48208,9 @@ id = "packageExternal" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/door/window/westright, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/supply/mail_sorting, /turf/simulated/floor/plasteel, /area/quartermaster/office) "ccZ" = ( @@ -48517,7 +48437,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Server Room"; - req_access = null; req_access_txt = "30" }, /obj/structure/cable{ @@ -48750,7 +48669,6 @@ "cee" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - id_tag = null; name = "Observation Room" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -48768,7 +48686,6 @@ "cef" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - id_tag = null; name = "Observation Room" }, /turf/simulated/floor/plasteel{ @@ -50135,13 +50052,11 @@ /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; icon_state = "rightsecure"; - name = "Server Exterior Door"; - req_access = null + name = "Server Exterior Door" }, /obj/machinery/door/window/brigdoor{ dir = 8; - name = "Server Interior Door"; - req_access = null + name = "Server Interior Door" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -52699,7 +52614,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/virology/glass{ - id_tag = null; name = "Virology Lobby Hallway" }, /turf/simulated/floor/plasteel{ @@ -53231,9 +53145,7 @@ icon_state = "pipe-c" }, /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/apmaint) "cnt" = ( @@ -53257,7 +53169,6 @@ "cnw" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology/glass{ - id_tag = null; name = "Virology Lobby Hallway" }, /turf/simulated/floor/plasteel{ @@ -54430,9 +54341,7 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint) "cpF" = ( -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/asmaint) "cpG" = ( @@ -54455,9 +54364,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/asmaint) "cpI" = ( @@ -54994,9 +54901,7 @@ /turf/simulated/floor/plating, /area/maintenance/apmaint) "cqD" = ( -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/apmaint) "cqE" = ( @@ -56252,9 +56157,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/aft) "csV" = ( @@ -56286,7 +56189,6 @@ "csX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology/glass{ - id_tag = null; name = "Monkey Pen"; req_access_txt = "39" }, @@ -56654,15 +56556,6 @@ icon_state = "white" }, /area/toxins/mixing) -"ctF" = ( -/obj/structure/rack{ - dir = 1 - }, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "ctG" = ( /obj/structure/cable{ d1 = 2; @@ -56803,13 +56696,13 @@ dir = 4; location = "Engineering" }, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/westright{ - name = "Engineering Monitoring Station"; - req_access = null; - req_one_access_txt = "11;24;34" - }, +/obj/machinery/door/window/westright, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/plasticflaps{ + opacity = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, /turf/simulated/floor/plasteel, /area/engine/controlroom) "ctY" = ( @@ -56926,12 +56819,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/effect/decal/warning_stripes/yellow/partial{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/arrow{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/engine/controlroom) "cul" = ( @@ -57042,11 +56929,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/window/northleft{ - dir = 4; - name = "Engineering Monitoring Station"; - req_one_access_txt = "11;24" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -57466,8 +57348,7 @@ /area/toxins/mixing) "cvf" = ( /obj/machinery/atmospherics/trinary/mixer{ - dir = 8; - req_access = null + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -57648,9 +57529,6 @@ /turf/simulated/floor/plating, /area/engine/controlroom) "cvC" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/structure/dispenser{ pixel_x = -1 }, @@ -57782,7 +57660,6 @@ "cvO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology/glass{ - id_tag = null; name = "Isolation B"; req_access_txt = "39" }, @@ -57868,7 +57745,6 @@ "cvX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ - id_tag = null; name = "Secondary Storage"; req_access_txt = "5" }, @@ -57991,7 +57867,6 @@ "cwh" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology/glass{ - id_tag = null; name = "Isolation A"; req_access_txt = "39" }, @@ -58991,9 +58866,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/apmaint) "cyq" = ( @@ -59503,9 +59376,7 @@ /area/maintenance/aft) "czp" = ( /obj/structure/table/reinforced, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/aft) "czq" = ( @@ -60088,9 +59959,7 @@ pixel_x = -3; pixel_y = 7 }, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/aft) "cAx" = ( @@ -60098,9 +59967,7 @@ /obj/structure/window/reinforced, /obj/item/storage/secure/briefcase, /obj/item/mop, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/aft) "cAy" = ( @@ -60110,9 +59977,7 @@ }, /obj/structure/window/reinforced, /obj/item/poster/random_contraband, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/aft) "cAz" = ( @@ -60343,9 +60208,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/apmaint) "cBg" = ( @@ -62086,9 +61949,7 @@ "cEI" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/aft2) "cEJ" = ( @@ -62909,6 +62770,9 @@ opacity = 1 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/door/window/northleft, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/simulated/floor/plasteel, /area/assembly/assembly_line) "cGV" = ( @@ -65243,9 +65107,7 @@ /area/toxins/xenobiology) "cMh" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/asmaint) "cMi" = ( @@ -67150,9 +67012,7 @@ /area/toxins/xenobiology) "cQC" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "cQD" = ( @@ -68942,9 +68802,7 @@ /area/maintenance/portsolar) "cUh" = ( /obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/aft2) "cUi" = ( @@ -69345,9 +69203,7 @@ name = "HIGH VOLTAGE"; pixel_y = -32 }, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/aft2) "cVo" = ( @@ -69764,6 +69620,9 @@ opacity = 1 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/service/bar, +/obj/machinery/door/window/eastright, /turf/simulated/floor/plasteel, /area/maintenance/fsmaint) "cWv" = ( @@ -69852,13 +69711,8 @@ /turf/simulated/floor/beach/sand, /area/hallway/secondary/exit) "cWG" = ( -/obj/machinery/door/window/southleft{ - dir = 8; - name = "Bar Delivery"; - req_access_txt = "25" - }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "cWH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -70301,6 +70155,9 @@ codes_txt = "delivery"; location = "Kitchen" }, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/service/kitchen, +/obj/machinery/door/window/northleft, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -72992,8 +72849,7 @@ id = "engsm"; name = "Radiation Shutters Control"; pixel_y = -24; - req_access_txt = "10"; - req_one_access = null + req_access_txt = "10" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/engine, @@ -73915,9 +73771,7 @@ /obj/structure/rack, /obj/item/toy/minimeteor, /obj/item/poster/random_contraband, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/aft) "dho" = ( @@ -74278,6 +74132,9 @@ opacity = 1 }, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot, +/obj/effect/mapping_helpers/airlock/access/any/service/hydroponics, +/obj/machinery/door/window/northleft, /turf/simulated/floor/plasteel{ icon_state = "bot" }, @@ -74796,11 +74653,6 @@ /turf/simulated/floor/plating, /area/storage/secure) "djt" = ( -/obj/machinery/door/window/eastright{ - dir = 2; - name = "Hydroponics Delivery"; - req_access_txt = "35" - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -74825,9 +74677,6 @@ /turf/simulated/wall/r_wall, /area/engine/engineering) "djw" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/alarm{ name = "north bump"; pixel_y = 24 @@ -74853,9 +74702,7 @@ "djz" = ( /obj/structure/rack, /obj/item/latexballon, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/aft) "djA" = ( @@ -75708,9 +75555,7 @@ "dli" = ( /obj/structure/disposalpipe/segment, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "dlj" = ( @@ -76162,9 +76007,7 @@ dir = 4 }, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance/two{ - color = null - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/maintenance/aft) "dms" = ( @@ -77911,7 +77754,6 @@ /obj/machinery/door/window/southright{ dir = 1; name = "AI Core Door"; - req_access = null; req_access_txt = "16" }, /turf/simulated/floor/bluegrid, @@ -115592,7 +115434,7 @@ bSu cbY ceT bSu -bQV +chf chf chf chf @@ -118354,7 +118196,7 @@ aih aih aqX aqW -akE +aqW amw avq aCh @@ -128966,7 +128808,7 @@ coj cpv crq cgs -ctF +afJ bPA bGG bGG diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index 5a63a7f36d3..40e20333ddb 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -37,8 +37,8 @@ supervisors = "the quartermaster" department_head = list("Head of Personnel") selection_color = "#eeddbe" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) - minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) outfit = /datum/outfit/job/cargo_tech /datum/outfit/job/cargo_tech @@ -63,7 +63,7 @@ supervisors = "the quartermaster" department_head = list("Head of Personnel") selection_color = "#eeddbe" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_MINING, ACCESS_MINT, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) alt_titles = list("Spelunker") outfit = /datum/outfit/job/mining diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 5506040ded8..4b264ac64f8 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -721,7 +721,7 @@ name = "Supply ID" registered_name = "Cargonian" icon_state = "cargo" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) /obj/item/card/id/engineering name = "Engineering ID" diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index cdfcb171a2f..31ed8220f57 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -229,6 +229,9 @@ /obj/effect/mapping_helpers/airlock/access/any/supply/vault access = ACCESS_HEADS_VAULT +/obj/effect/mapping_helpers/airlock/access/any/supply/mule_bot + access = ACCESS_CARGO_BOT + // -------------------- Req All (Requires ALL of the given accesses to open) // -------------------- Command access helpers /obj/effect/mapping_helpers/airlock/access/all/command @@ -437,3 +440,6 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/vault access = ACCESS_HEADS_VAULT + +/obj/effect/mapping_helpers/airlock/access/all/supply/mule_bot + access = ACCESS_CARGO_BOT diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index e7f4a5cd0c8..cf084749f8a 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -58,6 +58,7 @@ wires = new /datum/wires/mulebot(src) var/datum/job/cargo_tech/J = new/datum/job/cargo_tech access_card.access = J.get_access() + LAZYADD(access_card.access, ACCESS_CARGO_BOT) prev_access = access_card.access cell = new /obj/item/stock_parts/cell/upgraded(src)