diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index cf13c6193ba..f6174ef95bc 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -5209,7 +5209,7 @@ "bWi" = (/obj/item/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = -29},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/engine/break_room) "bWj" = (/obj/structure/table/reinforced,/obj/item/stack/packageWrap,/obj/item/hand_labeler,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/chief) "bWk" = (/obj/structure/table/reinforced,/obj/machinery/alarm{dir = 1; pixel_y = -24},/obj/machinery/photocopier/faxmachine{department = "Chief Engineer's Office"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/chief) -"bWl" = (/obj/machinery/modular_computer/console/preset/engineering,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/keycard_auth{pixel_x = -24},/obj/machinery/door_control{id = "engstorage"; name = "Engineering Secure Storage Control"; pixel_x = -38; pixel_y = 8; range = 100; req_access_txt = "11"},/obj/machinery/door_control{id = "transitlock"; name = "Transit Tube Lockdown Control"; pixel_x = -38; pixel_y = -8; req_access_txt = "11"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/chief) +"bWl" = (/obj/machinery/modular_computer/console/preset/engineering,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/keycard_auth{pixel_x = -24},/obj/machinery/door_control{id = "engstorage"; name = "Engineering Secure Storage Control"; pixel_x = -38; pixel_y = 8; req_access_txt = "11"},/obj/machinery/door_control{id = "transitlock"; name = "Transit Tube Lockdown Control"; pixel_x = -38; pixel_y = -8; req_access_txt = "11"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/chief) "bWm" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/chief) "bWn" = (/obj/machinery/photocopier,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/chief) "bWo" = (/obj/effect/spawner/window/reinforced,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; id_tag = "ceprivacy"; name = "CE Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/crew_quarters/chief) @@ -10775,7 +10775,7 @@ "dZk" = (/obj/machinery/computer/shuttle/sst,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_elite) "dZl" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/shuttle/syndicate_elite) "dZm" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/shuttle/syndicate_elite) -"dZn" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door_control{id = "syndicate_elite"; name = "Blast Doors"; pixel_x = -25; pixel_y = 0; range = 20; req_access_txt = "150"},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_elite"; name = "Front Hull Door"; opacity = 0; req_access_txt = "150"},/obj/structure/fans/tiny,/turf/simulated/shuttle/plating,/area/shuttle/syndicate_elite) +"dZn" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door_control{id = "syndicate_elite"; name = "Blast Doors"; pixel_x = -25; pixel_y = 0; req_access_txt = "150"},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_elite"; name = "Front Hull Door"; opacity = 0; req_access_txt = "150"},/obj/structure/fans/tiny,/turf/simulated/shuttle/plating,/area/shuttle/syndicate_elite) "dZo" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/shuttle/syndicate_elite) "dZp" = (/turf/simulated/floor/plating/airless,/area/shuttle/syndicate_elite) "dZq" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate_sit) @@ -10794,13 +10794,13 @@ "dZD" = (/obj/structure/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit) "dZE" = (/obj/structure/chair{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit) "dZF" = (/obj/machinery/light/spot{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/obj/structure/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit) -"dZG" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_sit_1"; name = "Side Hull Door"; opacity = 0; req_access_txt = "150"},/obj/docking_port/mobile{dir = 8; dwidth = 3; height = 5; id = "sit"; name = "SIT shuttle"; roundstart_move = "sit_away"; width = 11},/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "sit_arrivals"; name = "Arrivals Maintenance"; width = 11},/obj/structure/fans/tiny,/obj/machinery/door_control{id = "syndicate_sit_1"; name = "Blast Doors"; pixel_x = 0; pixel_y = -23; range = 20; req_access_txt = "150"},/turf/simulated/shuttle/plating,/area/shuttle/syndicate_sit) +"dZG" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_sit_1"; name = "Side Hull Door"; opacity = 0; req_access_txt = "150"},/obj/docking_port/mobile{dir = 8; dwidth = 3; height = 5; id = "sit"; name = "SIT shuttle"; roundstart_move = "sit_away"; width = 11},/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "sit_arrivals"; name = "Arrivals Maintenance"; width = 11},/obj/structure/fans/tiny,/obj/machinery/door_control{id = "syndicate_sit_1"; name = "Blast Doors"; pixel_x = 0; pixel_y = -23; req_access_txt = "150"},/turf/simulated/shuttle/plating,/area/shuttle/syndicate_sit) "dZH" = (/obj/structure/table,/obj/item/stack/sheet/metal,/obj/item/clothing/glasses/welding,/obj/item/weldingtool,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit) "dZI" = (/obj/structure/chair,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit) "dZJ" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/shuttle/syndicate_sit) "dZK" = (/obj/machinery/computer/shuttle/sit,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit) "dZL" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/shuttle/syndicate_sit) -"dZM" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door_control{id = "syndicate_sit_1"; name = "Blast Doors"; pixel_x = -25; pixel_y = 0; range = 20; req_access_txt = "150"},/obj/structure/fans/tiny,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_sit_1"; name = "Front Hull Door"; opacity = 0; req_access_txt = "150"},/turf/simulated/shuttle/plating,/area/shuttle/syndicate_sit) +"dZM" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door_control{id = "syndicate_sit_1"; name = "Blast Doors"; pixel_x = -25; pixel_y = 0; req_access_txt = "150"},/obj/structure/fans/tiny,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_sit_1"; name = "Front Hull Door"; opacity = 0; req_access_txt = "150"},/turf/simulated/shuttle/plating,/area/shuttle/syndicate_sit) "dZN" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/shuttle/syndicate_sit) "dZO" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 8; icon_state = "redcorner"},/area/maintenance/fsmaint) "dZP" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 2; icon_state = "redfull"; tag = "icon-redfull (NORTHWEST)"},/area/maintenance/fsmaint) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index efb346a3ca1..718ed329098 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -24,7 +24,7 @@ "ax" = (/obj/effect/decal/remains/robot{icon_state = "gib5"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/ruin/space/ancientstation/hivebot) "ay" = (/obj/structure/shuttle/engine/large{icon_state = "large_engine"; dir = 4},/turf/simulated/wall,/area/ruin/space/ancientstation/hivebot) "az" = (/turf/simulated/wall/rust,/area/ruin/space/ancientstation) -"aA" = (/obj/structure/table,/obj/effect/decal/cleanable/dirt,/obj/machinery/door_control{id = "ancient"; name = "Charlie Station Lockdown Button"; range = 30},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/comm) +"aA" = (/obj/structure/table,/obj/effect/decal/cleanable/dirt,/obj/machinery/door_control{id = "ancient"; name = "Charlie Station Lockdown Button"},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/comm) "aB" = (/obj/effect/decal/cleanable/dirt,/obj/structure/chair{dir = 1},/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/comm) "aC" = (/obj/structure/table,/obj/effect/decal/cleanable/dirt,/obj/item/toy/cards/deck,/obj/item/folder/blue,/obj/item/pen,/turf/simulated/floor/plasteel,/area/ruin/space/ancientstation/comm) "aD" = (/obj/machinery/door/airlock/highsecurity,/turf/simulated/floor/plating,/area/ruin/space/ancientstation/hivebot) diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm index 6a466c481d0..5621fc3907b 100644 --- a/_maps/map_files/RandomZLevels/terrorspiders.dmm +++ b/_maps/map_files/RandomZLevels/terrorspiders.dmm @@ -1138,8 +1138,8 @@ "vT" = (/obj/machinery/computer/crew,/turf/simulated/floor/plasteel,/area/awaymission/UO71/bridge) "vU" = (/obj/structure/disposaloutlet{dir = 8},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/plating/airless/asteroid,/area/awaymission/UO71/outside) "vV" = (/obj/machinery/computer/monitor,/turf/simulated/floor/plasteel,/area/awaymission/UO71/bridge) -"vW" = (/obj/structure/table,/obj/machinery/door_control{desc = "A remote control-switch for heavy lockdown doors."; id = "UO71_Queen"; name = "Terror Queen Containment Doors"; pixel_x = 0; pixel_y = -2; req_access_txt = "271"; wires = 1},/turf/simulated/floor/plasteel,/area/awaymission/UO71/bridge) -"vX" = (/obj/structure/table,/obj/machinery/door_control{desc = "A remote control-switch for heavy lockdown doors."; id = "UO71_Containment"; name = "Science Containment Doors"; pixel_x = 0; pixel_y = -2; req_access_txt = "271"; wires = 1},/turf/simulated/floor/plasteel,/area/awaymission/UO71/bridge) +"vW" = (/obj/structure/table,/obj/machinery/door_control{desc = "A remote control-switch for heavy lockdown doors."; id = "UO71_Containment"; name = "Science Containment Doors"; pixel_x = 0; pixel_y = -2; req_access_txt = "271"; wires = 1},/turf/simulated/floor/plasteel,/area/awaymission/UO71/bridge) +"vX" = (/obj/structure/table,/obj/machinery/door_control{desc = "A remote control-switch for heavy lockdown doors."; id = "UO71_Queen"; name = "Terror Queen Containment Doors"; pixel_x = 0; pixel_y = -2; req_access_txt = "271"; wires = 1},/turf/simulated/floor/plasteel,/area/awaymission/UO71/bridge) "vY" = (/obj/structure/table,/obj/machinery/door_control{desc = "A remote control-switch for heavy lockdown doors."; id = "UO71_Armory"; name = "Armory Doors"; pixel_x = 0; pixel_y = -2; req_access_txt = "271"; wires = 1},/turf/simulated/floor/plasteel,/area/awaymission/UO71/bridge) "vZ" = (/obj/structure/grille,/obj/structure/window/full/reinforced,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/awaymission/UO71/centralhall) "wa" = (/obj/machinery/conveyor{dir = 2; id = "UO71_mining"},/obj/effect/decal/warning_stripes/east,/turf/simulated/floor/plating,/area/awaymission/UO71/mining) @@ -1424,7 +1424,7 @@ aaaaaaaaaaaaaaabababababababababababababababababababababababababababfNtGtFpCpHnI aaaaaaaaaaaaaaabababababababababababababababababababababababababababfOufuiolomomujulukunqgukuouqupqiqxukuwusutsarruyuxrrrruxuzsgsaababfefeuDuAfefeqRfbuFuEfbababababababababnTuBuCuGnpnpuHuJuInprfuMuLrAuNuQrCuSuRuTnTabababababababababababababaaaaaaaaaaaaaa aaaaaaaaaaaaaaabababababababababababababababababababababababababababfNrPrRrSfOfOfOfOqapVpXpXqauZuVpXfNfNfNfNabsarrrrrrsdrrrrsgrrsaababuWfefefefeqArzvbuFuEfbababababababababnTvdvcvisknpqyvjqynpnpvkvfnpvgvhnTvgvhnTnTabababababababababababababaaaaaaaaaaaaaa aaaaaaaaaaaaaaabababababababababababababababababababababababababababfOsEvmtpfOabababqavqvpvsvrqJvtpXabababababsarrsdrrsdrrsdrrrrsaababuWuWuWvurqvvrDfbvyuEfbababababababababnpvBvzvCtitJtitovIvAuhumuunpvEvFnpvGvHnpababababababababababababababaaaaaaaaaaaaaa -aaaaaaaaaaaaaaabababababababababababababababababababababababababababfOuvuKuOfNabababqavRvQqJqJqJvSvOabababababsavTsgvVrrsdvXvWvYsaababuWuWvUvZwbrTwcfewewdfbababababababababnpwfuPwhwgwjuUuXwkwrwqqVuYnpwlwmnpwnwonpababababababababababababababaaaaaaaaaaaaaa +aaaaaaaaaaaaaaabababababababababababababababababababababababababababfOuvuKuOfNabababqavRvQqJqJqJvSvOabababababsavTsgvVrrsdvWvXvYsaababuWuWvUvZwbrTwcfewewdfbababababababababnpwfuPwhwgwjuUuXwkwrwqqVuYnpwlwmnpwnwonpababababababababababababababaaaaaaaaaaaaaa aaaaaaaaaaaaaaabababababababababababababababababababababababababababfOfOfNfNfOabababqawwwtqJqJqJwxqaabababababsarrwyrrrrrrwzwyrrsaabababwuwvwvwvwuwAwvwCwBwvababababababababnTwEvavewFwIvnwKwJrGvovwvxnpnpnpnpnpnpnpababababababababababababababaaaaaaaaaaaaaa aaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababqawPwOwRwQwTwSqaabababababsawUrrvDwXrrwVrrwUsaabababwuwZwYxawWvJvKyLxdwvababababababababnTnTnpxgxfxhnTnpnTnTnpnpnTnTababababababababababababababababababababaaaaaaaaaaaaaa aaaaaaaaaaaaaaabababababababababababababababababababababababababababababababababababqaqaqaqaqaqaqaqaabababababsasasasasasasasasasaabababwuxjxixlxkxnxmxpxowvabababababababababnpxqxsxrxtnpxunpabababababababababababababababababababababababababaaaaaaaaaaaaaa diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index db69c96ca7a..64273e6093d 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -254,7 +254,7 @@ "aeT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/structure/sink{pixel_y = 32},/turf/simulated/floor/plasteel{tag = "icon-whiteblue (NORTH)"; icon_state = "whiteblue"; dir = 1},/area/security/medbay) "aeU" = (/obj/structure/filingcabinet/chestdrawer,/obj/machinery/light{dir = 8},/obj/machinery/light_switch{pixel_x = -25},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{dir = 8; icon_state = "darkred"},/area/security/warden) "aeV" = (/obj/machinery/computer/security{network = list("SS13","Research Outpost","Mining Outpost")},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/item/radio/intercom{broadcasting = 0; name = "station intercom (General)"; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) -"aeW" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/door_control{desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = -28; pixel_y = 7; range = 100; req_access_txt = "2"},/obj/machinery/door_control{id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = -28; pixel_y = -3; range = 50; req_access_txt = "2"},/obj/machinery/door_control{id = "hosofficedoor"; name = "Office Door"; normaldoorcontrol = 1; pixel_x = -28; pixel_y = 17; req_access_txt = "58"},/turf/simulated/floor/carpet,/area/security/hos) +"aeW" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/door_control{desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = -28; pixel_y = 7; req_access_txt = "2"},/obj/machinery/door_control{id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = -28; pixel_y = -3; req_access_txt = "2"},/obj/machinery/door_control{id = "hosofficedoor"; name = "Office Door"; normaldoorcontrol = 1; pixel_x = -28; pixel_y = 17; req_access_txt = "58"},/turf/simulated/floor/carpet,/area/security/hos) "aeX" = (/obj/effect/decal/warning_stripes/east,/obj/machinery/suit_storage_unit/security/pod_pilot,/turf/simulated/floor/plasteel,/area/security/podbay) "aeY" = (/obj/effect/spawner/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/plating,/area/security/prisonershuttle) "aeZ" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prisonershuttle) @@ -269,7 +269,7 @@ "afi" = (/obj/machinery/sleeper,/obj/item/radio/intercom{dir = 8; name = "station intercom (General)"; pixel_x = 28},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)"},/area/security/medbay) "afj" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "white"},/area/security/medbay) "afk" = (/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/machinery/power/apc{cell_type = 5000; dir = 8; name = "west bump Important Area"; pixel_x = -24; shock_proof = 0},/obj/machinery/photocopier,/turf/simulated/floor/plasteel{dir = 8; icon_state = "darkred"},/area/security/warden) -"afl" = (/obj/machinery/door_control{id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = 3; pixel_y = -28; range = 30; req_access_txt = "2"},/obj/machinery/door_control{desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = -7; pixel_y = -28; range = 50; req_access_txt = "2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) +"afl" = (/obj/machinery/door_control{id = "Secure Gate"; name = "Brig Lockdown"; pixel_x = 3; pixel_y = -28; req_access_txt = "2"},/obj/machinery/door_control{desc = "A remote control-switch to lock down the prison wing's blast doors"; id = "Prison Gate"; name = "Prison Wing Lockdown"; pixel_x = -7; pixel_y = -28; req_access_txt = "2"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/warden) "afm" = (/obj/structure/grille,/obj/structure/sign/securearea{pixel_x = -30},/turf/simulated/floor/plating/airless,/area/space) "afn" = (/obj/structure/chair{dir = 8},/obj/effect/landmark/start{name = "Brig Physician"},/turf/simulated/floor/plasteel,/area/security/main) "afo" = (/obj/effect/spawner/window/reinforced,/turf/simulated/floor/plating,/area/security/prisonershuttle) @@ -959,7 +959,7 @@ "asw" = (/obj/machinery/computer/security{network = list("SS13","Research Outpost","Mining Outpost")},/obj/machinery/computer/security/telescreen{desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; network = list("Prison"); pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel,/area/security/permabrig) "asx" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/permabrig) "asy" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4},/obj/item/radio/intercom{dir = 0; name = "station intercom (General)"; pixel_x = 0; pixel_y = -28},/turf/simulated/floor/plasteel{dir = 8; icon_state = "darkredcorners"},/area/security/brig) -"asz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/door_control{id = "Prison Cell 1 Lockdown"; name = "Prison Cell 1 Lockdown"; pixel_x = -24; pixel_y = 24; range = 5; req_access_txt = "2"},/obj/machinery/flasher_button{id = "permaflash1"; name = "Prison Cell 1 Flasher"; pixel_x = -24; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/permabrig) +"asz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/door_control{id = "Prison Cell 1 Lockdown"; name = "Prison Cell 1 Lockdown"; pixel_x = -24; pixel_y = 24; req_access_txt = "2"},/obj/machinery/flasher_button{id = "permaflash1"; name = "Prison Cell 1 Flasher"; pixel_x = -24; pixel_y = 32},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/permabrig) "asA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "darkredcorners"},/area/security/brig) "asB" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/security/glass{name = "Solitary Confinement"; req_access_txt = "2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plating,/area/security/permabrig) "asC" = (/obj/machinery/camera{c_tag = "Brig Prison Hallway East"; dir = 4; network = list("Prison","SS13")},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/item/radio/intercom{dir = 8; name = "station intercom (General)"; pixel_x = -28; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 8; icon_state = "darkred"},/area/security/permabrig) @@ -984,7 +984,7 @@ "asV" = (/turf/space,/turf/simulated/shuttle/wall{tag = "icon-swall_f10"; icon_state = "swall_f10"; dir = 2},/area/shuttle/siberia) "asW" = (/obj/structure/grille,/obj/structure/window/full/shuttle{icon_state = "window8"},/turf/simulated/floor/plating,/area/shuttle/siberia) "asX" = (/obj/machinery/computer/secure_data,/turf/simulated/floor/plasteel{dir = 10; icon_state = "darkred"},/area/security/lobby) -"asY" = (/obj/structure/chair/office/dark,/obj/item/radio/intercom{dir = 0; name = "station intercom (General)"; pixel_x = -28; pixel_y = -28},/obj/item/radio/intercom/department/security{pixel_x = 28; pixel_y = -28},/obj/machinery/door_control{desc = "A remote control switch for the brig foyer."; id = "BrigEast"; name = "Brig Foyer East Doors"; normaldoorcontrol = 1; pixel_x = 5; pixel_y = -35; range = 10; req_access_txt = "63"},/obj/machinery/door_control{desc = "A remote control switch for the brig foyer."; id = "BrigRight"; name = "Brig Foyer Right Doors"; normaldoorcontrol = 1; pixel_x = 5; pixel_y = -25; range = 10; req_access_txt = "63"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door_control{desc = "A remote control switch for the brig foyer."; id = "BrigLeft"; name = "Brig Foyer Left Doors"; normaldoorcontrol = 1; pixel_x = -5; pixel_y = -25; range = 10; req_access_txt = "63"},/turf/simulated/floor/plasteel{dir = 6; icon_state = "darkred"},/area/security/lobby) +"asY" = (/obj/structure/chair/office/dark,/obj/item/radio/intercom{dir = 0; name = "station intercom (General)"; pixel_x = -28; pixel_y = -28},/obj/item/radio/intercom/department/security{pixel_x = 28; pixel_y = -28},/obj/machinery/door_control{desc = "A remote control switch for the brig foyer."; id = "BrigEast"; name = "Brig Foyer East Doors"; normaldoorcontrol = 1; pixel_x = 5; pixel_y = -35; req_access_txt = "63"},/obj/machinery/door_control{desc = "A remote control switch for the brig foyer."; id = "BrigRight"; name = "Brig Foyer Right Doors"; normaldoorcontrol = 1; pixel_x = 5; pixel_y = -25; req_access_txt = "63"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door_control{desc = "A remote control switch for the brig foyer."; id = "BrigLeft"; name = "Brig Foyer Left Doors"; normaldoorcontrol = 1; pixel_x = -5; pixel_y = -25; req_access_txt = "63"},/turf/simulated/floor/plasteel{dir = 6; icon_state = "darkred"},/area/security/lobby) "asZ" = (/obj/structure/cable,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/obj/effect/spawner/window/reinforced,/turf/simulated/floor/plating,/area/security/prison/cell_block/A) "ata" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "bcarpet05"},/area/security/prison/cell_block/A) "atb" = (/obj/structure/closet/secure_closet/brig{id = "Cell 1"; name = "Cell 1 Locker"},/turf/simulated/floor/plasteel{icon_state = "bcarpet05"},/area/security/prison/cell_block/A) @@ -1194,7 +1194,7 @@ "awX" = (/obj/structure/table,/obj/item/wrench,/obj/item/screwdriver,/obj/item/reagent_containers/spray/cleaner,/obj/machinery/light,/obj/machinery/camera/motion{c_tag = "Prison Lobby"; dir = 1; network = list("Prison","SS13")},/obj/machinery/light_switch{pixel_x = -5; pixel_y = -25},/turf/simulated/floor/plasteel,/area/security/permabrig) "awY" = (/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/plating,/area/security/permabrig) "awZ" = (/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/permabrig) -"axa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/door_control{id = "Prison Lockdown 2"; name = "Prison Cell 2 Lockdown"; pixel_x = -24; pixel_y = -24; range = 5; req_access_txt = "2"},/obj/machinery/flasher_button{id = "permaflash2"; name = "Prison Cell 2 Flasher"; pixel_x = -24; pixel_y = -32},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/permabrig) +"axa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/door_control{id = "Prison Lockdown 2"; name = "Prison Cell 2 Lockdown"; pixel_x = -24; pixel_y = -24; req_access_txt = "2"},/obj/machinery/flasher_button{id = "permaflash2"; name = "Prison Cell 2 Flasher"; pixel_x = -24; pixel_y = -32},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/permabrig) "axb" = (/turf/simulated/wall/r_wall,/area/security/execution) "axc" = (/obj/effect/spawner/window/reinforced,/obj/structure/cable,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "Prison Gate"; name = "Prison Lockdown Blast Doors"; opacity = 0},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "open"; id_tag = "Execution Shutter"; name = "Execution Decency Shutter"; opacity = 0},/turf/simulated/floor/plating,/area/security/execution) "axd" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/security{name = "Execution Room"; req_access = null; req_access_txt = "1"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "Prison Gate"; name = "Prison Lockdown Blast Doors"; opacity = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/execution) @@ -1264,7 +1264,7 @@ "ayp" = (/obj/structure/chair{dir = 4},/turf/simulated/floor/plasteel{icon_state = "redcorner"; dir = 4},/area/security/processing) "ayq" = (/obj/structure/table,/obj/item/taperecorder{pixel_y = 0},/turf/simulated/floor/plasteel,/area/security/processing) "ayr" = (/obj/machinery/embedded_controller/radio/airlock/airlock_controller{frequency = 1450; id_tag = "dorms_maint"; pixel_x = 0; pixel_y = -25; req_access_txt = "13"; tag_airpump = "dorms_pump"; tag_chamber_sensor = "dorms_sensor"; tag_exterior_door = "dorms_maint_outer"; tag_interior_door = "dorms_maint_inner"},/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1450; id_tag = "dorms_pump"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) -"ays" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_sit_1"; name = "Side Hull Door"; opacity = 0; req_access_txt = "150"},/obj/docking_port/mobile{dir = 8; dwidth = 3; height = 5; id = "sit"; name = "SIT shuttle"; roundstart_move = "sit_away"; width = 11},/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "sit_arrivals"; name = "Cyberiad Arrivals"; width = 11},/obj/structure/fans/tiny,/obj/machinery/door_control{id = "syndicate_sit_1"; name = "Blast Doors"; pixel_x = 0; pixel_y = -23; range = 20; req_access_txt = "150"},/turf/simulated/shuttle/plating,/area/shuttle/syndicate_sit) +"ays" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_sit_1"; name = "Side Hull Door"; opacity = 0; req_access_txt = "150"},/obj/docking_port/mobile{dir = 8; dwidth = 3; height = 5; id = "sit"; name = "SIT shuttle"; roundstart_move = "sit_away"; width = 11},/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "sit_arrivals"; name = "Cyberiad Arrivals"; width = 11},/obj/structure/fans/tiny,/obj/machinery/door_control{id = "syndicate_sit_1"; name = "Blast Doors"; pixel_x = 0; pixel_y = -23; req_access_txt = "150"},/turf/simulated/shuttle/plating,/area/shuttle/syndicate_sit) "ayt" = (/obj/structure/table,/obj/item/storage/box/evidence,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/item/pen,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/evidence) "ayu" = (/obj/machinery/biogenerator,/turf/simulated/floor/plasteel,/area/security/permabrig) "ayv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor/plasteel,/area/security/permabrig) @@ -1348,7 +1348,7 @@ "azV" = (/obj/effect/spawner/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor/plating,/area/security/prisonershuttle) "azW" = (/obj/structure/closet/secure_closet/brig{id = "Cell 5"; name = "Cell 5 Locker"},/obj/machinery/camera{c_tag = "Brig Cell 5"; dir = 2; network = list("SS13")},/obj/effect/decal/cleanable/cobweb2,/turf/simulated/floor/plasteel,/area/security/prison/cell_block/A) "azX" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4; level = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/interrogation) -"azY" = (/obj/machinery/door_control{id = "Interrogation"; name = "Interrogation Privacy Shutter"; pixel_x = -28; pixel_y = -3; range = 20; req_access_txt = "2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5; level = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/interrogation) +"azY" = (/obj/machinery/door_control{id = "Interrogation"; name = "Interrogation Privacy Shutter"; pixel_x = -28; pixel_y = -3; req_access_txt = "2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5; level = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/interrogation) "azZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/interrogation) "aAa" = (/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aAb" = (/obj/structure/chair/stool/bar,/turf/simulated/floor/wood{broken = 1; icon_state = "wood-broken"},/area/maintenance/abandonedbar) @@ -1434,7 +1434,7 @@ "aBD" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_elite) "aBE" = (/obj/effect/spawner/window/reinforced,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10; initialize_directions = 10},/turf/simulated/floor/plating,/area/solar/auxport) "aBF" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 4; frequency = 1379; id_tag = "solar_tool_pump"},/obj/machinery/airlock_sensor{frequency = 1379; id_tag = "solar_tool_sensor"; pixel_x = 25; pixel_y = 12},/obj/machinery/embedded_controller/radio/airlock/airlock_controller{tag_airpump = "solar_tool_pump"; tag_exterior_door = "solar_tool_outer"; frequency = 1379; id_tag = "solar_tool_airlock"; tag_interior_door = "solar_tool_inner"; pixel_x = 25; req_access_txt = "13"; tag_chamber_sensor = "solar_tool_sensor"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/solar/auxport) -"aBG" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door_control{id = "syndicate_sit_1"; name = "Blast Doors"; pixel_x = -25; pixel_y = 0; range = 20; req_access_txt = "150"},/obj/structure/fans/tiny,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_sit_1"; name = "Front Hull Door"; opacity = 0; req_access_txt = "150"},/turf/simulated/shuttle/plating,/area/shuttle/syndicate_sit) +"aBG" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door_control{id = "syndicate_sit_1"; name = "Blast Doors"; pixel_x = -25; pixel_y = 0; req_access_txt = "150"},/obj/structure/fans/tiny,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_sit_1"; name = "Front Hull Door"; opacity = 0; req_access_txt = "150"},/turf/simulated/shuttle/plating,/area/shuttle/syndicate_sit) "aBH" = (/obj/item/soap,/obj/machinery/light/small{tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/security/permabrig) "aBI" = (/obj/structure/bed,/obj/item/bedsheet/brown,/turf/simulated/floor/plasteel{icon_state = "bcarpet05"},/area/security/permabrig) "aBJ" = (/obj/structure/table,/obj/machinery/kitchen_machine/microwave,/obj/machinery/ai_status_display{pixel_y = -32},/turf/simulated/floor/plasteel,/area/security/permabrig) @@ -1585,7 +1585,7 @@ "aEy" = (/obj/item/poster/random_contraband,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aEz" = (/obj/structure/table/wood,/obj/structure/mirror{pixel_x = -28},/obj/item/storage/pill_bottle/random_drug_bottle,/turf/simulated/floor/plating,/area/maintenance/abandonedbar) "aEA" = (/obj/effect/spawner/window/reinforced,/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plating,/area/maintenance/fpmaint2) -"aEB" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door_control{id = "syndicate_elite"; name = "Blast Doors"; pixel_x = -25; pixel_y = 0; range = 20; req_access_txt = "150"},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_elite"; name = "Front Hull Door"; opacity = 0; req_access_txt = "150"},/obj/structure/fans/tiny,/turf/simulated/shuttle/plating,/area/shuttle/syndicate_elite) +"aEB" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door_control{id = "syndicate_elite"; name = "Blast Doors"; pixel_x = -25; pixel_y = 0; req_access_txt = "150"},/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "syndicate_elite"; name = "Front Hull Door"; opacity = 0; req_access_txt = "150"},/obj/structure/fans/tiny,/turf/simulated/shuttle/plating,/area/shuttle/syndicate_elite) "aEC" = (/obj/structure/chair/stool,/turf/simulated/floor/plating,/area/solar/auxport) "aED" = (/obj/machinery/power/terminal,/obj/machinery/light/small{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/solar/auxport) "aEE" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor/plating,/area/solar/auxport) @@ -2466,7 +2466,7 @@ "aVv" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4; level = 1},/turf/simulated/floor/plasteel,/area/crew_quarters/dorms) "aVw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/machinery/camera{c_tag = "Dormitory East"; dir = 8; network = list("SS13")},/turf/simulated/floor/plasteel{icon_state = "neutralcorner"; dir = 2},/area/crew_quarters/dorms) "aVx" = (/obj/item/twohanded/required/kirbyplants,/obj/machinery/light{dir = 1; in_use = 1},/obj/structure/closet/walllocker/emerglocker/north,/turf/simulated/floor/plasteel{tag = "icon-whiteblue (NORTHEAST)"; icon_state = "whiteblue"; dir = 5},/area/medical/reception) -"aVy" = (/obj/structure/table/glass,/obj/item/hand_labeler,/obj/item/reagent_containers/spray/cleaner{desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner"},/obj/machinery/door_control{desc = "A remote control switch for the medbay foyer."; id = "imnotmakingyoulubepissoff"; name = "Chemistry Privacy Shutter Control"; normaldoorcontrol = 0; pixel_x = 0; pixel_y = 26; range = 1},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteyellow"},/area/medical/chemistry) +"aVy" = (/obj/structure/table/glass,/obj/item/hand_labeler,/obj/item/reagent_containers/spray/cleaner{desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner"},/obj/machinery/door_control{desc = "A remote control switch for the medbay foyer."; id = "imnotmakingyoulubepissoff"; name = "Chemistry Privacy Shutter Control"; normaldoorcontrol = 0; pixel_x = 0; pixel_y = 26},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whiteyellow"},/area/medical/chemistry) "aVz" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plasteel,/area/crew_quarters/dorms) "aVA" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fsmaint2) "aVB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/door_control{id = "maint2"; name = "Blast Control Door B"; pixel_x = -28; pixel_y = 4},/obj/machinery/door_control{id = "maint1"; name = "Blast Control Door A"; pixel_x = -28; pixel_y = -6},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/maintenance/fsmaint2) @@ -4647,7 +4647,7 @@ "bLs" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel,/area/hallway/primary/central/se) "bLt" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{tag = "icon-whitebluefull"; icon_state = "whitebluefull"},/area/medical/paramedic) "bLu" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor,/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "Biohazard_medi"; name = "Quarantine Lockdown"; opacity = 0},/obj/machinery/computer/med_data,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteblue"; tag = "icon-whitehall (WEST)"},/area/medical/reception) -"bLv" = (/obj/machinery/door_control{desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyerPort"; name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = 24; pixel_y = 32; range = 6},/obj/structure/chair/office/light{dir = 4},/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor/plasteel{tag = "icon-whitebluefull"; icon_state = "whitebluefull"},/area/medical/reception) +"bLv" = (/obj/machinery/door_control{desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyerPort"; name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = 24; pixel_y = 32},/obj/structure/chair/office/light{dir = 4},/obj/effect/landmark/start{name = "Chemist"},/turf/simulated/floor/plasteel{tag = "icon-whitebluefull"; icon_state = "whitebluefull"},/area/medical/reception) "bLw" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6; level = 1},/turf/simulated/floor/plasteel{tag = "icon-whitebluefull"; icon_state = "whitebluefull"},/area/medical/paramedic) "bLx" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10; initialize_directions = 10; level = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/plasteel{tag = "icon-whitebluefull"; icon_state = "whitebluefull"},/area/medical/reception) "bLy" = (/turf/simulated/floor/plasteel{tag = "icon-whitebluecorner (WEST)"; icon_state = "whitebluecorner"; dir = 8},/area/medical/reception) @@ -5033,7 +5033,7 @@ "bSO" = (/obj/effect/decal/warning_stripes/southwestcorner,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"; tag = "icon-whitebluecorner"},/area/medical/medbay2) "bSP" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitebluecorner"; tag = "icon-whitebluecorner"},/area/medical/medbay2) "bSQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8; initialize_directions = 11; level = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) -"bSR" = (/obj/machinery/door_control{desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyerPort"; name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = -26; pixel_y = 25; range = 3; req_access_txt = null},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"; tag = "icon-whitebluecorner"},/area/medical/medbay2) +"bSR" = (/obj/machinery/door_control{desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyerPort"; name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_x = -26; pixel_y = 25; req_access_txt = null},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"; tag = "icon-whitebluecorner"},/area/medical/medbay2) "bSS" = (/obj/machinery/camera{c_tag = "Medbay Corridor Center"; network = list("SS13")},/obj/machinery/requests_console{department = "Medbay"; departmentType = 1; name = "Medbay Requests Console"; pixel_x = 0; pixel_y = 30; pixel_z = 0},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"; tag = "icon-whitebluecorner"},/area/medical/medbay2) "bST" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/turf/simulated/floor/plasteel,/area/assembly/chargebay) "bSU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whitebluecorner"; tag = "icon-whitebluecorner"},/area/medical/medbay2) @@ -5225,7 +5225,7 @@ "bWy" = (/obj/effect/spawner/window/reinforced,/turf/simulated/floor/plating,/area/medical/cryo) "bWz" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"; tag = "icon-whitebluecorner"},/area/medical/medbay2) "bWA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay2) -"bWB" = (/obj/structure/table/reinforced,/obj/item/wrench,/obj/item/crowbar,/obj/item/reagent_containers/spray/cleaner,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable,/obj/machinery/door_control{desc = "A remote control switch for the medbay foyer."; id = "CloningDoor"; name = "Cloning Doors Control"; normaldoorcontrol = 1; pixel_x = 0; pixel_y = -36; range = 3},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/genetics_cloning) +"bWB" = (/obj/structure/table/reinforced,/obj/item/wrench,/obj/item/crowbar,/obj/item/reagent_containers/spray/cleaner,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/cable,/obj/machinery/door_control{desc = "A remote control switch for the medbay foyer."; id = "CloningDoor"; name = "Cloning Doors Control"; normaldoorcontrol = 1; pixel_x = 0; pixel_y = -36},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/genetics_cloning) "bWC" = (/obj/machinery/computer/cloning,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/genetics_cloning) "bWD" = (/obj/machinery/dna_scannernew,/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/genetics_cloning) "bWE" = (/obj/machinery/portable_atmospherics/canister/oxygen{name = "Canister: \[O2] (CRYO)"},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/eastright{dir = 1; icon_state = "left"; name = "Cryo Tank Storage"; req_access_txt = "0"; req_one_access_txt = "5;32"},/obj/machinery/atmospherics/unary/portables_connector{dir = 1},/turf/simulated/floor/plasteel{icon_state = "freezerfloor"},/area/medical/genetics_cloning) diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm index af0164be297..6e739834ab5 100644 --- a/_maps/map_files/cyberiad/z2.dmm +++ b/_maps/map_files/cyberiad/z2.dmm @@ -699,11 +699,11 @@ "nF" = (/obj/machinery/computer/shuttle/sit,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "nG" = (/turf/unsimulated/floor{icon_state = "greencorner"; dir = 1},/area/centcom/control) "nH" = (/turf/unsimulated/floor{icon_state = "green"; dir = 4},/area/centcom/control) -"nI" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "sit_ready"; name = "SIT Base Access"; pixel_x = -6; pixel_y = 6; range = 30; req_access_txt = "153"},/obj/machinery/door_control{id = "sit_tele"; name = "SIT Teleporter Access"; pixel_x = 6; pixel_y = 6; req_access_txt = "153"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"nI" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "sit_ready"; name = "SIT Base Access"; pixel_x = -6; pixel_y = 6; req_access_txt = "153"},/obj/machinery/door_control{id = "sit_tele"; name = "SIT Teleporter Access"; pixel_x = 6; pixel_y = 6; req_access_txt = "153"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "nJ" = (/obj/machinery/door/poddoor{id_tag = "ASSAULT0"; name = "Launch Bay #0"},/turf/unsimulated/floor{name = "plating"},/area/centcom/specops) "nK" = (/obj/machinery/camera{c_tag = "CentComm Special Ops. Assault Armor South"; dir = 1; network = list("ERT","CentComm")},/obj/effect/decal/warning_stripes/yellow/partial{dir = 8},/obj/effect/decal/warning_stripes/arrow{dir = 8},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nL" = (/obj/machinery/computer/shuttle/sst,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"nM" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "sst_armory"; name = "SST Extra Weapons"; pixel_x = -6; pixel_y = -4; req_access_txt = "153"},/obj/machinery/door_control{id = "sst_ready"; name = "SST Base Access"; pixel_x = -6; pixel_y = 6; range = 30; req_access_txt = "153"},/obj/machinery/door_control{id = "sst_tele"; name = "SST Teleporter Access"; pixel_x = 6; pixel_y = 6; req_access_txt = "153"},/obj/machinery/door_control{id = "sst_mechbay"; name = "SST Mech Bay"; pixel_x = 6; pixel_y = -4; req_access_txt = "153"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"nM" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "sst_armory"; name = "SST Extra Weapons"; pixel_x = -6; pixel_y = -4; req_access_txt = "153"},/obj/machinery/door_control{id = "sst_ready"; name = "SST Base Access"; pixel_x = -6; pixel_y = 6; req_access_txt = "153"},/obj/machinery/door_control{id = "sst_tele"; name = "SST Teleporter Access"; pixel_x = 6; pixel_y = 6; req_access_txt = "153"},/obj/machinery/door_control{id = "sst_mechbay"; name = "SST Mech Bay"; pixel_x = 6; pixel_y = -4; req_access_txt = "153"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "nN" = (/obj/machinery/mass_driver{dir = 8; drive_range = 50; id_tag = "ASSAULT0"; name = "gravpult"},/obj/effect/decal/warning_stripes/yellow/hollow,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nO" = (/obj/item/radio/intercom/specops{pixel_y = -28},/turf/unsimulated/floor{icon_state = "vault"; dir = 1},/area/centcom/specops) "nP" = (/obj/machinery/mech_bay_recharge_port/upgraded/unsimulated{icon_state = "recharge_port"; dir = 8},/turf/unsimulated/floor{name = "plating"},/area/syndicate_mothership) @@ -1399,7 +1399,7 @@ "Bw" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "Bx" = (/obj/structure/chair/stool,/obj/effect/landmark{name = "Syndicate-Commando"; tag = "Commando"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "By" = (/obj/machinery/computer/shuttle/syndicate{name = "Nuclear Operatives Shuttle Console"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) -"Bz" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "nukeop_base"; name = "Nuclear Base Access"; pixel_x = -6; pixel_y = 6; range = 50; req_access_txt = "153"},/obj/machinery/door_control{id = "nukeop_ready"; name = "Nuclear Shuttle Access"; pixel_x = 6; pixel_y = 6; range = 50; req_access_txt = "153"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"Bz" = (/obj/structure/table/reinforced,/obj/machinery/door_control{id = "nukeop_base"; name = "Nuclear Base Access"; pixel_x = -6; pixel_y = 6; req_access_txt = "153"},/obj/machinery/door_control{id = "nukeop_ready"; name = "Nuclear Shuttle Access"; pixel_x = 6; pixel_y = 6; req_access_txt = "153"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "BA" = (/obj/structure/displaycase/stechkin,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "BB" = (/obj/structure/closet/secure_closet/syndicate_officer,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "BC" = (/obj/machinery/door/poddoor/impassable{id_tag = "sst_mechbay"; name = "Mech Bay"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm index 372c2fd62ae..31394aca84c 100644 --- a/_maps/map_files/cyberiad/z6.dmm +++ b/_maps/map_files/cyberiad/z6.dmm @@ -318,7 +318,7 @@ "gf" = (/turf/simulated/floor/plasteel,/area/derelict/arrival) "gg" = (/obj/structure/chair/stool,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 8; icon_state = "darkred"},/area/derelict/arrival) "gh" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/grenade/empgrenade,/turf/simulated/floor/plasteel{dir = 4; icon_state = "darkred"},/area/derelict/arrival) -"gi" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/machinery/door_control{id = "ruslockcom"; name = "Bridge Lockdown"; range = 35},/turf/simulated/floor/plasteel{dir = 2; icon_state = "darkred"},/area/derelict/arrival) +"gi" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced,/obj/machinery/door_control{id = "ruslockcom"; name = "Bridge Lockdown"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "darkred"},/area/derelict/arrival) "gj" = (/obj/structure/table/reinforced,/obj/machinery/door/window/southright,/obj/item/folder{pixel_x = 31; pixel_y = 1},/obj/item/paper/djstation{info = "Recommended Party Comrade Blyatski
Signing Officer: Mikail Gogochev
Captain,

I recognize the nature of this request my seem strange, but please, hear me out. Comrade Blyatski, though he is but a wee bot, is like iron fist of Commissar Grigor himself! Just the other day he chased that useless bastard Totstoi clean out of brig, you should have seen the way that drunkard whimpered! Like a dog with his tail between his legs.

Anyways, I digress! If any one is worth of recognition, it is our ever-vigilant and beloved Blyatski, true champion of USSP.

If you wish to, perhaps, see his vigilance and dedication in person, well! You need only come to inspect armoury.

Comrade Blyatski awaits your decision."; name = "recommendation for commendation"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "darkred"},/area/derelict/arrival) "gk" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/turf/simulated/wall/mineral/titanium/nodecon/tileblend{fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "dark"); icon_state = "4-i"},/area/derelict/arrival) "gl" = (/obj/structure/table/reinforced,/obj/item/paper_bin,/obj/item/pen,/obj/structure/window/reinforced,/obj/machinery/newscaster{desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station."; layer = 3.3; pixel_x = 27},/turf/simulated/floor/plasteel{dir = 6; icon_state = "darkred"},/area/derelict/arrival) @@ -459,7 +459,7 @@ "iQ" = (/obj/structure/computerframe{desc = "This computer is a husk of what it once was. Time and decay has worn its cheap circuitry to dust."; name = "decrepit computer"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{icon_state = "caution"; dir = 5},/area/derelict/eva{name = "Derelict Annex"}) "iR" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel,/area/derelict/eva{name = "Derelict Annex"}) "iS" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/obj/item/trash/spentcasing{icon_state = "762-casing"},/turf/simulated/floor/plasteel,/area/derelict/eva{name = "Derelict Annex"}) -"iT" = (/obj/machinery/door_control{id = "ruslock"; layer = 2.1; name = "suspicious button"; range = 35},/obj/machinery/vending/cigarette/free{product_slogans = "Just remember! No capitalist.;Best enjoyed with Vodka!.;Smoke!;Nine out of ten USSP scientists agree, smoking reduces stress!;There's no cigarette like a Russian cigarette!;Cigarettes! Now with 100% less capitalism."},/turf/simulated/floor/wood{broken = 1; icon_state = "wood-broken"},/area/derelict/crew_quarters) +"iT" = (/obj/machinery/door_control{id = "ruslock"; layer = 2.1; name = "suspicious button"},/obj/machinery/vending/cigarette/free{product_slogans = "Just remember! No capitalist.;Best enjoyed with Vodka!.;Smoke!;Nine out of ten USSP scientists agree, smoking reduces stress!;There's no cigarette like a Russian cigarette!;Cigarettes! Now with 100% less capitalism."},/turf/simulated/floor/wood{broken = 1; icon_state = "wood-broken"},/area/derelict/crew_quarters) "iU" = (/obj/structure/chair/stool/bar,/turf/simulated/floor/plasteel{icon_state = "wood"},/area/derelict/crew_quarters) "iV" = (/obj/structure/chair/stool/bar,/obj/effect/decal/cleanable/blood/splatter,/obj/effect/decal/remains/human{desc = "This guy seemed to have died in terrible way! Half his remains are dust."; icon_state = "remains"; name = "Human remains"},/turf/simulated/floor/plasteel{icon_state = "wood"},/area/derelict/crew_quarters) "iW" = (/obj/structure/grille,/obj/structure/shuttle/window{tag = "icon-window5_end (NORTH)"; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; dir = 1},/turf/simulated/floor/plating,/area/derelict/arrival) @@ -1081,7 +1081,7 @@ "uO" = (/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/derelict/eva{name = "Derelict Annex"}) "uP" = (/obj/structure/chair/comfy/brown{dir = 8},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/derelict/eva{name = "Derelict Annex"}) "uQ" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/beetsoup,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/derelict/eva{name = "Derelict Annex"}) -"uR" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/kitchen_machine/grill,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door_control{id = "ruslocksec"; layer = 2.1; name = "suspicious button"; range = 35},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitered"},/area/derelict/eva{name = "Derelict Annex"}) +"uR" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/kitchen_machine/grill,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/machinery/door_control{id = "ruslocksec"; layer = 2.1; name = "suspicious button"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitered"},/area/derelict/eva{name = "Derelict Annex"}) "uS" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/derelict/eva{name = "Derelict Annex"}) "uT" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/derelict/eva{name = "Derelict Annex"}) "uU" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "grimy"},/area/derelict/eva{name = "Derelict Annex"}) diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index a391514d0aa..17d734d7d14 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -5,7 +5,7 @@ icon_state = "doorctrl0" power_channel = ENVIRON var/id = null - var/range = 10 + var/safety_z_check = 1 var/normaldoorcontrol = 0 var/desiredstate = 0 // Zero is closed, 1 is open. var/specialfunctions = 1 @@ -81,7 +81,9 @@ add_fingerprint(user) if(normaldoorcontrol) - for(var/obj/machinery/door/airlock/D in range(range, src)) + for(var/obj/machinery/door/airlock/D in GLOB.airlocks) + if(safety_z_check && D.z != z) + continue if(D.id_tag == id) if(specialfunctions & OPEN) if(D.density) @@ -112,7 +114,9 @@ D.safe = 1 else - for(var/obj/machinery/door/poddoor/M in range(range, src)) + for(var/obj/machinery/door/poddoor/M in GLOB.airlocks) + if(safety_z_check && M.z != z) + continue if(M.id_tag == id) if(M.density) spawn( 0 ) diff --git a/code/modules/buildmode/submodes/link.dm b/code/modules/buildmode/submodes/link.dm index 90709463363..608bea17833 100644 --- a/code/modules/buildmode/submodes/link.dm +++ b/code/modules/buildmode/submodes/link.dm @@ -47,7 +47,7 @@ M.id = input(user, "Please select an ID for the button", "Buildmode", "") if(!M.id || M.id == "") goto(line_jump) - if(P.id_tag == M.id && (P in range(M.range, M)) && P.id_tag && P.id_tag != "") + if(P.id_tag == M.id && P.id_tag && P.id_tag != "") P.id_tag = null to_chat(user, "[P] unlinked.") goto(line_jump) @@ -86,7 +86,7 @@ if(istype(link_obj, /obj/machinery/door_control)) var/obj/machinery/door_control/M = link_obj - for(var/obj/machinery/door/airlock/P in range(M.range,M)) + for(var/obj/machinery/door/airlock/P in GLOB.airlocks) if(P.id_tag == M.id) form_connection(M, P, M.normaldoorcontrol) for(var/obj/machinery/door/poddoor/P in GLOB.airlocks)