diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 8059ef7c8b7..8e7eec09d29 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -289,7 +289,7 @@ new M.stack_type(output.loc) else if(console) - console.points -= O.worth*10 //reee wasting our materials! + console.points -= O.worth*3 //reee wasting our materials! use_power(500) ores_stored[metal]-- sheets++ diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 2a60dc52757..8e8a2dec3d9 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -185,7 +185,7 @@ if (ismob(loc)) var/mob/living/our_mob = loc our_mob.remove_from_mob(src) - + qdel(src) /obj/item/weapon/pickaxe/hammer @@ -673,6 +673,8 @@ var/closest = 15 for(var/turf/simulated/mineral/random/R in orange(14,loc)) + if(!R.mineral) + continue var/dist = get_dist(loc, R) if(dist < closest) closest = dist diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index f7b5a7cb76e..6c250b630cd 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -438,7 +438,7 @@ ORE_SILVER = 2, ORE_PHORON = 5 ) - var/mineralChance = 45 + var/mineralChance = 55 /turf/simulated/mineral/random/Initialize() if (prob(mineralChance) && !mineral) @@ -446,7 +446,8 @@ if (mineral_name && (mineral_name in ore_data)) mineral = ore_data[mineral_name] UpdateMineral() - + MineralSpread() + . = ..() /turf/simulated/mineral/random/high_chance @@ -460,7 +461,7 @@ ORE_SILVER = 2, ORE_PHORON = 3 ) - mineralChance = 45 + mineralChance = 55 /turf/simulated/mineral/random/higher_chance mineralSpawnChanceList = list( @@ -527,7 +528,7 @@ pixel_x = -4 pixel_y = -4 queue_smooth(src) - + return INITIALIZE_HINT_NORMAL /turf/simulated/floor/asteroid/ex_act(severity) diff --git a/maps/Aurora-MapDev/aurora-2.dmm b/maps/Aurora-MapDev/aurora-2.dmm index ac3fd3dfdb8..644936057e0 100644 --- a/maps/Aurora-MapDev/aurora-2.dmm +++ b/maps/Aurora-MapDev/aurora-2.dmm @@ -261,7 +261,7 @@ "fa" = (/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/effect/floor_decal/corner/yellow/full{icon_state = "corner_white_full";dir = 4},/turf/simulated/floor/tiled,/area/outpost/engineering/hallway) "fb" = (/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},/turf/simulated/floor/plating,/area/maintenance/sublevel) "fc" = (/obj/structure/cable{d1 = 2;d2 = 8;icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/plating,/area/maintenance/sublevel) -"fd" = (/turf/simulated/mineral/random,/area/mine/unexplored) +"fd" = (/turf/simulated/mineral,/area/mine/unexplored) "fe" = (/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plating,/area/outpost/engineering/power) "ff" = (/obj/structure/cable{d1 = 1;d2 = 4;icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{icon_state = "intact-scrubbers";dir = 5},/turf/simulated/floor/plating,/area/outpost/engineering/power) "fg" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4;d2 = 8;icon_state = "4-8"},/turf/simulated/floor/plating,/area/outpost/engineering/power) @@ -1652,7 +1652,7 @@ "FN" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/rnd/storage) "FO" = (/obj/machinery/door/airlock/glass_medical{name = "Auxiliary Storage";req_access = list(5)},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/dark,/area/medical/medbay4) "FP" = (/obj/effect/floor_decal/corner/mauve/full,/turf/simulated/floor/tiled/white,/area/rnd/telesci) -"FQ" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact";dir = 6},/turf/simulated/mineral/random,/area/mine/unexplored) +"FQ" = (/obj/machinery/atmospherics/pipe/simple/visible{icon_state = "intact";dir = 6},/turf/simulated/mineral,/area/mine/unexplored) "FR" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 10;icon_state = "intact"},/obj/structure/cable/green{d2 = 2;icon_state = "0-2"},/obj/machinery/power/apc{dir = 4;name = "east bump";pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/rnd/mixing) "FS" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{icon_state = "intact";dir = 1},/turf/simulated/wall/r_wall,/area/rnd/mixing) "FT" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/obj/machinery/firealarm{dir = 4;pixel_x = 24;pixel_y = 6},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled,/area/rnd/storage) @@ -1834,20 +1834,20 @@ "Jn" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/rnd/mixing) "Jo" = (/obj/structure/bed/chair,/obj/machinery/computer/security/telescreen{desc = "Used for watching the test chamber.";layer = 4;name = "Test Chamber Telescreen";network = list("Toxins Test Area");pixel_x = 0;pixel_y = -32},/obj/effect/floor_decal/corner/red{icon_state = "corner_white";dir = 10},/turf/simulated/floor/tiled,/area/rnd/mixing) "Jp" = (/obj/structure/bed/chair,/obj/machinery/computer/security/telescreen{desc = "Used for watching the test chamber.";layer = 4;name = "Test Chamber Telescreen";network = list("Toxins Test Area");pixel_x = 0;pixel_y = -32},/obj/effect/floor_decal/corner/red/full{icon_state = "corner_white_full";dir = 4},/obj/machinery/button/remote/driver{id = "toxins_mass_driver";name = "Mass Driver button";pixel_x = 26;req_access = list(7)},/turf/simulated/floor/tiled,/area/rnd/mixing) -"Jq" = (/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/mineral/random,/area/mine/unexplored) +"Jq" = (/obj/machinery/atmospherics/pipe/simple/visible,/turf/simulated/mineral,/area/mine/unexplored) "Jr" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/asteroid,/area/rnd/mixing) "Js" = (/obj/structure/sign/securearea{name = "\improper CAUTION: BOMB RANGE"},/turf/simulated/wall/r_wall,/area/rnd/mixing) "Jt" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/asteroid,/area/mine/unexplored) "Ju" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/airless{icon_state = "asteroidfloor"},/area/rnd/mixing) "Jv" = (/obj/structure/disposaloutlet,/obj/structure/disposalpipe/trunk{dir = 4},/obj/effect/floor_decal/industrial/warning/cee{icon_state = "warningcee";dir = 1},/turf/simulated/floor/tiled/airless{icon_state = "asteroidfloor"},/area/rnd/mixing) -"Jw" = (/obj/structure/disposalpipe/segment{dir = 8;icon_state = "pipe-c"},/turf/simulated/mineral/random,/area/mine/unexplored) +"Jw" = (/obj/structure/disposalpipe/segment{dir = 8;icon_state = "pipe-c"},/turf/simulated/mineral,/area/mine/unexplored) "Jx" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning";dir = 4},/obj/effect/floor_decal/industrial/warning{icon_state = "warning";dir = 8},/turf/simulated/floor/tiled/airless{icon_state = "asteroidfloor"},/area/rnd/mixing) "Jy" = (/obj/machinery/light/small,/turf/simulated/floor/asteroid,/area/rnd/mixing) "Jz" = (/obj/structure/cable/green{d1 = 4;d2 = 8;icon_state = "4-8"},/turf/simulated/floor/asteroid,/area/mine/unexplored) "JA" = (/obj/structure/cable/green{d1 = 1;d2 = 4;icon_state = "1-4"},/turf/simulated/floor/asteroid,/area/mine/unexplored) "JB" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/cable/green{d1 = 4;d2 = 8;icon_state = "4-8"},/turf/simulated/floor/asteroid,/area/mine/unexplored) "JC" = (/turf/simulated/wall/r_wall,/area/rnd/test_area) -"JD" = (/obj/structure/disposalpipe/segment,/turf/simulated/mineral/random,/area/mine/unexplored) +"JD" = (/obj/structure/disposalpipe/segment,/turf/simulated/mineral,/area/mine/unexplored) "JE" = (/obj/structure/cable/green{d1 = 2;d2 = 8;icon_state = "2-8"},/obj/effect/floor_decal/industrial/warning{icon_state = "warning";dir = 4},/obj/effect/floor_decal/industrial/warning{icon_state = "warning";dir = 8},/turf/simulated/floor/tiled/airless{icon_state = "asteroidfloor"},/area/rnd/mixing) "JF" = (/turf/simulated/floor/tiled/airless,/area/rnd/test_area) "JG" = (/obj/structure/window/reinforced{icon_state = "rwindow";dir = 8},/turf/simulated/floor/asteroid,/area/mine/unexplored) @@ -2235,7 +2235,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaleleleleaaaaaaaaaaaaaaaaaaaaaaaaaaaaleqksxsyszsAsBsDsCsFsEsHsGnFposJsIrNsKsMsLrNsNsOsPpPpoaaaaeQoLsRsQeQeReReRaalelekLleleaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanWsSsTsUsVsWsYsXsZsUtasXleleaaleleuDMlvrMmwlwlwlwlwleQeQLZMZleleleleleleleaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaleleleaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqktdtesztftgthtiqkqkoroNnStjtktltmtjtntotptqtrtstteQeQeQeQtueQtveQtwtweQeQeQeQtxleleaaaaaaaaaaaaaaaaaaaaaaaanWnWnWnWnWtytztAsVtBtDtCtEtAtFtCleleleleleuDMovrMpNmNntHtJtItLtKtMeQleleleleleleleleleaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaleleleleaaaaaaaaaaaaaaaaaaaaaaaaaaaaqktNtOtPtRtQtTtStUqkoQoNnFtjtVtWtXtjtYtZuatqubucudeQufueueuguhuiukujumuluounuqupleleaaaaaaaaaaaaaaaaaaaaaalesXurtzusutuuuvuwsVuxuzuyuAuBuCuyleleleleleuDMlNoNpySNqySuGuFeQNrNseQleleuIuIuIuIuIuJuJuJuJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaleleaaaaaaaaaaaaaaaaaaaaaaaaaaaaqkuKuLuMuNuOuPuQuRqkuTuSpltjuUuVuWtjuXuYuZtqvavbvceQvdeQeQeQeQeQeQeQeQeQOgOheQveleleaaaaaaaaaaaaaaaaaaaaleletCvftzvgvhvivivjvkvlvmnWnWvnvonWaaleleleleNtMrMstGtGvpMvvruFNuleleleleleuIvtvvvuvwvxvzvyuJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaleleaaaaaaaaaaaaaaaaaaaaaaaaaaaaqkuKuLuMuNuOuPuQuRqkuTuSpltjuUuVuWtjuXuYuZtqvavbvceQvdeQeQeQeQeQeQeQeQeQNZOheQveleleaaaaaaaaaaaaaaaaaaaaleletCvftzvgvhvivivjvkvlvmnWnWvnvonWaaleleleleNtMrMstGtGvpMvvruFNuleleleleleuIvtvvvuvwvxvzvyuJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaleleleleleleleleleleaaaaaaaaaaaaqkvAvBvCsAvDvEvFvGqkvHvIoYtjvJvKvLtjvMvNvOtqvPvQvReQvdeQvSvTvSvUaaaaaaeQeQeQeQaaleleaaaaaaaaaaaaaaaaaaaaleleuyvVvWvXutvYvZwawbwcwdsXwfwewgnWaaoOwhwhwhwhwhwhMwwhwhwiwkwjvsleleleleleuIwmwnwovwwpwqwruJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaleleleleleleleleleleleleleleaaqkqkqkwswtqkqkqkqkqnqnwuqnqnqneQeQeQeQeQeQeQeQeQeQeQvdeQwvwwwxvUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalelewywywywywytzwzsVwBnWNYwCwEwDwFnWnWnWwHwGwGwIwHwGwGwJwhwKwNwLwlaaaaleleleuIwMwQwOvwwPwSwRuJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalelelelelelelelelelelelelelelenUwTnXnXnXwUwVnXnXwWwXnZnXwYqneQeQeQeQufueueueueueuewZeQwwwwwwvUaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalelesXurtzusuttzwzxaxexbxcxdtzxfxhxgxjnWxkwGwGwIwHwGwGxlwhxmvrxqwlwlwlxnxoxpuIxrxtxsvwxuxvxuuJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/Aurora-MapDev/aurora-3.dmm b/maps/Aurora-MapDev/aurora-3.dmm index 9b38d4cb859..7db996c09b8 100644 --- a/maps/Aurora-MapDev/aurora-3.dmm +++ b/maps/Aurora-MapDev/aurora-3.dmm @@ -5854,7 +5854,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaacaacaacaacaacaacaaaaaaaaaaaaaaaaacaagaaraaraasaataacaaaaaaaaaaabaabaabaabaauaaCaawaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaacaayaazaaAaaBaacaacaacaacaacaacaacaacaacaaDaacaacaacaacaacaaaaabaabaaaaacaacaaFaacaabaabaabaabaabaabaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaacaaHaaGaaGaaGaaGaaIaaGaaGaaJaaGaaGaaGaaGaaGaaKaaGaaNaaLaacaaaaaaaaaaaaaacaaMaaSaacaabaabaabaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaabaabaabaabaabaabaabaaOaaOaaOaaOaaOaaOaaOaaOaaOaaOaaOaaOaaOaabaabaaPaaaaaaaaaaaaaaaaaaaaaaaQaaRaaQaaQaaQaaQaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaacabaaaTaaTaaTaaTaaTaaTaaTaaTaaTaaTaaTaaUaaUaaUaagabaaacaacaacaacaacaacaacaacaagaacaacaacaacaacaacaacaacaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaabaabaabaabaabaabaabaaOaaOaaOaaOaaOaaOaaOaaOaaOaaOaaOaaOaaOaabaabaqAaaaaaaaaaaaaaaaaaaaaaaaQaaRaaQaaQaaQaaQaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaacabaaaTaaTaaTaaTaaTaaTaaTaaTaaTaaTaaTaaUaaUaaUaagabaaacaacaacaacaacaacaacaacaagaacaacaacaacaacaacaacaacaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaaaaaaaaaaabaabaabaabaabaabaabaaOaaVaaVaaVaaOaaWaaWaaWaaOaaXaaXaaXaaOaabaabaabaaaaaaaaaaaaaaaaaaaaaaaQaaRaaYaaZabbaaQaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaacabaaaTabfabcabcabcabdabeabgabeabiabhablabjaaUabkabmaaGaaGaaGaaGabnaboaaGaaGaaGaaGabnaaGaaGaaGabuabpaacaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaaaaaaaaaaaaaabaababqaabaabaabaabaaOaaVabraaVaaOaaWabsaaWaaOaaXabtaaXaaOaabaabaabaabaabaaaaaaaaaaaaaaaaaQabyabvabwabxaaQaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaababzabaabAabFabBabCabDabEabDabEabGabJabHabIabKabPaadabLaagabMaagaagabNaacaacaagaacabOabOabOabOabOabRabQaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaaaaaaaaaaabaabaabaabaabaabaabaabaaOabSabUabTaaOabVabYabWaaOabZacdacaaaOaabaabaababqaabaaaaaaaaaaaaaaaaaQabXaaYaaRaaRaaQaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabacjabaackabFacmacbacbacbacbacbabFabJaccacoabKaaUaagaceacfacgaaBachaagaagaciaagaagabOacuacvaclabOabRabMaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaabaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/Aurora-MapDev/aurora-5.dmm b/maps/Aurora-MapDev/aurora-5.dmm index 2caa24b30c9..c11016b54d6 100644 --- a/maps/Aurora-MapDev/aurora-5.dmm +++ b/maps/Aurora-MapDev/aurora-5.dmm @@ -4,7 +4,7 @@ "ad" = (/obj/machinery/power/tracker,/obj/structure/cable/yellow{d2 = 2;icon_state = "0-2"},/turf/simulated/floor/airless,/area/solar/fore) "ae" = (/obj/structure/sign/electricshock,/turf/simulated/wall,/area/space) "af" = (/obj/structure/cable/yellow{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/simulated/floor/airless,/area/solar/fore) -"ag" = (/turf/simulated/mineral/random,/area/space) +"ag" = (/turf/simulated/mineral,/area/space) "ah" = (/obj/structure/cable/yellow,/turf/simulated/floor/airless,/area/solar/fore) "ai" = (/obj/machinery/camera/network/telecom{c_tag = "Telecomms - Fore Solar Array"},/turf/unsimulated/chasm_mask,/area/solar/fore) "aj" = (/obj/machinery/power/solar{id = "auxsolarnorth";name = "Fore Solar Array"},/obj/structure/cable/yellow{d2 = 2;icon_state = "0-2"},/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/solar/fore) @@ -677,7 +677,7 @@ "na" = (/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/machinery/atmospherics/portables_connector{dir = 1},/turf/simulated/floor/plating,/area/tcommsat/entrance) "nb" = (/obj/machinery/light/small/emergency{dir = 8},/turf/unsimulated/chasm_mask,/area/tcommsat/entrance) "nc" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled,/area/tcommsat/entrance) -"nd" = (/turf/simulated/mineral/random,/area/tcommsat/entrance) +"nd" = (/turf/simulated/mineral,/area/tcommsat/entrance) "ne" = (/turf/simulated/wall/r_wall,/area/space) "nf" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hallway/secondary/entry/fore) "ng" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/hallway/secondary/entry/fore) @@ -1424,7 +1424,7 @@ "Bt" = (/obj/machinery/door/airlock/glass,/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/aft) "Bu" = (/obj/machinery/door/airlock/glass,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1;d2 = 2;icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/entry/aft) "Bv" = (/obj/machinery/door/airlock/glass,/obj/machinery/door/firedoor,/turf/simulated/floor/tiled,/area/hallway/secondary/entry/aft) -"Bw" = (/turf/simulated/mineral/random,/area/bridge/levela) +"Bw" = (/turf/simulated/mineral,/area/bridge/levela) "Bx" = (/turf/simulated/floor/asteroid,/area/syndicate_station/surface) "By" = (/obj/machinery/atmospherics/pipe/zpipe/up/supply,/turf/simulated/floor/plating,/area/maintenance/arrivals) "Bz" = (/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/chasm_mask,/area/space) @@ -1899,7 +1899,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagagagagagagagagagagagagagagaPmU aaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagagagagagagagagagagagagagagaPaPaPononooononagagagagagagagagagagagagagagagagagagagagagagagagagagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacnopoqnGoporbqoskqcqotnAounBovnCnTnTownjagagagagagagaaaaaaagaaaamHmHmHmHmHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagagagagagagagagagagagagagagagagonoxozoyonagagagagagagagagagagagagagagagagagagagagagagagagagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacnoAoBnGoDoCbOoEjfjhoFnAoGoHoInCnToJoKnjagagagagagagaaaaaaaaaaaamHmHmHmHmHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagagagagagagagagagagagagagagonoLoNoMonagagagagagagagagagagagagagagagagagagagagagagagagagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacnoOoDoPoQoBcnoEkqoRnjnjnjnjnjnjnjnjnjnjagabagagagagagaaaaaaaaaamHmHmHmHmHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaHOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagagagagaaaaaaaaaaaaagonoSoUoTonagagagagagagagagagagagagagagagagagagagagagagagagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadWoVoWoXoYoVfyoEkqoZbqpapapapapapapabqagagpbagagagagagaaaaaaaaaaaamHmHmHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaHPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagagagagaaaaaaaaaaaaagonoSoUoTonagagagagagagagagagagagagagagagagagagagagagagagagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadWoVoWoXoYoVfyoEkqoZbqpapapapapapapabqagagpbagagagagagaaaaaaaaaaaamHmHmHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaHOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagaaaaaaaaaaaaaaaapcpdpepfpgaaaaagagagagagagagagagagagagagagagagagagagagagagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaphphphphphphphpipjnwbqpapapapapapapabqagagaaaaaaagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagaaaaaaaaaaaaaaaaaapkplpkaaaaaaaaaaaaaaaaagagagagagagagagagagagagagagagagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagphpmpnpopppqproEkqpsbqpapapapapapapabqagaaaaaaaaaaaaaaaaaaaaagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagaaaaaaaeacacacacacacptpuptacacacacacacaeaaagagagagagagagagagagagagagagagagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagphpvpwpwpwpxpzpypAHybqpapapapapapapabqaaaaaaaaaaaaaaaaaaagagagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -1912,7 +1912,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaapKpKpK aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaapTpSpSpSpSpUpVpWpXpXpXpXpYaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagagphpDqKqLqMqNqOqPqQcqcqcqcqHzqRHAcqcqcqcqqToRbqqEqGqUqVqWqJqvagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagwbwcwdweuZwcwdweuZwcwdweuZuZwfwhwgwjwiveveveveveveveveveveveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaqdqdqdqdqdaapVaaqdqdqdqdqdaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagqXqXqXqXphqYqZrarbrcrdoEkqcqrerfHBrhrhrhHCrfrjcqqTrkbqqEqGrlrmqWqJqvagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaguZuZwDwEuZuZwFwGuZuZwHwEuZuZwIwKwJwLvJveveveveveveveveveveveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaapVaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagqXrnrorpphphrqphphphbqrrrscqrtrurvrwrxryrzrArBcqrCjhbqqErDrErmrFqJqvagaaaaaaaarGrIrHrHrJrJrHrHrHrJrHrKaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaguZxcxbxdxexfxgxdxhxixjxlxkxnxmxpxoxqaaaaveveveveveveveveveveaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaapKpKpKpKpKaapVaapKpKpKpKpKaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagqXrnrMrLrLrLrLrLrLrLrOrNrPcqrtrQrRrSryrSrzrTrUmmrVcqHQqvqvrWrXqvqvqvaaaaaaaaaarGrYrYrYrYrYrYrYrYrYrYrZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauZuZHRuZHSuZuZuZxOxdxdwbxPxQxdwbxdxRxTxSxUxdxpxouZuZuZuZuZxVxXxWuZuBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaapKpKpKpKpKaapVaapKpKpKpKpKaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagqXrnrMrLrLrLrLrLrLrLrOrNrPcqrtrQrRrSryrSrzrTrUmmrVcqHQqvqvrWrXqvqvqvaaaaaaaaaarGrYrYrYrYrYrYrYrYrYrYrZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauZuZHRuZHRuZuZuZxOxdxdwbxPxQxdwbxdxRxTxSxUxdxpxouZuZuZuZuZxVxXxWuZuBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaapTpSpSpSpSpUpVpWpXpXpXpXpYaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagqXqXsasbsbsbsbsbsbsbbqoEkqcqrBscsdrSserSrzsfsgcqqTHTnwshsisjsksislsmaaaaaaaaaasnrYrYrYrYrYrYrYrYrYrYrZaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauZGlyqGmyrxdHUHVytyuyuyuyvywyxyyyxyzyByAyCyDxpxoyEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaqdqdqdqdqdaapVaaqdqdqdqdqdaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagagqXsosbspsqsrssstsusvoEkqnirhswsxrSserSsdsyrhcqszixsBsAsAsCsDsEsFsGsHaaaaaaaasIrYrYrYrYrYrYrYrYrYrYsIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauZuZuZyQyRySyRyTuZuZyUyVyWyVyYyXyZwbzbzazcuZuZzdwKzezfyWyVyVyVyVyVyVyVyVyVyVzgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaasJaasKaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagagagagagagagagagagagqXsosbsLsMsMsMsMsMsNoEkqcqsOsPrzrSryrSrzsQsRcqqTnJsSsTsTsUsTsTsVsWsXsXsXsXsXsYrYrYrYrYrYrYrYrYrYrYsIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazozqzpzszrztzuzvzwzxzyzzzAzAzBzCzDzEzFaaaaaazGuZzHzIzJzKzLzLzLzJzMzJzLzLzNzPzOzQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -1945,9 +1945,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBVBVBVBVBWBVBVBVBVBVBVBVBVBVBVBVBVzWzWzWBXzWzWBtBuBvzWaaaaaaaaaaaaaaaaagagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauzuzuzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGjGjGjGjGjGjGjaaaaBYBZCaCbCcCdCeCfCeCgChCiCjClCkCmHWCnCoyhCpCqCrzXyfyhCsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauzuzuzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGjGjGjGjGjGjGjaaaaCtCuChChCvChChChCwChChCxCyCzChCAHXCByhyhCpCCwTzXzYzZCDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauzuzuzuzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGjGjGjGjGjGjGjCECFCGCHCICJCKChCLCMCLCLChCxCNCOChCAHYCRCQCTCSCVCUCXCWyhCDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauzuzuzuzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGjGjGjGjGjGjGjCECFCGCHCICJCKChCLCMCLCLChCxCNCOChCAHXCRCQCTCSCVCUCXCWyhCDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauzuzuzuzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGjGjGjGjGjGjGjCYCZCYDbDaChDcChChChChDdDeDfDgDiDhDkDjDmDlyhyhyhDnDoyhyhCDaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauzuzuzBxBxBxBxBxBxBxuzuzuzaaaauzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGjGjGjGjGjGjGjDpDqDpDrChChDsDtDtDtDtDuDvDxDwDzDyDAHZDBDCyhyhDDDEDoDFyhDGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauzuzBxBxBxBxBxBxBxBxBxuzuzaauzuzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGjGjGjGjGjGjGjDpDqDpDrChChDsDtDtDtDtDuDvDxDwDzDyDAHWDBDCyhyhDDDEDoDFyhDGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauzuzBxBxBxBxBxBxBxBxBxuzuzaauzuzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGjGjGjGjGjGjGjCECFDHDIChChChChChChChCxDJCADKCODLDMBVDNDODODPHeHeDQzWzWzWagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauzuzuzBxBxBxBxBxBxBxBxBxuzuzuzuzuzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGjGjGjGjGjGjGjDpDqDpDSDRDTDTDTDRChChCxDJDUCjDWDVDXBVDYDZEaEbHeEcEdqXagagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauzuzuzBxBxBxBxBxBxBxBxBxuzuzuzuzuzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGjGjGjGjGjGjGjEeEfEeEgEgEhEgEgEgEiCIEjEkChElEmEnEoBVEqEpHhErHeEsEtEtEtEtagagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauzuzuzuzBxBxBxBxBxBxBxBxBxuzuzuzuzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa