diff --git a/code/WorkInProgress/Ported/policetape.dm b/code/WorkInProgress/Ported/policetape.dm index 15bcdcb949b..bb6db3117b7 100644 --- a/code/WorkInProgress/Ported/policetape.dm +++ b/code/WorkInProgress/Ported/policetape.dm @@ -22,7 +22,7 @@ /obj/item/tape/engineering name = "engineering tape" desc = "A length of engineering tape. Better not cross it." - req_one_access = list(access_engine,access_atmospherics) + req_access = list(access_engine,access_atmospherics) icon_base = "engineering" /obj/item/taperoll/attack_self(mob/user as mob) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 90326aaf4c9..a5d245a8bd9 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -82,28 +82,29 @@ /obj/var/list/req_access = null /obj/var/req_access_txt = "0" -/obj/var/list/req_one_access = null -/obj/var/req_one_access_txt = "0" + +/obj/var/list/req_combined_access = null +/obj/var/req_combined_access_txt = "0" /obj/New() //NOTE: If a room requires more than one access (IE: Morgue + medbay) set the req_acesss_txt to "5;6" if it requires 5 and 6 - if(src.req_access_txt) + if(req_access_txt) var/list/req_access_str = dd_text2list(req_access_txt,";") if(!req_access) req_access = list() for(var/x in req_access_str) var/n = text2num(x) if(n) - req_access += n + req_access |= n - if(src.req_one_access_txt) - var/list/req_one_access_str = dd_text2list(req_one_access_txt,";") - if(!req_one_access) - req_one_access = list() - for(var/x in req_one_access_str) + if(req_combined_access_txt) + var/list/req_access_str = dd_text2list(req_combined_access_txt,";") + if(!req_combined_access) + req_combined_access = list() + for(var/x in req_access_str) var/n = text2num(x) if(n) - req_one_access += n + req_combined_access |= n ..() @@ -133,40 +134,47 @@ var/obj/item/device/pda/pda = I I = pda.id - if(!src.req_access && !src.req_one_access) //no requirements + if(!req_access) //no requirements return 1 - if(!istype(src.req_access, /list)) //something's very wrong - return 1 - - var/list/L = src.req_access - if(!L.len && (!src.req_one_access || !src.req_one_access.len)) //no requirements + if(!istype(req_access, /list)) //something's very wrong return 1 + if(!req_access.len) //no requirements + if(!req_combined_access || !islist(req_combined_access) || !req_combined_access.len) + return 1 if(!I || !istype(I, /obj/item/weapon/card/id) || !I.access) //not ID or no access return 0 - if(src.req_one_access && src.req_one_access.len) - for(var/req in src.req_one_access) - if(req in I.access) //has an access from the single access list - return 1 - for(var/req in src.req_access) - if(!(req in I.access)) //doesn't have this access - Leave like this DMTG - return 0 - return 1 + for(var/req in req_access) + if(req in I.access) //has an access from the single access list + return 1 + if(req_combined_access && req_combined_access.len) + for(var/req in req_combined_access) + if(!req in I.access) + return 0 + return 1 + return 0 /obj/proc/check_access_list(var/list/L) - if(!src.req_access && !src.req_one_access) return 1 - if(!istype(src.req_access, /list)) return 1 - if(!src.req_access.len && (!src.req_one_access || !src.req_one_access.len)) return 1 - if(!L) return 0 - if(!istype(L, /list)) return 0 - if(src.req_one_access && src.req_one_access.len) - for(var/req in src.req_one_access) - if(req in L) //has an access from the single access list - return 1 - for(var/req in src.req_access) - if(!(req in L)) //doesn't have this access - Leave like this DMTG - return 0 - return 1 + if(!req_access) + return 1 + if(!istype(req_access, /list)) + return 1 + if(!req_access.len) + if(!req_combined_access || !islist(req_combined_access) || !req_combined_access.len) + return 1 + if(!L) + return 0 + if(!istype(L, /list)) + return 0 + for(var/req in req_access) + if(req in L) //has an access from the single access list + return 1 + if(req_combined_access && req_combined_access.len) + for(var/req in req_combined_access) + if(!req in L) + return 0 + return 1 + return 0 /proc/get_access(job) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 554df8637d8..5aecb06de1e 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -2267,8 +2267,7 @@ var/global/BSACooldown = 0 if("maint_access_engiebrig") for(var/obj/machinery/door/airlock/maintenance/M in world) if (access_maint_tunnels in M.req_access) - M.req_access = list() - M.req_one_access = list(access_brig,access_engine) + M.req_access = list(access_brig,access_engine) message_admins("[key_name_admin(usr)] made all maint doors engineering and brig access-only.") if("infinite_sec") var/datum/job/J = job_master.GetJob("Security Officer") diff --git a/maps/Antiqua.dmm b/maps/Antiqua.dmm index d0253335e0f..9d46fc27e82 100644 --- a/maps/Antiqua.dmm +++ b/maps/Antiqua.dmm @@ -179,7 +179,7 @@ "adw" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/assembly/assembly_line) "adx" = (/obj/structure/table,/obj/item/weapon/circular_saw,/obj/item/weapon/scalpel,/obj/machinery/camera{c_tag = "Assembly Line Surgery"; dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/assembly/assembly_line) "ady" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/assembly/assembly_line) -"adz" = (/obj/machinery/computer/operating{id = "robotics"; name = "Robotics Operating Computer"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/assembly/assembly_line) +"adz" = (/obj/machinery/computer/operating{name = "Robotics Operating Computer"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/assembly/assembly_line) "adA" = (/obj/machinery/sink{icon_state = "sink"; dir = 4; pixel_x = 11; pixel_y = 2},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/assembly/assembly_line) "adB" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "12"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/assembly/assembly_line) "adC" = (/obj/machinery/camera{c_tag = "Hallway Front"; dir = 4; network = "Research"},/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/toxins/hallway) @@ -207,7 +207,7 @@ "adY" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/maintenance/fore) "adZ" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/assembly/assembly_line) "aea" = (/obj/structure/table,/obj/item/device/mmi,/obj/item/device/mmi,/obj/item/device/mmi,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/assembly/assembly_line) -"aeb" = (/obj/machinery/optable{id = "robotics"; name = "Robotics Operating Table"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/assembly/assembly_line) +"aeb" = (/obj/machinery/optable{name = "Robotics Operating Table"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/assembly/assembly_line) "aec" = (/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/assembly/assembly_line) "aed" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/robot_debris,/turf/simulated/floor,/area/assembly/assembly_line) "aee" = (/obj/structure/reagent_dispensers/fueltank,/obj/machinery/light{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/assembly/assembly_line) @@ -846,7 +846,7 @@ "aqn" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/hallway/primary/fore) "aqo" = (/obj/structure/table,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "aqp" = (/obj/structure/stool/bed/chair,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) -"aqq" = (/obj/machinery/optable{id = "xenobio"; name = "Xenobiology Operating Table"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) +"aqq" = (/obj/machinery/optable{name = "Xenobiology Operating Table"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "aqr" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor,/area/toxins/xenobiology) "aqs" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/obj/machinery/shieldwallgen{req_access = list(55)},/turf/simulated/floor{icon_state = "bot"},/area/toxins/xenobiology) "aqt" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/toxins/xenobiology) @@ -871,7 +871,7 @@ "aqM" = (/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/obj/structure/table,/obj/item/device/radio/intercom{pixel_x = -25},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "aqN" = (/obj/structure/table,/obj/item/weapon/clipboard,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "aqO" = (/obj/structure/table,/obj/machinery/requests_console{department = "Xenobiology"; departmentType = 0; pixel_x = 0; pixel_y = -30},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) -"aqP" = (/obj/machinery/computer/operating{id = "xenobio"; name = "Xenobiology Operating Computer"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) +"aqP" = (/obj/machinery/computer/operating{name = "Xenobiology Operating Computer"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "aqQ" = (/obj/structure/table,/obj/item/weapon/circular_saw,/obj/machinery/light,/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "aqR" = (/obj/structure/table,/obj/item/weapon/scalpel,/obj/machinery/firealarm{dir = 2; layer = 4; pixel_x = 0; pixel_y = -25},/obj/machinery/camera{c_tag = "Xenobiology"; dir = 1; network = "Research"; pixel_x = 0},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "aqS" = (/obj/machinery/power/apc{dir = 2; name = "Xenobiology APC"; pixel_y = -25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) @@ -1599,7 +1599,7 @@ "aEM" = (/obj/machinery/computer/secure_data,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/security/checkpoint) "aEN" = (/obj/structure/table/reinforced{layer = 2},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/window/westright{dir = 2; icon_state = "right"; name = "Head of Personnel's Office"},/turf/simulated/floor,/area/security/checkpoint) "aEO" = (/obj/machinery/computer/med_data,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/security/checkpoint) -"aEP" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_command{name = "Arrivals Checkpoint"; req_access_txt = "19; 15"; req_one_access_txt = "0"},/turf/simulated/floor,/area/security/checkpoint) +"aEP" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_command{name = "Arrivals Checkpoint"; req_access_txt = "19; 15"},/turf/simulated/floor,/area/security/checkpoint) "aEQ" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/hallway/primary/port) "aER" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/item/weapon/wrench,/obj/item/device/multitool,/turf/simulated/floor{tag = "icon-yellow (NORTHWEST)"; icon_state = "yellow"; dir = 9},/area/bridge) "aES" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/table/reinforced,/turf/simulated/floor{dir = 1; icon_state = "yellow"},/area/bridge) @@ -1634,7 +1634,7 @@ "aFv" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor/plating,/area/construction/under_construction_small) "aFw" = (/obj/machinery/disposal,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/security/checkpoint) "aFx" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/checkpoint) -"aFy" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_command{name = "\improper Arrivals Checkpoint"; req_access_txt = "19; 15"; req_one_access_txt = "0"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/checkpoint) +"aFy" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_command{name = "\improper Arrivals Checkpoint"; req_access_txt = "19; 15";},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/security/checkpoint) "aFz" = (/obj/structure/disposalpipe/sortjunction{backsort = 0; backType = list(); dir = 1; icon_state = "pipe-j2s"; sortType = list("HoP Office")},/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/hallway/primary/port) "aFA" = (/obj/machinery/computer/atmos_alert,/turf/simulated/floor{dir = 8; icon_state = "yellow"},/area/bridge) "aFB" = (/obj/machinery/requests_console{announcementConsole = 1; department = "Bridge desk"; departmentType = 5; name = "Bridge RC"; pixel_x = 30; pixel_y = 0},/turf/simulated/floor,/area/bridge) @@ -1876,7 +1876,7 @@ "aKd" = (/obj/machinery/power/apc{dir = 1; name = "Station Electronics Hallway APC"; pixel_x = 0; pixel_y = 25},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload_foyer{name = "Station Electronics Hallway"}) "aKe" = (/obj/machinery/light/small/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload_foyer{name = "Station Electronics Hallway"}) "aKf" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/firealarm{pixel_y = 27},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload_foyer{name = "Station Electronics Hallway"}) -"aKg" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/machinery/door/airlock/secure{name = "Station Electronics"; req_one_access_txt = "16;61"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload_foyer{name = "Station Electronics Hallway"}) +"aKg" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/machinery/door/airlock/secure{name = "Station Electronics"; req_access_txt = "16;61"},/turf/simulated/floor{icon_state = "dark"},/area/turret_protected/ai_upload_foyer{name = "Station Electronics Hallway"}) "aKh" = (/turf/simulated/wall,/area/quartermaster/qm) "aKi" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor,/area/quartermaster/qm) "aKj" = (/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/structure/table,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor,/area/quartermaster/qm) @@ -2212,8 +2212,8 @@ "aQB" = (/turf/simulated/floor,/area/medical/medbay) "aQC" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay) "aQD" = (/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) -"aQE" = (/obj/machinery/optable{id = "medbay"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) -"aQF" = (/obj/machinery/computer/operating{id = "medbay"},/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) +"aQE" = (/obj/machinery/optable,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) +"aQF" = (/obj/machinery/computer/operating,/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) "aQG" = (/obj/effect/sign/securearea,/turf/simulated/wall/r_wall,/area/teleporter) "aQH" = (/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) "aQI" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) @@ -2673,7 +2673,7 @@ "aZu" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/chemistry) "aZv" = (/obj/machinery/chem_dispenser,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "aZw" = (/obj/structure/stool/bed/chair,/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) -"aZx" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Chemistry"; req_access_txt = "33"; req_one_access_txt = "0"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) +"aZx" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Chemistry"; req_access_txt = "33"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/chemistry) "aZy" = (/obj/structure/disposalpipe/sortjunction{backsort = 1; backType = list("Chemistry"); dir = 4; icon_state = "pipe-j2s"; sortType = list("CMO")},/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/medical/medbay) "aZz" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor,/area/medical/medbay) "aZA" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/medical/medbay) @@ -3311,7 +3311,7 @@ "blI" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "blJ" = (/obj/machinery/power/apc{dir = 4; name = "Virology APC"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "blK" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/virology) -"blL" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_medical{name = "Patient Room 1"; req_one_access_txt = "39"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) +"blL" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass/glass_medical{name = "Patient Room 1"; req_access_txt = "39"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "blM" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/virology) "blN" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/medical/virology) "blO" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/virology) diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 128d852577d..d8841f2034b 100755 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -532,7 +532,7 @@ "akl" = (/obj/structure/stool/bed/chair{dir = 1},/obj/machinery/camera{c_tag = "Courtroom South"; dir = 8; network = "SS13"},/turf/simulated/floor,/area/crew_quarters/courtroom) "akm" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fsmaint) "akn" = (/obj/machinery/atmospherics/binary/passive_gate{dir = 8; icon_state = "intact_on"; on = 1; tag = "icon-intact_off (WEST)"},/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/maintenance/fsmaint) -"ako" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Maintenance"; req_access_txt = "12;24"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/fsmaint) +"ako" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Maintenance"; req_combined_access_txt = "12;24"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "akp" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/fsmaint) "akq" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "akr" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) @@ -1063,7 +1063,7 @@ "auw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "aux" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/storage/tech) "auy" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/storage/tech) -"auz" = (/obj/machinery/door/airlock/command{name = "Secure Tech"; req_access = null; req_access_txt = "19;23"},/turf/simulated/floor/plating,/area/storage/tech) +"auz" = (/obj/machinery/door/airlock/command{name = "Secure Tech"; req_access = null; req_combined_access_txt = "19;23"},/turf/simulated/floor/plating,/area/storage/tech) "auA" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/storage/tech) "auB" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/storage/tech) "auC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/maintenance/fpmaint) @@ -1557,7 +1557,7 @@ "aDW" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 4; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aDX" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/chapel/main) "aDY" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 9; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/wall,/area/chapel/main) -"aDZ" = (/obj/machinery/door/airlock/maintenance{name = "Crematorium Maintenance"; req_access_txt = "27;12"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/chapel/main) +"aDZ" = (/obj/machinery/door/airlock/maintenance{name = "Crematorium Maintenance"; req_combined_access_txt = "27;12"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/chapel/main) "aEa" = (/obj/structure/closet/coffin,/obj/structure/window/basic{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "aEb" = (/turf/simulated/floor{dir = 9; icon_state = "carpetside"},/area/chapel/main) "aEc" = (/turf/simulated/floor{dir = 5; icon_state = "carpetside"},/area/chapel/main) @@ -1711,7 +1711,7 @@ "aGU" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/crew_quarters/theatre) "aGV" = (/turf/simulated/wall,/area/crew_quarters/theatre) "aGW" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/crew_quarters/theatre) -"aGX" = (/obj/machinery/door/airlock/maintenance{name = "Theatre Maintenance"; req_access_txt = "46;12"},/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/crew_quarters/theatre) +"aGX" = (/obj/machinery/door/airlock/maintenance{name = "Theatre Maintenance"; req_combined_access_txt = "46;12"},/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/crew_quarters/theatre) "aGY" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "aGZ" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "aHa" = (/obj/machinery/door{icon = 'icons/obj/doors/doormorgue.dmi'; name = "Crematorium Access"; req_access_txt = "27"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) @@ -1898,7 +1898,7 @@ "aKz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor,/area/hydroponics) "aKA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "greencorner"; dir = 2},/area/hydroponics) "aKB" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "green"},/area/hydroponics) -"aKC" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "35;12"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/hydroponics) +"aKC" = (/obj/machinery/door/airlock/maintenance{req_combined_access_txt = "35;12"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/hydroponics) "aKD" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/structure/disposalpipe/segment{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aKE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aKF" = (/obj/machinery/camera{c_tag = "Theatre West"; c_tag_order = 999; dir = 4},/turf/simulated/floor{icon_state = "wood"},/area/crew_quarters/theatre) @@ -2207,7 +2207,7 @@ "aQw" = (/obj/structure/table/reinforced,/obj/machinery/door/window/northleft{dir = 2; icon_state = "left"; req_access_txt = "51"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/mint) "aQx" = (/obj/structure/table/reinforced,/obj/machinery/door/window/northleft{dir = 2; icon_state = "left"; req_access_txt = "51"},/turf/simulated/floor{tag = "icon-vault (SOUTHWEST)"; icon_state = "vault"; dir = 10},/area/mint) "aQy" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/port) -"aQz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Chemical Storage Maintenance"; req_access_txt = "12;33"},/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 1; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/storage/tools) +"aQz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Chemical Storage Maintenance"; req_combined_access_txt = "12;33"},/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 1; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/storage/tools) "aQA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/storage/tools) "aQB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/closet/secure_closet/medicine,/turf/simulated/floor{icon_state = "white"},/area/storage/tools) "aQC" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/wall,/area/storage/tools) @@ -2553,7 +2553,7 @@ "aXe" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor,/area/hallway/primary/starboard) "aXf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/wall,/area/storage/auxillary) "aXg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/storage/auxillary) -"aXh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Emergency Storage"; req_access_txt = "12"; req_one_access_txt = ""},/turf/simulated/floor/plating,/area/storage/auxillary) +"aXh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{name = "Emergency Storage"; req_access_txt = "12"},/turf/simulated/floor/plating,/area/storage/auxillary) "aXi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/wall,/area/storage/auxillary) "aXj" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/hallway/primary/starboard) "aXk" = (/turf/simulated/wall,/area/hallway/primary/starboard) @@ -2646,7 +2646,7 @@ "aYT" = (/obj/machinery/camera{c_tag = "Mint Press"; dir = 4; network = "Command"},/turf/simulated/floor{icon_state = "dark"},/area/mint) "aYU" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/mint) "aYV" = (/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/mint) -"aYW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/vault{req_access_txt = "52;12"},/turf/simulated/floor/plating,/area/mint) +"aYW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/vault{req_combined_access_txt = "52;12"},/turf/simulated/floor/plating,/area/mint) "aYX" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/port) "aYY" = (/obj/machinery/conveyor{dir = 1; id = "packageSort1"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "floorgrime"},/area/quartermaster/sorting) "aYZ" = (/obj/effect/landmark/start{name = "Cargo Technician"},/turf/simulated/floor,/area/quartermaster/sorting) @@ -2694,7 +2694,7 @@ "aZP" = (/obj/item/weapon/paper{desc = "Due to spending cutbacks certin organic crewmembers have had to be replaced with synthetic analogs.
We apologise for any inconvenience caused.

Nanotrasen Finance Department"; name = "Spending Cutbacks"},/obj/item/latexballon{name = "Curly"},/turf/simulated/floor/plating,/area/crew_quarters/locker/locker_toilet) "aZQ" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/crew_quarters/locker) "aZR" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/crew_quarters/locker) -"aZS" = (/obj/machinery/door/airlock/command{name = "Mint Materials Loading"; req_access = null; req_access_txt = "12;51"},/turf/simulated/floor/plating,/area/mint) +"aZS" = (/obj/machinery/door/airlock/command{name = "Mint Materials Loading"; req_combined_access_txt = "12;51"},/turf/simulated/floor/plating,/area/mint) "aZT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/port) "aZU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor/plating,/area/maintenance/port) "aZV" = (/obj/machinery/conveyor_switch{id = "packageSort1"},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/quartermaster/sorting) @@ -2891,8 +2891,8 @@ "bdE" = (/obj/structure/table/reinforced,/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/door/window/northleft{name = "Reception Window"; req_access = null; req_access_txt = "0"},/obj/machinery/door/window/southleft{name = "Research and Development"; req_access_txt = "7"},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bdF" = (/obj/structure/table/reinforced,/obj/machinery/door/window/northright{name = "Reception Window"; req_access_txt = "0"},/obj/machinery/door/window/southright{name = "Research and Development"; req_access_txt = "7"},/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bdG" = (/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"}) -"bdH" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"; req_one_access_txt = "1"},/turf/simulated/floor,/area/medical/research{name = "Research Division"}) -"bdI" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"; req_one_access_txt = "1"},/turf/simulated/floor,/area/medical/research{name = "Research Division"}) +"bdH" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47;1"},/turf/simulated/floor,/area/medical/research{name = "Research Division"}) +"bdI" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47;1"},/turf/simulated/floor,/area/medical/research{name = "Research Division"}) "bdJ" = (/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bdK" = (/obj/effect/landmark{name = "carpspawn"},/turf/space,/area/shuttle/escape/station) "bdL" = (/obj/machinery/camera{c_tag = "Auxiliary Docking"; dir = 8; network = "Arrivals"},/turf/simulated/floor,/area/hallway/secondary/entry) @@ -3060,7 +3060,7 @@ "bgR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bgS" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 1; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bgT" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) -"bgU" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Chemistry"; req_access_txt = "33; 7"; req_one_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) +"bgU" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Chemistry"; req_combined_access_txt = "33;7"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bgV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/lab) "bgW" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/lab) "bgX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/toxins/lab) @@ -3077,12 +3077,12 @@ "bhi" = (/obj/machinery/conveyor{id = "garbage"},/obj/machinery/door/poddoor{density = 1; icon_state = "pdoor1"; id = "Disposal Exit"; name = "Disposal Exit Vent"; opacity = 1},/turf/simulated/floor/engine,/area/maintenance/disposal) "bhj" = (/obj/machinery/driver_button{id = "trash"; pixel_x = -26},/turf/simulated/floor/plating,/area/maintenance/disposal) "bhk" = (/obj/machinery/power/apc{dir = 4; name = "Disposal APC"; pixel_x = 27; pixel_y = 0},/obj/structure/cable,/turf/simulated/floor/plating,/area/maintenance/disposal) -"bhl" = (/obj/machinery/door/airlock/maintenance{name = "QM Office Maintenance"; req_access_txt = "12;31"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/port) +"bhl" = (/obj/machinery/door/airlock/maintenance{name = "QM Office Maintenance"; req_combined_access_txt = "12;31"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/port) "bhm" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor,/area/quartermaster/storage) "bhn" = (/turf/simulated/floor,/area/quartermaster/storage) "bho" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/quartermaster/storage) "bhp" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor,/area/quartermaster/storage) -"bhq" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Delivery Office"; req_access_txt = "50;31"},/turf/simulated/floor,/area/quartermaster/storage) +"bhq" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Delivery Office"; req_combined_access_txt = "50;31"},/turf/simulated/floor,/area/quartermaster/storage) "bhr" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/quartermaster/sorting) "bhs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor,/area/quartermaster/sorting) "bht" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/quartermaster/sorting) @@ -3210,8 +3210,8 @@ "bjL" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bjM" = (/obj/item/weapon/stock_parts/console_screen,/obj/structure/table,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/console_screen,/obj/item/weapon/stock_parts/matter_bin,/obj/item/weapon/stock_parts/matter_bin,/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bjN" = (/obj/effect/sign/biohazard,/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"}) -"bjO" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"; req_one_access_txt = "1"},/turf/simulated/floor,/area/medical/research{name = "Research Division"}) -"bjP" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47"; req_one_access_txt = "1"},/turf/simulated/floor,/area/medical/research{name = "Research Division"}) +"bjO" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47;1"},/turf/simulated/floor,/area/medical/research{name = "Research Division"}) +"bjP" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/research{name = "Research Division Access"; req_access_txt = "47;1"},/turf/simulated/floor,/area/medical/research{name = "Research Division"}) "bjQ" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bjR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "bjS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/effect/sign/securearea{name = "EXTERNAL AIRLOCK"; desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; pixel_x = -1},/turf/simulated/floor/plating,/area/hallway/secondary/entry) @@ -3335,7 +3335,7 @@ "bmg" = (/obj/structure/table,/obj/item/weapon/pen,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bmh" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bmi" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) -"bmj" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Morgue"; req_access_txt = "6;5"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) +"bmj" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Morgue"; req_combined_access_txt = "6;5"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "bmk" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bml" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Chemistry"; req_access_txt = "33"},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) "bmm" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) @@ -3402,7 +3402,7 @@ "bnv" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bnw" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bnx" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"bny" = (/obj/machinery/door/airlock/maintenance{name = "Research Maintenance"; req_access_txt = "12;47"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) +"bny" = (/obj/machinery/door/airlock/maintenance{name = "Research Maintenance"; req_combined_access_txt = "12;47"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) "bnz" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bnA" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bnB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/status_display{density = 0; layer = 4; supply_display = 1},/turf/simulated/floor/plating,/area/quartermaster/storage) @@ -3451,8 +3451,8 @@ "bos" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor/plating,/area/medical/medbay) "bot" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Medbay"; req_access_txt = "5"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bou" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/medical/medbay) -"bov" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5"; req_one_access_txt = "1"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"bow" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5"; req_one_access_txt = "1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"bov" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5;1"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"bow" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{id_tag = "MedbayFoyer"; name = "Medbay"; req_access_txt = "5;1"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "box" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "boy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "boz" = (/obj/machinery/door/firedoor/border_only,/obj/structure/table/reinforced,/obj/machinery/door/window/westleft{name = "Chemistry Desk"},/obj/machinery/door/window/eastright{name = "Chemistry Desk"; req_access_txt = "33"},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) @@ -3643,7 +3643,7 @@ "bsc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bsd" = (/turf/simulated/wall,/area/quartermaster/storage) "bse" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/quartermaster/storage) -"bsf" = (/obj/machinery/door/airlock/maintenance{name = "Cargo Bay Maintenance"; req_access_txt = "12;31"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/quartermaster/storage) +"bsf" = (/obj/machinery/door/airlock/maintenance{name = "Cargo Bay Maintenance"; req_combined_access_txt = "12;31"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/quartermaster/storage) "bsg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage) "bsh" = (/obj/structure/plasticflaps,/obj/machinery/conveyor{dir = 1; id = "miningToQM"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/quartermaster/storage) "bsi" = (/turf/simulated/wall,/area/quartermaster/qm) @@ -3815,7 +3815,7 @@ "bvs" = (/obj/machinery/door/airlock/glass{name = "Genetics"; req_access_txt = "9"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bvt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "Genetics Inner Shutters"; name = "Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/medical/genetics) "bvu" = (/obj/structure/disposalpipe/segment,/obj/structure/table,/obj/item/weapon/storage/diskbox,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) -"bvv" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Genetics Research"; req_access_txt = "9; 7"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) +"bvv" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Genetics Research"; req_combined_access_txt = "9; 7"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bvw" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bvx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bvy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/gasstorage) @@ -3953,7 +3953,7 @@ "bya" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint) "byb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint) "byc" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint) -"byd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/door/airlock/maintenance{name = "QM Office Maintenance"; req_access_txt = "12;41"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/qm) +"byd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/door/airlock/maintenance{name = "QM Office Maintenance"; req_combined_access_txt = "12;41"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/quartermaster/qm) "bye" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/quartermaster/qm) "byf" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/quartermaster/qm) "byg" = (/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j1s"; sortType = list("QM Office")},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/quartermaster/qm) @@ -4025,7 +4025,7 @@ "bzu" = (/obj/machinery/door/poddoor{id = "mixvent1"; name = "Mixer Room Vent"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) "bzv" = (/obj/structure/plasticflaps,/obj/machinery/conveyor{dir = 1; id = "miningToQM"},/obj/machinery/mineral/output,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/quartermaster/miningdock) "bzw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/quartermaster/miningdock) -"bzx" = (/obj/machinery/door/airlock/maintenance{name = "Mining Maintenance"; req_access_txt = "48;12"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plating,/area/quartermaster/miningdock) +"bzx" = (/obj/machinery/door/airlock/maintenance{name = "Mining Maintenance"; req_combined_access_txt = "48;12"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plating,/area/quartermaster/miningdock) "bzy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/quartermaster/miningdock) "bzz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/quartermaster/qm) "bzA" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/gas,/obj/item/clothing/glasses/meson,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor,/area/quartermaster/qm) @@ -4425,7 +4425,7 @@ "bHe" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall/r_wall,/area/atmos) "bHf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/atmos) "bHg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/wall/r_wall,/area/atmos) -"bHh" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "atmos"; name = "Airlock Window Shield"; opacity = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/atmos{name = "Atmospherics Maintenance"; req_access_txt = "12;24"},/turf/simulated/floor,/area/atmos) +"bHh" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "atmos"; name = "Airlock Window Shield"; opacity = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/airlock/atmos{name = "Atmospherics Maintenance"; req_combined_access_txt = "12;24"},/turf/simulated/floor,/area/atmos) "bHi" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 4; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall/r_wall,/area/atmos) "bHj" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r"; level = 2},/turf/simulated/wall/r_wall,/area/atmos) "bHk" = (/turf/simulated/wall/r_wall,/area/atmos) @@ -4619,7 +4619,7 @@ "bKQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/aft) "bKR" = (/obj/machinery/camera{c_tag = "Aft Primary Hallway 2"; dir = 8; network = "SS13"},/turf/simulated/floor,/area/hallway/primary/aft) "bKS" = (/obj/machinery/dispenser{pltanks = 0},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor,/area/atmos) -"bKT" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "atmos"; name = "Airlock Window Shield"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/atmos{name = "Atmospherics Maintenance"; req_access_txt = "12;24"},/turf/simulated/floor,/area/atmos) +"bKT" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "atmos"; name = "Airlock Window Shield"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/atmos{name = "Atmospherics Maintenance"; req_combined_access_txt = "12;24"},/turf/simulated/floor,/area/atmos) "bKU" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor,/area/atmos) "bKV" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/atmos) "bKW" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/atmos) @@ -4795,7 +4795,7 @@ "bOk" = (/turf/simulated/wall,/area/assembly/chargebay) "bOl" = (/obj/machinery/recharge_station,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "bot"},/area/assembly/chargebay) "bOm" = (/obj/machinery/recharge_station,/turf/simulated/floor{icon_state = "bot"},/area/assembly/chargebay) -"bOn" = (/obj/machinery/door/airlock/maintenance{name = "Assembly Line Maintenance"; req_access_txt = "12;29"},/turf/simulated/floor/plating,/area/maintenance/apmaint) +"bOn" = (/obj/machinery/door/airlock/maintenance{name = "Assembly Line Maintenance"; req_combined_access_txt = "12;29"},/turf/simulated/floor/plating,/area/maintenance/apmaint) "bOo" = (/obj/effect/showcase{icon_state = "showcase_3"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/assembly/chargebay) "bOp" = (/obj/machinery/light,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/assembly/chargebay) "bOq" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor{icon_state = "arrival"; dir = 8},/area/hallway/primary/aft) @@ -4831,7 +4831,7 @@ "bOU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/toxins/server) "bOV" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor{icon_state = "dark"},/area/toxins/server) "bOW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/toxins/server) -"bOX" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/research{name = "Research Division Storage"; req_access_txt = "47"; req_one_access_txt = "1"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"bOX" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/research{name = "Research Division Storage"; req_access_txt = "47;1"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bOY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"}) "bOZ" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology) "bPa" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/item/weapon/monkeycube_box,/obj/item/weapon/monkeycube_box,/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology) @@ -4844,7 +4844,7 @@ "bPh" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{icon_state = "manifold"; level = 2},/obj/machinery/meter,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology) "bPi" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology) "bPj" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology) -"bPk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/maintenance{name = "Xenobiology Maintenance"; req_access_txt = "55;12"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/toxins/xenobiology) +"bPk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/maintenance{name = "Xenobiology Maintenance"; req_combined_access_txt = "55;12"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/toxins/xenobiology) "bPl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/structure/disposalpipe/junction,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bPm" = (/obj/machinery/light/spot{dir = 8; layer = 2.8},/turf/simulated/floor/airless{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/area/toxins/test_area) "bPn" = (/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/airless{tag = "icon-warning (NORTH)"; icon_state = "warning"; dir = 1},/area/toxins/test_area) @@ -4956,7 +4956,7 @@ "bRp" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/apmaint) "bRq" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/apmaint) "bRr" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/apmaint) -"bRs" = (/obj/machinery/door/airlock/maintenance{name = "Assembly Line Maintenance"; req_access_txt = "12;29"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/assembly/chargebay) +"bRs" = (/obj/machinery/door/airlock/maintenance{name = "Assembly Line Maintenance"; req_combined_access_txt = "12;29"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/assembly/chargebay) "bRt" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/assembly/chargebay) "bRu" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor{icon_state = "green"; dir = 8},/area/hallway/primary/aft) "bRv" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 10; icon_state = "intact-r"; initialize_directions = 10; level = 2},/turf/simulated/wall/r_wall,/area/maintenance/asmaint) @@ -5161,7 +5161,7 @@ "bVm" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bVn" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/asmaint) "bVo" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/asmaint) -"bVp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/maintenance{name = "Medical Maintenance"; req_access_txt = "5"; req_one_access_txt = "1"},/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/medbay) +"bVp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/maintenance{name = "Medical Maintenance"; req_access_txt = "5;1"},/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/medbay) "bVq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall,/area/medical/medbay) "bVr" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/wall/r_wall,/area/medical/virology) "bVs" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 6; icon_state = "intact-r-f"; initialize_directions = 6; level = 1; name = "pipe"},/turf/simulated/wall/r_wall,/area/medical/virology) @@ -5180,7 +5180,7 @@ "bVF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bVG" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/toxins/test_area) "bVH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/aft) -"bVI" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Assembly Line Maintenance"; req_access_txt = "12;29"},/turf/simulated/floor/plating,/area/assembly/assembly_line) +"bVI" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Assembly Line Maintenance"; req_combined_access_txt = "12;29"},/turf/simulated/floor/plating,/area/assembly/assembly_line) "bVJ" = (/obj/structure/table,/obj/structure/disposalpipe/segment,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/turf/simulated/floor,/area/assembly/assembly_line) "bVK" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor,/area/assembly/assembly_line) "bVL" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/weapon/storage/firstaid/regular{empty = 1; name = "First-Aid (empty)"},/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer,/obj/item/weapon/reagent_containers/glass/beaker/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/tricordrazine,/obj/item/weapon/reagent_containers/glass/beaker/tricordrazine,/turf/simulated/floor,/area/assembly/assembly_line) @@ -5313,7 +5313,7 @@ "bYi" = (/obj/machinery/door/window/eastright{base_state = "left"; dir = 8; icon_state = "left"; name = "Assembly Line Delivery"; req_access_txt = "29"},/obj/structure/window/reinforced{dir = 1},/obj/machinery/light,/turf/simulated/floor{icon_state = "delivery"},/area/assembly/assembly_line) "bYj" = (/obj/machinery/door/window/eastright{name = "Assembly Line Delivery"; req_access_txt = "34"},/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "Assembly Line"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "bot"},/area/assembly/assembly_line) "bYk" = (/obj/machinery/light,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/hallway/primary/aft) -"bYl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering Break Room"; req_access_txt = "10"; req_one_access_txt = "24;29"},/turf/simulated/floor,/area/engine/engineering_break_room) +"bYl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/door/airlock/glass/glass_engineering{name = "Engineering Break Room"; req_access_txt = "10;24;29"},/turf/simulated/floor,/area/engine/engineering_break_room) "bYm" = (/obj/structure/stool/bed/chair/comfy/black,/obj/effect/landmark/start{name = "Station Engineer"},/turf/simulated/floor,/area/engine/engineering_break_room) "bYn" = (/obj/structure/stool/bed/chair/comfy/black,/obj/effect/landmark/start{name = "Atmospheric Technician"},/turf/simulated/floor,/area/engine/engineering_break_room) "bYo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/power/apc{dir = 4; name = "Breakroom APC"; pixel_x = 24},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/engine/engineering_break_room) @@ -5391,7 +5391,7 @@ "bZI" = (/obj/machinery/computer/operating,/turf/simulated/floor,/area/assembly/assembly_line) "bZJ" = (/obj/structure/table,/obj/item/weapon/circular_saw,/obj/item/weapon/scalpel,/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor,/area/assembly/assembly_line) "bZK" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/assembly/assembly_line) -"bZL" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Assembly Line Maintenance"; req_access_txt = "12;29"},/turf/simulated/floor/plating,/area/assembly/assembly_line) +"bZL" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{name = "Assembly Line Maintenance"; req_combined_access_txt = "12;29"},/turf/simulated/floor/plating,/area/assembly/assembly_line) "bZM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/assembly/assembly_line) "bZN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/aft) "bZO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/maintenance/aft) @@ -5759,10 +5759,10 @@ "cgM" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/engine/particle_accelerator) "cgN" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plating,/area/engine/particle_accelerator) "cgO" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-2"; tag = "90Curve"},/turf/simulated/floor/plating,/area/engine/particle_accelerator) -"cgP" = (/obj/machinery/door/airlock/external{name = "Engineering External Access"; req_access = null; req_access_txt = "10;13"},/turf/simulated/floor/plating,/area/engine/particle_accelerator) +"cgP" = (/obj/machinery/door/airlock/external{name = "Engineering External Access"; req_access = null; req_combined_access_txt = "10;13"},/turf/simulated/floor/plating,/area/engine/particle_accelerator) "cgQ" = (/turf/simulated/floor/plating,/area/engine/engineering) "cgR" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/engine/engineering) -"cgS" = (/obj/machinery/door/airlock/external{name = "Engineering External Access"; req_access = null; req_access_txt = "10;13"},/turf/simulated/floor/plating,/area/engine/engineering) +"cgS" = (/obj/machinery/door/airlock/external{name = "Engineering External Access"; req_access = null; req_combined_access_txt = "10;13"},/turf/simulated/floor/plating,/area/engine/engineering) "cgT" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst{dir = 4},/turf/simulated/shuttle/wall{tag = "icon-swall_f6"; icon_state = "swall_f6"; dir = 2},/area/shuttle/escape_pod5/station) "cgU" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"; dir = 2},/area/shuttle/escape_pod5/station) "cgV" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s10"; icon_state = "swall_s10"; dir = 2},/area/shuttle/escape_pod5/station) @@ -5858,7 +5858,7 @@ "ciH" = (/obj/machinery/field_generator,/turf/simulated/floor/plating,/area/engine/engineering) "ciI" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/engine/engineering) "ciJ" = (/obj/effect/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating,/area/engine/engineering) -"ciK" = (/obj/machinery/door/airlock/external{name = "Engineering External Access"; req_access = null; req_access_txt = "10;13"},/turf/simulated/floor/plating,/area) +"ciK" = (/obj/machinery/door/airlock/external{name = "Engineering External Access"; req_access = null; req_combined_access_txt = "10;13"},/turf/simulated/floor/plating,/area) "ciL" = (/obj/structure/cable,/turf/simulated/floor/plating/airless,/area/solar/starboard) "ciM" = (/obj/machinery/camera{c_tag = "Aft Starboard Solar Array"; dir = 2; network = "Solars"; pixel_x = 22},/turf/space,/area) "ciN" = (/obj/machinery/light,/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor,/area/engine/engineering)