From c6b643a472126bb2229aa8ec7aa9014b89aab451 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sat, 20 May 2017 20:44:57 -0300 Subject: [PATCH] Fix some map issues (#2348) Fixes #2326 Fixes #2322 Maybe Fixes #2344 Fixes #2336 Fixes #2323 Also, fixes the xenoarch eva storage airlocks being the wrong ones --- maps/Aurora-MapDev/aurora-2.dmm | 18 +++++++-------- maps/Aurora-MapDev/aurora-3.dmm | 41 +++++++++++++++++++++------------ maps/Aurora-MapDev/aurora-5.dmm | 4 ++-- 3 files changed, 37 insertions(+), 26 deletions(-) diff --git a/maps/Aurora-MapDev/aurora-2.dmm b/maps/Aurora-MapDev/aurora-2.dmm index 2362d731095..d2a76d06104 100644 --- a/maps/Aurora-MapDev/aurora-2.dmm +++ b/maps/Aurora-MapDev/aurora-2.dmm @@ -965,7 +965,7 @@ "sC" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)";pixel_y = 22},/obj/machinery/camera/network/research_outpost{c_tag = "Research Sublevel - Expedition Preparation"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 2;d2 = 4;icon_state = "2-4"},/turf/simulated/floor/tiled,/area/outpost/research/eva) "sD" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply";dir = 6},/turf/simulated/floor/tiled,/area/outpost/research/eva) "sE" = (/obj/machinery/alarm{pixel_y = 22},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4;d2 = 8;icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway) -"sF" = (/obj/machinery/door/firedoor{dir = 4;name = "Firelock"},/obj/machinery/door/airlock/glass_mining{name = "Loading area";req_access = list(65)},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4;d2 = 8;icon_state = "4-8"},/turf/simulated/floor/tiled,/area/outpost/research/eva) +"sF" = (/obj/machinery/door/firedoor{dir = 4;name = "Firelock"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4;d2 = 8;icon_state = "4-8"},/obj/machinery/door/airlock/glass_research{name = "Xenoarchaeology Department";req_access = list(7)},/turf/simulated/floor/tiled,/area/outpost/research/eva) "sG" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 1;d2 = 2;icon_state = "1-2"},/obj/structure/cable/green{d1 = 2;d2 = 8;icon_state = "2-8"},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway) "sH" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4;d2 = 8;icon_state = "4-8"},/obj/effect/floor_decal/corner/paleblue{icon_state = "corner_white";dir = 9},/turf/simulated/floor/tiled/white,/area/outpost/research/hallway) "sI" = (/obj/machinery/atmospherics/valve/digital/open,/obj/structure/cable/blue{d1 = 4;d2 = 8;icon_state = "4-8"},/turf/simulated/floor/tiled,/area/outpost/research/isolation_monitoring) @@ -1029,7 +1029,7 @@ "tO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled,/area/outpost/research/eva) "tP" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{icon_state = "intact-supply";dir = 6},/turf/simulated/floor/tiled,/area/outpost/research/eva) "tQ" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5;icon_state = "intact"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/eva) -"tR" = (/obj/machinery/door/airlock/glass_mining{name = "Warehouse";req_access = list(31)},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/eva) +"tR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/glass_research{name = "EVA Storage";req_access = list(7)},/turf/simulated/floor/tiled,/area/outpost/research/eva) "tS" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 10;icon_state = "intact"},/obj/structure/cable/green{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/simulated/floor/tiled,/area/outpost/research/eva) "tT" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers";dir = 9},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/outpost/research/eva) "tU" = (/obj/machinery/recharge_station,/obj/machinery/light{dir = 4;icon_state = "tube1"},/turf/simulated/floor/tiled,/area/outpost/research/eva) @@ -2391,13 +2391,13 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaleleJLleleleaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaleleJLleaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaleJKJMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJNJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPsPtPuPvPwPxPyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJOJOJOJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPzPAPBPCPDPEPFaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJOJFJFJFJFJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPGPHPIPJPKPLPMPNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJFJFJFJFJFJFJFJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPOPPPQPRPSPTPUPVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJFJFJFJFJFJFJFJFJFJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPWPXPYPZQaQbQcQdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJFJFJFJFJFJFJFJFJFJFJFJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQeQfQgQhQiQjQkQlaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJFJFJFJFJFJFJFJFJFJFJFJFJFJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQmQnQoQpQqQrQsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJNJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPsPsPsPsPsPsPsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJOJOJOJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPsPAPBPCPAPAPsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJOJFJFJFJFJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPsPsPIPsPKPKPKPsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJFJFJFJFJFJFJFJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPsPPPAPRPSPTPSPsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJFJFJFJFJFJFJFJFJFJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPsPXPYPZPTPSPTPsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJFJFJFJFJFJFJFJFJFJFJFJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPsPsPBQhPSPTPTPsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJCJFJFJFJFJFJFJFJFJFJFJFJFJFJCJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaPsPsPsQpPsQpPsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJFJFJFJFJFJFJFJFJFJFJFJFJFJFJFJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJPJQJFJFJFJFJFJRJFJFJFJFJFJSJPJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaJCJFJFJFJFJFJFJFJPJFJFJFJFJFJFJFJCaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/Aurora-MapDev/aurora-3.dmm b/maps/Aurora-MapDev/aurora-3.dmm index c297f9b2662..42df6a7caf3 100644 --- a/maps/Aurora-MapDev/aurora-3.dmm +++ b/maps/Aurora-MapDev/aurora-3.dmm @@ -752,7 +752,7 @@ "aox" = (/obj/structure/table/rack,/obj/item/device/magnetic_lock/security{pixel_x = -3;pixel_y = 4},/obj/item/device/magnetic_lock/security{pixel_x = -3;pixel_y = 4},/obj/item/device/magnetic_lock/security{pixel_x = -3;pixel_y = 4},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aoy" = (/obj/machinery/light{dir = 1},/obj/machinery/camera/network/security{c_tag = "Security - Armoury Fore"},/obj/structure/table/rack,/obj/item/weapon/storage/box/chemimp{pixel_x = -4;pixel_y = 4},/obj/item/weapon/storage/box/trackimp,/obj/item/weapon/storage/lockbox/loyalty{pixel_x = 4;pixel_y = -4},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aoz" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled,/area/security/range) -"aoA" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/melee/baton/loaded,/obj/structure/window/reinforced{icon_state = "rwindow";dir = 8},/obj/structure/window/reinforced{icon_state = "rwindow";dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Riot Gear Storage"},/turf/simulated/floor/tiled/dark,/area/security/armoury) +"aoA" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/melee/baton/loaded,/obj/structure/window/reinforced{icon_state = "rwindow";dir = 8},/obj/structure/window/reinforced{icon_state = "rwindow";dir = 1},/obj/structure/window/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Riot Gear Storage";req_access = list(3)},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aoB" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/security/range) "aoC" = (/obj/machinery/light,/turf/simulated/floor/tiled,/area/security/range) "aoD" = (/obj/machinery/recharger/wallcharger{pixel_x = 5;pixel_y = 22},/obj/machinery/light/small/emergency{dir = 1},/obj/machinery/camera/network/security{c_tag = "Armoury - Riot Storage"},/turf/simulated/floor/tiled/dark,/area/security/armoury) @@ -817,7 +817,7 @@ "apK" = (/obj/machinery/atmospherics/pipe/simple/visible/black{dir = 10},/turf/simulated/floor/plating,/area/engineering/engine_room) "apL" = (/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/engineering) "apM" = (/turf/simulated/wall/r_wall,/area/engineering/engine_smes) -"apN" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/melee/baton/loaded,/obj/structure/window/reinforced{icon_state = "rwindow";dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/brigdoor/eastleft{name = "Riot Gear Storage"},/turf/simulated/floor/tiled/dark,/area/security/armoury) +"apN" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/melee/baton/loaded,/obj/structure/window/reinforced{icon_state = "rwindow";dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/brigdoor/eastleft{name = "Riot Gear Storage";req_access = list(3)},/turf/simulated/floor/tiled/dark,/area/security/armoury) "apO" = (/obj/structure/closet/crate,/obj/item/weapon/circuitboard/smes,/obj/item/weapon/circuitboard/smes,/obj/item/weapon/smes_coil,/obj/item/weapon/smes_coil,/obj/item/weapon/smes_coil/super_capacity,/obj/item/weapon/smes_coil/super_capacity,/obj/item/weapon/smes_coil/super_io,/obj/item/weapon/smes_coil/super_io,/turf/simulated/floor/plating,/area/engineering/storage) "apP" = (/turf/simulated/floor/plating,/area/engineering/storage) "apQ" = (/obj/machinery/shieldgen,/turf/simulated/floor/plating,/area/engineering/storage) @@ -855,7 +855,7 @@ "aqw" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/firealarm{dir = 4;layer = 3.3;pixel_x = 26},/turf/simulated/floor/tiled,/area/engineering/atmos/storage) "aqx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1;d2 = 8;icon_state = "1-8"},/obj/structure/cable/green{d1 = 2;d2 = 8;icon_state = "2-8"},/obj/structure/disposalpipe/sortjunction/flipped{dir = 2;name = "Atmospherics";sortType = "Atmospherics"},/turf/simulated/floor/tiled,/area/engineering/atmos/storage) "aqy" = (/obj/machinery/door/airlock/maintenance{name = "Firefighting equipment";req_access = list(12)},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/maintenance/engineering) -"aqz" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/melee/baton/loaded,/obj/structure/window/reinforced{icon_state = "rwindow";dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/brigdoor/eastleft{name = "Riot Gear Storage"},/obj/machinery/light/small/emergency{dir = 8},/turf/simulated/floor/tiled/dark,/area/security/armoury) +"aqz" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/riot,/obj/item/clothing/head/helmet/riot,/obj/item/weapon/shield/riot,/obj/item/weapon/melee/baton/loaded,/obj/structure/window/reinforced{icon_state = "rwindow";dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/brigdoor/eastleft{name = "Riot Gear Storage";req_access = list(3)},/obj/machinery/light/small/emergency{dir = 8},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aqA" = (/turf/simulated/mineral,/area/mine/unexplored) "aqB" = (/obj/machinery/light/small/emergency{tag = "icon-bulb1 (EAST)";icon_state = "bulb1";dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_access = list(2)},/obj/item/weapon/gun/energy/gun,/obj/item/weapon/gun/energy/gun,/turf/simulated/floor/tiled/dark,/area/security/armoury) "aqC" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/effect/floor_decal/corner/blue{icon_state = "corner_white";dir = 9},/turf/simulated/floor/tiled,/area/security/main) @@ -1291,7 +1291,7 @@ "ayQ" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/disposalpipe/segment{dir = 2;icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/engineering) "ayR" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/security/armoury) "ayS" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/sign/nosmoking_2{pixel_y = 32},/obj/machinery/camera/network/security{c_tag = "Security - Armoury Entrance"},/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/turf/simulated/floor/tiled/dark,/area/security/armoury) -"ayT" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/laserproof{pixel_x = -2;pixel_y = 2},/obj/item/clothing/suit/armor/laserproof{pixel_x = 2;pixel_y = -2},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Ablative Armour Storage"},/obj/structure/window/reinforced{dir = 1},/obj/machinery/light/small/emergency{dir = 8},/obj/item/clothing/head/helmet/ablative,/obj/item/clothing/head/helmet/ablative,/turf/simulated/floor/tiled/dark,/area/security/armoury) +"ayT" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/laserproof{pixel_x = -2;pixel_y = 2},/obj/item/clothing/suit/armor/laserproof{pixel_x = 2;pixel_y = -2},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Ablative Armour Storage";req_access = list(3)},/obj/structure/window/reinforced{dir = 1},/obj/machinery/light/small/emergency{dir = 8},/obj/item/clothing/head/helmet/ablative,/obj/item/clothing/head/helmet/ablative,/turf/simulated/floor/tiled/dark,/area/security/armoury) "ayU" = (/obj/machinery/flasher/portable,/obj/machinery/light/small/emergency{tag = "icon-bulb1 (EAST)";icon_state = "bulb1";dir = 4},/obj/effect/floor_decal/industrial/outline/blue,/turf/simulated/floor/tiled/dark,/area/security/armoury) "ayV" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/light{dir = 8;icon_state = "tube1";pixel_y = 0},/obj/structure/sign/nosmoking_2{pixel_x = -32},/obj/machinery/camera/network/security{c_tag = "Security - Holding Cell";dir = 4},/obj/effect/floor_decal/corner/blue{icon_state = "corner_white";dir = 6},/turf/simulated/floor/tiled,/area/security/brig) "ayW" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Security Processing";req_access = list(1)},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/security/brig) @@ -1379,7 +1379,7 @@ "aAA" = (/obj/machinery/door/window/brigdoor/southright{dir = 4;icon_state = "rightsecure";name = "Distribution Post";req_access = list(3)},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aAB" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/lawoffice) "aAC" = (/obj/machinery/photocopier,/turf/simulated/floor/wood,/area/lawoffice) -"aAD" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/bulletproof{pixel_x = -2;pixel_y = 2},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 2;pixel_y = -2},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Bulletproof Armour Storage"},/obj/structure/window/reinforced{dir = 1},/obj/item/clothing/head/helmet/ballistic,/obj/item/clothing/head/helmet/ballistic,/turf/simulated/floor/tiled/dark,/area/security/armoury) +"aAD" = (/obj/structure/table/rack,/obj/item/clothing/suit/armor/bulletproof{pixel_x = -2;pixel_y = 2},/obj/item/clothing/suit/armor/bulletproof{pixel_x = 2;pixel_y = -2},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/window/brigdoor/eastleft{name = "Bulletproof Armour Storage";req_access = list(3)},/obj/structure/window/reinforced{dir = 1},/obj/item/clothing/head/helmet/ballistic,/obj/item/clothing/head/helmet/ballistic,/turf/simulated/floor/tiled/dark,/area/security/armoury) "aAE" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/corner/blue{icon_state = "corner_white";dir = 6},/turf/simulated/floor/tiled,/area/security/brig) "aAF" = (/obj/structure/bed/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/shuttle/lifts/placeholder) "aAG" = (/turf/simulated/shuttle/floor{icon_state = "floor6"},/area/shuttle/lifts/placeholder) @@ -2157,7 +2157,7 @@ "aPy" = (/obj/structure/grille,/obj/structure/window/reinforced/polarized{id = "Detective"},/obj/structure/window/reinforced/polarized{dir = 1;id = "Detective"},/obj/structure/window/reinforced/polarized{dir = 8;id = "Detective"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/security/detectives_office) "aPz" = (/obj/structure/grille,/obj/structure/window/reinforced/polarized{id = "Detective"},/obj/structure/window/reinforced/polarized{dir = 1;id = "Detective"},/obj/structure/window/reinforced/polarized{dir = 4;id = "Detective"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/security/detectives_office) "aPA" = (/turf/simulated/wall,/area/engineering/foyer) -"aPB" = (/obj/machinery/door/airlock/maintenance,/obj/structure/cable/green{d1 = 1;d2 = 2;icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hallway/primary/starboard) +"aPB" = (/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/structure/cable/green{d1 = 1;d2 = 2;icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hallway/primary/starboard) "aPC" = (/obj/machinery/atm{pixel_x = -32},/obj/structure/cable/green{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/primary/starboard) "aPD" = (/obj/item/modular_computer/console/preset/engineering,/turf/simulated/floor/tiled,/area/engineering/foyer) "aPE" = (/obj/machinery/door/blast/regular{density = 0;icon_state = "pdoor0";id = "bridge blast";name = "Bridge Blast Doors";opacity = 0},/obj/machinery/door/airlock/command{name = "Head of Personnel";req_access = list(57)},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/crew_quarters/heads/hop) @@ -2405,7 +2405,7 @@ "aUm" = (/turf/simulated/wall,/area/hallway/primary/central_one) "aUn" = (/obj/structure/grille,/obj/structure/window/reinforced/polarized{dir = 8;id = "cap"},/obj/structure/window/reinforced/polarized{dir = 4;id = "hop"},/obj/machinery/door/blast/regular{density = 0;icon_state = "pdoor0";id = "bridge blast";name = "Bridge Blast Doors";opacity = 0},/obj/machinery/door/firedoor,/obj/structure/cable/green{d1 = 1;d2 = 2;icon_state = "1-2"},/obj/structure/cable/green,/turf/simulated/floor/plating,/area/crew_quarters/captain) "aUo" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable/green{d1 = 1;d2 = 2;icon_state = "1-2"},/obj/structure/cable/green{d1 = 1;d2 = 4;icon_state = "1-4"},/obj/effect/floor_decal/corner/paleblue/diagonal,/turf/simulated/floor/tiled/white,/area/bridge) -"aUp" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor,/obj/structure/window/reinforced{dir = 5;health = 1e+007},/turf/simulated/floor/plating,/area/security/lobby) +"aUp" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/security/lobby) "aUq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4;d2 = 8;icon_state = "4-8"},/obj/effect/floor_decal/corner/paleblue/full,/turf/simulated/floor/tiled,/area/bridge) "aUr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4;d2 = 8;icon_state = "4-8"},/obj/effect/floor_decal/corner/paleblue/diagonal,/turf/simulated/floor/tiled/white,/area/bridge) "aUs" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4;d2 = 8;icon_state = "4-8"},/turf/simulated/floor/tiled,/area/bridge) @@ -2620,7 +2620,7 @@ "aYt" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled,/area/engineering/foyer) "aYu" = (/obj/machinery/atm{pixel_y = -32},/obj/structure/bed/chair{dir = 1},/turf/simulated/floor/tiled,/area/engineering/foyer) "aYv" = (/obj/machinery/vending/cigarette,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/engineering/foyer) -"aYw" = (/obj/machinery/door/airlock/maintenance,/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/maintenance/maintcentral) +"aYw" = (/obj/machinery/door/airlock/maintenance{req_access = list(12)},/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aYx" = (/turf/simulated/wall/r_wall,/area/assembly/robotics) "aYy" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "aYz" = (/turf/simulated/wall/r_wall,/area/hallway/primary/central_one) @@ -3032,7 +3032,7 @@ "bgp" = (/obj/effect/decal/cleanable/dirt,/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/research_port) "bgq" = (/obj/structure/cable/green{d2 = 2;icon_state = "0-2"},/obj/machinery/power/apc{dir = 1;name = "north bump";pixel_x = 0;pixel_y = 24},/turf/simulated/floor/tiled,/area/assembly/robotics) "bgr" = (/obj/machinery/conveyor_switch/oneway{convdir = -1;id = "RobotSurg"},/turf/simulated/floor/tiled,/area/assembly/robotics) -"bgs" = (/obj/structure/table/rack{pixel_x = 3;pixel_y = 3},/obj/item/weapon/storage/toolbox/mechanical{desc = "A blue toolbox containing mechanic-related tools."},/obj/item/weapon/storage/toolbox/mechanical{desc = "A blue toolbox containing mechanic-related tools."},/obj/machinery/requests_console{department = "Robotics";departmentType = 2;name = "Robotics RC";pixel_y = 30},/obj/machinery/light{dir = 1},/obj/item/weapon/storage/belt,/obj/item/weapon/storage/toolbox/electrical,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/device/multitool,/obj/item/device/multitool,/turf/simulated/floor/tiled,/area/assembly/robotics) +"bgs" = (/obj/structure/table/rack{pixel_x = 3;pixel_y = 3},/obj/item/weapon/storage/toolbox/mechanical{desc = "A blue toolbox containing mechanic-related tools."},/obj/item/weapon/storage/toolbox/mechanical{desc = "A blue toolbox containing mechanic-related tools."},/obj/machinery/requests_console{department = "Robotics";departmentType = 2;name = "Robotics RC";pixel_y = 30},/obj/machinery/light{dir = 1},/obj/item/weapon/storage/belt,/obj/item/weapon/storage/toolbox/electrical,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/device/multitool,/obj/item/device/multitool,/obj/item/clothing/glasses/welding,/obj/item/clothing/glasses/welding,/obj/item/clothing/head/welding,/obj/item/clothing/head/welding,/turf/simulated/floor/tiled,/area/assembly/robotics) "bgt" = (/obj/machinery/disposal,/obj/machinery/firealarm{dir = 1;pixel_y = 24},/obj/machinery/camera/network/research{c_tag = "Research - Robotics Manufacturing"},/obj/structure/disposalpipe/trunk,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/assembly/robotics) "bgu" = (/obj/structure/window/basic{dir = 4},/obj/effect/floor_decal/industrial/warning{icon_state = "warning";dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled,/area/assembly/robotics) "bgv" = (/obj/structure/table/standard,/obj/item/weapon/folder,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/machinery/light{dir = 4;icon_state = "tube1";pixel_x = 0},/turf/simulated/floor/tiled/white,/area/assembly/robotics) @@ -5080,7 +5080,7 @@ "bTJ" = (/obj/structure/window/reinforced/polarized{id = "dancedance"},/obj/structure/table/woodentable,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = -8},/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 8},/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = -4},/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 4},/obj/item/weapon/material/kitchen/utensil/spoon,/turf/simulated/floor/wood,/area/crew_quarters/bar) "bTK" = (/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/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/research_port) "bTL" = (/obj/item/weapon/stamp{pixel_x = -3;pixel_y = 3},/obj/item/weapon/stamp/denied{pixel_x = 4;pixel_y = -2},/obj/structure/table/standard,/turf/simulated/floor/tiled,/area/quartermaster/office) -"bTM" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced/polarized{id = "finedining"},/obj/structure/disposalpipe/segment,/obj/machinery/chemical_dispenser/coffee/full,/turf/simulated/floor/lino,/area/crew_quarters/bar) +"bTM" = (/obj/structure/window/reinforced/polarized{id = "finedining"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/lino,/area/crew_quarters/bar) "bTN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable/green{d1 = 2;d2 = 4;icon_state = "2-4"},/turf/simulated/floor/tiled,/area/quartermaster/office) "bTO" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4;d2 = 8;icon_state = "4-8"},/turf/simulated/floor/tiled,/area/quartermaster/office) "bTP" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/cable/green{d1 = 4;d2 = 8;icon_state = "4-8"},/turf/simulated/floor/tiled,/area/quartermaster/office) @@ -5901,6 +5901,17 @@ "cjy" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/maintenance/disposal) "cjz" = (/obj/structure/disposalpipe/junction/yjunction{icon_state = "pipe-y";dir = 8},/turf/simulated/wall/r_wall,/area/maintenance/disposal) "cjA" = (/obj/machinery/light/small/emergency,/turf/simulated/open,/area/maintenance/disposal) +"cjB" = (/obj/structure/bookcase{name = "bookcase (Religion)"},/turf/simulated/floor/wood,/area/library) +"cjC" = (/obj/structure/bookcase{name = "bookcase (Fiction)"},/turf/simulated/floor/wood,/area/library) +"cjD" = (/obj/structure/bookcase{name = "bookcase (Fiction)"},/turf/simulated/floor/wood,/area/library) +"cjE" = (/obj/structure/bookcase{name = "bookcase (Fiction)"},/turf/simulated/floor/wood,/area/library) +"cjF" = (/obj/structure/bookcase{name = "bookcase (Religion)"},/turf/simulated/floor/wood,/area/library) +"cjG" = (/obj/structure/bookcase{name = "bookcase (Non-Fiction)"},/turf/simulated/floor/wood,/area/library) +"cjH" = (/obj/structure/bookcase{name = "bookcase (Non-Fiction)"},/turf/simulated/floor/wood,/area/library) +"cjI" = (/obj/structure/bookcase{name = "bookcase (Non-Fiction)"},/turf/simulated/floor/wood,/area/library) +"cjJ" = (/obj/structure/bookcase{name = "bookcase (Reference)"},/turf/simulated/floor/wood,/area/library) +"cjK" = (/obj/structure/bookcase{name = "bookcase (Reference)"},/turf/simulated/floor/wood,/area/library) +"cjL" = (/obj/structure/bookcase{name = "bookcase (Reference)"},/turf/simulated/floor/wood,/area/library) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -6059,11 +6070,11 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaabaabaabaZqaZqbaeaZqaZqaZqaZqaZqaZqaZqaZqaKzbBhbHcbFLbFLbFLbFLbFLbFLbFLbGibGibGjbHdbGlbGibFNbHfbHebGobHgbGqbHibHnbHjbHtbHrbHDbHvbFNbGQbFRbFRbFRbFRbFRaVfbGRaVfaUmaUmaUmaUmaUmaUmbDAbGDbEAbHGbGFbEAbEybEybHHbGHbHJbDAbDAbDAbDAbDAbDNbgBbxXbxXbGJbgBbGKbANbANbGLbHNbgBbgBbgBbgBbHObgBbANbANbGObANbANbxXbGObGPbxXbxXbGObxXbxXbxXbGObxXbxXbGObxXbxXbxXbgBaaaaaaaaaaYkbAbaYkaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaabaabaabaabaabaZqbHRbHQbcNbcNbHVbcNbcNbcNbcNbcNbcNbHWbFLcfbcfbcfbcfbcfbbFLbGibHYbHXbIabHZbIbbFNbGZbHabHbbHbbIibIcbIlbIjbIubHhbHhbIvbFNbaebFRbGybGzbGybFRbGAbHFbGAbGCaaaaaaaaaaaaaaabDAbHobHpbHpbHqbEAbEybEybEAbEAbIAbHsbICbHubDAbIFbGxbgBbHwbHxbHybgBbHzbANbxXbANbHAbGXbHBbHCbgBbANbIHbGLbANbHEbIJbIIbIKbIKbIKbIKbIKbIKbIKbIKbIKbIKbIKbIKbIKbIKbIKbHEbgBaaaaaaaaaaYkbAbaYkaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaabaabaZqaZqaZqaZqaZqbfwbHIaKzaZqaZqaZqaKzbgpbFLcfbcfbcfbcfbcfbbFLbGibILbHKbHLbHMbINbFNbIPbHPbGZbGZbIZbIVbHSbHTbHUbHhbHhbJfbFNbaebFRbIxbHkbHlbFRbHmbIzbHmbGCaaaaaaaaaaaaaaabDAccGbEAbIdbIebIfbIfbIfbIfbIfbIgbEybIhbFUbDAbJrbgBbgBbgBbgBbgBbgBbJsbIkbJvbImbJsbgBbInbxXbIobANbgBbANbxXbIpbIqbIpbIpbIpbIpbIrbIrbIrbIrbIrbIpbIpbIpbIpbIpbIpbIpbIsbgBaaaaaaaaaaYkbAbaYkaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaabaabaaaaaaaabaabaabaabaabaabaZqaZqaZqbLhaZqaqAaZqbItbJBbFLcfbcfbcfbcfbcfbbFLbGibJEbIwbJGbIybJIbFNbJMbHbbIBbJObIDbIEbJSbJQbJVbJUbJUbJWbFNbaebFRbJkbJmbJlbJobJnbJqbIObGCaaaaaaaaaaaaaaabDAbEAbIQbIRbISbEybITbEybEybITbITbITbIhbEvbIUbKgbMAbIWaabaaaaaabgBbIXbIYbKjbJabJbbgBbJcbJdbJebKmbgBbJgbJgbJhbIpbIrbIrbJibIrbIrbIrbJibIrbIrbIpbJjbIpbIpbJjbIpbIpbxXbgBaaaaaaaYkaYkbKnaYkaYkaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaabaabaaaaaaaabaabaabaabaabaabaZqaZqaZqbLhaZqaqAaZqbItbJBbFLcfbcfbcfbcfbcfbbFLbGibJEbIwbJGbIybJIbFNbJMbHbbIBbJObIDbIEbJSbJQbJVbJUbJUbJWbFNbaebFRbJkbJmbJlbJobJnbJqbIObGCaaaaaaaaaaaaaaabDAbEAbIQbIRbISbEycjBbEybEycjCcjDcjEbIhbEvbIUbKgbMAbIWaabaaaaaabgBbIXbIYbKjbJabJbbgBbJcbJdbJebKmbgBbJgbJgbJhbIpbIrbIrbJibIrbIrbIrbJibIrbIrbIpbJjbIpbIpbJjbIpbIpbxXbgBaaaaaaaYkaYkbKnaYkaYkaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaZqaKzaZqaZqaZqaZqchpbFLcfbcfbcfbcfbcfbbFLbGibKtbKqbKBbKxbKDbFNbKFbKEbKHbFNbFNbJtbJubKLbJubJtbFNbFNbFNbJYbFRbJZbIMbKdbFRbJybKfbIObGCaaaaaaaaaaaaaaabDAbEAbIQbJzbISbEybEybEybEybEybEybEybIhbGDbJAbKSbMAbJCaabaabaabbgBbJDbIYbKTbJabJFbgBbgBbgBbgBbKWbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBbgBaaaaaaaYkbJHbAbbLbaYkaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaqAaqAaabaabaZqaMfaZqbJJbJKaZqbeZbFLcfbcfbcfbcfbcfbbFLbGibJLbLebJNbLfbJPbFNbLgbHhbJRbLibFNbJTbJubLjbJubLkbFNbLlbcNbaebFRbJwbJxbJwbFRbLnbKfbKabGCaaaaaaaaaaaaaaabDAbEAbIQbKbbISbEybITbEybEybITbITbITbIhbFUbJAbKSchcbJCaabaabaaabgBbgBbgBbgBbgBbgBbgBaabaabbKcbLpbKeaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaYkaRPbLqbLvaYkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaqAaqAaabaabaZqaKzaZqbKhbKibLwbgpbFLbFLbFLbFLbFLbFLbFLbGibKkbKlbLBbLxbJPbFNbKobHhbHhbKpbFNbFNbJubLEbJubFNbFNbrDaKzbBkbFRbJwbJXbLmbFRbKsbLGcgEbGCaaaaaaaaaaaaaaabDAbEAbGpbKubKvbKwbKwbKwbKwbKwbKwbKwbLKbHGbKybKSchdbKzaabaabaaaaaaaaaaaaaaaaaaaabaabaabaabbKAbLMbKAaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaaaaaaaaaaaaaYkaYkaYkaYkaYkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqAaabaabaqAaZqaKzaZqbKCaKzaZqbLNbLObcMbcMbcMbcMbLPaKwbGibGibKGbLQbKIbGibFNbKJbHhbKKbLWbFNbKMbKNbKMbKNbKMbFNbaebKOaKzbKrbKrbKrbKrbKrbLZbMdbIObGCaaaaaaaaaaaaaaabDAbKUbKVbMebKXbKYbITbKZbLabITbITbITbIhbMgbDAbKSbLcbLcaabaabaabaabaabaabaaaaabaabaabaabaabbLdbMhbLdaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaqAaqAaabaabaZqaMfaZqbJJbJKaZqbeZbFLcfbcfbcfbcfbcfbbFLbGibJLbLebJNbLfbJPbFNbLgbHhbJRbLibFNbJTbJubLjbJubLkbFNbLlbcNbBkbFRbJwbJxbJwbFRbLnbKfbKabGCaaaaaaaaaaaaaaabDAbEAbIQbKbbISbEycjFbEybEycjGcjHcjIbIhbFUbJAbKSchcbJCaabaabaaabgBbgBbgBbgBbgBbgBbgBaabaabbKcbLpbKeaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaYkaRPbLqbLvaYkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaqAaqAaabaabaZqaKzaZqbKhbKibLwbgpbFLbFLbFLbFLbFLbFLbFLbGibKkbKlbLBbLxbJPbFNbKobHhbHhbKpbFNbFNbJubLEbJubFNbFNbrDaKzaKzbFRbJwbJXbLmbFRbKsbLGcgEbGCaaaaaaaaaaaaaaabDAbEAbGpbKubKvbKwbKwbKwbKwbKwbKwbKwbLKbHGbKybKSchdbKzaabaabaaaaaaaaaaaaaaaaaaaabaabaabaabbKAbLMbKAaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaaaaaaaaaaaaaYkaYkaYkaYkaYkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqAaabaabaqAaZqaKzaZqbKCaKzaZqbLNbLObcMbcMbcMbcMbLPaKwbGibGibKGbLQbKIbGibFNbKJbHhbKKbLWbFNbKMbKNbKMbKNbKMbFNbaebKOaKzbKrbKrbKrbKrbKrbLZbMdbIObGCaaaaaaaaaaaaaaabDAbKUbKVbMebKXbKYbITbKZbLacjJcjKcjLbIhbMgbDAbKSbLcbLcaabaabaabaabaabaabaaaaabaabaabaabaabbLdbMhbLdaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaqAaZqaKzaZqaZqaZqaZqaZqaZqaZqaZqaZqaZqbeZaKwbGibGibGibGibGibGibFNbMnbFNbFNbFNbFNbKMbKNbKMbKNbKMbFNbMoaZqaKzbKrbKPbKQbKRbKrbLFbKfbIObGCaaaaaaaaaaaaaaabDAbDAbDAbDAbDAbDAbDAbDAbDAbDAbDAbDAbMvbDAbDAbKSbLcaabaabaabaabaabaaaaaaaaaaabaabaabaabaabaabbMwaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaZqaKzaKzaZqbLobMybMxbLrbLsbLtbvTbMGbMzbcMbcMbcMbMHbcMbcMchqbcMbMIbLyaabaabbFNbKMbLzbKMbLAbKMbFNbaebMJbLhbKrbMpbMqbMqbMsbMrciqbLHbGCbLIbLIbLIbLIbLIbDAbDAbDAccHbLJbMPbLLbLLbMTbMRbMUbMUbMVbMUbMUbMWbLcaaaaabaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaZqbcWaKzaZqbvTbLRbvTbLSbLTbvUbvTaZqaZqbLUaZqaKzbLVaZqaMfaZqaKzbhxaKwaabaabbFNbKMbKMbMXbKMbKMbFNbaebLXaKzbKrbLCbLDbMMbKrbHmbIzbHmbGCbLIbLYbNibMabMbbMcbNkbLIbNlbLIbMfbLIbLIbNpbNmbLcbMibLcbLcbLJbLcbLcaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -6076,7 +6087,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaabaZqaKzaKzaKzaKzaKzaKzaKzaKzaKzbLhaKzbLVaKzaKzaKzaKzaKzaZqaZqbQsbQkbQtbNhbPnbNjbOZbPabPbbQvbQFbQybQLbQHbQNbQNbQNbQObNjbHmbIzbHmbGCbLIbPjbQPbPlbPmbQQbPobLIaabaabaabaabbLcbKSbLcbLcbLcbPpbPqbPqbPpbPqbLcbLcbLcbPrbMZbPsbLcbLcbMZbLcaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaabaZqaZqaZqaZqaZqaZqaZqaZqaZqaZqaZqaKzaKzaKzbcfaMfaKzbPtbPuaZqbQSbKibPwbNhbPnbNjbQWbQVbQYbQXbNjbPybPWbOGbOGbPBbOGbPCbQZbIObKfbIObPEbPFbPGbPGbPGbPHbRaccJbPEbPEbPEbPEbPEbPEbKSbLcbPKbPLbLJbLJbLJbLJbNSbLJbNSbLcbPsbLJbPMbLcbNabLJbLcaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaZqaKzaZqaKzaKzaKzaKzaKzbObaZqbPNbPObRbbNhbPnbNjbPQbPRbPSbPTbRcbPybRgbRebRebRhbRjbOGbPZbIObMNbRlbPEbPEbRmbPHbPHbQcbRabPJbQdbRnbWMbWsbWMbPEbKSbLcbRqbLJbNTbQhbQhbQhbNUbLJbLJbLcbPsbNSbQibLcbLJbLcbLcaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaZqaKzaZqaZqbLuaZqaKzaZqaZqaZqbQjbvTbRrbNhbPnbNjbPTbQlbQmbPTbQnbPybQobQpbQqbQrbRtbOGbPZcghbKfacCbPEbPEbRubQubQubQubRvbQwbPJbQxbWsbWMbRwbPEbKSbLcbNSbLJbNUbQhbQhbQhbNUbLJbLJbLcbQzbNSbQAbLcbLJbLcaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaZqaKzaZqaZqbLuaZqaKzaZqaZqaZqbQjbvTbRrbNhbPnbNjbPTbQlbQmbPTbQnbPybQobQpbQqbQrbRtbOGbPZcghbKfbIObPEbPEbRubQubQubQubRvbQwbPJbQxbWsbWMbRwbPEbKSbLcbNSbLJbNUbQhbQhbQhbNUbLJbLJbLcbQzbNSbQAbLcbLJbLcaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaZqaKzaZqbQBbPtaKzaKzbNtaZqbNhbNhbNhbNhbNhbPnbNjbPQbQCbQDbQEbRzbPybQGbRFbQIbQJbRtbOGbPZbIObKfbNNbQKbRGbPJbPJbPJbPJbRabPJbPJbQMbWMbWsbWMbPEbKSbRHbLJbNSbNSbNSbLJbLJbLJbNSbLJbOwbNSbNSbPsbLcbLJbLcaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaZqaMfaZqaKzaKzaKzaKzaKzaZqbRIbRJbRJbRJbRJbRNbNjbPTbQRbRPbPTbQTbPybQUbRRbRRbRRbPzbOGbPZbIObRWbRSbRYbRXbSbbSabSbbSbbSdbRdbRdbSebPEbPEbPEbPEbKSbLcbLcbLcbLcbLcbLcbLcbLcbLcbLcbLcbLcbLcbLcbLcbLJbLcaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaZqaKzaZqaKzaMfaKzaKzbLVaZqbPnbRfbRfbRfbRfbRfbRfbRfbRfbRfbRfbRfbShbSkbOGbOGbRibOGbSnbRkbSobKfbSpbPEbPEbSqbRabRobRobRobPJbPJbRpbSvbSrbRsbPEbSxbMUbMUbMUbSDbSzchrbSEbLJchsbLJbLJbLJbLJbLJbLJbLJbLcaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/Aurora-MapDev/aurora-5.dmm b/maps/Aurora-MapDev/aurora-5.dmm index 5eea089f3a0..431a5864e3d 100644 --- a/maps/Aurora-MapDev/aurora-5.dmm +++ b/maps/Aurora-MapDev/aurora-5.dmm @@ -902,7 +902,7 @@ "rr" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/disposalpipe/segment,/obj/machinery/alarm{dir = 4;icon_state = "alarm0";pixel_x = -22;pixel_y = 0},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/fore) "rs" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/fore) "rt" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hydroponics/garden) -"ru" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/grass,/area/hydroponics/garden) +"ru" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled,/area/hydroponics/garden) "rv" = (/obj/machinery/seed_storage/garden,/turf/simulated/floor/grass,/area/hydroponics/garden) "rw" = (/obj/machinery/vending/hydronutrients,/turf/simulated/floor/grass,/area/hydroponics/garden) "rx" = (/obj/machinery/smartfridge/drying_rack,/obj/machinery/light{dir = 1},/obj/machinery/camera/network/civilian_east{c_tag = "Surface - Public Garden"},/turf/simulated/floor/grass,/area/hydroponics/garden) @@ -1965,7 +1965,7 @@ aaaaaaaaacaaduicdvaaduicdvaaidicdvaaacaaagagagagaPaVaPbcbgbgbybybybXdxcddOeheheh aaaaaaaaacaaduicdvaaduicdvaaidicdvaaacaaaaagagagaPaVaPbcbgbgcadNbybXdVcddOdOdOdOdOdOdOjGdOdOdOdOdOdOdObXdVcdbydNcabgbgagagagagagagagagagagaaaaaabMbMbMbMbMbMbMbMbMbMbMbMbMjIjHjKjJjLfufujMfufujNerjPjOjPjxjRjQjTjSjUjxjVjVjVeAjWfEfEhifEfEjYjXkajZkbbWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaacaadukcdvaadukcdvaaidkcdvaaacaaaaagagagaPaVaPbcbgbgbybybybXdVkdkecOcOkfkgkikhkjkkklkmkfcOcOkekndVcdbybybybgbgagagagagagagagagagagaaaaaabMbMbMbMbMbMbMbMbMbMbMbMbMfofpfpkofsfrftfufrftkperkrkqksktkukvkwkvkxktkycqkzeAkAfBfDhifBfDfFkBfHfHfIbWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaagagagaPaVaPbcbgbgbybybybXkCdgdgdgdgkDkEkEkEkFkEkEkEkGdgdgdgdgkHcdbybykIbgbgagagagagagagagagagaaaaaaaabMbMbMbMbMbMbMbMbMbMbMbMbMaaaaaaerkKkJkLkMkJkLkNerkOkqkykPkRkQkSkTkUkPkycqkVeAkWkXkYkZkXkYlaeAaaaaaabWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaeacacacacacacacacacacacacacaeaaagagagagaPaVaPbcbgbglbbybybydAdAdAdAdAkflcldkklelfldkmkfdAdAdAdAdAbybybybybgbgagagagagagagagagaaaaaaaaaabMbMbMbMbMbMbMbMbMbMbMbMbMaaaaaaereslglglglglglherlikqJKljlkkvlmlnlploJLcqlqeAeBeCeCeCeCeCeDeAaaaaaabWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaeacacacacacacacacacacacacacaeaaagagagagaPaVaPbcbgbglbbybybydAdAdAdAdAkflcldkklelfldkmkfdAdAdAdAdAbybybybybgbgagagagagagagagagaaaaaaaaaabMbMbMbMbMbMbMbMbMbMbMbMbMaaaaaaereslglglglglglherlikqJKljlkkvlmlnlploJKcqlqeAeBeCeCeCeCeCeDeAaaaaaabWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagaPaVaPaPbgbgbybybybybybybybykfkfkfkfkflrkfkfkfkfbgbybybybybybybybybgbgagagagagagagagagaaaaaaaaaabMbMbMbMbMbMbMbMbMbMbMbMbMaaaaaaaaaaaaaaaaaaaaaabqltlsltjxlvlulwlxlyjxlzlzlzbqaaaaaaaaaaaaaaaaaaaaaabWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagaPaVaPbcbgbgbybybybybybybybylAlBkhlDlClFlElGkklIlHbybybybybybybybybgbgagagagagagagagagagaaaaaaaabMbMbMbMbMbMbMbMbMbMbMbMbMaaaaaaaaaaaaaaaaaaaaaalJhNlKlLjAlMlOlNjAlMlOlPlQhXlJaaaaaaaaaaaaaaaaaaaaaabWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagaPaVaPbcbgbgbgbybybybybybybgkflSlRlUlTlVkhlWkhlXbgbgbybybybybybybgbgbgagagagagagagagagagagagaaaaaaaaaabMbMbMbMbMbMbMaaaaaaaaaaaaaaaaaaaaaaaaaaaacnjgkqcqlYlZlYmalYlZlYcqcqjkcnaaaaaaaaaaaaaaaaaaaaaaaaaaaabWbWbWbWbWbWbWaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa