From 29b9e0e8785dff2693e239b5fcb7dbf0c3e8ddf1 Mon Sep 17 00:00:00 2001 From: kyres1 Date: Mon, 25 May 2026 18:15:01 -0500 Subject: [PATCH 1/5] east domotan changes, fixes up z4 necropolis --- .../z4_surface/Hedgemaze.dmm | 85 +- .../z4_surface/Inn_necropolis.dmm | 470 +- .../domotan_necropolis/z4_surface/Oasis_1.dmm | 248 +- .../domotan_necropolis/z4_surface/Oasis_2.dmm | 278 +- .../domotan_necropolis/z4_surface/Outpost.dmm | 488 +- .../domotan_necropolis/z4_surface/cave_1.dmm | 193 +- .../domotan_necropolis/z4_surface/cave_2.dmm | 336 +- .../domotan_necropolis/z4_surface/cave_3.dmm | 580 +- .../domotan_necropolis/z4_surface/cave_4.dmm | 322 +- .../domotan_necropolis/z4_surface/cave_5.dmm | 318 +- .../domotan_necropolis/z4_surface/cave_6.dmm | 234 +- _maps/domotan_necropolis/z4_surface/cells.dmm | 715 +- .../domotan_necropolis/z4_surface/forest.dmm | 80 +- .../z4_surface/graveyard.dmm | 1677 +- .../z4_surface/literally_nothing.dmm | 4 +- .../z4_surface/one_goblin.dmm | 224 +- .../z4_surface/spidercave.dmm | 101 +- .../z4_surface/templates_base.dm | 89 +- .../domotan_necropolis/z4_surface/washout.dmm | 1564 +- _maps/map_files/domotan/domotan_east.dmm | 21165 ++++++++-------- code/game/area/roguetownareas.dm | 2 +- .../mapGeneratorModules/decap.dm | 12 +- 22 files changed, 14916 insertions(+), 14269 deletions(-) diff --git a/_maps/domotan_necropolis/z4_surface/Hedgemaze.dmm b/_maps/domotan_necropolis/z4_surface/Hedgemaze.dmm index a40c5e49c77..716f1d6a09b 100644 --- a/_maps/domotan_necropolis/z4_surface/Hedgemaze.dmm +++ b/_maps/domotan_necropolis/z4_surface/Hedgemaze.dmm @@ -2,40 +2,53 @@ "a" = ( /obj/structure/flora/grass/bush/wall/tall, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) +"b" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/goblin, +/turf/open/floor/grass/yel, +/area/under/cave) "c" = ( /obj/structure/innocent_bush, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "e" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) +"h" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/grass/yel, +/area/under/cave) "i" = ( /obj/structure/flora/grass/bush/wall/tall, /obj/structure/flora/grass/bush/wall/tall, /obj/structure/flora/grass/bush/wall/tall, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "r" = ( /obj/structure/flora/grass/bush/wall/tall, /obj/structure/flora/grass/bush/wall/tall, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) +"u" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/grass/yel, +/area/under/cave) "A" = ( /obj/structure/flora/grass/swampweed, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "C" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "M" = ( /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "S" = ( /obj/structure/flora/grass, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" e @@ -191,12 +204,12 @@ M C M M -M +b a a M a -M +u e "} (7,1,1) = {" @@ -204,9 +217,9 @@ e M a S -M -M -C +u +u +h M M a @@ -223,7 +236,7 @@ a a M a -M +u e "} (8,1,1) = {" @@ -235,9 +248,9 @@ a a M a -M -M -C +u +u +h C M a @@ -258,7 +271,7 @@ e M a S -M +b M M a @@ -292,7 +305,7 @@ a r C M -M +b M M M @@ -344,7 +357,7 @@ a M a c -M +u a a M @@ -355,7 +368,7 @@ M a M C -M +b C M M @@ -371,7 +384,7 @@ M M a a -M +u a a a @@ -398,7 +411,7 @@ a a a r -M +u a M M @@ -432,7 +445,7 @@ a a a a -M +u a M M @@ -459,7 +472,7 @@ a M a a -M +u a M a @@ -493,7 +506,7 @@ a a a a -M +u e "} (18,1,1) = {" @@ -506,10 +519,10 @@ M a M M -M -M -M -M +u +u +u +u M C r @@ -520,7 +533,7 @@ a M a a -M +u e "} (19,1,1) = {" @@ -542,12 +555,12 @@ M a M a -M +b a M a a -M +u e "} (20,1,1) = {" @@ -558,10 +571,10 @@ M M M i -M +b a M -M +b M M a diff --git a/_maps/domotan_necropolis/z4_surface/Inn_necropolis.dmm b/_maps/domotan_necropolis/z4_surface/Inn_necropolis.dmm index f948372fff0..36857eb6877 100644 --- a/_maps/domotan_necropolis/z4_surface/Inn_necropolis.dmm +++ b/_maps/domotan_necropolis/z4_surface/Inn_necropolis.dmm @@ -9,129 +9,135 @@ /obj/effect/spawner/map_spawner/loot/food, /obj/effect/spawner/map_spawner/loot/food, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "dL" = ( /obj/structure/fermentation_keg/redwine, /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "fx" = ( /obj/structure/chair/stool, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "fG" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "gy" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "gD" = ( /obj/structure/barricade/wooden/crude, /turf/closed/wall/mineral/wood/window, -/area/indoors/cave) +/area/under/cave) "gJ" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "ik" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/grass/bush, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "iP" = ( /obj/structure/bed/inn, /obj/item/bedsheet/fabric, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "jd" = ( /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "jw" = ( /obj/structure/table/wood/plain, /obj/item/dice_cup/wooden, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "lQ" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "mb" = ( /obj/structure/flora/grass/bush, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "me" = ( /obj/structure/table/wood/nice/decorated, /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "mT" = ( /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "nk" = ( /obj/machinery/light/fueled/torchholder/l, /obj/structure/chair/stool, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "nC" = ( /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "oQ" = ( -/turf/open/openspace, -/area/indoors/cave) +/turf/open/floor/dirt/road, +/area/under/cave) "pN" = ( /obj/structure/fermentation_keg/distiller, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "pY" = ( /obj/structure/table/wood/counter/end{ dir = 1 }, +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "qc" = ( /obj/structure/door/swing, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "qS" = ( /obj/effect/decal/cleanable/debris/wood, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "rc" = ( /obj/structure/table/wood/counter/end{ dir = 10 }, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) +"rj" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/closed/mineral, +/area/under/cave) "ry" = ( /obj/structure/bed/inn, /obj/item/bedsheet/fabric, /obj/effect/decal/cleanable/dirt, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "sA" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) "sU" = ( /obj/structure/chair/wood, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "tc" = ( /obj/structure/fermentation_keg/beer, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "tt" = ( /turf/closed/wall/mineral/wood, -/area/indoors/cave) -"vc" = ( -/turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) +"uA" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/ruinedwood/two, +/area/under/cave) "vf" = ( /obj/machinery/light/fueled/torchholder/c{ pixel_y = -1; @@ -139,30 +145,38 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "vK" = ( /turf/closed/wall/mineral/wood/window, -/area/indoors/cave) +/area/under/cave) +"ye" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/grass/mixyel, +/area/under/cave) "zm" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/grass/bush, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) +"zW" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/naturalstone, +/area/under/cave) "At" = ( /obj/structure/table/wood/plain, /obj/item/reagent_containers/glass/cup/golden, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "Fb" = ( /obj/structure/table/wood/counter{ dir = 1 }, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "Fr" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "Gx" = ( /obj/structure/closet/crate/crafted_closet/inn, /obj/item/clothing/armor/leather/hide, @@ -175,28 +189,28 @@ /obj/item/clothing/pants/trou, /obj/item/clothing/pants/trou, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "GX" = ( /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "Iv" = ( /obj/machinery/light/fueled/torchholder/l, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "IB" = ( /obj/structure/flora/grass/bush, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "IN" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "Jm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "JA" = ( /obj/structure/table/wood/counter{ dir = 1 @@ -214,65 +228,73 @@ pixel_x = -11 }, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "Lh" = ( /obj/structure/door/window, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "Lm" = ( /obj/machinery/light/fueled/torchholder/r, /obj/effect/decal/cleanable/dirt, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "OR" = ( /obj/machinery/light/fueled/torchholder/c{ dir = 1; pixel_y = -1 }, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "PG" = ( /obj/structure/door/red, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) +"QR" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/dirt/road, +/area/under/cave) "Ro" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "Rp" = ( /obj/structure/chair/wood/alt/chair3{ dir = 4 }, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) +"Rw" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/closed/wall/mineral/wood, +/area/under/cave) "RB" = ( /obj/structure/chair/wood/alt/chair3{ dir = 8 }, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "RQ" = ( /obj/structure/table/wood/plain, /obj/item/toy/cards/deck, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "TH" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "Uw" = ( /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) "Ys" = ( /obj/structure/chair/wood/alt/chair3, /turf/open/floor/ruinedwood/two, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" sA sA sA -sA +rj sA sA sA @@ -281,11 +303,10 @@ sA sA fG fG +zW fG fG fG -fG -sA sA sA sA @@ -294,6 +315,7 @@ sA sA sA sA +rj "} (2,1,1) = {" sA @@ -307,11 +329,11 @@ GX jd sA sA -vc +oQ sA -vc -vc -vc +oQ +oQ +oQ sA GX GX @@ -336,8 +358,8 @@ sA sA sA sA -vc -vc +oQ +oQ sA sA GX @@ -359,14 +381,14 @@ Fr Fr jd GX -vc -vc -vc -vc -vc -vc -vc -vc +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ GX IB GX @@ -386,14 +408,14 @@ GX GX jd GX -vc -vc -vc -vc -vc -vc -vc -vc +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ GX jd jd @@ -410,19 +432,19 @@ mb GX Fr GX -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ GX GX GX @@ -437,22 +459,22 @@ GX jd mb GX -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ jd Fr sA @@ -464,8 +486,8 @@ Ro Ro GX GX -vc -vc +oQ +oQ tt tt tt @@ -475,11 +497,11 @@ Lh tt vK tt -tt +Rw jd -vc -vc -vc +oQ +oQ +oQ jd Ro sA @@ -490,9 +512,9 @@ GX GX jd GX -vc -vc -vc +oQ +oQ +oQ vK dL Uw @@ -505,8 +527,8 @@ OR tt Ro jd -vc -vc +oQ +oQ Ro Fr sA @@ -516,9 +538,9 @@ sA sA jd GX -vc -vc -vc +oQ +oQ +oQ GX gD tc @@ -532,8 +554,8 @@ Uw tt Fr GX -vc -vc +oQ +oQ jd jd sA @@ -542,10 +564,10 @@ sA fG sA sA -vc -vc -vc -vc +oQ +oQ +oQ +oQ jd tt pN @@ -559,21 +581,21 @@ TH tt Fr jd -vc -vc +oQ +oQ sA sA sA "} (12,1,1) = {" fG -vc -vc -vc -vc -vc -vc -jd +oQ +oQ +oQ +oQ +oQ +oQ +ye tt aF TH @@ -586,20 +608,20 @@ Uw vK Ro Ro -vc -vc +oQ +oQ sA -vc +oQ fG "} (13,1,1) = {" fG -vc -vc -vc -vc -vc -vc +oQ +oQ +oQ +oQ +oQ +oQ jd tt mT @@ -613,20 +635,20 @@ vf vK mb Ro -vc -vc +oQ +oQ sA -vc +oQ fG "} (14,1,1) = {" fG -vc +oQ sA -vc -vc -vc -vc +oQ +oQ +oQ +oQ GX tt qc @@ -642,8 +664,8 @@ GX lQ GX GX -vc -vc +oQ +oQ fG "} (15,1,1) = {" @@ -653,12 +675,12 @@ sA GX GX GX -vc +oQ GX tt TH TH -Uw +uA TH Uw jw @@ -669,8 +691,8 @@ tt tt tt tt -vc -vc +oQ +oQ fG "} (16,1,1) = {" @@ -679,8 +701,8 @@ sA sA mb GX -vc -vc +oQ +oQ GX gD Uw @@ -697,7 +719,7 @@ Iv Gx tt sA -vc +oQ fG "} (17,1,1) = {" @@ -707,7 +729,7 @@ Fr GX oQ oQ -vc +oQ GX vK mT @@ -723,8 +745,8 @@ TH Jm Uw tt -vc -vc +oQ +oQ fG "} (18,1,1) = {" @@ -734,8 +756,8 @@ GX GX GX oQ -vc -vc +oQ +oQ tt tt tt @@ -750,7 +772,7 @@ ry me iP tt -vc +oQ sA sA "} @@ -760,15 +782,15 @@ GX oQ oQ GX -vc -vc -vc -vc -vc -vc -vc -vc -vc +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ jd gy Ro @@ -778,7 +800,7 @@ tt tt tt GX -vc +oQ sA "} (20,1,1) = {" @@ -788,15 +810,15 @@ GX oQ oQ oQ -vc -vc -vc -vc -vc -vc -vc -vc -vc +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ gJ lQ Fr @@ -804,8 +826,8 @@ Fr Ro gJ GX -vc -vc +oQ +oQ sA "} (21,1,1) = {" @@ -815,52 +837,52 @@ GX GX GX oQ -vc +oQ oQ GX GX Fr GX GX -vc -vc +oQ +oQ jd mb -vc -vc -vc +oQ +oQ +oQ Fr -vc -vc -vc +oQ +oQ +oQ sA "} (22,1,1) = {" sA GX oQ -oQ -GX +QR GX GX oQ +oQ GX Ro gJ lQ mb -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc -vc -sA +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +oQ +rj "} (23,1,1) = {" sA @@ -877,16 +899,16 @@ gJ Ro GX sA -vc -vc +oQ +oQ sA sA -vc -vc -vc -vc -vc -vc +oQ +oQ +oQ +oQ +oQ +oQ sA "} (24,1,1) = {" @@ -905,7 +927,7 @@ sA sA sA sA -vc +oQ sA sA ik diff --git a/_maps/domotan_necropolis/z4_surface/Oasis_1.dmm b/_maps/domotan_necropolis/z4_surface/Oasis_1.dmm index b63fd05ebb0..a71b3425dcc 100644 --- a/_maps/domotan_necropolis/z4_surface/Oasis_1.dmm +++ b/_maps/domotan_necropolis/z4_surface/Oasis_1.dmm @@ -1,14 +1,15 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/closed/wall/mineral/decostone/moss/blue, -/area/indoors/cave) +/area/under/cave) "b" = ( +/obj/effect/spawner/map_spawner/necropolis/water_clutter, /turf/open/water, -/area/indoors/cave) +/area/under/cave) "c" = ( /obj/machinery/light/fueled/hearth, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "d" = ( /obj/structure/closet/crate/chest/wicker, /obj/item/ore/coal, @@ -16,155 +17,182 @@ /obj/item/ore/coal, /obj/item/ore/coal, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "f" = ( /obj/structure/chair/hotspring_bench/left, /turf/open/floor/cobblerock, -/area/indoors/cave) +/area/under/cave) "g" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "i" = ( /obj/machinery/light/fueled/campfire/longlived, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) +"j" = ( +/obj/effect/spawner/map_spawner/necropolis/water_clutter, +/turf/open/water/river, +/area/under/cave) "l" = ( /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/cobblerock, -/area/indoors/cave) +/area/under/cave) "m" = ( /turf/open/floor/cobblerock, -/area/indoors/cave) +/area/under/cave) "n" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "o" = ( /obj/structure/bridge_stakes{ dir = 4 }, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "p" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) +"q" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/naturalstone, +/area/under/cave) "r" = ( /obj/structure/bridge_stakes{ dir = 8 }, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "s" = ( /obj/structure/chair/hotspring_bench/right, /turf/open/floor/cobblerock, -/area/indoors/cave) +/area/under/cave) "t" = ( /obj/structure/flora/grass/pyroclasticflowers, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "u" = ( /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "v" = ( /obj/structure/door/weak, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "w" = ( /obj/machinery/light/fueled/torchholder/l{ pixel_x = -12 }, /turf/open/floor/cobblerock, -/area/indoors/cave) +/area/under/cave) "x" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "y" = ( /obj/structure/chair/hotspring_bench/left{ dir = 1 }, /turf/open/floor/cobblerock, -/area/indoors/cave) +/area/under/cave) "z" = ( /obj/structure/chair/hotspring_bench/right{ dir = 1 }, /turf/open/floor/cobblerock, -/area/indoors/cave) +/area/under/cave) "A" = ( /turf/open/water/river{ dir = 8 }, -/area/indoors/cave) +/area/under/cave) "B" = ( /obj/structure/flora/pillar, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "D" = ( /obj/machinery/light/fueled/torchholder/r{ pixel_x = 10 }, /turf/open/floor/cobblerock, -/area/indoors/cave) +/area/under/cave) "E" = ( /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "F" = ( /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "G" = ( /obj/structure/lootable_structure/stockpile/grain_barrel, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "H" = ( /obj/structure/bed/sleepingbag, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "I" = ( /obj/structure/flora/pillar, /turf/open/floor/cobblerock, -/area/indoors/cave) +/area/under/cave) "J" = ( /obj/structure/well/fountain, /turf/open/floor/cobblerock, -/area/indoors/cave) +/area/under/cave) "K" = ( /obj/structure/bridge{ dir = 4 }, /turf/open/water/river, -/area/indoors/cave) +/area/under/cave) +"M" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/naturalstone, +/area/under/cave) "N" = ( /turf/open/water/river, -/area/indoors/cave) +/area/under/cave) +"O" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/naturalstone, +/area/under/cave) +"P" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/closed/mineral, +/area/under/cave) +"Q" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/dirt/road, +/area/under/cave) "R" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"S" = ( +/turf/open/water, +/area/under/cave) "T" = ( /obj/structure/bridge{ dir = 8 }, /turf/open/water/river, -/area/indoors/cave) +/area/under/cave) "U" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "V" = ( /obj/structure/bed/hay, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "W" = ( /obj/structure/table/wood/counter{ dir = 4 }, /obj/structure/fluff/millstone, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "X" = ( /obj/structure/table/wood/counter{ dir = 4 @@ -178,18 +206,18 @@ pixel_y = -5 }, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "Y" = ( /obj/machinery/light/fueled/torchholder/c{ dir = 1; pixel_y = -2 }, /turf/open/floor/cobblerock, -/area/indoors/cave) +/area/under/cave) "Z" = ( /obj/structure/lootable_structure/stockpile/fish_barrel, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" p @@ -204,19 +232,19 @@ p p p R -R +q E E E E -R -p +q p p p p p p +P "} (2,1,1) = {" p @@ -263,11 +291,11 @@ U U E E -b -b -b -b -b +S +S +S +S +S p p p @@ -283,17 +311,17 @@ v E E E -u +Q u E U U U E +S +S b -b -b -b +S b p p @@ -318,25 +346,25 @@ E E E E +S b -b -b -b +S +S p p p "} (6,1,1) = {" p -R +M G Z p p p -b -b -b +S +S +S H i u @@ -346,9 +374,9 @@ E t E E -b -b -b +S +S +S p p p @@ -362,7 +390,7 @@ p p p b -b +S u u H @@ -373,8 +401,8 @@ E E E N -b -b +S +S b p p @@ -384,12 +412,12 @@ p p p p -R +O p p p -b -b +S +S u u u @@ -402,7 +430,7 @@ E N N b -b +S p p p @@ -411,11 +439,11 @@ p p p p -R +M R p p -b +S N N N @@ -425,10 +453,10 @@ N K T N +j N N -N -b +S b p p @@ -439,15 +467,15 @@ p p p p -R +M E p -b -b +S +S A n F -N +j N K T @@ -455,8 +483,8 @@ N N N N -b -b +S +S p p p @@ -482,8 +510,8 @@ E u u E -b -b +S +S p p R @@ -517,7 +545,7 @@ R "} (13,1,1) = {" R -R +q R R R @@ -545,7 +573,7 @@ E (14,1,1) = {" R R -R +q R E F @@ -562,7 +590,7 @@ w m Y a -b +S E t p @@ -605,7 +633,7 @@ p p p E -b +S E U U @@ -616,8 +644,8 @@ m m z a -b -b +S +S E p p @@ -626,14 +654,14 @@ R (17,1,1) = {" p p -R +q R p p p -b -b -b +S +S +S E E a @@ -643,24 +671,24 @@ D m Y a -b +S E E p p -R +q "} (18,1,1) = {" p p -R -R +M +q R p p +S b -b -b +S E E a @@ -685,8 +713,8 @@ R R p p -b -b +S +S b F F @@ -712,9 +740,9 @@ p p p p -b -b -b +S +S +S F E u @@ -740,8 +768,8 @@ p p p b -b -b +S +S F E F @@ -762,12 +790,12 @@ p p p p +P p p p -p -b -b +S +S b F E @@ -783,7 +811,7 @@ E E p p -p +P "} (23,1,1) = {" p @@ -828,7 +856,7 @@ p R p p -R +q p E p @@ -852,7 +880,7 @@ p p p p -R +q R R R diff --git a/_maps/domotan_necropolis/z4_surface/Oasis_2.dmm b/_maps/domotan_necropolis/z4_surface/Oasis_2.dmm index bf60108e1a0..a6cf954d314 100644 --- a/_maps/domotan_necropolis/z4_surface/Oasis_2.dmm +++ b/_maps/domotan_necropolis/z4_surface/Oasis_2.dmm @@ -2,24 +2,24 @@ "a" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "b" = ( /obj/machinery/light/fueled/hearth, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "c" = ( /obj/machinery/anvil, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "d" = ( /obj/structure/composter/full, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "e" = ( /obj/structure/bed/hay, /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "f" = ( /obj/structure/closet/crate/chest/crate, /obj/item/neuFarm/seed/onion, @@ -43,7 +43,7 @@ /obj/item/neuFarm/seed/tamto, /obj/item/neuFarm/seed/tamto, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "g" = ( /obj/structure/closet/crate/chest/old_crate, /obj/item/reagent_containers/food/snacks/butter, @@ -58,15 +58,22 @@ /obj/effect/spawner/map_spawner/loot/food, /obj/effect/spawner/map_spawner/loot/food, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) +"h" = ( +/turf/open/water/ocean, +/area/under/cave) "i" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"j" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/dirt/road, +/area/under/cave) "k" = ( /obj/structure/rack, /obj/effect/spawner/map_spawner/loot/armor, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "l" = ( /obj/structure/closet/crate/chest/old_crate, /obj/item/reagent_containers/food/snacks/produce/vegetable/onion, @@ -83,112 +90,125 @@ /obj/effect/spawner/map_spawner/loot/food, /obj/effect/spawner/map_spawner/loot/food, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "m" = ( /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "n" = ( /obj/structure/flora/grass/bush_meagre, -/turf/open/floor/grass/eora, -/area/indoors/cave) +/turf/open/floor/grass/red, +/area/under/cave) "o" = ( /obj/structure/table/wood/counter{ dir = 1 }, /obj/item/reagent_containers/glass/bucket/pot, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "p" = ( /obj/structure/flora/ausbushes/leafybush, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "q" = ( /obj/structure/flora/grass/bush, -/turf/open/floor/grass/eora, -/area/indoors/cave) +/turf/open/floor/grass/red, +/area/under/cave) "s" = ( /obj/structure/flora/tree/dead_bush, -/turf/open/floor/grass/eora, -/area/indoors/cave) +/turf/open/floor/grass/red, +/area/under/cave) "t" = ( /obj/structure/table/wood/counter{ dir = 1 }, /obj/item/cooking/pan, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) +"u" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/dirt/road, +/area/under/cave) "v" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "w" = ( -/turf/open/floor/grass/eora, -/area/indoors/cave) +/turf/open/floor/grass/red, +/area/under/cave) "x" = ( /obj/structure/rack, /obj/effect/spawner/map_spawner/loot/weapon, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "y" = ( /obj/structure/chair/stool, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "z" = ( /obj/structure/flora/ausbushes/pointybush, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "B" = ( /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "C" = ( /obj/machinery/light/fueled/forge, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "D" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) +"F" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/naturalstone, +/area/under/cave) +"G" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/naturalstone, +/area/under/cave) "H" = ( /obj/structure/bed/hay, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "I" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) "J" = ( /obj/structure/tent_wall, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "K" = ( /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "L" = ( /obj/structure/roguetent, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "M" = ( /obj/structure/chair/wood{ dir = 4 }, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "N" = ( /obj/structure/fermentation_keg/water, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "O" = ( -/turf/open/water, -/area/indoors/cave) +/obj/effect/spawner/map_spawner/necropolis/water_clutter, +/turf/open/water/ocean, +/area/under/cave) "P" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) "Q" = ( /obj/machinery/light/fueled/campfire/densefire, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "R" = ( /obj/structure/closet/crate/chest/crate, /obj/item/weapon/hoe, @@ -198,14 +218,22 @@ /obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) +"S" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/naturalstone, +/area/under/cave) +"T" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/grass/yel, +/area/under/cave) "U" = ( /obj/structure/flora/ausbushes/grassybush, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "V" = ( /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "W" = ( /obj/structure/closet/crate/chest/wicker, /obj/item/ore/coal, @@ -223,15 +251,19 @@ /obj/item/ore/coal, /obj/item/ore/coal, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) +"X" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/dirt/road, +/area/under/cave) "Y" = ( /obj/structure/grindwheel, /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) "Z" = ( /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/grass/cold, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" I @@ -274,8 +306,8 @@ I I I i -i -i +S +G I I I @@ -357,7 +389,7 @@ m m V V -V +j w q q @@ -383,7 +415,7 @@ m P P m -V +u V w w @@ -430,7 +462,7 @@ m m m V -V +u V V m @@ -439,7 +471,7 @@ m m m V -V +u w n w @@ -457,12 +489,12 @@ m V V V +u V V V -V -O -O +h +h m m V @@ -481,18 +513,18 @@ i I P m -V +u V K K V +u V +h +h +h V -O -O -O -V -V +u V w q @@ -509,15 +541,15 @@ I P P V -V +j K K V V +h O -O -O -O +h +h V V w @@ -528,24 +560,24 @@ w w w I -i +G "} (12,1,1) = {" i I m -V +X V V p K V -O -O -O -O -O -O +h +V +V +V +X +h V w w @@ -567,13 +599,13 @@ K K K V -O -O -O -O -O -O -O +h +V +V +V +V +h +h w n w @@ -587,27 +619,27 @@ i (14,1,1) = {" i i -V +j K K p K +h O -O -O -O -O -O -O -O -O -O +h +V +V +V +V +h +h +h w w w V V -V +j I i "} @@ -618,22 +650,22 @@ V K K K -O -O -O -O -O -O -O -O -O -O -O -w +h +h +h +h V V V V +h +h +h +w +V +V +u +V V i i @@ -648,14 +680,14 @@ U K K V +h O +h +h +h O -O -O -O -O -O -O +h +h w V V @@ -678,19 +710,19 @@ V V V V +h O -O -O -V +h V V V +j B a a B I -i +F "} (18,1,1) = {" I @@ -701,15 +733,15 @@ K z K V -V -V +u +j V B +h O -O -O -V +h V +u V B B @@ -734,7 +766,7 @@ V V a B -O +h B B B @@ -758,7 +790,7 @@ K K U V -V +u V B B @@ -786,7 +818,7 @@ K K K K -V +j V B a @@ -804,7 +836,7 @@ I I I K -K +T K K K @@ -894,7 +926,7 @@ I I I i -i +F i i i diff --git a/_maps/domotan_necropolis/z4_surface/Outpost.dmm b/_maps/domotan_necropolis/z4_surface/Outpost.dmm index 8536837351e..387d8951c4d 100644 --- a/_maps/domotan_necropolis/z4_surface/Outpost.dmm +++ b/_maps/domotan_necropolis/z4_surface/Outpost.dmm @@ -2,295 +2,317 @@ "aa" = ( /obj/effect/spawner/map_spawner/sewerencounter, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "bJ" = ( /obj/structure/fluff/railing/tall/palisade, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "bM" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "cw" = ( /obj/structure/chair/wood/alt/chair_noble/fancyplush, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "eB" = ( /obj/effect/decal/cleanable/blood/puddle, +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/goblin, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) +"eC" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/orcs, +/turf/open/floor/dirt/road, +/area/under/cave) "gR" = ( /obj/effect/decal/cleanable/blood, /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "jC" = ( /obj/effect/decal/cleanable/blood/puddle, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "jE" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) "jY" = ( /obj/item/weapon/polearm/spear, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "kh" = ( -/turf/open/openspace, -/area/indoors/cave) +/turf/open/floor/dirt, +/area/under/cave) "ll" = ( /obj/structure/bed/hay, /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "lB" = ( /obj/effect/landmark/chest_or_mimic, /obj/effect/spawner/map_spawner/loot/medium, /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "lF" = ( /obj/effect/decal/cleanable/blood/puddle, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "lH" = ( /obj/effect/decal/cleanable/blood/puddle, /obj/effect/mob_spawn/human/corpse, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "lR" = ( /obj/effect/decal/cleanable/blood/gibs/torso, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "nm" = ( /obj/effect/decal/remains/human, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "om" = ( /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "oV" = ( /obj/structure/bed/hay, /obj/effect/mob_spawn/human/corpse/damaged, +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/goblin, +/turf/open/floor/dirt/road, +/area/under/cave) +"ps" = ( +/obj/structure/bed/hay, +/obj/effect/mob_spawn/human/corpse/damaged, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "qs" = ( /obj/effect/decal/cleanable/blood/tracks, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "qu" = ( /obj/structure/tent_wall, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "rU" = ( /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"sl" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/closed/mineral, +/area/under/cave) "tb" = ( /obj/effect/decal/cleanable/blood/footprints, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "tF" = ( /obj/effect/decal/cleanable/blood/puddle, /obj/effect/decal/cleanable/blood/puddle, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "tU" = ( /obj/structure/bed/hay, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "uG" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "uL" = ( /obj/effect/mob_spawn/human/corpse/damaged, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "uW" = ( /obj/item/bodypart/r_leg, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "vk" = ( /obj/structure/tent_wall, /obj/structure/tent_wall, /obj/structure/tent_wall, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "vJ" = ( /obj/structure/fluff/railing/tall/palisade, /obj/structure/fluff/railing/tall/palisade, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "vM" = ( /obj/effect/mob_spawn/human/corpse, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "vR" = ( /obj/item/restraints/legcuffs/beartrap/armed/camouflage, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "wc" = ( /obj/structure/tent_wall, /obj/structure/tent_wall, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "yf" = ( /obj/machinery/light/fueled/torchholder/l, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "yt" = ( /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "yH" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 10 }, /obj/effect/spawner/map_spawner/sewerencounter, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "zP" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "AO" = ( /obj/structure/chair/stool/crafted, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) +"BI" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/goblin, +/turf/open/floor/dirt, +/area/under/cave) "El" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 8 }, /obj/machinery/light/fueled/firebowl, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "Eo" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "Fl" = ( /obj/item/weapon/knife/dagger/steel, /obj/structure/table/wood/crafted, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "Gh" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "Gn" = ( /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "GQ" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "Hi" = ( /obj/structure/bed/hay, /obj/effect/decal/cleanable/blood/puddle, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "HR" = ( /obj/structure/fluff/railing/tall/palisade, -/obj/structure/fluff/walldeco/customflag/regent, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "IC" = ( /obj/item/bodypart/l_leg, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "JD" = ( /obj/structure/rack/shelf/big, /obj/effect/spawner/map_spawner/loot/weapon, /obj/effect/spawner/map_spawner/loot/weapon, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "Le" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/fluff/railing/tall/palisade, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "Ly" = ( /obj/effect/decal/cleanable/blood/puddle, /obj/structure/fluff/railing/tall/palisade, -/obj/structure/fluff/walldeco/customflag/regent, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "Ps" = ( /obj/structure/rack/shelf/big, /obj/effect/spawner/map_spawner/loot/armor, /obj/effect/spawner/map_spawner/loot/armor, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "PE" = ( /obj/effect/decal/cleanable/blood/puddle, /obj/effect/decal/cleanable/blood/tracks{ dir = 8 }, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "PQ" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) +"Qc" = ( +/obj/structure/chair/stool/crafted, +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/orcs, +/turf/open/floor/dirt/road, +/area/under/cave) "Qd" = ( /obj/structure/tent_wall, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "Rv" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "RB" = ( /obj/structure/roguetent, /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "RW" = ( -/obj/structure/tent_wall, -/obj/structure/fluff/walldeco/customflag/regent, -/turf/open/floor/naturalstone, -/area/indoors/cave) +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/dirt/road, +/area/under/cave) "TI" = ( /obj/structure/table/wood/crafted, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "TX" = ( /obj/machinery/light/fueled/torchholder/c, /obj/effect/spawner/map_spawner/sewerencounter, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "WB" = ( /obj/effect/decal/cleanable/blood/puddle, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "WT" = ( /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "Yh" = ( /obj/structure/roguetent, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) "Ys" = ( -/obj/structure/fluff/railing/tall/palisade, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "YU" = ( /obj/effect/spawner/map_spawner/sewerencounter, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "Zn" = ( /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/dirt/road, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" jE @@ -301,10 +323,10 @@ jE jE jE jE -Gh -Gh -Gh -Gh +Ys +Ys +Ys +Ys om Gh Gh @@ -328,13 +350,13 @@ jE jE jE jE -Gh +Ys jE om om -om -om -Gh +RW +RW +Ys jE jE jE @@ -352,14 +374,14 @@ jE jE jE jE +sl jE jE -jE -Gh -Gh +Ys +Ys om om -Gh +Ys jE jE jE @@ -394,7 +416,7 @@ jE jE jE jE -jE +sl jE jE jE @@ -404,23 +426,23 @@ jE jE jE jE -Gh -Gh +Ys +Ys om -Gh -Gh -Gh +Ys +Ys +Ys lF om om om -Gh -Gh -Gh -Gh -Gh -Gh -Gh +Ys +Ys +Ys +Ys +jE +jE +jE jE jE jE @@ -433,21 +455,21 @@ jE jE om om -Gh Ys -Gh -Gh +HR +Ys +Ys gR om zP +HR Ys -Gh om +Ys Gh Gh -Gh -Gh -Gh +jE +jE jE jE jE @@ -458,9 +480,9 @@ jE jE jE jE -Gh +Ys YU -Gh +Ys Qd Qd Qd @@ -474,7 +496,7 @@ rU om Gh Gh -Gh +jE jE jE jE @@ -485,23 +507,23 @@ jE jE jE jE -Gh -Gh -Gh +Ys +Ys +Ys Qd Hi om JD Ps -oV -RW -Gh +ps +Qd +Ys lF -Gh +Ys aa +RW om -om -Gh +jE jE jE jE @@ -510,10 +532,10 @@ jE "} (9,1,1) = {" jE -Gh +Ys jE lF -Gh +Ys lF Qd ll @@ -522,53 +544,53 @@ eB om ll Qd -Gh +Ys tb tb tb uL -om -Gh +RW +Ys jE jE jE jE -Gh +Ys "} (10,1,1) = {" jE -Gh -Gh -Gh +Ys +Ys +Ys om -Gh -RW +Ys +Qd oV aa om eB tU wc -Gh +Ys lF -Gh +Ys Rv -om -om -Gh +RW +RW jE jE jE jE -Gh +jE +Ys "} (11,1,1) = {" +Ys Gh -Gh -Gh +Ys om om -Gh +Ys Qd Qd Qd @@ -580,89 +602,89 @@ GQ jC om om -Gh -Gh -Gh +Ys +Ys jE -Gh -Gh -Gh +jE +Ys +Ys +Ys Gh "} (12,1,1) = {" +RW +RW om om -om -om -Gh -Gh +Ys +Ys bJ -Gh -Gh -Gh -Gh -Gh +Ys +Ys +Ys +Ys +Ys uW -Gh +Ys lH om om -Ys +HR om -Gh +jE jE Gh -om +RW Gh Gh "} (13,1,1) = {" -om +RW om zP -Gh +Ys lF om Ly -Gh +Ys vR -Gh +Ys yH uG -Gh +Ys WB -Gh +Ys Gn Rv vJ -Gh -Gh +Ys jE -om -om -Gh +jE +RW +RW Gh +Ys "} (14,1,1) = {" +RW om -om -Gh +Ys Gn tF om om -Gh -Gh +Ys +Ys nm El om -Gh +Ys Qd Qd Qd Qd Qd -Gh +Ys om jE om @@ -672,7 +694,7 @@ om "} (15,1,1) = {" om -Gh +Ys jE Qd Qd @@ -683,50 +705,50 @@ Qd GQ PE om -Gh +Ys wc kh kh om wc -Gh -Gh -Gh +Ys +Ys +Ys om om om om "} (16,1,1) = {" -Gh -Gh +Ys +Ys jE lB TI om -AO +Qc aa -RW -Gh +Qd +Ys Eo jY -Gh +Ys Qd om -om +BI kh Qd -Gh -Gh -Gh +Ys +Ys +Ys om -Gh +Ys om om "} (17,1,1) = {" -Gh -Gh +Ys +Ys jE cw Fl @@ -737,46 +759,46 @@ Qd bM lR vM -Gh +Ys Yh kh kh -kh +BI Qd yt -Gh -Gh +Ys +Ys jE -Gh -Gh -Gh +Ys +Ys +Ys "} (18,1,1) = {" -Gh +Ys jE jE PQ TI -om +eC AO Zn RB qs WT -Gh +Ys YU wc -om kh +om kh Qd -Gh -Gh +Ys +Ys jE jE -Gh +Ys jE -Gh +Ys "} (19,1,1) = {" jE @@ -791,13 +813,13 @@ Qd bM bM Eo -Gh +Ys vk Qd Qd Qd Qd -Gh +Ys om jE jE @@ -818,39 +840,39 @@ Qd yt Le om -Gh Ys -Gh +HR +Ys yf -Gh +Ys HR -Gh +Ys om jE jE jE -jE +sl jE "} (21,1,1) = {" jE jE jE -Gh -Gh -Gh +Ys +Ys +Ys bM uG -Gh -Gh Ys -Gh -Gh +Ys +HR +Ys +Ys om om -Gh -Gh -Gh +Ys +Ys +Ys om aa jE @@ -863,6 +885,7 @@ jE jE jE jE +sl jE jE jE @@ -870,9 +893,8 @@ jE jE jE jE -jE -Gh -Gh +Ys +Ys om jE jE @@ -896,9 +918,8 @@ jE jE jE jE -Gh -Gh -om +Ys +Ys om om jE @@ -912,6 +933,7 @@ jE jE jE jE +jE "} (24,1,1) = {" jE @@ -926,7 +948,7 @@ jE jE jE om -om +RW om jE jE @@ -950,11 +972,11 @@ jE jE jE jE -Gh -Gh -om -om -om +Ys +Ys +RW +RW +RW Gh Gh jE diff --git a/_maps/domotan_necropolis/z4_surface/cave_1.dmm b/_maps/domotan_necropolis/z4_surface/cave_1.dmm index 41af8e4c050..c2fdae0b3e7 100644 --- a/_maps/domotan_necropolis/z4_surface/cave_1.dmm +++ b/_maps/domotan_necropolis/z4_surface/cave_1.dmm @@ -1,22 +1,47 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "b" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) +"c" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/naturalstone, +/area/under/cave) "f" = ( /turf/open/water/marsh/deep, -/area/indoors/cave) +/area/under/cave) +"i" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner, +/turf/open/floor/naturalstone, +/area/under/cave) +"j" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/naturalstone, +/area/under/cave) +"n" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/naturalstone, +/area/under/cave) "o" = ( /turf/open/water/marsh, -/area/indoors/cave) +/area/under/cave) +"p" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/goblin, +/turf/open/floor/naturalstone, +/area/under/cave) "q" = ( -/turf/open/openspace, -/area/indoors/cave) +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) +"r" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/naturalstone, +/area/under/cave) "F" = ( /turf/open/water/blood, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" b @@ -39,7 +64,7 @@ b a a a -a +r a b b @@ -74,14 +99,14 @@ b "} (3,1,1) = {" b -a -q -a +n a a a +c a a +r F o o @@ -102,8 +127,8 @@ b (4,1,1) = {" b a -q a +c a a a @@ -113,11 +138,11 @@ F o o b +q a a a -a -a +i a b a @@ -128,9 +153,9 @@ b "} (5,1,1) = {" b +p a -a -a +b b b b @@ -140,7 +165,7 @@ b o o b -a +q a b b @@ -148,7 +173,7 @@ a b b a -a +j a b b @@ -174,9 +199,9 @@ b a b b -a -q q +n +a b b "} @@ -187,15 +212,15 @@ b a a a -a +n a a F F o F -a -a +j +j a b a @@ -203,7 +228,7 @@ a a a q -a +q a a "} @@ -215,30 +240,30 @@ a a a a -a +j a a F F F a -a +n a b a b b +c +q +q a -a -a -a -a +i "} (9,1,1) = {" b a b -a +n a b b @@ -263,10 +288,10 @@ a "} (10,1,1) = {" b -a +c b a -a +j b b b @@ -275,7 +300,7 @@ b b b a -a +q b b b @@ -293,33 +318,33 @@ b a b a -q -q +a +a a a a b b b -q a +q b b +q a a -q -q a +r b b b a "} (12,1,1) = {" +c a a -a -a +r a a a @@ -329,13 +354,13 @@ a b b a -q +a b b -a -a -q q +n +a +j a b b @@ -343,7 +368,7 @@ b b "} (13,1,1) = {" -a +c a a a @@ -355,14 +380,14 @@ b a a a +j a +c a a a a a -q -q a b b @@ -370,7 +395,7 @@ b b "} (14,1,1) = {" -a +c a b a @@ -388,8 +413,8 @@ a a a a -q -q +c +a a b b @@ -397,15 +422,15 @@ b b "} (15,1,1) = {" -a +c a b -a +q a b +c a -a -a +c a a a @@ -416,21 +441,21 @@ b a a b -b -b +a +a b b b b "} (16,1,1) = {" +c a a a +j a -a -a -a +c a b a @@ -441,7 +466,7 @@ a b b a -a +c b b b @@ -495,13 +520,13 @@ b a a a +n a -a -a +q a b a -a +r a "} (19,1,1) = {" @@ -514,18 +539,18 @@ b b b b -a +j a b a b b -a -a +j a a q -a +q +n b a a @@ -550,12 +575,12 @@ b b b a -b -b -a -a +q +q a +j a +n b "} (21,1,1) = {" @@ -568,19 +593,19 @@ o o a a +q +q a +j a a a a -q -a -a a b b a -a +c a a b @@ -595,15 +620,15 @@ o o a a +n a -a -b b b -q +a +a b b -a +r b b b @@ -626,8 +651,8 @@ a a a b -q -q +a +a b b a @@ -650,14 +675,14 @@ o b b a -a +i a b b b b b -a +j b b b diff --git a/_maps/domotan_necropolis/z4_surface/cave_2.dmm b/_maps/domotan_necropolis/z4_surface/cave_2.dmm index 335cdd87ff8..c82ab31fc3e 100644 --- a/_maps/domotan_necropolis/z4_surface/cave_2.dmm +++ b/_maps/domotan_necropolis/z4_surface/cave_2.dmm @@ -1,19 +1,91 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) +"b" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) +"e" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/naturalstone, +/area/under/cave) +"g" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) +"l" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/volcanic, +/area/under/cave) +"n" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/naturalstone, +/area/under/cave) +"o" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/volcanic, +/area/under/cave) "p" = ( /turf/open/floor/grass/hell, -/area/indoors/cave) +/area/under/cave) +"q" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/volcanic, +/area/under/cave) +"r" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/volcanic, +/area/under/cave) +"x" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/naturalstone, +/area/under/cave) +"A" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/volcanic, +/area/under/cave) +"B" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner, +/turf/open/floor/volcanic, +/area/under/cave) +"C" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/naturalstone, +/area/under/cave) +"G" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/closed/mineral, +/area/under/cave) "J" = ( -/turf/open/floor/grass/eora, -/area/indoors/cave) +/turf/open/floor/volcanic, +/area/under/cave) +"K" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/easy, +/turf/open/floor/naturalstone, +/area/under/cave) +"M" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/naturalstone, +/area/under/cave) +"N" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/volcanic, +/area/under/cave) "O" = ( -/turf/open/openspace, -/area/indoors/cave) +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/volcanic, +/area/under/cave) "R" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"X" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/volcanic, +/area/under/cave) (1,1,1) = {" a @@ -29,13 +101,13 @@ a a a R -R +n a a a a R -R +C a a a @@ -73,17 +145,17 @@ a a a R -R +K a a a R a -O -R -R +J R R +b +b a a a @@ -101,7 +173,7 @@ a a R R -a +G a a R @@ -109,17 +181,17 @@ a R a a -R -R +b +b a a R J +N J -J -R -R -R +e +b +b R a "} @@ -127,26 +199,26 @@ a a a O -R +x R a R -R -O -O -O +M +J +J +J a +b +b +e R -R -R -R -R -R +g +x J J R -R -R +b +b R a "} @@ -154,21 +226,21 @@ a a a O -R +x R a R -R -O +n +J R a a R R -O -O -R -R +J +J +g +x a a a @@ -179,14 +251,14 @@ a "} (7,1,1) = {" a -O -O +J +N R R R R R -O +J R a a @@ -194,7 +266,7 @@ a a a a -O +J R a a @@ -206,25 +278,25 @@ a "} (8,1,1) = {" a -O -O +J +J a R a R J -R -R -R -J +e +b +b +q J J a a -O -R +J +e a -O +J R R R @@ -233,27 +305,27 @@ a "} (9,1,1) = {" a -O -O +J +J a R a +b +q R -J -R +b +q +q +e +n R J -J -R -R -R -O -R +M R a a -O -R +J +M R R a @@ -266,7 +338,7 @@ a R a a -J +q a a a @@ -281,7 +353,7 @@ a a a R -R +C R a "} @@ -313,16 +385,16 @@ a a "} (12,1,1) = {" -R -R +b +b R a a a J -J -R -J +X +x +O J J J @@ -340,45 +412,45 @@ R a "} (13,1,1) = {" -R -R -R -J +b +b +g +o +q J J -J -R R +x +O J -J -R R +C a a R a R -R +K a a J -J -R +q +b R "} (14,1,1) = {" R J -J -R -R -R -O O +x +e +R +J +J J a a -O +J R R R @@ -389,13 +461,13 @@ R a J J -J -R +q +b R "} (15,1,1) = {" a -J +A a a a @@ -405,7 +477,7 @@ a p p a -O +J R R a @@ -416,7 +488,7 @@ R a a J -J +q J R "} @@ -425,7 +497,7 @@ a J a J -J +B J a a @@ -433,17 +505,17 @@ J p J R -R -J +M +q +q +q +q J -J -O -O R R a a -J +q R a "} @@ -453,24 +525,24 @@ J J J R -J +l a a J J J J -J -J -J -J -O -R +q +q +q +q +q R R +e a a -R +b a a "} @@ -497,7 +569,7 @@ a R a a -R +b a a "} @@ -523,7 +595,7 @@ a a R a -O +J R a a @@ -546,7 +618,7 @@ J R J J -J +l R J R @@ -570,7 +642,7 @@ a a J J -J +A J J J @@ -585,10 +657,10 @@ a (22,1,1) = {" R R -J +N J p -O +N R J J @@ -596,7 +668,7 @@ a J a a -R +e J a a @@ -606,7 +678,7 @@ a a a R -R +n a "} (23,1,1) = {" @@ -615,23 +687,23 @@ J J J J -O +A R J J J J -J -R -R +X R -O +x +x +J a a J R J -R +M R R a @@ -641,18 +713,18 @@ a R a a -J -O -O +q +q +q a a J J J R -R -O -O +x +r +J a a J @@ -668,16 +740,16 @@ a a a a -R -R -R +b +b +b a a a a a a -O +J O a a diff --git a/_maps/domotan_necropolis/z4_surface/cave_3.dmm b/_maps/domotan_necropolis/z4_surface/cave_3.dmm index 82585945c49..2cdc32caf2e 100644 --- a/_maps/domotan_necropolis/z4_surface/cave_3.dmm +++ b/_maps/domotan_necropolis/z4_surface/cave_3.dmm @@ -1,29 +1,61 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/openspace, -/area/indoors/cave) +/turf/open/floor/dirt, +/area/under/cave) "b" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "e" = ( /obj/effect/spawner/map_spawner/loot/weapon, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"r" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/naturalstone, +/area/under/cave) "w" = ( /obj/effect/spawner/map_spawner/loot/potion_ingredient/herb, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"B" = ( +/turf/open/floor/naturalstone, +/area/under/cave) +"C" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/closed/mineral, +/area/under/cave) +"J" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/naturalstone, +/area/under/cave) +"M" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/naturalstone, +/area/under/cave) "N" = ( /obj/effect/spawner/map_spawner/loot/common, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "P" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) +"R" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/dirt, +/area/under/cave) +"U" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/dirt, +/area/under/cave) +"W" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/naturalstone, +/area/under/cave) "Y" = ( /obj/effect/spawner/map_spawner/loot/armor, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" P @@ -35,11 +67,11 @@ P P P P +B +B P P -P -P -P +C P P P @@ -55,61 +87,61 @@ P (2,1,1) = {" P b +B +B +B +B +B +B +r +r +r +M +B +B b b b b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b +B +B +B +M +B +P P "} (3,1,1) = {" P b +B +P +B +B +W +B +r +r +r +B +B +B b b b b +B b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b +B +B +r +B P "} (4,1,1) = {" P b -b +B P P P @@ -129,72 +161,72 @@ P P P P -b -b +r +B P "} (5,1,1) = {" P b -b +B +C P P P P P P -P -b +B P P -b -b -b +B +B +B w P P P P P -b -b -P +B +B +C "} (6,1,1) = {" P b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b +B +B +B +B +B +W +B +B +B +B +B +B +B +B +B P P P P P -b -b +B +r P "} (7,1,1) = {" P b -b +B P -b +B P -b +B P P P @@ -204,24 +236,24 @@ P P P a -b -b -b -b +B +B +W +B P P -b -b +B +r P "} (8,1,1) = {" P -b -b +B +B P -b -b -b +B +B +J P P P @@ -230,119 +262,119 @@ P a P P -a -b -b -b +U +B +r +r w P P -b -b +B +B P "} (9,1,1) = {" P -b -b +B +B P P -b -b +B +B P P P -b -b +B +B a a P +U a -a -b -b -b +B +B +B P P -b +B b P "} (10,1,1) = {" -P -b -b +B +W +B P P -b -b +B +B Y P P -b +M P a P -P +C P a P P -b +B P -b -b +B +B b P "} (11,1,1) = {" +B +B +B P -b -b P P P P P P -P -b +B P P P P -b +B a a -b -b -b -b +B +B +B +B b b P "} (12,1,1) = {" +J +B +B P -b -b P P P P P -P -b -b -b +B +W +B a a -b -b -b +W +B +B P P -b +B P P b @@ -350,26 +382,26 @@ b P "} (13,1,1) = {" +B +B +B P -b -b +C P P P P +B +B +B +B +B +B +B +B P -P -b -b -b -b -b -b -b -b -P -b -b +B +B P P b @@ -377,219 +409,219 @@ b P "} (14,1,1) = {" -P -b -b +B +B +B P P a P a P -a -b +R +B P P P -b +B P P P -b -b +B +B P P -b -b +B +B P "} (15,1,1) = {" P -b -b +B +P P P N -b -b -b +B +B +B a a -b +B P P -b -b +B +B P P -b +B P P P -b -b +B +B P "} (16,1,1) = {" P -b -b +B P P -b -b P +B +B P P -b +P +B P P P a a -b -b -b -b +B +J +M +B a P -b -b +r +B P "} (17,1,1) = {" P -b -b +B +B P P -b +B P P P P -b +B P P P e a -b -b -b -b +B +B +B +W a P -b -b -P +r +M +C "} (18,1,1) = {" P b -b +B P P -b +B P P P P -b -b -b -b -b -b +W +B +B +B +B +B P -b -b -b +W +W +B P P -b -b +r +B P "} (19,1,1) = {" P b -b +B P P -b +B P P P -b -b -b +B +B +B P P P P P -b -b +W +W a P P -b -b +B +B P "} (20,1,1) = {" P b -b +B P P -b -b -b -b -b +W +B +B +B +B P P P -b -b -b -b -b -a +B +M +B +B +B +U a P P -b -b +W +B P "} (21,1,1) = {" P b -b +B P P P a a P -b +B P P -b -b -b +B +B +B N -b +B P P P P P -b -b +M +B P "} (22,1,1) = {" @@ -608,75 +640,72 @@ P P P P +C P P P P P P -P -b -b +B +B P "} (23,1,1) = {" P +B b b +B +P +P +P +B +B +B +B b b b b b b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b +B +B +B +B +r +B P "} (24,1,1) = {" P +B b b +B +B +B +B +B +B +B +B +B +B b b b b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -b -P -"} -(25,1,1) = {" +B +B P +B +r P P +"} +(25,1,1) = {" P P P @@ -688,6 +717,9 @@ P P P P +B +B +J P P P diff --git a/_maps/domotan_necropolis/z4_surface/cave_4.dmm b/_maps/domotan_necropolis/z4_surface/cave_4.dmm index 1dc7cb6fc14..042aa3cac26 100644 --- a/_maps/domotan_necropolis/z4_surface/cave_4.dmm +++ b/_maps/domotan_necropolis/z4_surface/cave_4.dmm @@ -1,38 +1,78 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/open/floor/grass/yel, -/area/indoors/cave) +/area/under/cave) +"b" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/grass/yel, +/area/under/cave) "c" = ( /turf/closed/mineral/random/low_nonval, -/area/indoors/cave) +/area/under/cave) "j" = ( /turf/closed/mineral/silver, -/area/indoors/cave) +/area/under/cave) +"k" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/naturalstone, +/area/under/cave) +"m" = ( +/turf/open/floor/naturalstone, +/area/under/cave) +"q" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/goblin, +/turf/open/floor/grass/yel, +/area/under/cave) "v" = ( /turf/closed/mineral/random, -/area/indoors/cave) +/area/under/cave) "x" = ( /turf/closed/mineral/random/high_valuable, -/area/indoors/cave) +/area/under/cave) +"y" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/closed/mineral, +/area/under/cave) "B" = ( /obj/structure/fluff/signage{ desc = "Take the bounty of the earth at your own risk!"; name = "A warning" }, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "C" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) +"E" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/grass/yel, +/area/under/cave) +"J" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/naturalstone, +/area/under/cave) "L" = ( /turf/closed/mineral/copper, -/area/indoors/cave) +/area/under/cave) +"M" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/naturalstone, +/area/under/cave) "N" = ( /turf/closed/mineral/gold, -/area/indoors/cave) +/area/under/cave) +"T" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/naturalstone, +/area/under/cave) +"X" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/grass/yel, +/area/under/cave) "Y" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" C @@ -44,8 +84,8 @@ C C C C -Y -Y +m +M C C C @@ -72,7 +112,7 @@ C C C B -Y +m C C C @@ -98,14 +138,14 @@ c c C C -Y -Y +m +m C C C -a -Y -Y +q +m +m C C c @@ -126,13 +166,13 @@ C C a a -a +E C C C +b a -a -Y +M C c c @@ -152,12 +192,12 @@ c C C a -a -a +b +E a C C -a +X a a C @@ -181,12 +221,12 @@ C a a C -a +X N C a a -a +b C C c @@ -209,12 +249,12 @@ C C L a +m Y Y -Y -Y -a -Y +m +X +T C C C @@ -230,20 +270,20 @@ c c c c -C +y C C C L +m +m Y Y -Y -Y -a a -Y -Y -Y +X +T +m +k C v v @@ -262,7 +302,7 @@ C C L L -Y +m Y N N @@ -284,9 +324,9 @@ C C a a +b a -a -Y +m Y Y Y @@ -313,18 +353,18 @@ a a a a -Y -Y -Y +m +M +m a Y C C C a +b a -a -Y +m C j j @@ -332,7 +372,7 @@ j C "} (12,1,1) = {" -Y +M C c C @@ -349,9 +389,9 @@ C C C C -a -a -Y +X +X +m a C j @@ -359,7 +399,7 @@ j C "} (13,1,1) = {" -Y +m C C C @@ -367,18 +407,18 @@ C a C C +q a a a +b a -a -a -Y -Y +k +m C C -a -Y +X +J a C j @@ -386,9 +426,9 @@ j C "} (14,1,1) = {" -Y -Y -Y +m +m +m B C a @@ -397,15 +437,15 @@ c c c C +b a -a -Y -Y -Y +M +m +m C C -a -Y +X +T C C c @@ -413,26 +453,26 @@ C C "} (15,1,1) = {" -Y -Y -Y -Y -Y -Y -Y -Y -Y -a -a +m +m +m +m +T +T +m +m +T +X +X a -Y +m C C C C a -a -Y +X +T C C c @@ -440,17 +480,17 @@ C C "} (16,1,1) = {" -Y +m C -Y +M C C C a -Y -Y -Y -a +M +T +T +X a Y Y @@ -459,7 +499,7 @@ C C a a -Y +M C C c @@ -474,12 +514,12 @@ C C C a -Y +m C C C a -a +q C Y C @@ -502,8 +542,8 @@ C C a a -Y -Y +m +m C C C @@ -512,7 +552,7 @@ Y C c a -a +b a C C @@ -527,23 +567,23 @@ C C C C -Y -Y +m +m C -Y +m C -Y -Y +m +m C C C C a a -Y -Y +m +T a -Y +m C C "} @@ -554,23 +594,23 @@ c C C C -Y -Y -C -Y +J +m +y +m C -Y -Y +m +m C c C C a a -Y -a +m +X a -Y +k C C "} @@ -581,13 +621,13 @@ c c C C -Y -Y -Y -Y -Y -Y -Y +m +m +T +T +T +m +M a a a @@ -595,9 +635,9 @@ a a a C +X a -a -Y +m C C "} @@ -608,23 +648,23 @@ c c C C -Y -Y -Y -Y -Y -Y -Y -Y -a -a +M +m +m +T +T +m +J +m a a +b a +q C +X a -a -Y +m C C "} @@ -635,12 +675,12 @@ c c C C -Y -Y +m +m C C C -Y +T C C C @@ -649,9 +689,9 @@ a a C C +X a -a -Y +J C C "} @@ -667,12 +707,12 @@ C C C C -Y +T C C C a -a +b a C C @@ -692,11 +732,11 @@ C C C C -Y -Y -Y -Y -Y +m +m +m +m +m C C C diff --git a/_maps/domotan_necropolis/z4_surface/cave_5.dmm b/_maps/domotan_necropolis/z4_surface/cave_5.dmm index 6422a3a75ff..11bfc4592da 100644 --- a/_maps/domotan_necropolis/z4_surface/cave_5.dmm +++ b/_maps/domotan_necropolis/z4_surface/cave_5.dmm @@ -1,13 +1,53 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) +"c" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) +"j" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/dirt, +/area/under/cave) +"l" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/naturalstone, +/area/under/cave) +"r" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner, +/turf/open/floor/naturalstone, +/area/under/cave) +"t" = ( +/turf/open/floor/dirt, +/area/under/cave) +"C" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/dirt, +/area/under/cave) "D" = ( -/turf/open/openspace, -/area/indoors/cave) +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/dirt, +/area/under/cave) +"H" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/naturalstone, +/area/under/cave) "K" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"L" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/easy, +/turf/open/floor/naturalstone, +/area/under/cave) +"T" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/naturalstone, +/area/under/cave) +"V" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/easy, +/turf/open/floor/dirt, +/area/under/cave) (1,1,1) = {" a @@ -49,9 +89,9 @@ a a a a +H K -K -K +T K K K @@ -68,6 +108,7 @@ a a a K +l K K K @@ -76,15 +117,14 @@ K K K K -K -K -K -K -K -K -K -K -K +c +T +T +l +c +c +c +c K K a @@ -104,9 +144,9 @@ K a a K +c K -K -K +T K K K @@ -124,22 +164,22 @@ a K a a -K +r K K K a a -D -K -K +t +t +c K K K a a a -K +r a a a @@ -157,9 +197,9 @@ a a a a -D -K -K +t +t +t a a a @@ -184,8 +224,8 @@ a a a a -D -D +t +j K a a @@ -201,20 +241,20 @@ a (8,1,1) = {" a a -K +T a a a K +j +t +t +L +t +t +t K -D -D -K -D -D -K -K -K +c K K K @@ -233,21 +273,21 @@ a a a K -K -K +t +j +t +t +t D -K -K -K D +D +c K +H K -K -K -K -K -K -K +c +c +c K a a @@ -255,26 +295,26 @@ a (10,1,1) = {" a a -K +H a a +T +T K -K -K -K -D -D -K +t +t +j +t D D +c K +H +H K -K -K -K -K -K -K +c +c +D K a a @@ -282,26 +322,26 @@ a (11,1,1) = {" K a -K +H K a -K -K +T +T a a a a a a +t a a -a -K +H K a a a -D +t K a a @@ -323,7 +363,7 @@ a a a a -D +t K a a @@ -335,13 +375,13 @@ a "} (13,1,1) = {" K -K -K -K -K -K -D +T +c +c +c D +t +t K K a @@ -350,34 +390,34 @@ a a a a -D -D +t +K a a a K K -K +l K "} (14,1,1) = {" K +T +c K +H K -K -K -K -D -K -K -D +t +t +C +t a a a a a a -D +K K a a @@ -389,29 +429,29 @@ K "} (15,1,1) = {" K +c K +H +H +H +t +t K -K -K -K -D -D -K -D +t a a a a a a +t +t K K -D -D -D -K K K +T +T K "} (16,1,1) = {" @@ -421,8 +461,8 @@ a K a a -K -D +t +t K a a @@ -431,13 +471,13 @@ a K K a +t +t +t K -K -D -D -D -K -K +T +T +T K K "} @@ -445,22 +485,22 @@ K K a a -K +T a a +t K K +c +c +c +c K K -K -K -K -K -K -a -a -a a +t +V +t a a K @@ -472,11 +512,11 @@ K a a a -K +T a a -D -D +t +t K K K @@ -486,7 +526,7 @@ K K a a -a +t a a a @@ -502,22 +542,22 @@ a K a a -D -D -K +V +t +c a a a a K -K +l a a a a a a -K +c a a a @@ -526,17 +566,17 @@ a a a a -K +H a a K D -D +t a a a a -K +T K a a @@ -544,7 +584,7 @@ a a a a -K +c a a a @@ -553,25 +593,25 @@ a a a a -K +H a a K -K +c K a a a a +T +T K -K -K -D D -K D +t +t K -K +c a a a @@ -590,10 +630,10 @@ a a a a +H +T K -K -K -K +c D D D @@ -617,8 +657,8 @@ a a a a -K -K +H +H a a a @@ -632,7 +672,7 @@ a "} (24,1,1) = {" a -K +H a a a @@ -645,7 +685,7 @@ a a a K -K +H a a a diff --git a/_maps/domotan_necropolis/z4_surface/cave_6.dmm b/_maps/domotan_necropolis/z4_surface/cave_6.dmm index 22d0f1c26bd..96e4050a3f0 100644 --- a/_maps/domotan_necropolis/z4_surface/cave_6.dmm +++ b/_maps/domotan_necropolis/z4_surface/cave_6.dmm @@ -1,13 +1,63 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) +"b" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/dirt, +/area/under/cave) +"c" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/easy, +/turf/open/floor/naturalstone, +/area/under/cave) "q" = ( -/turf/open/openspace, -/area/indoors/cave) +/turf/open/floor/dirt, +/area/under/cave) "y" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"z" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) +"B" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/dirt, +/area/under/cave) +"G" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/easy, +/turf/open/floor/dirt, +/area/under/cave) +"H" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) +"K" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/goblin, +/turf/open/floor/naturalstone, +/area/under/cave) +"L" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/naturalstone, +/area/under/cave) +"N" = ( +/obj/effect/spawner/map_spawner/necropolis/mob_spawner/goblin, +/turf/open/floor/dirt, +/area/under/cave) +"Q" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/naturalstone, +/area/under/cave) +"U" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/naturalstone, +/area/under/cave) +"Z" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/naturalstone, +/area/under/cave) (1,1,1) = {" a @@ -24,7 +74,7 @@ a a a y -y +z y y a @@ -71,23 +121,23 @@ a a a a +c y -y -y +U a y a -a +q a y a +U y -y -y +z a a q -q +G a "} (4,1,1) = {" @@ -103,24 +153,24 @@ a y a a -y -a +z +q a y y y a -y -y +z +z a -y +q q a "} (5,1,1) = {" a a -a +N y a a @@ -130,36 +180,36 @@ a y a a -y -y -a +z +q +b a a a a a +z y -y -y -a +q +b a "} (6,1,1) = {" a a -a +q y y y a y a -y -y +z +z a a y -a +q a a a @@ -174,10 +224,10 @@ a (7,1,1) = {" a a +q a a -a -y +Q y y a @@ -185,8 +235,8 @@ a a y y -y -y +U +q y y a @@ -201,7 +251,7 @@ a (8,1,1) = {" a a -a +q a a y @@ -213,12 +263,12 @@ y y a a -a +q a y y y -y +Z y y a @@ -228,7 +278,7 @@ a (9,1,1) = {" a a -a +q a a y @@ -236,7 +286,7 @@ a a a a -y +L a a a @@ -257,13 +307,13 @@ a a a a -y +Z y y a a a -y +L a a a @@ -283,7 +333,7 @@ a y a a -y +b y a y @@ -300,7 +350,7 @@ a a a a -y +L a a a @@ -310,21 +360,21 @@ a y y y -y +q a a -y +L y a a -y +H a a a +z +z y -y -y -y +c a a y @@ -344,11 +394,11 @@ y a a a -y +z y a a -y +z a a y @@ -358,7 +408,7 @@ a a y a -y +U "} (14,1,1) = {" y @@ -375,17 +425,17 @@ y a a a -y +z a a a -y +U a a a y y -y +c "} (15,1,1) = {" y @@ -395,14 +445,14 @@ a a a y +q +b a -a -a -y y +c a a -y +z y a a @@ -418,40 +468,40 @@ y y a y -y q -y -y +q +q +q a a y y y y -y +Z y y a a -y +Z a a a a a -y +Z "} (17,1,1) = {" a a -y -a -a -a -a -a +Z +q +B +N +q +q a -y +Z a a a @@ -473,9 +523,9 @@ a a y a -a -a -a +q +q +q a a y @@ -487,11 +537,11 @@ a a a y -y +L a a a -y +U y a "} @@ -499,9 +549,9 @@ a a a a -y -a -a +K +q +b a a a @@ -518,7 +568,7 @@ a a a y -y +L y a "} @@ -527,18 +577,18 @@ a a a y +q +b a a a -a -a -y -y -y -y -y +z +z +z +H y y +Z a a a @@ -580,8 +630,8 @@ a a a a -a -y +q +q y y y @@ -596,7 +646,7 @@ y a a a -y +Z y a a @@ -607,12 +657,12 @@ a a a a -a +q q y a y -y +Z y y y @@ -635,8 +685,8 @@ a a a a -a -a +q +q a y a diff --git a/_maps/domotan_necropolis/z4_surface/cells.dmm b/_maps/domotan_necropolis/z4_surface/cells.dmm index 48866213506..c0c46cb4754 100644 --- a/_maps/domotan_necropolis/z4_surface/cells.dmm +++ b/_maps/domotan_necropolis/z4_surface/cells.dmm @@ -1,290 +1,387 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ad" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/dirt, +/area/under/cave) "df" = ( /obj/effect/spawner/trap, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "fq" = ( /obj/item/restraints/legcuffs/beartrap/armed, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "hj" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/water, -/area/indoors/cave) +/turf/open/floor/dirt, +/area/under/cave) "hC" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "hR" = ( /obj/effect/decal/cleanable/blood/drip, +/obj/effect/spawner/map_spawner/necropolis/random_dirty, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "hY" = ( /obj/structure/bed/sleepingbag, /obj/effect/decal/cleanable/dirt/cobweb, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "jo" = ( /obj/effect/spawner/map_spawner/loot/armor, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "kv" = ( /obj/structure/bed/sleepingbag, /obj/effect/decal/cleanable/dirt, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"ly" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/hexstone, +/area/under/cave) "lQ" = ( /obj/effect/spawner/map_spawner/loot/food, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "lR" = ( /obj/structure/bed/sleepingbag, /obj/item/restraints/legcuffs/beartrap/armed, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "lX" = ( /obj/structure/bed/sleepingbag, /obj/effect/decal/cleanable/dirt/cobweb/cobweb2, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"lZ" = ( +/turf/open/floor/dirt, +/area/under/cave) "mA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) "mH" = ( /obj/effect/decal/cleanable/blood/footprints, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "or" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/spawner/map_spawner/loot, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "ov" = ( /obj/effect/spawner/map_spawner/loot, /obj/effect/decal/cleanable/glitter, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"pi" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/dirt, +/area/under/cave) "pI" = ( /obj/effect/decal/cleanable/blood/footprints, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "pM" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) "pQ" = ( /mob/living/carbon/human/species/skeleton/npc/easy, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "pV" = ( /obj/structure/bars, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "qh" = ( /obj/machinery/light/fueled/torchholder/l, /obj/effect/decal/cleanable/dirt, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "qw" = ( /obj/structure/bed/sleepingbag, /obj/effect/decal/cleanable/glitter, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "sh" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) "sJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "td" = ( /obj/structure/door/iron/bars/cell, /obj/effect/decal/cleanable/blood/footprints, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "tB" = ( /turf/closed/wall/mineral/decostone/long, -/area/indoors/cave) +/area/under/cave) "tD" = ( /obj/structure/bars, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) +"tI" = ( +/obj/machinery/light/fueled/torchholder/c, +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/hexstone, +/area/under/cave) +"ur" = ( +/obj/machinery/light/fueled/torchholder/r, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/hexstone, +/area/under/cave) "uC" = ( /obj/effect/spawner/map_spawner/loot, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "vv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/cobweb, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "vy" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "wx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "xe" = ( /obj/random/spider, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "xh" = ( /turf/closed/wall/mineral/decostone/end{ dir = 8 }, -/area/indoors/cave) +/area/under/cave) "xt" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "yf" = ( /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"yx" = ( +/obj/machinery/light/fueled/torchholder/r, +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/hexstone, +/area/under/cave) +"yI" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/hexstone, +/area/under/cave) "yP" = ( /obj/structure/bed/sleepingbag, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"zA" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/hexstone, +/area/under/cave) "zG" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "zT" = ( /obj/machinery/light/fueled/torchholder/l, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) +"Ag" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/hexstone, +/area/under/cave) "AH" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"Bt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/hexstone, +/area/under/cave) "BM" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "Ck" = ( /obj/machinery/light/fueled/torchholder/c, /obj/effect/decal/cleanable/dirt, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "DJ" = ( -/turf/open/water, -/area/indoors/cave) +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/dirt, +/area/under/cave) "Ed" = ( /obj/structure/bed/sleepingbag, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "Ee" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "Ev" = ( /obj/machinery/light/fueled/torchholder/c, /obj/item/restraints/legcuffs/beartrap/armed, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "Fn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "Gf" = ( /obj/structure/bars, -/turf/open/water, -/area/indoors/cave) +/turf/open/floor/dirt, +/area/under/cave) "GQ" = ( /obj/machinery/light/fueled/torchholder/c, -/turf/open/openspace, -/area/indoors/cave) +/turf/open/floor/dirt, +/area/under/cave) +"GT" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/hexstone, +/area/under/cave) "Hz" = ( /obj/item/natural/rock, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "HW" = ( /obj/effect/decal/cleanable/blood/gibs/core, /obj/effect/decal/cleanable/dirt, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "Ia" = ( -/turf/open/openspace, -/area/indoors/cave) +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/dirt, +/area/under/cave) "IV" = ( /obj/effect/decal/cleanable/blood/footprints, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "Jv" = ( /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "JD" = ( /turf/closed/wall/mineral/decostone/end{ dir = 4 }, -/area/indoors/cave) +/area/under/cave) "MM" = ( /obj/effect/decal/cleanable/dirt/cobweb/cobweb2, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "No" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/dirt, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"OL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/hexstone, +/area/under/cave) "Ph" = ( /obj/machinery/light/fueled/torchholder/c, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "Pq" = ( /obj/item/natural/rock, /obj/effect/decal/cleanable/dirt, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "PD" = ( /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/dirt, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "PN" = ( /obj/item/natural/rock, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "PT" = ( /obj/effect/spawner/map_spawner/loot/coin/low, /obj/item/restraints/legcuffs/beartrap/armed, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"Qd" = ( +/turf/open/floor/hexstone, +/area/under/cave) +"Qo" = ( +/obj/machinery/light/fueled/torchholder/c, +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/hexstone, +/area/under/cave) +"QS" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/closed/wall/mineral/decostone/long, +/area/under/cave) +"Rm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/hexstone, +/area/under/cave) "RT" = ( /obj/effect/decal/cleanable/blood/gibs/body, /obj/effect/decal/cleanable/glitter, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"SE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/hexstone, +/area/under/cave) "UF" = ( /obj/effect/spawner/map_spawner/loot/coin/low, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"UX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/hexstone, +/area/under/cave) "VI" = ( /obj/effect/spawner/map_spawner/loot, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "Xq" = ( /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"XA" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/hexstone, +/area/under/cave) "Yq" = ( /obj/machinery/light/fueled/torchholder/r, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) "YH" = ( /obj/structure/door/iron/bars/cell, /turf/open/floor/hexstone, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" sh @@ -297,12 +394,12 @@ sh sh sh sh -BM -Fn -Fn -BM -BM -BM +Qd +SE +SE +Qd +Qd +Qd sh sh sh @@ -315,16 +412,16 @@ sh "} (2,1,1) = {" sh +Qd +Qd +Qd +Qd +Qd BM BM -BM -BM -BM -BM -BM -BM +Qd sh -BM +Qd pM mA HW @@ -332,114 +429,114 @@ Fn pM sh Pq -BM -BM -DJ -DJ -DJ -DJ +Qd +Qd +Ia +lZ +lZ +ad sh "} (3,1,1) = {" sh -BM -BM -Ia -BM -BM -BM -BM -Jv -BM -Fn +Qd +Qd +DJ +ly BM BM BM +yx +Qd +OL +ly +ly +Qd Jv -BM -BM -BM -BM -BM +Qd +Qd +Qd +Qd +Qd Jv -BM -DJ -DJ +Qd +Ia +lZ sh "} (4,1,1) = {" sh -BM -Ia -Ia -BM -BM +Qd +lZ +DJ +Qd +Qd tB tB tB tB Ph -BM +Qd tB tB tB tB Ph -BM +Qd tB tB tB tB -Ph -DJ +Qo +pi sh "} (5,1,1) = {" sh -BM +Qd Ia -Ia -BM -BM +DJ +ly +Qd xh hY UF tD -BM +Qd df tD RT qw xh -BM -BM +Qd +GT xh yP AH tD -BM -DJ +Qd +pi sh "} (6,1,1) = {" sh -BM -Ia +Qd Ia -BM -BM +DJ +ly +Qd YH lQ hC tD -Fn -BM +Bt +Qd tD ov pQ YH -BM -BM +Qd +Qd YH AH yf @@ -450,11 +547,11 @@ sh "} (7,1,1) = {" sh -BM -Ia -BM -BM -BM +Qd +lZ +ly +ly +Qd JD yP AH @@ -465,67 +562,67 @@ tD MM qw JD -BM +Qd Fn JD yP VI tD BM -BM +Qd sh "} (8,1,1) = {" sh -BM -Ia -BM -BM -BM +Qd +lZ +Qd +Qd +Qd tB tB tB tB Ck -BM +Qd tB tB tB tB -Ph -BM +tI +Qd tB tB tB tB -Ph -BM +Qo +Qd sh "} (9,1,1) = {" sh -BM -BM -hR -BM -BM -BM -BM -BM -BM +Qd +Qd +Ag +XA +Qd +Qd BM BM BM +Qd +Qd +yI BM fq -BM -Fn -BM -Fn -Fn -BM -BM -BM +Qd +OL +ly +OL +OL +ly +Qd +Qd sh sh "} @@ -533,42 +630,42 @@ sh sh sh sh -BM -BM +Qd +Qd Ee -Fn -BM +Rm +Qd Jv +Qd BM -BM -BM -Fn -Fn -Yq +yI +Rm +Rm +ur PD Fn -Fn -BM -BM +OL +ly +Qd Yq zG Fn Fn -BM +Qd "} (11,1,1) = {" AH -BM -BM +Qd +Qd PN -BM -BM -tB +Qd +Qd tB tB tB +QS Ph -BM +Qd tB tB tB @@ -580,39 +677,39 @@ tB tB tB Ph -BM -BM +Qd +Qd "} (12,1,1) = {" AH -BM +Qd sh -BM -BM -BM +Qd +Qd +Qd xh yP VI tD -BM -BM +Qd +ly tD sJ yP xh -BM +Qd Fn xh yP pQ tD -BM +Qd sh -BM +Qd "} (13,1,1) = {" AH -BM +Qd IV pI IV @@ -621,53 +718,53 @@ td mH Xq tD -BM -BM +Qd +ly tD or AH YH -BM +Qd Fn YH VI xt tD -BM +Qd PN -BM +ly "} (14,1,1) = {" AH -BM -BM -BM -BM -BM +Qd +Qd +Qd +Qd +Qd JD yP xt tD -BM -BM +Qd +ly tD AH lR JD -BM +Qd Fn JD lX jo tD -BM +Qd pM -BM +ly "} (15,1,1) = {" AH -BM -BM +Qd +Qd df Fn Fn @@ -676,82 +773,82 @@ tB tB tB Ph -BM +Qd tB tB tB tB Ph -Fn +Bt tB tB tB tB Ev pM -BM +ly "} (16,1,1) = {" AH -BM +Qd sh -BM +Qd Fn Hz Fn -BM +Qd BM BM Ee -BM +Qd BM Fn Fn Fn Fn -BM -Fn -BM +Qd +OL +ly Fn Fn Fn pM -BM +Qd "} (17,1,1) = {" sh sh sh -BM -BM -Fn +Ia +lZ Fn +Bt Fn -Yq -BM -BM +ur +Qd BM BM BM +Qd Jv -BM +Qd Fn -Fn -BM -BM +OL +ly +ly Yq -Fn -Fn -Fn -BM +OL +Rm +Rm +Qd "} (18,1,1) = {" sh -BM -BM -BM +Qd +Qd Ia -BM +Ia +XA tB tB tB @@ -763,7 +860,7 @@ tB tB tB Ph -BM +Qd tB tB tB @@ -774,40 +871,40 @@ sh "} (19,1,1) = {" sh -BM -Ia -Ia +Qd +sh +lZ +lZ Ia -BM xh -DJ +lZ uC pV -BM -BM +Qd +Qd tD vv yP xh -BM +Qd Fn xh yP AH tD -BM +ly BM sh "} (20,1,1) = {" sh -Ia -Ia -Ia -BM -BM +pi +sh +sh +XA +lZ YH -DJ +lZ DJ Gf DJ @@ -816,50 +913,50 @@ tD No PT YH -BM +GT wx YH -Ia -Ia +lZ +lZ tD -BM +ly hR sh "} (21,1,1) = {" sh -Ia -Ia -BM -BM -BM +pi +DJ +sh +Qd +Qd JD Ed DJ Gf DJ -Fn +hj tD No kv JD -BM +Qd Fn JD -Ia +lZ VI tD -BM +ly Fn sh "} (22,1,1) = {" sh BM -Fn -BM -BM +Rm BM +ly +Qd tB tB tB @@ -871,13 +968,13 @@ tB tB tB Ph -Fn +Bt tB tB tB tB Ck -BM +Qd sh "} (23,1,1) = {" @@ -886,52 +983,52 @@ xe Fn Hz Fn -Fn -Fn -BM +UX +OL +Qd zT -BM -BM -BM +Qd +Qd +Qd vy -BM +Qd zT -BM -BM -BM -BM -BM +Qd +XA +Qd +ly +ly qh Fn wx -BM +XA sh "} (24,1,1) = {" sh +Qd BM BM -BM -BM -BM -BM +zA +Qd +ly Fn -BM +Qd sh -BM +Qd pM pM Fn pM sh sh -BM +Qd PN -BM -Fn +ly +OL +OL Fn -Fn -BM +Qd sh "} (25,1,1) = {" @@ -945,12 +1042,12 @@ sh sh sh sh -BM -BM -BM -BM -BM -BM +Qd +Qd +Qd +Qd +Qd +Qd sh sh sh diff --git a/_maps/domotan_necropolis/z4_surface/forest.dmm b/_maps/domotan_necropolis/z4_surface/forest.dmm index 6beeedfd243..c5f741956c1 100644 --- a/_maps/domotan_necropolis/z4_surface/forest.dmm +++ b/_maps/domotan_necropolis/z4_surface/forest.dmm @@ -1,162 +1,166 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "b" = ( /obj/structure/flora/ausbushes/sparsegrass, /mob/living/simple_animal/hostile/retaliate/bat, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "c" = ( /obj/structure/flora/tree, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "e" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "f" = ( /obj/structure/flora/tree/dead_bush, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "h" = ( /obj/structure/flora/tree/dead_bush, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "j" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "k" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) "l" = ( /obj/structure/flora/tree/dead_bush, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "m" = ( /obj/structure/flora/ausbushes/palebush, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "n" = ( /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "o" = ( /obj/structure/flora/grass/bush, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "q" = ( /obj/machinery/light/fueled/firebowl/stump, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "r" = ( /obj/structure/flora/tree/dead_bush, /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "s" = ( /obj/structure/flora/tree/dead_bush, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "u" = ( /obj/structure/flora/grass/bush, /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "w" = ( /obj/machinery/light/fueled/firebowl/stump, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "x" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "y" = ( /obj/structure/flora/tree/dead_bush, /obj/structure/flora/ausbushes/sparsegrass, /mob/living/simple_animal/hostile/retaliate/bat, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "z" = ( /obj/structure/flora/grass/bush, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "A" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) "B" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"E" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/grass/mixyel, +/area/under/cave) "F" = ( /obj/structure/flora/ausbushes/palebush, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "H" = ( /obj/structure/flora/grass/bush_meagre, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "I" = ( /obj/structure/flora/grass/bush, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "K" = ( /obj/structure/flora/grass/bush, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "M" = ( /mob/living/simple_animal/hostile/retaliate/bat, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "N" = ( /obj/structure/flora/grass/bush_meagre, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "P" = ( /obj/structure/flora/ausbushes/sparsegrass, /mob/living/simple_animal/hostile/retaliate/bat, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "Q" = ( /obj/structure/flora/tree/dead_bush, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "R" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "S" = ( /mob/living/simple_animal/hostile/retaliate/bat, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "U" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "V" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/healthy, -/area/indoors/cave) +/area/under/cave) "W" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "X" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) "Y" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/grass/mixyel, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" k @@ -677,7 +681,7 @@ n n K n -n +E n n X diff --git a/_maps/domotan_necropolis/z4_surface/graveyard.dmm b/_maps/domotan_necropolis/z4_surface/graveyard.dmm index b1e360e3952..085baa8c24b 100644 --- a/_maps/domotan_necropolis/z4_surface/graveyard.dmm +++ b/_maps/domotan_necropolis/z4_surface/graveyard.dmm @@ -1,149 +1,140 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/closed/wall/mineral/decostone/moss/blue/end, -/area/indoors/cave) -"b" = ( +"aD" = ( /obj/structure/bars/cemetery, -/turf/open/floor/grass/yel, -/area/indoors/cave) -"d" = ( /obj/structure/bars/cemetery, -/turf/open/floor/grass/red, -/area/indoors/cave) -"e" = ( -/obj/structure/door/stone, +/turf/open/floor/dirt, +/area/under/cave) +"aZ" = ( +/obj/structure/closet/crate/coffin, +/obj/effect/spawner/map_spawner/loot/coin/low, /turf/open/floor/churchmarble, -/area/indoors/cave) -"f" = ( -/obj/item/natural/stone, -/turf/open/floor/grass/red, -/area/indoors/cave) -"g" = ( +/area/under/cave) +"bg" = ( +/obj/structure/closet/crate/coffin, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/churchmarble, +/area/under/cave) +"ci" = ( +/turf/open/floor/dirt/road, +/area/under/cave) +"en" = ( +/obj/structure/closet/dirthole/grave, +/obj/effect/spawner/map_spawner/loot/coin/low, +/turf/open/floor/dirt/road, +/area/under/cave) +"fB" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/greenstone, +/area/under/cave) +"hY" = ( +/obj/structure/closet/dirthole/grave, +/obj/effect/spawner/map_spawner/loot/weapon, +/turf/open/floor/dirt/road, +/area/under/cave) +"iC" = ( +/obj/machinery/light/fueled/firebowl/standing/blue, +/turf/open/floor/churchmarble, +/area/under/cave) +"jx" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/dirt, +/area/under/cave) +"jJ" = ( +/obj/structure/flora/pillar, +/turf/open/floor/churchmarble, +/area/under/cave) +"kd" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/cobblerock, +/area/under/cave) +"kU" = ( /obj/structure/closet/dirthole/grave, /obj/effect/spawner/map_spawner/loot, -/turf/open/floor/grass/yel, -/area/indoors/cave) -"h" = ( -/obj/item/natural/stone, -/turf/open/floor/grass/yel, -/area/indoors/cave) -"i" = ( +/turf/open/floor/dirt, +/area/under/cave) +"lk" = ( /obj/structure/closet/dirthole/grave, /obj/structure/gravemarker, /obj/effect/mob_spawn/human/corpse/damaged{ flavour_text = "The body of some poor soul." }, -/obj/effect/spawner/map_spawner/loot/coin/low, -/turf/open/floor/grass/yel, -/area/indoors/cave) -"j" = ( -/turf/open/floor/grass/yel{ - dir = 4 - }, -/area/indoors/cave) -"k" = ( -/turf/open/floor/grass/red, -/area/indoors/cave) -"l" = ( -/obj/machinery/light/fueled/firebowl/stump, -/turf/open/floor/grass/red, -/area/indoors/cave) -"m" = ( -/turf/closed/wall/mineral/decostone, -/area/indoors/cave) -"n" = ( -/obj/structure/closet/dirthole/grave, -/obj/structure/gravemarker, -/obj/effect/spawner/map_spawner/loot, -/turf/open/floor/grass/yel, -/area/indoors/cave) -"o" = ( -/turf/closed/mineral, -/area/indoors/cave) -"p" = ( +/turf/open/floor/dirt/road, +/area/under/cave) +"lC" = ( /obj/structure/closet/dirthole/grave, /obj/structure/gravemarker, /obj/effect/mob_spawn/human/corpse/damaged{ flavour_text = "The body of some poor soul." }, -/turf/open/floor/grass/yel, -/area/indoors/cave) -"r" = ( +/obj/effect/spawner/map_spawner/loot, +/turf/open/floor/dirt/road, +/area/under/cave) +"mM" = ( +/obj/item/natural/stone, +/turf/open/floor/greenstone, +/area/under/cave) +"nB" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/dirt, +/area/under/cave) +"oV" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/closed/mineral, +/area/under/cave) +"pk" = ( +/turf/closed/mineral, +/area/under/cave) +"rv" = ( +/obj/item/natural/stone, +/obj/structure/bars/cemetery, +/turf/open/floor/dirt, +/area/under/cave) +"rX" = ( +/turf/open/floor/cobblerock, +/area/under/cave) +"sq" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/greenstone, +/area/under/cave) +"sD" = ( /obj/machinery/light/fueled/wallfire/candle/blue/l, -/turf/open/floor/churchmarble, -/area/indoors/cave) -"s" = ( -/turf/closed/wall/mineral/stone, -/area/indoors/cave) -"t" = ( -/obj/structure/fluff/walldeco/stone, -/turf/closed/wall/mineral/decostone/moss/blue, -/area/indoors/cave) -"u" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/natural/stone, +/obj/structure/closet/crate/crafted_closet, /turf/open/floor/churchmarble, -/area/indoors/cave) -"v" = ( +/area/under/cave) +"sE" = ( +/turf/open/floor/greenstone, +/area/under/cave) +"tQ" = ( /obj/structure/closet/dirthole/grave, -/turf/open/floor/grass/red, -/area/indoors/cave) -"w" = ( -/obj/machinery/light/fueled/firebowl/stump, /turf/open/floor/dirt/road, -/area/indoors/cave) -"x" = ( -/obj/structure/closet/dirthole/grave, -/turf/open/floor/grass/yel, -/area/indoors/cave) -"y" = ( -/obj/structure/window/stained/silver, -/turf/open/floor/churchmarble, -/area/indoors/cave) -"z" = ( +/area/under/cave) +"ur" = ( /obj/item/natural/stone, -/obj/structure/bars/cemetery, -/turf/open/floor/grass/red, -/area/indoors/cave) -"A" = ( -/turf/closed/wall/mineral/decostone/moss/blue, -/area/indoors/cave) -"B" = ( -/turf/open/floor/dirt/road, -/area/indoors/cave) -"C" = ( +/turf/closed/wall/mineral/stone, +/area/under/cave) +"uO" = ( /obj/structure/closet/crate/coffin, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/map_spawner/loot/coin/low, -/turf/open/floor/churchmarble, -/area/indoors/cave) -"D" = ( -/turf/open/floor/churchmarble, -/area/indoors/cave) -"E" = ( -/obj/structure/closet/dirthole/grave, -/obj/effect/spawner/map_spawner/loot/coin/low, -/turf/open/floor/grass/yel, -/area/indoors/cave) -"F" = ( -/obj/structure/closet/dirthole/grave, -/obj/effect/spawner/map_spawner/loot/weapon, -/turf/open/floor/grass/red, -/area/indoors/cave) -"G" = ( -/obj/effect/decal/cleanable/dirt, /turf/open/floor/churchmarble, -/area/indoors/cave) -"H" = ( +/area/under/cave) +"uV" = ( /obj/structure/closet/dirthole/grave, /obj/structure/gravemarker, /obj/effect/mob_spawn/human/corpse/damaged{ flavour_text = "The body of some poor soul." }, -/obj/effect/spawner/map_spawner/loot, -/turf/open/floor/grass/yel, -/area/indoors/cave) -"I" = ( +/obj/effect/spawner/map_spawner/loot/coin/low, +/turf/open/floor/dirt, +/area/under/cave) +"vp" = ( +/obj/machinery/light/fueled/firebowl/standing/blue, +/turf/open/floor/greenstone, +/area/under/cave) +"wo" = ( +/obj/item/natural/stone, +/turf/open/floor/dirt/road, +/area/under/cave) +"xp" = ( /obj/machinery/light/fueled/wallfire/candle/blue/r, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate/chest/old_crate, @@ -153,66 +144,64 @@ /obj/item/natural/bundle/stick, /obj/item/natural/bundle/cloth/roll, /turf/open/floor/churchmarble, -/area/indoors/cave) -"J" = ( -/turf/open/floor/cobblerock, -/area/indoors/cave) -"K" = ( -/obj/structure/bars/cemetery, +/area/under/cave) +"xA" = ( +/obj/structure/closet/dirthole/grave, +/obj/structure/gravemarker, +/obj/effect/mob_spawn/human/corpse/damaged{ + flavour_text = "The body of some poor soul." + }, +/obj/effect/spawner/map_spawner/loot/coin/low, +/turf/open/floor/dirt/road, +/area/under/cave) +"zX" = ( /obj/structure/bars/cemetery, -/turf/open/floor/grass/yel, -/area/indoors/cave) -"L" = ( -/obj/item/natural/stone, -/turf/closed/wall/mineral/stone, -/area/indoors/cave) -"M" = ( -/obj/structure/closet/crate/coffin, -/turf/open/floor/churchmarble, -/area/indoors/cave) -"N" = ( +/turf/open/floor/greenstone, +/area/under/cave) +"AF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/fueled/wallfire/candle/blue/r, /turf/open/floor/churchmarble, -/area/indoors/cave) -"O" = ( +/area/under/cave) +"AT" = ( +/obj/machinery/light/fueled/firebowl/stump, +/turf/open/floor/dirt, +/area/under/cave) +"BB" = ( +/obj/structure/closet/dirthole/grave, +/obj/structure/gravemarker, +/obj/effect/spawner/map_spawner/loot, +/turf/open/floor/dirt, +/area/under/cave) +"CW" = ( +/turf/closed/wall/mineral/stone, +/area/under/cave) +"Ek" = ( /obj/structure/bars/cemetery, /obj/structure/bars/cemetery, -/turf/open/floor/grass/red, -/area/indoors/cave) -"P" = ( -/obj/machinery/light/fueled/wallfire/candle/blue/l, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/crafted_closet, -/obj/item/clothing/shirt/robe/necra, -/obj/item/clothing/shirt/robe/necra, -/turf/open/floor/churchmarble, -/area/indoors/cave) -"Q" = ( +/turf/open/floor/greenstone, +/area/under/cave) +"Fe" = ( /mob/living/simple_animal/hostile/retaliate/mimic, /turf/open/floor/churchmarble, -/area/indoors/cave) -"R" = ( -/obj/structure/closet/crate/coffin, -/obj/effect/spawner/map_spawner/loot/coin/low, -/turf/open/floor/churchmarble, -/area/indoors/cave) -"S" = ( -/turf/open/floor/grass/yel, -/area/indoors/cave) -"T" = ( -/obj/machinery/light/fueled/firebowl/standing/blue, +/area/under/cave) +"FL" = ( /turf/open/floor/churchmarble, -/area/indoors/cave) -"U" = ( -/obj/structure/flora/pillar, +/area/under/cave) +"HF" = ( +/obj/structure/closet/dirthole/grave, +/turf/open/floor/greenstone, +/area/under/cave) +"IE" = ( +/obj/machinery/light/fueled/wallfire/candle/blue/r, +/obj/structure/closet/crate/crafted_closet, /turf/open/floor/churchmarble, -/area/indoors/cave) -"V" = ( -/obj/machinery/light/fueled/firebowl/standing/blue, -/turf/open/floor/grass/yel, -/area/indoors/cave) -"W" = ( +/area/under/cave) +"IJ" = ( +/obj/structure/fluff/walldeco/stone, +/turf/closed/wall/mineral/decostone/moss/blue, +/area/under/cave) +"Jo" = ( /obj/machinery/light/fueled/wallfire/candle/blue/l, /obj/structure/closet/crate/chest/old_crate, /obj/item/weapon/shovel, @@ -221,701 +210,771 @@ /obj/item/natural/bundle/stick, /obj/item/natural/bundle/cloth/roll, /turf/open/floor/churchmarble, -/area/indoors/cave) -"X" = ( +/area/under/cave) +"Jp" = ( /obj/structure/closet/dirthole/grave, -/obj/structure/gravemarker, -/obj/effect/mob_spawn/human/corpse/damaged{ - flavour_text = "The body of some poor soul." - }, -/obj/effect/spawner/map_spawner/loot/coin/low, -/turf/open/floor/grass/red, -/area/indoors/cave) -"Y" = ( -/obj/machinery/light/fueled/wallfire/candle/blue/r, -/obj/structure/closet/crate/crafted_closet, -/obj/item/clothing/shirt/robe/necra, -/obj/item/clothing/shirt/robe/necra, +/turf/open/floor/dirt, +/area/under/cave) +"JR" = ( +/obj/structure/bars/cemetery, +/turf/open/floor/dirt, +/area/under/cave) +"KZ" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/dirt, +/area/under/cave) +"Lu" = ( +/obj/machinery/light/fueled/wallfire/candle/blue/l, +/turf/open/floor/churchmarble, +/area/under/cave) +"LD" = ( +/obj/structure/window/stained/silver, /turf/open/floor/churchmarble, -/area/indoors/cave) -"Z" = ( +/area/under/cave) +"MP" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/greenstone, +/area/under/cave) +"PA" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/dirt, +/area/under/cave) +"PD" = ( +/turf/open/floor/dirt, +/area/under/cave) +"PF" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/greenstone, +/area/under/cave) +"PO" = ( +/turf/closed/wall/mineral/decostone/moss/blue, +/area/under/cave) +"Qw" = ( /obj/structure/closet/crate/coffin, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/loot/coin/low, +/turf/open/floor/churchmarble, +/area/under/cave) +"QP" = ( +/obj/item/natural/stone, +/turf/open/floor/dirt, +/area/under/cave) +"Rj" = ( +/obj/structure/door/stone, +/turf/open/floor/churchmarble, +/area/under/cave) +"Rt" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/cobblerock, +/area/under/cave) +"Su" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/churchmarble, +/area/under/cave) +"Tf" = ( +/turf/closed/wall/mineral/decostone/moss/blue/end, +/area/under/cave) +"TV" = ( +/obj/machinery/light/fueled/firebowl/stump, +/turf/open/floor/dirt/road, +/area/under/cave) +"UM" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/greenstone, +/area/under/cave) +"Wl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/natural/stone, /turf/open/floor/churchmarble, -/area/indoors/cave) +/area/under/cave) +"WY" = ( +/turf/closed/wall/mineral/decostone, +/area/under/cave) +"Xb" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/dirt/road, +/area/under/cave) +"Zs" = ( +/obj/structure/closet/dirthole/grave, +/obj/structure/gravemarker, +/obj/effect/mob_spawn/human/corpse/damaged{ + flavour_text = "The body of some poor soul." + }, +/turf/open/floor/dirt, +/area/under/cave) (1,1,1) = {" -o -o -o -o -o -o -o -o -o -S -k -k -k -k -S -S -o -o -o -o -o -o -o -o -o +pk +pk +pk +oV +pk +pk +pk +pk +pk +fB +jx +PD +PD +PD +PF +PF +pk +pk +pk +pk +pk +pk +pk +pk +oV "} (2,1,1) = {" -o -o -o -o -o -o -o -o -o -S -o -o -J -o -o -S -o -o -o -o -o -o -o -o -o +pk +pk +pk +pk +pk +pk +pk +pk +pk +fB +pk +pk +rX +pk +pk +PF +pk +pk +pk +pk +pk +pk +pk +pk +pk "} (3,1,1) = {" -o -o -S -S -S -S -S -S -S -S -S -S -J -o -J -J -S -k -k -k -S -S -S -o -o +pk +pk +pk +sE +sE +sE +sE +sE +sE +sE +sE +sE +rX +pk +rX +rX +sE +PD +nB +KZ +PF +PF +PF +pk +pk "} (4,1,1) = {" -o -o -S -S -b -m -y -m -m -y -m -m -h -k -S -S -S -f -S -S -S -J -J -o -o +pk +pk +pk +sE +zX +WY +LD +WY +WY +LD +WY +WY +mM +PD +MP +MP +MP +QP +sE +sE +sE +kd +kd +pk +pk "} (5,1,1) = {" -o -o -S -h -d -v -S -x -S -i -B -v -S -S -k -A -y -A -y -A -S -J -S -o -o +pk +pk +UM +mM +JR +Jp +sE +tQ +sE +xA +ci +Jp +sE +sE +PD +PO +LD +PO +LD +PO +sE +rX +PF +pk +pk "} (6,1,1) = {" -o -o -S -S -O -J -S -S -J -J -w -B -B -S -a -A -Z -A -Z -A -A -S -S -o -o +pk +pk +sE +sE +aD +rX +sE +sE +rX +rX +TV +ci +ci +sE +Tf +PO +bg +PO +bg +PO +PO +sE +sE +pk +pk "} (7,1,1) = {" -o -o -J -J -b -H -S -x -J -x -S -x -S -S -y -C -G -r -G -C -y -S -S -o -o +pk +pk +rX +rX +zX +lC +PF +tQ +rX +tQ +sE +tQ +sE +sE +LD +Qw +Su +Lu +Su +Qw +LD +sE +sE +pk +pk "} (8,1,1) = {" -o -o -k -J -b -J -S -B -J -B -B -S -J -J -A -A -G -U -D -A -A -J -S -o -o +pk +pk +PD +rX +zX +kd +PF +ci +rX +ci +ci +sE +rX +rX +PO +PO +Su +jJ +FL +PO +PO +rX +sE +pk +pk "} (9,1,1) = {" -o -o -S -f -z -x -S -v -k -v -B -n -B -J -t -T -G -u -G -A -A -J -k -o -o +pk +pk +sE +QP +rv +tQ +PF +tQ +PD +Jp +PD +BB +ci +rX +IJ +iC +Su +Wl +Su +PO +PO +rX +PD +pk +pk "} (10,1,1) = {" -S -o -S -k -b -S -B -k -l -k -J -B -B -J -e -G -G -D -G -Q -y -k -o -o -o +sE +pk +PF +PD +zX +sE +ci +PD +AT +PD +rX +ci +ci +rX +Rj +Su +Su +FL +Su +Fe +LD +PD +pk +pk +pk "} (11,1,1) = {" -k -o -S -k -b -E -B -p -S -g -J -x -S -S -t -T -u -G -D -A -A -S -o -S -S +jx +pk +PF +KZ +zX +en +ci +lk +sE +kU +rX +tQ +sE +sE +IJ +iC +Wl +Su +FL +PO +PO +sE +pk +sE +sE "} (12,1,1) = {" -S -k -S -k -b -B -S -J -J -S -J -J -k -k -A -A -G -U -u -A -A -S -k -J -S +fB +PD +PF +KZ +zX +ci +sE +rX +rX +sE +rX +rX +PD +PD +PO +PO +Su +jJ +Wl +PO +PO +sE +PD +rX +PF "} (13,1,1) = {" -k -o -S -S -b -p -S -x -S -p -S -x -S -f -y -C -G -N -G -R -y -S -o -o -S +PD +pk +sE +sE +zX +lk +sE +tQ +sE +lk +sE +tQ +sE +QP +LD +Qw +Su +AF +Su +aZ +LD +sE +pk +pk +PF "} (14,1,1) = {" -k -o -o -S -b -k -S -J -B -k -f -S -S -k -A -A -Z -A -M -A -A -S -J -o -S +PD +pk +pk +sE +zX +PD +sE +rX +ci +PD +QP +sE +sE +PD +PO +PO +bg +PO +uO +PO +PO +sE +rX +pk +sE "} (15,1,1) = {" -k -k -J -S -b -F -k -p -B -E -S -p -S -S -k -A -y -A -y -A -S -S -J -S -S +jx +nB +rX +sE +zX +hY +PD +lk +Xb +en +sE +lk +sE +UM +PD +PO +LD +PO +LD +PO +sE +UM +rX +PF +PF "} (16,1,1) = {" -S -k -J -J -b -S -k -S -B -B -B -S -S -S -S -k -S -S -S -k -S -S -o -o -S +fB +nB +rX +rX +zX +sE +PD +PF +Xb +Xb +Xb +sE +sE +sE +sE +PD +sE +sE +sE +nB +MP +sE +pk +pk +sE "} (17,1,1) = {" -o -o -k -S -b -x -h -x -B -v -k -p -J -J -J -k -S -S -J -J -J -S -k -S -S +pk +pk +PD +sE +zX +tQ +wo +HF +ci +tQ +PD +lk +rX +rX +rX +PA +sE +sE +rX +Rt +rX +sE +PD +UM +sE "} (18,1,1) = {" -o -o -S -S -b -S -w -S -B -S -k -S -S -J -J -k -s -s -s -s -L -s -S -o -o +pk +pk +sE +MP +zX +sE +TV +sE +ci +sE +PD +sE +sE +rX +rX +PD +CW +CW +CW +CW +ur +CW +sE +pk +pk "} (19,1,1) = {" -o -o -S -k -K -v -B -X -S -x -l -g -S -S -S -V -s -P -D -D -W -s -S -o -o +pk +pk +MP +nB +Ek +Jp +ci +uV +sE +Jp +AT +kU +UM +sE +sE +vp +CW +sD +FL +FL +Jo +CW +sE +pk +pk "} (20,1,1) = {" -o -o -S -S -d -B -k -k -k -J -J -S -J -J -k -k -e -D -G -G -D -s -S -o -o +pk +pk +sE +sE +JR +ci +PD +PD +PD +rX +rX +sE +rX +rX +PD +PD +Rj +FL +Su +Su +FL +CW +sE +pk +pk "} (21,1,1) = {" -o -o -S -S -d -p -S -g -k -p -J -p -J -S -S -V -s -Y -G -G -I -s -S -o -o +pk +PD +sE +sq +JR +Zs +sE +kU +PD +Zs +rX +Zs +rX +UM +sE +vp +CW +IE +Su +Su +xp +CW +sE +pk +pk "} (22,1,1) = {" -o -o -S -S -d -m -y -m -m -y -m -m -S -k -k -S -s -s -s -s -s -s -S -o -o +pk +PD +pk +sE +JR +WY +LD +WY +WY +LD +WY +WY +sE +PD +PD +sE +CW +CW +CW +CW +CW +CW +sE +pk +oV "} (23,1,1) = {" -o -o -S -S -j -S -S -S -S -S -S -S -J -J -o -J -S -S -J -J -S -S -S -o -o +pk +PD +PD +PD +sE +sE +MP +MP +MP +sE +sE +sE +rX +rX +pk +rX +sE +sE +Rt +Rt +MP +sE +sE +pk +pk "} (24,1,1) = {" -o -o -o -o -o -o -o -o -o -o -S -o -o -o -J -S -o -o -o -o -o -o -o -o -o +pk +PD +PD +PD +pk +pk +pk +pk +pk +pk +sE +pk +pk +pk +rX +sE +pk +pk +pk +pk +pk +pk +pk +pk +pk "} (25,1,1) = {" -o -o -o -o -o -o -o -o -o -o -k -k -k -k -S -S -o -o -o -o -o -o -o -o -o +pk +pk +pk +pk +pk +pk +pk +pk +pk +pk +jx +jx +jx +PD +sE +sE +pk +pk +pk +pk +pk +pk +pk +pk +pk "} diff --git a/_maps/domotan_necropolis/z4_surface/literally_nothing.dmm b/_maps/domotan_necropolis/z4_surface/literally_nothing.dmm index 3d5e0421618..dd980badaca 100644 --- a/_maps/domotan_necropolis/z4_surface/literally_nothing.dmm +++ b/_maps/domotan_necropolis/z4_surface/literally_nothing.dmm @@ -1,10 +1,10 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "q" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" q diff --git a/_maps/domotan_necropolis/z4_surface/one_goblin.dmm b/_maps/domotan_necropolis/z4_surface/one_goblin.dmm index bfd0fa5c6a9..793b00d4f2f 100644 --- a/_maps/domotan_necropolis/z4_surface/one_goblin.dmm +++ b/_maps/domotan_necropolis/z4_surface/one_goblin.dmm @@ -1,135 +1,174 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "c" = ( /obj/effect/decal/cleanable/blood/old, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"d" = ( +/obj/effect/decal/cleanable/blood/tracks{ + dir = 4 + }, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) "e" = ( /obj/effect/decal/cleanable/blood/footprints, /obj/effect/decal/cleanable/blood, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "f" = ( -/turf/open/openspace, -/area/indoors/cave) +/turf/open/floor/dirt, +/area/under/cave) "g" = ( /mob/living/carbon/human/species/goblin/npc/ambush/cave{ name = "Sophie" }, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "h" = ( /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "k" = ( /obj/effect/decal/cleanable/blood/gibs/torso, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) +"l" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "m" = ( /obj/effect/decal/cleanable/blood/tracks, /obj/effect/decal/cleanable/blood/tracks, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "n" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/blood/gibs/up, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"q" = ( +/obj/effect/decal/cleanable/blood/puddle, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) +"r" = ( +/obj/effect/decal/cleanable/blood/old, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) "s" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "t" = ( /obj/effect/decal/cleanable/blood/footprints{ dir = 1 }, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "u" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) "v" = ( /obj/effect/decal/cleanable/blood/footprints{ dir = 8 }, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "w" = ( /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "x" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "y" = ( /obj/effect/decal/cleanable/blood/tracks, /obj/effect/decal/cleanable/blood/footprints, /obj/effect/decal/cleanable/blood, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "z" = ( /obj/effect/decal/cleanable/blood/footprints, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "A" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 10 }, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"B" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) "C" = ( /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/cleanable/blood, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "D" = ( /obj/machinery/light/fueled/firebowl, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "F" = ( /obj/effect/decal/cleanable/blood/gibs/up, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"G" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/dirt, +/area/under/cave) "I" = ( /obj/effect/decal/cleanable/blood/puddle, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/old, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "J" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"K" = ( +/obj/effect/decal/cleanable/blood/gibs/torso, +/turf/open/floor/naturalstone, +/area/under/cave) "M" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 }, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "N" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "O" = ( /obj/effect/decal/cleanable/blood/gibs/old, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "P" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "Q" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "R" = ( /obj/effect/decal/cleanable/blood/footprints, /obj/effect/decal/cleanable/blood/footprints{ @@ -137,28 +176,39 @@ }, /obj/machinery/light/fueled/firebowl, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "S" = ( /obj/effect/decal/cleanable/blood/puddle, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "T" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 5 }, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) +"U" = ( +/obj/effect/decal/cleanable/blood/tracks, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "V" = ( /obj/effect/decal/cleanable/blood/puddle, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"X" = ( +/obj/effect/decal/cleanable/blood/gibs/up, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) "Y" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 8 }, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" u @@ -177,7 +227,7 @@ a a a a -a +l u u u @@ -247,10 +297,10 @@ u a a a +l a a -a -a +B a a a @@ -302,20 +352,20 @@ a f a M -a -a +B +B a x a a f -a +B y -w +U w w m -a +B a a x @@ -327,23 +377,23 @@ u u f f -a -M -a -a -a +B +d +B +B +B a f f a +B +B +B a +B a -a -a -a -a -a -a +B +B a a a @@ -358,19 +408,19 @@ c a a c -c -a -a +r +B a a -c -a +B +r a a +B k a a -a +B a f f @@ -393,7 +443,7 @@ P c c a -a +B a a F @@ -507,7 +557,7 @@ F a a a -k +K D a "} @@ -550,14 +600,14 @@ a a a a -a +B a V a a a a -a +B a a a @@ -570,21 +620,21 @@ u u a a -a -a -a +B +B +B +G f -f -f -a -a +G +B +B a a a x C a -a +B a Y a @@ -597,11 +647,11 @@ u u a f -a -a -a -a -V +B +B +B +B +q N a a @@ -611,8 +661,8 @@ c a a a -a -a +B +B Y a c @@ -628,7 +678,7 @@ a T I a -F +X F a x @@ -639,7 +689,7 @@ a a c a -a +B Y a a @@ -655,7 +705,7 @@ a a a a -a +B a x a @@ -666,7 +716,7 @@ F x a a -a +B M a a @@ -682,9 +732,9 @@ h a a h -a -c -a +B +r +B c a a @@ -696,7 +746,7 @@ a a M a -a +l f u "} @@ -744,7 +794,7 @@ a a D a -a +l c a a diff --git a/_maps/domotan_necropolis/z4_surface/spidercave.dmm b/_maps/domotan_necropolis/z4_surface/spidercave.dmm index 838fce5a622..6e186af40a4 100644 --- a/_maps/domotan_necropolis/z4_surface/spidercave.dmm +++ b/_maps/domotan_necropolis/z4_surface/spidercave.dmm @@ -1,40 +1,61 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/closed/mineral, -/area/indoors/cave) +/area/under/cave) "b" = ( /obj/effect/decal/cleanable/dirt/cobweb, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"c" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/naturalstone, +/area/under/cave) "e" = ( /mob/living/simple_animal/hostile/retaliate/spider, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "o" = ( /obj/structure/spider/stickyweb, /mob/living/simple_animal/hostile/retaliate/spider, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "q" = ( /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "r" = ( /obj/structure/spider/stickyweb, /obj/effect/spawner/map_spawner/loot, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "t" = ( /obj/structure/spider/stickyweb, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"u" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/turf/open/floor/naturalstone, +/area/under/cave) +"C" = ( +/obj/effect/spawner/map_spawner/necropolis/random_rock_wall, +/turf/open/floor/naturalstone, +/area/under/cave) +"E" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/naturalstone, +/area/under/cave) "J" = ( /obj/effect/decal/cleanable/dirt/cobweb/cobweb2, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) "Q" = ( /obj/effect/spawner/map_spawner/loot, /turf/open/floor/naturalstone, -/area/indoors/cave) +/area/under/cave) +"Z" = ( +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/naturalstone, +/area/under/cave) (1,1,1) = {" a @@ -48,11 +69,11 @@ a a q q +C q q q -q -q +C a a a @@ -133,8 +154,8 @@ a a a a -q -q +u +E a a a @@ -235,7 +256,7 @@ t a a q -q +C e q q @@ -247,7 +268,7 @@ t a a q -q +E a a a @@ -316,7 +337,7 @@ q q a q -q +u q a a @@ -366,7 +387,7 @@ a a a a -q +E q q t @@ -410,12 +431,12 @@ a a q q -q -q -q +C +c +Z "} (15,1,1) = {" -q +C a q a @@ -426,8 +447,8 @@ a a q q -q -q +Z +Z q a q @@ -436,15 +457,15 @@ a a a a -q -q -q -q +u +C +Z +Z "} (16,1,1) = {" q -q -q +Z +Z q a a @@ -455,7 +476,7 @@ a a a q -q +Z a t t @@ -465,12 +486,12 @@ a a q a -q -q +Z +Z "} (17,1,1) = {" a -q +Z q e a @@ -481,7 +502,7 @@ a Q t t -q +u q a t @@ -586,9 +607,9 @@ q t t q -q -q -q +Z +Z +Z q t a @@ -616,9 +637,9 @@ t t t t -q -q -q +Z +Z +Z a t q diff --git a/_maps/domotan_necropolis/z4_surface/templates_base.dm b/_maps/domotan_necropolis/z4_surface/templates_base.dm index 9ba423f305c..ef6ff670d8b 100644 --- a/_maps/domotan_necropolis/z4_surface/templates_base.dm +++ b/_maps/domotan_necropolis/z4_surface/templates_base.dm @@ -1,6 +1,6 @@ //The highest level of the Necropolis //This is basically just ground level of Mount Miracle at this point -#define NECROPOLIS_Z4_TEMPLATES list("z4_respite_camp") +#define NECROPOLIS_Z4_TEMPLATES list("z4_cave_1", "z4_cave_2", "z4_cave_3", "z4_cave_4", "z4_cave_5", "z4_cave_6", "z4_cells", "z4_forest", "z4_graveyard", "z4_hedgemaze", "z4_inn_necropolis", "z4_oasis_1", "z4_oasis_2", "z4_one_goblin", "z4_outpost", "z4_spidercave", "z4_washout", "z4_respite_camp") /obj/effect/landmark/map_load_mark/necropolis/z4 name = "Necropolis Z4 Template Spawner" @@ -13,4 +13,89 @@ name = "Z4RespiteCamp" id = "z4_respite_camp" mappath = "_maps/domotan_necropolis/z4_surface/z4_respite_camp.dmm" - rarity = 1 + +//start of actual templates +/datum/map_template/dungeon/z4_cave_1 + name = "Z4Cave1" + id = "z4_cave_1" + mappath = "_maps/domotan_necropolis/z4_surface/cave_1.dmm" + +/datum/map_template/dungeon/z4_cave_2 + name = "Z4Cave2" + id = "z4_cave_2" + mappath = "_maps/domotan_necropolis/z4_surface/cave_2.dmm" + +/datum/map_template/dungeon/z4_cave_3 + name = "Z4Cave3" + id = "z4_cave_3" + mappath = "_maps/domotan_necropolis/z4_surface/cave_3.dmm" + +/datum/map_template/dungeon/z4_cave_4 + name = "Z4Cave4" + id = "z4_cave_4" + mappath = "_maps/domotan_necropolis/z4_surface/cave_4.dmm" + +/datum/map_template/dungeon/z4_cave_5 + name = "Z4Cave5" + id = "z4_cave_5" + mappath = "_maps/domotan_necropolis/z4_surface/cave_5.dmm" + +/datum/map_template/dungeon/z4_cave_6 + name = "Z4Cave6" + id = "z4_cave_6" + mappath = "_maps/domotan_necropolis/z4_surface/cave_6.dmm" + +/datum/map_template/dungeon/z4_cells + name = "Z4Cells" + id = "z4_cells" + mappath = "_maps/domotan_necropolis/z4_surface/cells.dmm" + +/datum/map_template/dungeon/z4_forest + name = "Z4Forest" + id = "z4_forest" + mappath = "_maps/domotan_necropolis/z4_surface/forest.dmm" + +/datum/map_template/dungeon/z4_graveyard + name = "Z4Graveyard" + id = "z4_graveyard" + mappath = "_maps/domotan_necropolis/z4_surface/graveyard.dmm" + +/datum/map_template/dungeon/z4_hedgemaze + name = "Z4Hedgemaze" + id = "z4_hedgemaze" + mappath = "_maps/domotan_necropolis/z4_surface/hedgemaze.dmm" + +/datum/map_template/dungeon/z4_inn_necropolis + name = "Z4InnNecropolis" + id = "z4_inn_necropolis" + mappath = "_maps/domotan_necropolis/z4_surface/Inn_necropolis.dmm" + +/datum/map_template/dungeon/z4_oasis_1 + name = "Z4Oasis1" + id = "z4_oasis_1" + mappath = "_maps/domotan_necropolis/z4_surface/oasis_1.dmm" + +/datum/map_template/dungeon/z4_oasis_2 + name = "Z4Oasis2" + id = "z4_oasis_2" + mappath = "_maps/domotan_necropolis/z4_surface/oasis_2.dmm" + +/datum/map_template/dungeon/z4_one_goblin + name = "Z4OneGoblin" + id = "z4_one_goblin" + mappath = "_maps/domotan_necropolis/z4_surface/one_goblin.dmm" + +/datum/map_template/dungeon/z4_outpost + name = "Z4Outpost" + id = "z4_outpost" + mappath = "_maps/domotan_necropolis/z4_surface/outpost.dmm" + +/datum/map_template/dungeon/z4_spidercave + name = "Z4Spidercave" + id = "z4_spidercave" + mappath = "_maps/domotan_necropolis/z4_surface/spidercave.dmm" + +/datum/map_template/dungeon/z4_washout + name = "Z4Washout" + id = "z4_washout" + mappath = "_maps/domotan_necropolis/z4_surface/washout.dmm" diff --git a/_maps/domotan_necropolis/z4_surface/washout.dmm b/_maps/domotan_necropolis/z4_surface/washout.dmm index b5d8b579342..1c868b4f9ef 100644 --- a/_maps/domotan_necropolis/z4_surface/washout.dmm +++ b/_maps/domotan_necropolis/z4_surface/washout.dmm @@ -1,819 +1,957 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( +"bD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, /turf/open/floor/churchbrick, -/area/indoors/cave) -"b" = ( -/turf/open/openspace, -/area/indoors/cave) -"c" = ( +/area/under/cave) +"bZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/natural/rock, -/turf/open/floor/tile/bath, -/area/indoors/cave) -"d" = ( +/obj/structure/chair/bench/church/smallbench/stone, +/turf/open/floor/churchbrick, +/area/under/cave) +"dy" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/natural/rock, -/turf/open/floor/tile/bath, -/area/indoors/cave) -"f" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/flora/pillar, +/turf/open/floor/churchbrick, +/area/under/cave) +"fg" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/churchbrick, +/area/under/cave) +"fQ" = ( +/obj/structure/bars/bent, +/turf/open/water/river{ + dir = 8 + }, +/area/under/cave) +"gR" = ( /turf/open/floor/tile/bath, -/area/indoors/cave) -"g" = ( -/turf/closed/mineral, -/area/indoors/cave) -"i" = ( +/area/under/cave) +"ht" = ( /obj/structure/flora/pillar, /turf/open/floor/churchbrick, -/area/indoors/cave) -"j" = ( -/turf/open/water/river, -/area/indoors/cave) -"k" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/tile/bath, -/area/indoors/cave) -"l" = ( -/obj/structure/chair/bench, -/turf/open/floor/tile/bath, -/area/indoors/cave) -"n" = ( +/area/under/cave) +"hC" = ( /turf/open/water/river{ - dir = 1 + dir = 4 }, -/area/indoors/cave) -"o" = ( +/area/under/cave) +"iW" = ( +/obj/structure/bars/alt, /turf/open/water/river{ dir = 8 }, -/area/indoors/cave) -"p" = ( -/obj/effect/decal/cleanable/dirt, +/area/under/cave) +"ja" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/tile/bath, -/area/indoors/cave) -"s" = ( /obj/structure/flora/pillar, /turf/open/floor/tile/bath, -/area/indoors/cave) -"t" = ( +/area/under/cave) +"jK" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/mineral, -/area/indoors/cave) -"u" = ( +/area/under/cave) +"kA" = ( +/obj/structure/bars/bent, +/turf/open/water/river{ + dir = 4 + }, +/area/under/cave) +"mk" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/chair/chair3, +/obj/effect/spawner/map_spawner/necropolis, /turf/open/floor/churchbrick, -/area/indoors/cave) -"v" = ( -/obj/structure/chair/bench/church/smallbench/stone, +/area/under/cave) +"mp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/chair/chair3, /turf/open/floor/churchbrick, -/area/indoors/cave) -"x" = ( +/area/under/cave) +"pe" = ( +/turf/open/water/river{ + dir = 1 + }, +/area/under/cave) +"pj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/flora/pillar, +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/churchbrick, +/area/under/cave) +"ry" = ( +/obj/structure/chair/bench, +/turf/open/floor/tile/bath, +/area/under/cave) +"tt" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, /turf/open/floor/tile/bath, -/area/indoors/cave) -"y" = ( +/area/under/cave) +"tR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/chair/bench, -/turf/open/floor/tile/bath, -/area/indoors/cave) -"z" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/churchbrick, +/area/under/cave) +"uC" = ( +/turf/open/water/river{ + dir = 8 + }, +/area/under/cave) +"uG" = ( +/turf/open/floor/churchbrick, +/area/under/cave) +"vz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, /turf/open/floor/churchbrick, -/area/indoors/cave) -"B" = ( +/area/under/cave) +"vZ" = ( +/obj/effect/decal/cleanable/dirt, /obj/item/natural/rock, /turf/open/floor/churchbrick, -/area/indoors/cave) -"G" = ( +/area/under/cave) +"wc" = ( +/turf/closed/mineral, +/area/under/cave) +"xJ" = ( +/obj/structure/bars, +/turf/open/water/river, +/area/under/cave) +"xY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/churchbrick, -/area/indoors/cave) -"H" = ( +/area/under/cave) +"yH" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/natural/rock, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/tile/bath, +/area/under/cave) +"Af" = ( +/obj/item/chair/chair3, /turf/open/floor/churchbrick, -/area/indoors/cave) -"M" = ( +/area/under/cave) +"AU" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/tile/bath, +/area/under/cave) +"Ed" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/dirt, +/area/under/cave) +"Ef" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/flora/pillar, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/natural/rock, /turf/open/floor/churchbrick, -/area/indoors/cave) -"O" = ( +/area/under/cave) +"Ep" = ( +/obj/structure/flora/pillar, /turf/open/floor/tile/bath, -/area/indoors/cave) -"P" = ( +/area/under/cave) +"Fd" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/tile/bath, +/area/under/cave) +"FX" = ( /obj/effect/decal/cleanable/dirt, +/obj/item/natural/rock, /turf/open/floor/tile/bath, -/area/indoors/cave) -"R" = ( +/area/under/cave) +"Gu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/natural/rock, +/turf/open/floor/tile/bath, +/area/under/cave) +"IN" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/naturalstone, +/area/under/cave) +"IY" = ( +/obj/structure/bars, /turf/open/water/river{ - dir = 4 + dir = 1 }, -/area/indoors/cave) -"T" = ( -/obj/item/chair/chair3, -/turf/open/floor/churchbrick, -/area/indoors/cave) -"U" = ( +/area/under/cave) +"MH" = ( +/turf/open/floor/naturalstone, +/area/under/cave) +"Nw" = ( +/obj/structure/bars, +/turf/open/water/river{ + dir = 8 + }, +/area/under/cave) +"OA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/tile/bath, +/area/under/cave) +"PV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/structure/flora/pillar, +/turf/open/floor/tile/bath, +/area/under/cave) +"PX" = ( +/turf/open/water/river, +/area/under/cave) +"Qf" = ( +/obj/structure/bars/bent, +/turf/open/water/river, +/area/under/cave) +"QA" = ( +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/naturalstone, +/area/under/cave) +"Re" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/dirt, +/area/under/cave) +"Rh" = ( /obj/structure/chair/bench/church/smallbench/stone, /turf/open/floor/churchbrick, -/area/indoors/cave) -"V" = ( +/area/under/cave) +"Ru" = ( +/obj/structure/bars/bent, +/turf/open/water/river{ + dir = 1 + }, +/area/under/cave) +"Ss" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/tile/bath, +/area/under/cave) +"SF" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/dirt, +/area/under/cave) +"TA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/bench, +/turf/open/floor/tile/bath, +/area/under/cave) +"UG" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/tile/bath, +/area/under/cave) +"Vu" = ( +/obj/structure/bars, +/turf/open/water/river{ + dir = 4 + }, +/area/under/cave) +"Wq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/map_spawner/necropolis, +/turf/open/floor/tile/bath, +/area/under/cave) +"Wz" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/flora/pillar, +/turf/open/floor/churchbrick, +/area/under/cave) +"WV" = ( +/obj/effect/landmark/map_load_mark/necropolis/z3_pillars, +/turf/open/floor/churchbrick, +/area/under/cave) +"XA" = ( +/obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/turf/open/floor/churchbrick, +/area/under/cave) +"XY" = ( +/turf/open/floor/dirt, +/area/under/cave) +"Yp" = ( /obj/item/natural/rock, /turf/open/floor/churchbrick, -/area/indoors/cave) -"Y" = ( +/area/under/cave) +"Zo" = ( /obj/item/natural/rock, /turf/open/floor/tile/bath, -/area/indoors/cave) +/area/under/cave) (1,1,1) = {" -g -g -g -g -g -g -g -g -g -g -j -j -R -R -R -n -g -g -g -g -g -g -g -g -g +wc +wc +wc +wc +wc +wc +wc +wc +wc +wc +xJ +xJ +Vu +Vu +Vu +IY +wc +wc +wc +wc +wc +wc +wc +wc +wc "} (2,1,1) = {" -g -O -O -O -a -a -a -a -O -O -O -j -R -R -R -n -O -a -a -a -G -G -G -k -g +wc +wc +wc +gR +uG +uG +uG +uG +gR +gR +gR +PX +hC +hC +hC +pe +gR +uG +fg +uG +xY +xY +jK +jK +wc "} (3,1,1) = {" -g -P -y -G -G -G -G -a -a -O -O -j -R -R -R -n -n -a -G -G -a -i -a -O -g +wc +Ss +TA +xY +mk +xY +xY +uG +uG +gR +gR +PX +hC +hC +hC +pe +pe +uG +xY +xY +uG +ht +uG +gR +wc "} (4,1,1) = {" -g -O -k -G -G -G -z -M -G -O -k -j -R -R -R -n -n -G -V -z -G -a -a -O -g +wc +gR +UG +xY +xY +xY +dy +Wz +xY +gR +UG +PX +hC +hC +hC +pe +pe +xY +Ef +dy +bD +uG +uG +gR +wc "} (5,1,1) = {" -g -O -G -H -z -z -z -G -z -G -O -j -R -R -R -n -O -G -z -G -a -a -a -O -g +wc +gR +xY +vZ +dy +dy +pj +xY +dy +xY +gR +PX +hC +hC +hC +pe +gR +xY +dy +xY +uG +uG +uG +gR +wc "} (6,1,1) = {" -g -O -z -a -G -G -B -B -G -G -O -j -R -R -R -n -l -G -M -a -a -B -G -O -g +wc +gR +vz +uG +xY +xY +Yp +Yp +xY +xY +gR +PX +hC +hC +hC +pe +ry +xY +Wz +uG +XA +Yp +xY +gR +wc "} (7,1,1) = {" -g -O -z -a -G -z -G -a -G -G -O -j -R -R -R -n -O -G -G -a -T -a -G -O -g +wc +gR +dy +uG +xY +dy +xY +fg +xY +xY +gR +PX +hC +hC +hC +pe +gR +xY +xY +uG +Af +uG +mk +gR +wc "} (8,1,1) = {" -g -O -x -G -a -z -z -a -G -k -O -j -R -R -R -n -n -a -B -a -G -G -a -O -g +wc +gR +PV +xY +uG +tR +dy +uG +xY +UG +gR +PX +hC +hC +hC +pe +pe +uG +Yp +uG +xY +xY +uG +gR +wc "} (9,1,1) = {" -g -O -O -a -a -G -z -v -z -P -j -j -R -R -R -n -O -a -a -a -a -a -a -O -g +wc +gR +gR +uG +uG +xY +dy +Rh +dy +Ss +PX +PX +hC +hC +hC +pe +gR +uG +uG +uG +uG +uG +uG +gR +wc "} (10,1,1) = {" -R -R -R -O -a -a -z -z -P -O -O -j -R -R -R -n -R -R -R -R -R -R -R -R -R +Vu +hC +hC +gR +uG +XA +dy +dy +Ss +gR +gR +PX +hC +hC +hC +pe +hC +hC +hC +hC +hC +hC +hC +hC +kA "} (11,1,1) = {" -j -j -R -O -O -R -P -P -P -O -j -R -R -R -R -R -n -n -n -n -n -n -n -n -n +xJ +PX +hC +gR +gR +hC +Ss +Ss +Ss +gR +PX +hC +hC +hC +hC +hC +pe +pe +pe +pe +pe +pe +pe +pe +IY "} (12,1,1) = {" -j -j -R -R -R -R -R -R -R -R -j -b -b -b -b -b -n -n -n -n -n -n -n -n -n +Qf +PX +hC +hC +hC +hC +hC +hC +hC +hC +PX +PX +XY +Ed +SF +pe +pe +pe +pe +pe +pe +pe +pe +pe +pe "} (13,1,1) = {" -j -j -j -j -j -j -j -j -j -j -j -b -b -b -b -b -n -n -n -n -n -n -n -n -n +Qf +PX +PX +PX +PX +PX +PX +PX +PX +PX +PX +XY +MH +Re +XY +XY +pe +pe +pe +pe +pe +pe +pe +pe +Ru "} (14,1,1) = {" -j -j -j -j -j -j -j -j -j -j -j -b -b -b -b -b -n -n -n -n -n -n -n -n -n +Qf +PX +PX +PX +PX +PX +PX +PX +PX +PX +PX +MH +IN +QA +XY +Ed +pe +pe +pe +pe +pe +pe +pe +pe +Ru "} (15,1,1) = {" -j -j -j -j -j -j -j -j -j -j -j -b -b -b -b -b -n -n -n -n -n -n -n -n -n +xJ +PX +PX +PX +PX +PX +PX +PX +PX +PX +PX +uC +MH +MH +Re +pe +pe +pe +pe +pe +pe +pe +pe +pe +Ru "} (16,1,1) = {" -o -O -o -a -o -o -o -o -o -a -j -o -o -o -o -o -n -n -n -o -o -a -o -o -o +Nw +gR +uC +uG +uC +uC +uC +uC +uC +uG +PX +uC +uC +uC +uC +uC +pe +pe +pe +uC +uC +uG +uC +uC +iW "} (17,1,1) = {" -g -O -G -a -a -O -o -O -B -a -a -O -j -o -o -n -O -o -o -o -a -B -o -o -o +wc +gR +xY +uG +uG +gR +uC +gR +Yp +uG +uG +gR +PX +uC +uC +pe +gR +uC +uC +uC +uG +Yp +uC +uC +fQ "} (18,1,1) = {" -g -O -P -a -H -G -k -G -G -a -k -O -j -o -o -n -k -O -O -a -a -a -O -O -g +wc +gR +Ss +uG +vZ +xY +UG +xY +xY +uG +UG +gR +PX +uC +uC +pe +UG +AU +gR +uG +uG +uG +gR +gR +wc "} (19,1,1) = {" -g -d -P -O -G -G -z -z -z -O -k -O -j -o -o -n -P -P -B -a -a -a -O -O -g +wc +FX +Wq +gR +xY +xY +dy +dy +dy +gR +Fd +gR +PX +uC +uC +pe +Ss +Ss +Yp +uG +WV +uG +tt +gR +wc "} (20,1,1) = {" -g -k -p -f -k -G -z -z -P -s -O -j -j -o -o -n -O -G -a -a -a -a -O -s -g +wc +UG +yH +ja +UG +xY +pj +dy +Ss +Ep +gR +PX +PX +uC +uC +pe +gR +xY +uG +uG +uG +uG +gR +Ep +wc "} (21,1,1) = {" -g -O -p -k -P -G -G -G -z -O -k -j -j -o -o -n -n -O -u -a -G -B -O -O -g +wc +gR +yH +UG +OA +xY +xY +xY +dy +gR +UG +PX +PX +uC +uC +pe +pe +gR +mp +uG +xY +Yp +gR +gR +wc "} (22,1,1) = {" -t -O -k -a -U -G -k -H -G -a -k -O -j -o -o -n -k -k -O -a -a -a -O -O -g +jK +gR +UG +uG +bZ +xY +UG +vZ +xY +uG +UG +gR +PX +uC +uC +pe +UG +UG +gR +uG +XA +uG +gR +AU +wc "} (23,1,1) = {" -g -O -G -G -G -O -O -O -a -G -a -O -j -o -o -n -n -k -c -k -a -a -Y -O -g +wc +wc +xY +xY +xY +gR +gR +gR +XA +xY +uG +gR +PX +uC +uC +pe +pe +UG +Gu +UG +uG +uG +Zo +wc +wc "} (24,1,1) = {" -g -O -O -a -O -O -Y -k -k -G -O -O -j -o -o -n -k -k -k -f -P -G -O -O -g +wc +wc +wc +uG +gR +AU +Zo +UG +UG +xY +gR +gR +PX +uC +uC +pe +UG +UG +UG +ja +Ss +xY +wc +wc +wc "} (25,1,1) = {" -g -g -g -g -g -g -g -g -g -g -g -j -j -o -o -n -g -g -g -g -g -g -g -g -g +wc +wc +wc +wc +wc +wc +wc +wc +wc +wc +wc +xJ +xJ +uC +Nw +IY +wc +wc +wc +wc +wc +wc +wc +wc +wc "} diff --git a/_maps/map_files/domotan/domotan_east.dmm b/_maps/map_files/domotan/domotan_east.dmm index f3fb093c8ac..76ed890c19d 100644 --- a/_maps/map_files/domotan/domotan_east.dmm +++ b/_maps/map_files/domotan/domotan_east.dmm @@ -87,7 +87,7 @@ pixel_y = 16 }, /turf/open/floor/grass/red, -/area/outdoors/mountains/decap) +/area/outdoors/seculton) "aG" = ( /obj/structure/chair/bench/church/smallbench{ dir = 8 @@ -128,7 +128,7 @@ "aV" = ( /obj/structure/flora/ausbushes/palebush, /turf/open/floor/grass/red, -/area/outdoors/mountains/decap) +/area/outdoors/seculton) "bb" = ( /obj/structure/handcart{ dir = 4 @@ -168,9 +168,12 @@ /turf/open/floor/grass/cold, /area/outdoors/mountains) "bA" = ( -/obj/effect/landmark/mapGenerator/domotan/necropolis_z3, -/turf/closed/basic, -/area) +/obj/effect/landmark/mapGenerator/decap{ + endTurfX = 255; + endTurfY = 255 + }, +/turf/open/water/ocean/abyss, +/area/outdoors/beach) "bE" = ( /obj/structure/table/wood/treestump/burnt, /turf/open/floor/grass, @@ -198,9 +201,12 @@ /turf/open/floor/dirt/road, /area/outdoors/seculton) "cm" = ( -/obj/structure/flora/grass, -/turf/open/floor/cobblerock, -/area/outdoors/mountains/decap) +/obj/structure/fluff/railing/border{ + dir = 1; + icon_state = "border" + }, +/turf/open/openspace, +/area/outdoors/mountains) "cp" = ( /turf/open/water/ocean/abyss, /area/outdoors/beach) @@ -316,7 +322,7 @@ dir = 8 }, /turf/open/floor/ruinedwood/darker, -/area/outdoors/mountains/decap) +/area/outdoors/seculton) "dr" = ( /obj/structure/stairs/d, /turf/open/floor/ruinedwood/darker, @@ -347,8 +353,9 @@ /turf/open/floor/ruinedwood/darker, /area/indoors/hellwatch) "ea" = ( -/turf/open/floor/hay, -/area/indoors/shelter/mountains/decap) +/obj/structure/door/iron/bars, +/turf/open/floor/grass/yel, +/area/outdoors/seculton) "ee" = ( /obj/structure/fake_machine/scomm/r, /turf/open/floor/ruinedwood/darker, @@ -395,7 +402,7 @@ /obj/structure/flora/ausbushes/brflowers, /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/grass/red, -/area/outdoors/mountains/decap) +/area/outdoors/seculton) "eM" = ( /obj/structure/rack/shelf/biggest, /turf/open/floor/cobble/alt, @@ -404,19 +411,9 @@ /turf/open/floor/dirt, /area/under/cave) "eQ" = ( -/obj/item/bedsheet/pelt, -/obj/item/coin/silver/pile, -/obj/item/coin/silver/pile, -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) -"eT" = ( -/obj/structure/table/wood{ - icon_state = "longtable_mid"; - dir = 1 - }, -/obj/item/reagent_containers/glass/bowl, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/obj/structure/fluff/railing/wood, +/turf/open/openspace, +/area/outdoors/mountains) "fc" = ( /obj/structure/fluff/walldeco/church/line{ dir = 1 @@ -534,11 +531,11 @@ /turf/open/floor/ruinedwood/darker, /area/indoors/hellwatch) "fZ" = ( -/obj/structure/table/wood{ - icon_state = "longtable" +/obj/structure/stairs{ + dir = 4 }, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/turf/open/floor/dirt/road, +/area/outdoors/mountains) "gd" = ( /obj/machinery/light/fueled/torchholder/l, /turf/open/floor/grass/yel, @@ -627,8 +624,12 @@ /turf/open/floor/cobble, /area/indoors/seculton) "gS" = ( -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/fluff/railing/wood, +/turf/open/floor/dirt/road, +/area/outdoors/mountains) "gY" = ( /obj/structure/closet/crate/crafted_closet/inn, /turf/open/floor/ruinedwood/darker, @@ -718,6 +719,13 @@ /obj/item/paper/scroll, /turf/open/floor/ruinedwood/darker, /area/indoors/hellwatch) +"hZ" = ( +/obj/effect/landmark/mapGenerator/decap{ + endTurfX = 255; + endTurfY = 255 + }, +/turf/open/openspace, +/area/outdoors/mountains) "ib" = ( /obj/structure/rack, /obj/item/clothing/head/roguehood/colored/random, @@ -805,7 +813,7 @@ }, /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/ruinedwood/darker, -/area/outdoors/mountains/decap) +/area/outdoors/seculton) "ja" = ( /obj/structure/fluff/railing/wood, /turf/open/floor/ruinedwood/turned, @@ -926,7 +934,7 @@ "kG" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/grass/yel, -/area/outdoors/mountains/decap) +/area/outdoors/seculton) "kK" = ( /obj/item/weapon/pick, /obj/structure/minecart_rail{ @@ -1227,9 +1235,6 @@ /obj/structure/fluff/statue/knightalt, /turf/open/floor/churchrough, /area/indoors/seculton) -"ox" = ( -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) "oA" = ( /obj/item/natural/stone, /turf/open/floor/naturalstone, @@ -1358,23 +1363,12 @@ /turf/open/floor/ruinedwood/darker, /area/indoors/hellwatch) "qf" = ( -/obj/structure/table/wood{ - icon_state = "longtable"; +/obj/structure/stairs{ dir = 8 }, -/obj/item/reagent_containers/glass/cup/wooden{ - pixel_y = 18; - pixel_x = -9 - }, -/obj/item/reagent_containers/glass/cup/wooden{ - pixel_y = 18 - }, -/obj/item/reagent_containers/glass/cup/wooden{ - pixel_y = 18; - pixel_x = 8 - }, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/obj/structure/fluff/railing/wood, +/turf/open/floor/dirt/road, +/area/outdoors/mountains) "qi" = ( /turf/open/floor/grass/yel, /area/outdoors/seculton) @@ -1389,30 +1383,15 @@ /turf/open/floor/dirt/road, /area/outdoors/seculton) "qq" = ( -/obj/structure/bed/shit{ - name = "makeshift bed" - }, -/turf/open/floor/twig/platform{ - dir = 4 - }, -/area/indoors/shelter/mountains/decap) +/obj/structure/flora/newtree/snow, +/turf/open/floor/dirt/road, +/area/outdoors/mountains) "qr" = ( -/obj/structure/table/wood{ - icon_state = "longtable_mid"; - dir = 1 - }, -/obj/item/reagent_containers/glass/cup/wooden{ - pixel_x = 16; - pixel_y = 10 - }, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/turf/closed/wall/mineral/stone, +/area/indoors/shelter/mountains) "qv" = ( /turf/open/floor/naturalstone, /area/indoors/hellwatch) -"qx" = ( -/turf/open/floor/rooftop, -/area/indoors/shelter/mountains/decap) "qz" = ( /obj/item/natural/rock, /turf/open/floor/naturalstone, @@ -1489,10 +1468,12 @@ /turf/open/floor/cobble, /area/under/necropolis) "rg" = ( -/obj/structure/bearpelt, -/obj/item/coin/gold/pile, -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) +/obj/structure/fluff/railing/border{ + dir = 1; + icon_state = "border" + }, +/turf/open/floor/snow/rough, +/area/outdoors/mountains) "rm" = ( /obj/structure/table/wood/treestump, /turf/open/floor/grass/yel, @@ -1521,9 +1502,6 @@ }, /turf/open/floor/ruinedwood, /area/indoors/hellwatch) -"rA" = ( -/turf/open/floor/rooftop, -/area/outdoors/mountains/decap) "rC" = ( /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/cobble/alt, @@ -1540,16 +1518,13 @@ /obj/structure/fake_machine/scomm/r, /turf/open/floor/grass/yel, /area/outdoors/seculton) -"rT" = ( -/obj/structure/ladder, -/turf/open/floor/twig/platform{ - dir = 4 - }, -/area/indoors/shelter/mountains/decap) "rY" = ( -/obj/structure/ladder, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/obj/structure/fluff/traveltile{ + aportalgoesto = "z2-northeast1-in"; + aportalid = "z2-northeast1-out" + }, +/turf/open/floor/cobblerock, +/area/outdoors/seculton) "sh" = ( /obj/structure/chair/wood{ dir = 1 @@ -1653,30 +1628,6 @@ }, /turf/open/floor/ruinedwood/darker, /area/indoors/hellwatch) -"tn" = ( -/obj/item/bedsheet/pelt, -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) -"tr" = ( -/obj/structure/table/wood{ - icon_state = "longtable_mid" - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = -8 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = -8; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = 6; - pixel_y = 3 - }, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) "tz" = ( /obj/structure/closet/crate/chest, /obj/item/reagent_containers/food/snacks/egg, @@ -1713,13 +1664,6 @@ /obj/effect/mapping_helpers/access/keyset/garrison/general, /turf/open/floor/church, /area/indoors/hellwatch) -"tX" = ( -/obj/structure/bed/inn/double, -/obj/item/bedsheet/double_pelt, -/obj/item/coin/gold/pile, -/obj/item/coin/gold/pile, -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) "ug" = ( /obj/structure/fake_machine/scomm/r, /turf/open/floor/churchmarble, @@ -1735,9 +1679,14 @@ /turf/open/floor/church, /area/indoors/hellwatch) "uu" = ( -/obj/structure/fluff/railing/wood, -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) +/obj/effect/landmark/mapGenerator/cave/lava{ + startTurfX = 60; + startTurfY = 22; + endTurfX = 179; + endTurfY = 227 + }, +/turf/closed/mineral, +/area/indoors/shelter/mountains) "ux" = ( /obj/structure/chair/bench/church/smallbench, /turf/open/floor/grass/yel, @@ -1825,9 +1774,8 @@ /turf/closed/mineral, /area/under/cavelava) "vG" = ( -/obj/structure/ladder, -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) +/turf/closed/wall/mineral/stone, +/area/under/cave) "vH" = ( /turf/open/openspace, /area/outdoors/mountains) @@ -1855,13 +1803,9 @@ /turf/open/floor/metal, /area/under/necropolis) "vU" = ( -/obj/structure/table/wood{ - icon_state = "longtable_mid"; - dir = 1 - }, -/obj/item/reagent_containers/glass/bottle/wine/sourwine, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/obj/structure/fluff/railing/wood, +/turf/open/floor/snow/rough, +/area/outdoors/mountains) "vV" = ( /obj/machinery/light/fueled/torchholder/l, /turf/open/floor/cobblerock, @@ -2002,7 +1946,7 @@ "xV" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/grass/red, -/area/outdoors/mountains/decap) +/area/outdoors/seculton) "yd" = ( /turf/closed/mineral, /area/outdoors/mountains) @@ -2030,9 +1974,9 @@ /turf/open/floor/churchbrick, /area/indoors/hellwatch) "yg" = ( -/obj/structure/chair/stool, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/obj/structure/flora/newtree/snow, +/turf/open/floor/grass/yel, +/area/outdoors/seculton) "yr" = ( /obj/structure/fluff/statue/knightalt/r, /turf/open/floor/grass/red, @@ -2086,15 +2030,9 @@ /obj/structure/door/stone, /turf/open/floor/ruinedwood, /area/under/necropolis) -"zs" = ( -/obj/structure/bed/shit{ - name = "makeshift bed" - }, -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) "zw" = ( -/turf/closed/wall/mineral/wooddark, -/area/indoors/shelter/mountains/decap) +/turf/open/water/marsh, +/area/outdoors/mountains) "zx" = ( /obj/item/natural/rock, /turf/open/floor/naturalstone, @@ -2102,7 +2040,7 @@ "zM" = ( /obj/structure/roguerock, /turf/open/floor/naturalstone, -/area/under/cave) +/area/under/cavelava) "zQ" = ( /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/ruinedwood/darker, @@ -2184,23 +2122,6 @@ /obj/structure/rack/shelf/notdense, /turf/open/floor/dirt/road, /area/indoors/shelter/mountains) -"Bm" = ( -/obj/structure/table/wood{ - icon_state = "longtable_mid" - }, -/obj/item/reagent_containers/glass/cup/wooden{ - pixel_y = 18; - pixel_x = -9 - }, -/obj/item/reagent_containers/glass/cup/wooden{ - pixel_y = 18 - }, -/obj/item/reagent_containers/glass/cup/wooden{ - pixel_y = 18; - pixel_x = 8 - }, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) "Bn" = ( /obj/structure/closet/crate/chest, /turf/open/floor/church, @@ -2223,10 +2144,6 @@ /obj/item/bin/water, /turf/open/floor/ruinedwood/turned, /area/indoors/hellwatch) -"BL" = ( -/obj/item/coin/gold/pile, -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) "BN" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 4 @@ -2265,8 +2182,9 @@ /area/outdoors/mountains) "CD" = ( /obj/machinery/light/fueled/torchholder/r, +/obj/structure/fluff/railing/tall/palisade, /turf/open/floor/grass/yel, -/area/outdoors/mountains/decap) +/area/outdoors/seculton) "CI" = ( /turf/open/floor/grass/red, /area/outdoors/mountains/decap) @@ -2345,10 +2263,11 @@ "DM" = ( /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/grass/red, -/area/outdoors/mountains/decap) +/area/outdoors/seculton) "DO" = ( -/turf/open/floor/dirt/road, -/area/indoors/shelter/mountains/decap) +/obj/structure/fluff/railing/wood, +/turf/open/floor/ruinedwood, +/area/outdoors/mountains) "DP" = ( /obj/structure/fluff/walldeco/church/line{ dir = 4 @@ -2412,17 +2331,9 @@ /turf/open/floor/dirt/road, /area/outdoors/mountains/decap) "Fb" = ( -/obj/structure/closet/crate/chest/wicker, -/obj/item/reagent_containers/food/snacks/fat/salo, -/obj/item/reagent_containers/food/snacks/fat/salo, -/obj/item/reagent_containers/food/snacks/fat/salo, -/obj/item/reagent_containers/food/snacks/fat/salo, -/obj/item/reagent_containers/food/snacks/fat/salo, -/obj/item/reagent_containers/food/snacks/fat/salo, -/obj/item/reagent_containers/food/snacks/fat/salo, -/obj/item/reagent_containers/food/snacks/fat/salo, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/obj/structure/flora/newtree/snow, +/turf/open/floor/grass/yel, +/area/outdoors/mountains) "Fn" = ( /obj/structure/stairs/stone/church{ dir = 8 @@ -2594,8 +2505,9 @@ /turf/open/floor/grass/yel, /area/outdoors/mountains/decap) "GE" = ( -/turf/open/floor/hay, -/area/outdoors/mountains/decap) +/obj/structure/flora/newtree/snow, +/turf/open/floor/grass/cold, +/area/outdoors/mountains) "GF" = ( /obj/structure/fluff/walldeco/church/line{ dir = 1 @@ -2606,23 +2518,12 @@ /turf/open/floor/churchrough, /area/indoors/hellwatch) "GJ" = ( -/obj/structure/table/wood{ - dir = 1; - icon_state = "longtable" - }, -/obj/item/reagent_containers/glass/bottle/wine/sourwine, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/obj/structure/flora/newtree/snow, +/turf/open/floor/grass/red, +/area/outdoors/mountains) "GR" = ( -/obj/structure/table/wood{ - icon_state = "longtable" - }, -/obj/item/reagent_containers/glass/cup/wooden{ - pixel_x = 20; - pixel_y = 6 - }, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/turf/open/floor/dirt/road, +/area/under/cavelava) "GU" = ( /obj/structure/fluff/railing/wood{ dir = 8 @@ -2783,35 +2684,10 @@ }, /turf/open/floor/cobblerock, /area/indoors/seculton) -"IX" = ( -/obj/item/reagent_containers/glass/bucket/pot/stone, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) "Jg" = ( /obj/structure/closet/crate/chest/crate, /turf/open/floor/cobble, /area/under/necropolis) -"Jk" = ( -/obj/structure/table/wood{ - dir = 4; - icon_state = "longtable" - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = -8 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = 6 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = -8; - pixel_y = 3 - }, -/obj/item/reagent_containers/glass/bowl{ - pixel_x = 6; - pixel_y = 3 - }, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) "Jm" = ( /turf/closed/basic, /area/outdoors/mountains) @@ -2821,18 +2697,12 @@ }, /turf/open/floor/cobblerock, /area/under/necropolis) -"Jq" = ( -/obj/structure/table/wood{ - dir = 4; - icon_state = "longtable" - }, -/obj/item/candle/skull/lit, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) "Js" = ( -/obj/structure/table/wood/treestump, -/turf/open/floor/grass/yel, -/area/outdoors/mountains/decap) +/obj/structure/stairs{ + dir = 8 + }, +/turf/open/floor/dirt/road, +/area/outdoors/mountains) "Jt" = ( /obj/structure/stairs/stone{ dir = 1 @@ -2919,19 +2789,9 @@ /turf/open/floor/churchrough, /area/outdoors/seculton) "Km" = ( -/obj/structure/fluff/railing/wood{ - dir = 1; - pixel_y = -1 - }, -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) -"Ku" = ( -/obj/structure/table/wood{ - dir = 1; - icon_state = "longtable" - }, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/obj/structure/fluff/railing/tall/palisade, +/turf/open/water/marsh, +/area/outdoors/seculton) "Ky" = ( /obj/structure/minecart_rail, /turf/open/floor/naturalstone, @@ -3209,17 +3069,6 @@ /obj/machinery/light/fueled/torchholder/c, /turf/open/openspace, /area/outdoors/seculton) -"Nq" = ( -/obj/structure/table/wood{ - icon_state = "longtable_mid"; - dir = 1 - }, -/obj/item/reagent_containers/glass/bowl, -/obj/item/reagent_containers/glass/cup/wooden{ - pixel_x = 16 - }, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) "Nt" = ( /obj/structure/stairs/stone{ dir = 1 @@ -3245,7 +3094,7 @@ dir = 8 }, /turf/open/floor/cobblerock, -/area/outdoors/mountains/decap) +/area/outdoors/seculton) "NH" = ( /obj/structure/fluff/steamvent, /obj/machinery/light/fueled/torchholder/l, @@ -3263,19 +3112,9 @@ /obj/effect/mapping_helpers/access/keyset/church/general, /turf/open/floor/ruinedwood/darker, /area/indoors/hellwatch) -"NY" = ( -/turf/open/floor/cobblerock, -/area/outdoors/mountains/decap) "Od" = ( /turf/closed/mineral, /area/indoors/hellwatch) -"Og" = ( -/obj/structure/fluff/traveltile{ - aportalgoesto = "z2-northeast1-in"; - aportalid = "z2-northeast1-out" - }, -/turf/open/floor/dirt/road, -/area/outdoors/mountains) "Oh" = ( /obj/item/natural/stone, /turf/open/floor/cobblerock, @@ -3418,12 +3257,9 @@ /turf/open/water/ocean/abyss, /area/outdoors/mountains/decap) "PH" = ( -/obj/structure/table/wood{ - icon_state = "longtable"; - dir = 8 - }, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/obj/structure/flora/newtree/snow, +/turf/open/floor/grass/yel, +/area/outdoors/mountains/decap) "PQ" = ( /obj/machinery/light/fueled/torchholder/r, /turf/open/openspace, @@ -3433,17 +3269,8 @@ /turf/open/floor/grass/yel, /area/outdoors/seculton) "PU" = ( -/obj/structure/table/wood{ - icon_state = "longtable_mid"; - dir = 1 - }, -/obj/item/reagent_containers/glass/cup/wooden, -/obj/item/reagent_containers/glass/cup/wooden{ - pixel_x = 16; - pixel_y = 10 - }, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/turf/closed/wall/mineral/stonebrick/reddish, +/area/under/cave) "PX" = ( /obj/structure/stairs{ dir = 1 @@ -3510,11 +3337,12 @@ /turf/open/floor/church, /area/indoors/hellwatch) "Qy" = ( -/obj/structure/bed/shit{ - name = "makeshift bed" +/obj/effect/landmark/mapGenerator/cave{ + endTurfX = 61; + endTurfY = 139 }, -/turf/open/floor/hay, -/area/indoors/shelter/mountains/decap) +/turf/open/water/ocean/abyss, +/area/outdoors/beach) "QD" = ( /obj/structure/table/wood/treestump, /turf/open/floor/grass/red, @@ -3575,9 +3403,8 @@ /turf/open/floor/dirt/road, /area/indoors/shelter/mountains) "Rj" = ( -/obj/item/coin/silver/pile, -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) +/turf/open/lava, +/area/under/cavelava) "Rk" = ( /obj/structure/fluff/railing/wood{ dir = 4 @@ -3624,10 +3451,9 @@ /turf/open/floor/grass/red, /area/outdoors/seculton) "RV" = ( -/turf/open/floor/twig/platform{ - dir = 4 - }, -/area/indoors/shelter/mountains/decap) +/obj/structure/flora/newtree, +/turf/open/floor/grass/yel, +/area/outdoors/seculton) "RX" = ( /obj/structure/fluff/railing/border{ dir = 8 @@ -3675,7 +3501,7 @@ "Sw" = ( /obj/structure/flora/ausbushes/palebush, /turf/open/floor/grass/yel, -/area/outdoors/mountains/decap) +/area/outdoors/seculton) "Sy" = ( /turf/closed/wall/mineral/stone, /area/outdoors/mountains/decap) @@ -3754,7 +3580,7 @@ /area/outdoors/hellwatch) "Tn" = ( /turf/open/water/clean, -/area/outdoors/mountains) +/area/under/cave) "To" = ( /turf/open/floor/cobble/alt, /area/outdoors/hellwatch) @@ -3877,12 +3703,12 @@ /turf/open/floor/ruinedwood/turned, /area/indoors/hellwatch) "UI" = ( -/obj/structure/table/church{ - icon_state = "churchtable_end" - }, /obj/item/candle/skull{ pixel_y = 14 }, +/obj/structure/table/church{ + dir = 1 + }, /turf/open/floor/dirt/road, /area/outdoors/mountains) "UJ" = ( @@ -3939,10 +3765,6 @@ /obj/structure/closet/crate/coffin, /turf/open/floor/cobblerock, /area/outdoors/seculton) -"VB" = ( -/obj/item/cooking/pan, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) "VD" = ( /obj/structure/window, /obj/structure/barricade/wooden/crude, @@ -3971,10 +3793,9 @@ /turf/open/floor/ruinedwood/turned, /area/indoors/hellwatch) "VX" = ( -/obj/item/bedsheet/pelt, -/obj/item/coin/silver/pile, -/turf/open/floor/twig/platform, -/area/indoors/shelter/mountains/decap) +/obj/structure/flora/newtree/snow, +/turf/open/floor/sand, +/area/outdoors/mountains) "VY" = ( /turf/closed/wall/mineral/craftstone, /area/indoors/hellwatch) @@ -4274,17 +4095,13 @@ }, /turf/open/floor/ruinedwood/darker, /area/indoors/hellwatch) -"ZG" = ( -/turf/closed/wall/mineral/tent, -/area/indoors/shelter/mountains/decap) "ZJ" = ( /obj/structure/table/wood, /turf/open/floor/dirt/road, /area/indoors/shelter/mountains) "ZO" = ( -/obj/structure/closet/crate/chest/wicker, -/turf/open/floor/cobble/mossy, -/area/indoors/shelter/mountains/decap) +/turf/open/water/marsh, +/area/outdoors/seculton) "ZR" = ( /obj/structure/fluff/traveltile{ aportalgoesto = "z2-southeast1-in"; @@ -135637,253 +135454,9 @@ xI xI xI xI -bA -"} -(2,1,3) = {" -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI xI +"} +(2,1,3) = {" xI xI xI @@ -135895,8 +135468,6 @@ xI xI xI xI -"} -(3,1,3) = {" xI xI xI @@ -136141,6 +135712,8 @@ xI xI xI xI +"} +(3,1,3) = {" xI xI xI @@ -136152,8 +135725,6 @@ xI xI xI xI -"} -(4,1,3) = {" xI xI xI @@ -136398,6 +135969,8 @@ xI xI xI xI +"} +(4,1,3) = {" xI xI xI @@ -136409,8 +135982,6 @@ xI xI xI xI -"} -(5,1,3) = {" xI xI xI @@ -136655,6 +136226,8 @@ xI xI xI xI +"} +(5,1,3) = {" xI xI xI @@ -136666,8 +136239,6 @@ xI xI xI xI -"} -(6,1,3) = {" xI xI xI @@ -136912,6 +136483,8 @@ xI xI xI xI +"} +(6,1,3) = {" xI xI xI @@ -136923,8 +136496,6 @@ xI xI xI xI -"} -(7,1,3) = {" xI xI xI @@ -137169,6 +136740,8 @@ xI xI xI xI +"} +(7,1,3) = {" xI xI xI @@ -137180,8 +136753,6 @@ xI xI xI xI -"} -(8,1,3) = {" xI xI xI @@ -137426,6 +136997,8 @@ xI xI xI xI +"} +(8,1,3) = {" xI xI xI @@ -137437,8 +137010,6 @@ xI xI xI xI -"} -(9,1,3) = {" xI xI xI @@ -137683,6 +137254,8 @@ xI xI xI xI +"} +(9,1,3) = {" xI xI xI @@ -137694,8 +137267,6 @@ xI xI xI xI -"} -(10,1,3) = {" xI xI xI @@ -137940,6 +137511,9 @@ xI xI xI xI +"} +(10,1,3) = {" +xI xI xI xI @@ -137951,8 +137525,6 @@ xI xI xI xI -"} -(11,1,3) = {" xI xI xI @@ -138196,6 +137768,96 @@ xI xI xI xI +"} +(11,1,3) = {" +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI xI xI xI @@ -138208,8 +137870,163 @@ xI xI xI xI -"} -(12,1,3) = {" +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +"} +(12,1,3) = {" xI xI xI @@ -201172,10 +200989,267 @@ cp cp cp cp +Qy +bA +"} +(2,1,4) = {" +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +fA +Di +qi +qi +qi +ZO +ZO +ZO +ZO +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +CN +NG +NG +NG +NG +NG +CN +qi +ZO +ZO +ZO +ZO +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +Wv +MY +MY +MY +MY +Xe +Xe +ES +ES +ES +Xe +Xe +MP +MP +PG +PG +PG +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp cp cp "} -(2,1,4) = {" +(3,1,4) = {" xI xI xI @@ -201351,34 +201425,55 @@ xI xI fA Di -MY -MY -MY -nw -nw -nw -nw -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -CN -NG -NG -NG -NG -NG -CN -MY -nw -nw +qi +qi +qi +qi +ZO +qi +qi +qi +qi +lF +lF +lF +lF +lF +lF +lF +mk +qi +qi +qi +lF +lF +qi +qi +Sw +ZO +ZO +ZO +ZO +ZO +ZO +ZO +qi +Sw +qi +RV +qi +qi +rm +qi +qi +qi +qi +qi +qi +qi +qi +qi +Km nw nw MY @@ -201387,30 +201482,10 @@ MY MY MY MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -Xe -Xe -ES -ES -ES -Xe -Xe +jI +jI +jI +MP MP MP PG @@ -201430,9 +201505,8 @@ cp cp cp cp -cp "} -(3,1,4) = {" +(4,1,4) = {" xI xI xI @@ -201608,54 +201682,55 @@ xI xI fA Di -MY -MY -MY -MY -nw -MY -MY -MY -MY -NY -NY -NY -NY -NY -NY -NY -Am -MY -MY -MY -NY -NY -MY -MY -Sw -nw -nw -nw -nw -nw -nw -nw -MY -Sw -MY -GD -MY -MY -Js -MY -MY -MY -MY -MY -MY -MY -MY -MY +qi +RV +qi +mk +qi +qi +RV +qi +lF +lF +qi +qi +qi +qi +qi +lF +lF +lF +lF +lF +lF +lF +lF +qi +MH +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +qi +qi +MH +qi +qi +qi +qi +qi +qi +RV +qi +qi +qi +ZO +Km nw nw nw @@ -201664,7 +201739,6 @@ MY MY MY MY -MY jI jI jI @@ -201689,7 +201763,7 @@ cp cp cp "} -(4,1,4) = {" +(5,1,4) = {" xI xI xI @@ -201865,54 +201939,55 @@ xI xI fA Di -MY -GD -MY -Am -MY -MY -GD -MY -NY -NY -MY -MY -MY -MY -MY -NY -NY -NY -NY -NY -NY -NY -NY -MY -gI -nw -nw -nw -nw -nw -nw -nw -nw -nw -MY -MY -gI -MY -MY -MY -MY -MY -MY -GD -MY -MY -MY -nw +qi +qi +qi +Wj +qi +qi +qi +qi +lF +qi +mk +kG +ZO +ZO +qi +qi +qi +ZO +ZO +RV +kG +lF +lF +qi +qi +qi +ZO +ZO +ZO +ZO +ZO +ZO +rm +qi +qi +qi +qi +qi +qi +RV +qi +MH +qi +qi +qi +qi +qi +qi +Wv nw nw nw @@ -201924,12 +201999,11 @@ MY MY jI jI -jI MP MP MP -PG -PG +MP +MP PG cp cp @@ -201946,7 +202020,7 @@ cp cp cp "} -(5,1,4) = {" +(6,1,4) = {" xI xI xI @@ -202122,62 +202196,62 @@ xI xI fA Di -MY -MY -MY -CI -MY -MY -MY -MY -NY -MY -Am +qi +qi +lF +lF +lF +qi +lF +lF +lF +Wj +Wj +ZO +ZO +ZO +ZO +MH +ZO +ZO +ZO +qi +lF +lF +lF +lF +lF +qi +qi +qi +qi kG -nw -nw -MY +RV +qi +MH +qi +qi +qi +qi +qi +ZO +ZO +qi +qi +qi +qi +mk +qi +qi +qi +ea MY MY nw -nw -GD -kG -NY -NY MY MY MY nw -nw -nw -nw -nw -nw -Js -MY -MY -MY -MY -MY -MY -GD -MY -gI -MY -MY -MY -MY -MY -MY -MY -nw -nw -nw -nw -MY -MY -MY MY MY jI @@ -202187,7 +202261,7 @@ MP MP MP MP -PG +MP cp cp cp @@ -202203,30 +202277,7 @@ cp cp cp "} -(6,1,4) = {" -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI +(7,1,4) = {" xI xI xI @@ -202378,62 +202429,86 @@ xI xI xI fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA +fA Di -MY -MY -CI -CI -MY -MY -MY -NY -NY -CI -CI -nw -nw -nw -nw -gI -nw -nw -nw -MY -NY -NY -NY -NY -NY -MY -MY -MY -MY +qi +lF +lF +lF +lF +lF +lF +lF +Wj +Wj +ZO +ZO +ZO +ZO +ZO +RV +ZO +qi +qi +lF +Uf +qi +qi +RV +lF +lF +lF +mk +Wj +Wj +qi +qi +qi kG -GD -MY -gI -MY -MY -MY -MY -MY -nw -nw -MY -MY -MY -MY -Am +qi +ZO +ZO +ZO +ZO +ZO +ZO +qi +UF +qi +qi +rm +qi +qi +RV MY MY MY -kL MY +GD MY nw -MY -MY -MY nw MY MY @@ -202444,9 +202519,8 @@ MP MP MP MP -MP -cp -cp +PG +PG cp cp cp @@ -202460,18 +202534,7 @@ cp cp cp "} -(7,1,4) = {" -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI +(8,1,4) = {" xI xI xI @@ -202623,74 +202686,85 @@ fA fA fA fA -fA -fA -fA -fA -fA -fA -fA -fA -fA -fA -fA -fA -Di -MY -MY -CI -CI -CI -MY -MY -NY -CI -CI -nw -nw -nw -nw -nw -GD -nw -MY -MY -NY -cm -MY -MY -GD -NY -NY -NY -Am -CI -CI -MY -MY -MY +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +qr +qi +lF +lF +RV +qi +MH +qi +lF +qi +Wj +ZO +ZO +ZO +qi +Sw +qi kG -MY -nw -nw -nw -nw -nw -nw -MY -ZU -MY -MY -Js +qi +qi +Uf +lF +qi +XC +qi +Wj +DM +aV +UF +xV +Wj +DM +qi +qi +XC +ZO +ZO +ZO +ZO +ZO +qi +Wj +Wj +Wj +Wj +DM +qi +qi +qi +CD MY MY -GD MY MY MY MY -GD -MY nw nw MY @@ -202702,7 +202776,7 @@ MP MP MP MP -PG +MP PG cp cp @@ -202717,17 +202791,7 @@ cp cp cp "} -(8,1,4) = {" -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI +(9,1,4) = {" xI xI xI @@ -202868,7 +202932,6 @@ fA fA fA fA -fA eH eH eH @@ -202892,57 +202955,68 @@ eH eH eH eH -Di -MY -MY -CI -GD -MY -gI -MY -NY -MY -CI -nw -nw -nw -MY -Sw -MY +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +qr +lF +lF +qi +MH +qi +qi kG -MY -MY -cm -NY -MY -CD -MY -CI -DM +lF +qi +Wj +XC +qi +MH +qi +XC +qi +qi +qi +lF +lF +qi +qi +VY +VY +it +VY +it +VY +Wj aV -ZU -xV -CI -DM -MY -MY -CD -nw -nw -nw -nw -nw -MY -CI -CI -CI -CI +cK +cK +jV +cK +qi +qi +XC +qi +qi +Wj DM -MY -MY -MY -CD -MY +Wj +Wj +Wj +cK +cK +cK +cK +cK +iV MY MY MY @@ -202974,10 +203048,7 @@ cp cp cp "} -(9,1,4) = {" -xI -xI -xI +(10,1,4) = {" xI xI xI @@ -203108,16 +203179,6 @@ fA fA fA fA -fA -fA -fA -fA -fA -fA -fA -eH -eH -eH eH eH eH @@ -203149,57 +203210,69 @@ eH eH eH eH -Di -MY -MY -MY -gI -MY -MY -xV -NY -MY -CI -CD -MY -gI -MY -CD -MY -MY -MY -NY -NY -MY -MY -VY +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +lF +lF +cg +qi +qi +ZO +qi +qi +lF +lF +Wj VY it -VY it VY -CI +VY +VY +aD +DM +lF +lF +eL aV +VY +bm +OG +Fu +YR +VY +VY cK cK -jV +SM +qz cK -MY -MY -CD -MY -MY -CI -DM -CI -CI -CI cK cK cK cK cK -iV +jV +jV +cK +cK +cK +ms +qv +qz +vB +cK MY MY MY @@ -203207,6 +203280,7 @@ MY MY nw nw +nw MY MY jI @@ -203231,7 +203305,7 @@ cp cp cp "} -(10,1,4) = {" +(11,1,4) = {" xI xI xI @@ -203356,9 +203430,6 @@ xI xI xI xI -xI -xI -fA fA fA fA @@ -203394,286 +203465,32 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -Di -MY -MY -MY -CI -nw -CI -CI -NY -NY -CI -VY -it -it -VY -VY -VY -aD -DM -NY -NY -eL -aV -VY -bm -OG -Fu -YR -VY -VY -cK -cK -SM -qz -cK -cK -cK -cK -cK -cK -jV -jV -cK -cK -cK -ms -qv -qz -vB -cK -MY -MY -MY -MY -MY -nw -nw -nw -MY -MY -jI -jI -MP -MP -MP -MP -MP -MP -PG -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -"} -(11,1,4) = {" -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -fA -fA -fA -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -Di -MY -MY -CI -CI -nw -nw -CI -NY -NY -CI +qi +qi +qi +qi +qi +qi +qi +qi +yg +qi +qi +qi +qi +qi +lF +lF +lF +qi +qi +ZO +ZO +ZO +qi +lF +lF +Wj it pe yO @@ -203901,36 +203718,36 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -Di -MY -nw -nw +qi +qi +qi +qi +qi +yg +qi +RV +qi +qi +qi +qi +qi +qi +qi +qi +lF +lF +lF +lF +qi +qi +ZO Di -nw -nw -nw -CI -NY -NY +ZO +ZO +qi +qi +lF +lF it ae lJ @@ -204140,54 +203957,54 @@ eH eH eH eH +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -Di -Di -Di -nw +qi +qi +qi +qi +qi +RV +qi +qi +qi +qi +qi +qi +yg +qi +qi +qi +lF +lF +lF +lF +lF +cg +cg +qi +qr +ZO Di Di VY -nw -CI -NY -NY +qi +qi +lF +lF VY Lx VQ @@ -204396,55 +204213,55 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +qi +qi +qi +qi +yg +qi +qi +qi +qi +qi +qi +qi +qi +yg +qi +qi +qi +qi +ZO +ZO +ZO +RV +qi +qi +qi +qi +qi +lF +lF +lF +lF +lF +cg +cg +qi +qi +qi +vG +vG eH Di VY dp iX -NY -NY +lF +lF VY jK fE @@ -204650,49 +204467,49 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +ZO +qi +qi +qi +qi +yg +ZO +ZO +qi +qi +qi +yg +qi +qi +qi +yg +ZO +qi +qi +qi +qi +qi +qi +ZO +ZO +ZO +qi +qi +qi +qi +lF +lF +lF +lF +lF +cg +cg +qi +qi +qi +qi +qi eH eH eH @@ -204907,48 +204724,48 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +ZO +ZO +ZO +ZO +yg +qi +qi +ZO +ZO +ZO +qi +qi +qi +qi +qi +qi +ZO +ZO +ZO +qi +qi +qi +qi +yg +qi +qi +qi +lF +lF +lF +lF +lF +lF +cg +cg +cg +cg +qi +yg +qi +qi +qi eH eH eH @@ -205163,47 +204980,47 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +ZO +ZO +ZO +ZO +qi +qi +ZO +ZO +ZO +qi +qi +qi +qi +qi +yg +qi +ZO +ZO +qi +yg +qi +qi +qi +qi +lF +lF +lF +lF +lF +cg +cg +cg +qi +qi +qi +qi +qi +qi +qi +qi eH eH eH @@ -205420,47 +205237,47 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +ZO +ZO +ZO +ZO +qi +qi +qi +qi +qi +qi +yg +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +lF +lF +lF +lF +lF +cg +cg +cg +qi +qi +qi +qi +qi +ZO +ZO +ZO +ZO +qi +qi eH eH eH @@ -205676,47 +205493,47 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +qi +ZO +qi +qi +yg +qi +qi +yg +qi +qi +qi +qi +qi +qi +qi +qi +lF +lF +lF +lF +cg +cg +cg +cg +cg +qi +RV +qi +qi +qi +qi +qi +qi +qi +ZO +ZO +qi +qi eH eH eH @@ -205932,47 +205749,47 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +yg +qi +qi +yg +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +lF +lF +lF +lF +lF +cg +cg +cg +qi +ZO +qi +qi +qi +qi +qi +RV +qi +qi +qi +RV +qi +qi +qi eH eH eH @@ -206188,48 +206005,48 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +ZO +ZO +ZO +yg +qi +cg +cg +lF +lF +cg +cg +cg +cg +cg +cg +qi +qi +ZO +ZO +ZO +qi +qi +ZO +ZO +ZO +ZO +qi +qi +qi +qi +qi eH eH eH @@ -206445,48 +206262,48 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +yg +qi +qi +qi +qi +qi +qi +qi +qi +yg +ZO +ZO +qi +cg +cg +lF +cg +cg +cg +cg +cg +cg +cg +cg +cg +cg +qi +qi +yg +qi +qi +qi +ZO +ZO +ZO +ZO +qi +qi +qi +qi +qi eH eH eH @@ -206701,45 +206518,45 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +rY +qi +qi +qi +qi +qi +qi +qi +qi +yg +qi +qi +qi +qi +qi +lF +lF +cg +cg +cg +qi +qi +qi +qi +qi +cg +cg +cg +cg +qi +qi +qi +qi +yg +qi +qi +qi +qi +qi eH eH eH @@ -206958,44 +206775,44 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +rY +lF +qi +qi +qi +cg +cg +qi +qi +qi +qi +qi +qi +lF +lF +cg +cg +cg +qi +qi +qi +qi +qi +qi +qi +qi +cg +cg +cg +qi +qi +qi +qi +qi +qi +qi +RV +qi eH eH eH @@ -207215,44 +207032,44 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +rY +lF +lF +lF +lF +lF +lF +lF +lF +lF +lF +lF +lF +lF +lF +cg +cg +qi +qi +qi +qi +qi +yg +qi +qi +qi +qi +cg +cg +qi +qi +qi +RV +qi +qi +yg +qi +qi eH eH eH @@ -207472,44 +207289,44 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +rY +lF +qi +qi +qi +qi +qi +qi +cg +cg +qi +qi +qi +qi +yg +qi +qi +ZO +qi +yg +qi +yg +qi +qi +yg +qi +qi +cg +cg +qi +yg +qi +qi +qi +qi +qi +ZO +ZO eH eH eH @@ -207729,44 +207546,44 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +rY +qi +qi +qi +qi +yg +qi +qi +qi +yg +qi +ZO +ZO +qi +qi +yg +ZO +ZO +ZO +qi +qi +qi +qi +qi +ZO +ZO +ZO +qi +cg +qi +qi +qi +qi +qi +qi +qi +ZO +ZO eH eH eH @@ -207987,43 +207804,43 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +ZO +ZO +ZO +qi +qi +ZO +ZO +ZO +qi +qi +qi +qi +qi +ZO +ZO +ZO +qi +cg +cg +qi +yg +qi +qi +qi +ZO +ZO +ZO eH eH eH @@ -208244,42 +208061,42 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +qi +yg +qi +qi +qi +qi +qi +ZO +ZO +ZO +qi +qi +qi +qi +qi +qi +qi +qi +yg +qi +qi +ZO +qi +qi +cg +cg +qi +qi +qi +qi +ZO +ZO +ZO eH eH eH @@ -208502,41 +208319,41 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +qi +qi +qi +ZO +ZO +qi +yg +qi +qi +qi +qi +qi +qi +yg +qi +qi +qi +qi +qi +yg +qi +qi +qi +cg +cg +qi +qi +qi +yg +ZO +ZO +ZO eH eH eH @@ -208759,41 +208576,41 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +qi +qi +qi +ZO +ZO +qi +qi +qi +qi +yg +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +qi +cg +cg +qi +qi +qi +qi +ZO +ZO +ZO eH eH eH @@ -209017,40 +208834,40 @@ eH eH eH eH +qi +qi +qi +qi +yg +qi +ZO +ZO +qi +qi +yg +qi +qi +qi +qi +qi +qi eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +qi +qi +cg +cg +qi +qi +ZO +ZO +ZO +ZO +ZO eH eH eH @@ -209274,40 +209091,40 @@ eH eH eH eH +qi +qi +qi +qi +qi +qi +ZO +ZO +qi +qi +qi +qi +qi +qi +qi +qi eH eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +qi +cg +cg +qi +qi +ZO +ZO +ZO +ZO +ZO eH eH eH @@ -209532,6 +209349,20 @@ eH eH eH eH +qi +qi +qi +qi +qi +ZO +ZO +qi +qi +qi +qi +qi +qi +qi eH eH eH @@ -209539,29 +209370,15 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +cg +cg +qi +qi +qi +qi eH eH eH @@ -209810,15 +209627,15 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -eH -eH +qi +qi +qi +cg +cg +cg +qi +qi +qi eH eH eH @@ -210070,12 +209887,12 @@ eH eH eH eH +cg +cg +cg eH -eH -eH -eH -eH -eH +qi +qi eH eH eH @@ -216213,6 +216030,13 @@ eH eH eH eH +bv +bv +bv +bv +bv +bv +bv eH eH eH @@ -216242,25 +216066,18 @@ eH eH eH eH -eH -eH -eH -eH -eH -eH -eH -bN -bN -bN bN bN bN bN bN bN +Fb bN bN bN +zw +zw bN bN eH @@ -216315,7 +216132,7 @@ Di Di Di Di -Di +uu jI MP MP @@ -216410,11 +216227,11 @@ nR nR nR nR -Og -Og -Og -Og -Og +nR +nR +nR +nR +nR nR nR bN @@ -216474,7 +216291,7 @@ bN bN bN bv -bv +GE bv bv bv @@ -216514,10 +216331,10 @@ bN bN bN bN +Fb bN -bN -bN -bN +zw +zw bN bN bN @@ -216665,13 +216482,13 @@ bN bN bv bv -bv nR -fC -fC -fC -fC -fC +nR +nR +nR +nR +nR +nR nR bN bN @@ -216688,7 +216505,7 @@ bN bN bN bN -bN +Fb bN bN bN @@ -216715,14 +216532,14 @@ bN bN bv bv -bv +GE bv bv bv bv bv fC -fC +qq bv bv bv @@ -216746,12 +216563,12 @@ bN bN bN bN -bN -bv +Fb bv bv bv bv +GE bv bv bv @@ -216763,11 +216580,12 @@ bN bN bN bN -bN +Fb bv bv bv bN +Fb bN bN bN @@ -216778,15 +216596,14 @@ bN bN bN bN -bN -bv -bv +GE bv bv bv bv bv bv +GE bN bN bN @@ -216894,18 +216711,18 @@ bv bv bv bv +GE bv bv bv bv -bv -bv +GE bv bv bN bN bN -bv +GE bv bv bv @@ -216926,9 +216743,9 @@ bv bv bv bv -bv -bv -bv +fC +fC +fC bv bv bv @@ -216942,17 +216759,14 @@ bN bN bN bN +Fb bN bN bN bN bN bN -bN -bv -bv -bv -bv +GE bv bv bv @@ -216962,14 +216776,17 @@ bv bv bv bv +GE bv bv bv bv +GE bv bv bv bv +GE bv bv bv @@ -216985,12 +216802,12 @@ fC fC fC bv -fC +qq bv fC bv fC -fC +qq bN fC bv @@ -217013,7 +216830,7 @@ bv bv bv bv -bv +GE bv bv bv @@ -217147,7 +216964,7 @@ bv fC fC bv -bv +GE bv bv fC @@ -217169,33 +216986,33 @@ bv bv bv bv -bv +GE fC fC bv bv bv bv +GE bv bv bv bv bv bv +fC +fC +fC bv bv bv bv bv +GE bv bv bv -bv -bv -bv -bv -bv -bN +Fb bN bN bN @@ -217210,7 +217027,7 @@ bv bv bv bv -bv +GE bv bv bv @@ -217258,7 +217075,7 @@ bv bv bv bv -bv +GE bv bv bv @@ -217396,7 +217213,7 @@ gn gn gn gn -gn +VX gn bv bv @@ -217410,9 +217227,9 @@ fC fC bv bv +GE bv -bv -fC +qq fC fC fC @@ -217440,12 +217257,12 @@ bv bv bv bv +GE bv bv bv bv -bv -bv +GE bv bv bv @@ -217486,7 +217303,7 @@ fC fC bv bv -bv +GE bv bv bv @@ -217519,7 +217336,7 @@ bv bv bv bv -bv +GE bv bv bv @@ -217540,13 +217357,13 @@ fC fC fC bN +Fb bN bN bN bN bN -bN -bN +Fb bN ZA ZA @@ -217657,11 +217474,11 @@ gn gn bv bv +GE bv bv bv -bv -bv +GE bv bv bv @@ -217673,7 +217490,7 @@ bv bv bv bv -bv +GE bN bv bN @@ -217683,11 +217500,11 @@ bv bv bv bv +GE bv bv bv -bv -bv +GE bv bv bv @@ -217704,6 +217521,7 @@ bv bv bv bv +GE bv bv bv @@ -217712,6 +217530,7 @@ bv bv bv bv +GE bv bv bv @@ -217724,12 +217543,10 @@ bv bv bv bv -bv -bv -fC +qq fC fC -bv +GE bv fC bv @@ -217737,8 +217554,7 @@ bv bv fC bv -fC -bv +qq bv bv bv @@ -217748,6 +217564,7 @@ bv bv bv bv +GE bv bv bN @@ -217780,7 +217597,7 @@ bv bv bv bv -bv +GE bv bv bv @@ -217810,7 +217627,7 @@ ZA ZA ZA ZA -ZA +GJ ZA ZA ZA @@ -217819,7 +217636,7 @@ bv bN bv fC -fC +qq bN bN bN @@ -217925,7 +217742,7 @@ bN bN bN bv -bv +GE fC bv bv @@ -217936,6 +217753,7 @@ bN bN bN bN +GE bv bv bv @@ -217949,8 +217767,7 @@ bv bv bv bv -bv -bv +GE bv bv bv @@ -217967,19 +217784,19 @@ bv fC fC fC -fC +qq bv fC fC bv bv +GE bv bv bv bv bv -bv -bv +GE bv bv bv @@ -217990,7 +217807,7 @@ bv bv fC bv -bv +GE fC bv bv @@ -217998,11 +217815,11 @@ bv bv bv bv +GE bv bv bv -bv -bv +GE bv bv bv @@ -218033,6 +217850,7 @@ vE bN bN bv +GE bv bv bv @@ -218044,8 +217862,7 @@ bv bv bv bv -bv -bv +GE bN bN bN @@ -218166,7 +217983,7 @@ gn gn gn gn -gn +VX gn bv bv @@ -218196,11 +218013,12 @@ vE bv bv bv -bv +GE bv bN bv bv +GE bv bv bv @@ -218212,8 +218030,7 @@ bv bv bv bv -bv -fC +qq fC fC fC @@ -218241,7 +218058,7 @@ fC fC fC bv -bv +GE fC fC bv @@ -218292,7 +218109,7 @@ bN bN bv bv -bv +GE bv bv bv @@ -218336,7 +218153,7 @@ bv bv fC fC -fC +qq vE vE vE @@ -218423,7 +218240,7 @@ gn gn gn gn -gn +VX bv bv bv @@ -218467,6 +218284,7 @@ bN bN bN bv +GE bv bv bv @@ -218474,15 +218292,14 @@ bv bv bv bv +GE bv bv bv bv bv bv -bv -bv -bv +GE bv bv bv @@ -218495,7 +218312,7 @@ bv bv bv bv -bv +GE bv bv bv @@ -218744,7 +218561,7 @@ bv bv bv bv -bv +GE bv bv bv @@ -218805,7 +218622,7 @@ vE vE bN bv -bv +GE bv bv bN @@ -218993,6 +218810,7 @@ bv bv bv bv +GE bv bv bv @@ -219007,8 +218825,7 @@ bv bv bv bv -bv -bv +GE bv bv bv @@ -219256,13 +219073,13 @@ bv bv bv bv +GE bv bv bv bv bv -bv -bv +GE bv bv bv @@ -219456,7 +219273,7 @@ gn bv bv bv -bv +GE bv bN vE @@ -219766,7 +219583,7 @@ bv bv bv bv -bN +Fb bN bN bN @@ -219964,7 +219781,7 @@ PG PG gn gn -gn +VX gn gn gn @@ -220281,269 +220098,13 @@ vE vE vE vE -hL -hL -hL -hL -hL -hL -hL -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -nR -uR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -uR -nR -nR -uR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -uR -nR -nR -uR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -uR -nR -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -MY -MY -MY -MY -MY -Jx -Jx -PG -PG -PG -PG -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -"} -(77,1,4) = {" -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -PG -PG -PG -PG -PG -PG -PG -PG -PG -gn -gn -gn -gn -gn -bv -bv -bv -hL -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -hL -OZ -OZ -hL -hL +GR +GR +GR +GR +GR +GR +GR vE vE vE @@ -220556,7 +220117,6 @@ vE vE vE vE -OZ nR uR nR @@ -220632,7 +220192,6 @@ nR nR uR nR -uR vE vE vE @@ -220678,14 +220237,15 @@ vE vE vE vE -MY +vE +vE MY MY MY MY MY Jx -PG +Jx PG PG PG @@ -220707,7 +220267,7 @@ cp cp cp "} -(78,1,4) = {" +(77,1,4) = {" cp cp cp @@ -220743,9 +220303,7 @@ gn bv bv bv -hL -OZ -hL +GR vE vE vE @@ -220758,21 +220316,6 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE @@ -220797,8 +220340,6 @@ vE vE vE vE -OZ -hL vE vE vE @@ -220813,7 +220354,26 @@ vE vE vE vE -OZ +vE +vE +GR +uR +uR +GR +GR +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +uR nR uR nR @@ -220934,14 +220494,14 @@ vE vE vE vE +vE MY MY -MY +PH MY MY MY Jx -Jx PG PG PG @@ -220964,7 +220524,7 @@ cp cp cp "} -(79,1,4) = {" +(78,1,4) = {" cp cp cp @@ -220996,16 +220556,13 @@ gn gn gn gn +gn bv bv bv -bv -hL -OZ -hL -hL -hL -OZ +GR +uR +GR vE vE vE @@ -221015,21 +220572,6 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE @@ -221037,6 +220579,7 @@ vE vE vE vE +uR vE vE vE @@ -221054,10 +220597,6 @@ vE vE vE vE -OZ -OZ -OZ -hL vE vE vE @@ -221069,8 +220608,29 @@ vE vE vE vE -hL -OZ +vE +vE +vE +vE +vE +vE +uR +GR +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +uR nR uR nR @@ -221190,13 +220750,14 @@ vE vE vE vE +vE MY MY MY MY MY MY -MY +Jx Jx PG PG @@ -221219,9 +220780,8 @@ cp cp cp cp -cp "} -(80,1,4) = {" +(79,1,4) = {" cp cp cp @@ -221249,53 +220809,42 @@ PG PG PG PG -PG gn gn gn +gn +GE bv bv bv -bv -hL +GR +uR +GR +GR +GR +uR vE vE vE vE -OZ -OZ -hL vE vE vE vE vE -hL -hL -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR vE vE vE +uR vE vE vE vE vE vE +uR vE vE vE @@ -221311,12 +220860,7 @@ vE vE vE vE -hL vE -OZ -OZ -OZ -hL vE vE vE @@ -221326,8 +220870,24 @@ vE vE vE vE -OZ -OZ +vE +uR +uR +uR +GR +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +GR +uR nR uR nR @@ -221446,15 +221006,15 @@ vE vE vE vE +vE MY MY MY +PH MY MY MY Jx -Jx -Jx PG PG PG @@ -221478,7 +221038,7 @@ cp cp cp "} -(81,1,4) = {" +(80,1,4) = {" cp cp cp @@ -221509,43 +221069,41 @@ PG PG gn gn +gn bv bv bv bv +GR vE vE vE vE +uR +uR +GR vE vE vE -OZ -OZ vE vE +GR vE +uR vE -OZ -OZ vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR +uR +uR +uR +uR vE vE +uR +uR +uR vE vE vE @@ -221570,21 +221128,23 @@ vE vE vE vE +GR vE -hL -OZ -OZ -hL +uR +uR +uR +GR vE vE vE vE vE -hL -hL -hL -OZ -OZ +vE +vE +vE +vE +uR +uR nR uR nR @@ -221702,7 +221262,7 @@ vE vE vE vE -MY +vE MY MY MY @@ -221711,7 +221271,7 @@ MY MY Jx Jx -PG +Jx PG PG PG @@ -221735,7 +221295,7 @@ cp cp cp "} -(82,1,4) = {" +(81,1,4) = {" cp cp cp @@ -221767,7 +221327,7 @@ PG gn gn bv -gn +bv bv bv vE @@ -221777,146 +221337,29 @@ vE vE vE vE -vE -hL -hL -vE -hL -OZ -OZ -vE -vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -hL -vE -vE -vE -vE -vE -hL -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE -vE +uR +uR vE vE vE vE +uR +uR vE +uR +uR vE -hL -OZ -hL vE -hL -hL -hL -hL -OZ -OZ -OZ -OZ -OZ -nR uR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR uR -nR -nR uR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR uR -nR -nR +vE +vE +vE +uR uR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR uR -nR uR vE vE @@ -221945,6 +221388,124 @@ vE vE vE vE +GR +uR +uR +GR +vE +vE +vE +vE +vE +GR +GR +GR +uR +uR +nR +uR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +uR +nR +nR +uR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +uR +nR +nR +uR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +uR +nR +uR +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE vE vE vE @@ -221964,7 +221525,7 @@ MY MY MY MY -MY +PH Jx Jx PG @@ -221973,7 +221534,6 @@ PG PG PG PG -PG cp cp cp @@ -221992,7 +221552,7 @@ cp cp cp "} -(83,1,4) = {" +(82,1,4) = {" cp cp cp @@ -222021,10 +221581,10 @@ PG PG PG PG -PG -bv gn gn +GE +gn bv bv vE @@ -222035,70 +221595,70 @@ vE vE vE vE +GR +GR vE -hL -hL -hL -hL +GR +uR +uR +uR vE +uR +uR vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ -OZ -OZ -hL -hL -hL -hL -hL -hL vE vE vE vE -hL -hL -OZ -OZ -hL +vE +uR +uR +uR +uR +uR +uR +GR +GR vE vE vE vE vE +GR vE vE vE vE -hL -hL -hL -hL -hL -hL -OZ -OZ -OZ -hL -hL -hL -OZ +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +GR +uR +GR +vE +GR +GR +GR +GR +uR +uR +uR +uR +uR nR uR nR @@ -222212,8 +221772,9 @@ vE vE vE vE -MY -MY +vE +vE +vE MY MY MY @@ -222230,7 +221791,6 @@ PG PG PG PG -PG cp cp cp @@ -222249,7 +221809,7 @@ cp cp cp "} -(84,1,4) = {" +(83,1,4) = {" cp cp cp @@ -222293,69 +221853,69 @@ vE vE vE vE +GR +GR +GR +GR vE -OZ -OZ -hL +uR +uR +uR vE vE +uR +uR +uR vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE -hL -OZ -hL -hL -OZ -OZ -hL vE vE vE vE +uR +uR +uR +GR +uR +uR +uR +GR +GR +GR +GR +GR +GR vE vE -hL -hL -OZ -OZ -hL -hL -hL -OZ -OZ -hL -hL vE vE +GR +GR +uR +uR +GR vE -OZ +vE +vE +vE +vE +vE +vE +vE +vE +GR +GR +GR +GR +GR +GR +uR +uR +uR +GR +GR +GR +uR nR uR nR @@ -222468,16 +222028,16 @@ vE vE vE vE +vE MY MY MY MY MY +PH MY MY MY -MY -Jx Jx Jx PG @@ -222506,7 +222066,7 @@ cp cp cp "} -(85,1,4) = {" +(84,1,4) = {" cp cp cp @@ -222538,6 +222098,7 @@ PG PG bv gn +gn bv bv vE @@ -222550,69 +222111,68 @@ vE vE vE vE +uR +uR +GR vE vE -OZ -hL +uR +uR +uR vE +uR +uR vE +uR vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ -OZ -OZ -hL -hL -hL -hL -hL -hL -hL -OZ -hL -hL -hL vE -hL -hL -hL -OZ -hL vE vE vE vE +uR +uR +uR +uR +GR +uR +uR +uR +uR +uR +uR +uR +uR +uR vE -hL -OZ -OZ -hL -hL -OZ -OZ -hL -hL -hL +GR +uR +GR +GR +uR +uR +GR vE vE vE vE -OZ +vE +vE +GR +GR +uR +uR +GR +GR +GR +uR +uR +GR +GR +vE +vE +vE +uR nR uR nR @@ -222720,10 +222280,11 @@ vE vE vE vE -MY -MY -MY -MY +vE +vE +vE +vE +vE MY MY MY @@ -222744,7 +222305,6 @@ PG PG PG PG -PG cp cp cp @@ -222763,7 +222323,7 @@ cp cp cp "} -(86,1,4) = {" +(85,1,4) = {" cp cp cp @@ -222796,6 +222356,7 @@ PG bv gn bv +bv vE vE vE @@ -222808,68 +222369,67 @@ vE vE vE vE +uR +GR vE vE -OZ -hL -vE -vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -vE -vE +uR +uR +uR +uR vE +uR vE +uR vE vE -hL -hL vE vE +uR vE +uR +uR +GR +uR +uR +uR +GR +GR +GR +GR +GR +GR +GR +uR +GR +GR +GR vE +GR +GR +GR +uR +GR vE -hL -hL -OZ -OZ -hL vE vE -hL -hL -OZ -OZ -hL -hL -hL -OZ -hL -hL vE vE +GR +uR +uR +GR +GR +uR +uR +GR +GR +GR vE vE vE vE -OZ +uR nR uR nR @@ -222969,18 +222529,19 @@ vE vE vE vE -Jx -MY -MY -MY -MY -MY -MY -MY +vE +vE +vE +vE +vE +vE +vE +vE MY MY MY MY +PH MY MY MY @@ -222992,16 +222553,15 @@ MY Jx Jx Jx -Jx PG PG PG PG -cp -cp -cp -cp -cp +PG +PG +PG +PG +PG cp cp cp @@ -223020,7 +222580,7 @@ cp cp cp "} -(87,1,4) = {" +(86,1,4) = {" cp cp cp @@ -223049,11 +222609,10 @@ PG PG PG PG +PG bv +gn bv -bv -bv -vE vE vE vE @@ -223067,66 +222626,67 @@ vE vE vE vE -hL -OZ -hL -vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL vE +uR +GR vE +uR +uR +uR +uR vE vE vE +uR +uR vE vE vE +uR vE +uR +uR +uR +uR +uR +uR vE vE vE vE vE vE +GR +GR vE vE vE -OZ -hL -hL -hL -hL -hL vE vE +GR +GR +uR +uR +GR vE -hL -hL -OZ -OZ -hL vE +GR +GR +uR +uR +GR +GR +GR +uR +GR +GR vE vE vE vE vE vE +uR nR uR nR @@ -223217,18 +222777,19 @@ vE vE vE vE +vE +vE +vE +vE +vE +vE +vE +vE +vE Jx -Jx -Jx -Jx -Jx -Jx -Jx -Jx -Jx -Jx -Jx -Jx +MY +MY +MY MY MY MY @@ -223253,7 +222814,6 @@ PG PG PG PG -PG cp cp cp @@ -223277,7 +222837,7 @@ cp cp cp "} -(88,1,4) = {" +(87,1,4) = {" cp cp cp @@ -223309,6 +222869,7 @@ PG bv bv bv +bv vE vE vE @@ -223323,27 +222884,14 @@ vE vE vE vE +GR +uR +GR vE +uR +uR +uR vE -OZ -hL -hL -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL vE vE vE @@ -223353,6 +222901,10 @@ vE vE vE vE +uR +uR +uR +GR vE vE vE @@ -223363,21 +222915,29 @@ vE vE vE vE -hL -OZ -OZ -hL -hL vE vE vE vE vE -hL -hL -OZ -OZ -hL +vE +vE +vE +uR +GR +GR +GR +GR +GR +vE +vE +vE +GR +GR +uR +uR +GR +vE vE vE vE @@ -223472,13 +223032,8 @@ vE vE vE vE -Jx -Jx -Jx -Jx -Jx -Jx -Jx +vE +vE Jx Jx Jx @@ -223501,6 +223056,12 @@ MY MY MY MY +MY +PH +MY +MY +PH +MY Jx Jx Jx @@ -223532,9 +223093,8 @@ cp cp cp cp -cp "} -(89,1,4) = {" +(88,1,4) = {" cp cp cp @@ -223565,41 +223125,14 @@ PG PG bv bv +bv vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE -hL -OZ -hL -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE @@ -223609,6 +223142,27 @@ vE vE vE vE +uR +GR +GR +uR +uR +uR +uR +vE +vE +vE +vE +vE +uR +uR +uR +uR +vE +vE +GR +vE +vE vE vE vE @@ -223620,22 +223174,28 @@ vE vE vE vE -hL -hL vE -hL vE vE vE vE vE +GR +uR +uR +GR +GR vE vE -hL -hL -OZ -OZ -hL +vE +vE +vE +GR +GR +uR +uR +GR +vE vE vE vE @@ -223740,8 +223300,6 @@ Jx Jx Jx Jx -PG -Jx Jx Jx Jx @@ -223755,13 +223313,15 @@ MY MY MY MY +MY +MY +MY +MY +MY Jx Jx Jx Jx -Jx -Jx -PG PG PG PG @@ -223791,7 +223351,7 @@ cp cp cp "} -(90,1,4) = {" +(89,1,4) = {" cp cp cp @@ -223819,66 +223379,41 @@ PG PG PG PG -jI -jI -MY -MY +PG +bv +bv vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE -hL -OZ -OZ vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE +uR +uR vE vE vE -hL -OZ -hL +GR +uR +GR +uR +uR +uR +vE +vE +uR +uR +uR +uR +uR +uR +uR vE vE vE @@ -223891,8 +223426,33 @@ vE vE vE vE -OZ -hL +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +GR +GR +vE +GR +vE +vE +vE +vE +vE +vE +vE +GR +GR +uR +uR +GR vE vE vE @@ -223985,6 +223545,7 @@ vE vE vE vE +vE Jx Jx Jx @@ -223993,17 +223554,10 @@ Jx Jx Jx Jx -PG -PG -PG -PG -PG -PG -PG -PG Jx Jx Jx +PG Jx Jx Jx @@ -224013,11 +223567,17 @@ Jx Jx Jx Jx +MY +MY +MY +MY +MY +Jx +Jx Jx Jx Jx Jx -PG PG PG PG @@ -224048,7 +223608,7 @@ cp cp cp "} -(91,1,4) = {" +(90,1,4) = {" cp cp cp @@ -224077,84 +223637,84 @@ PG PG PG jI -MY +jI MY MY vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL vE -OZ -hL vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE +uR vE +uR +uR +uR +uR vE vE +GR +uR +uR vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR vE vE vE vE -hL -OZ vE vE vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +vE +vE +vE +uR +vE +vE +vE +vE +vE +vE +vE +vE +GR +uR +GR +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +uR +GR +vE +vE +vE +vE +vE nR uR nR @@ -224240,6 +223800,8 @@ vE vE vE vE +vE +vE Jx Jx Jx @@ -224248,10 +223810,6 @@ Jx Jx Jx Jx -Jx -PG -PG -PG PG PG PG @@ -224271,8 +223829,11 @@ Jx Jx Jx Jx -PG -PG +Jx +Jx +Jx +Jx +Jx PG PG PG @@ -224303,9 +223864,8 @@ cp cp cp cp -cp "} -(92,1,4) = {" +(91,1,4) = {" cp cp cp @@ -224332,65 +223892,45 @@ PG PG PG PG +PG jI -jI +MY MY MY vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -hL -OZ vE +uR +uR +uR vE +uR +uR +uR +uR +GR vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +GR vE vE vE +uR +uR +uR +uR +uR +uR +uR +uR +uR vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE -hL -hL vE vE vE @@ -224398,20 +223938,40 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +uR +uR +uR +uR +uR +vE +vE +vE +vE +vE +vE +GR +uR +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +uR +uR +uR +uR +uR +uR +uR +vE +vE +uR nR uR nR @@ -224487,6 +224047,7 @@ nR nR uR nR +uR vE vE vE @@ -224505,17 +224066,6 @@ Jx Jx Jx Jx -Jx -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG PG PG PG @@ -224527,6 +224077,17 @@ PG PG PG PG +Jx +Jx +Jx +Jx +Jx +Jx +Jx +Jx +Jx +Jx +Jx PG PG PG @@ -224560,9 +224121,8 @@ cp cp cp cp -cp "} -(93,1,4) = {" +(92,1,4) = {" cp cp cp @@ -224592,27 +224152,24 @@ PG jI jI MY +MY vE vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -hL -hL vE +uR +uR vE vE +uR +uR +uR +uR +GR +GR +uR vE vE vE @@ -224633,42 +224190,45 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ -hL -hL -hL vE vE vE vE vE +uR +uR +uR +uR +uR +uR +uR vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +vE +GR +GR +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +uR +uR +uR +uR +uR +uR +uR +vE +vE +uR nR uR nR @@ -224761,8 +224321,8 @@ Jx Jx Jx Jx -PG -PG +Jx +Jx PG PG PG @@ -224819,7 +224379,7 @@ cp cp cp "} -(94,1,4) = {" +(93,1,4) = {" cp cp cp @@ -224847,29 +224407,26 @@ PG PG PG jI -MY -MY +jI MY vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL vE vE +uR +uR +uR +uR +uR +uR +uR +uR +uR +GR +GR +GR vE vE vE @@ -224890,42 +224447,45 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ -hL vE vE vE vE +uR +uR +uR +uR +uR +uR +uR +uR vE +GR +uR +GR +GR +GR vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +vE +vE +vE +vE +uR +uR +uR +uR +uR +uR +uR +uR +uR +vE +vE +uR nR uR nR @@ -225009,7 +224569,7 @@ vE vE vE vE -Jx +vE Jx Jx Jx @@ -225076,7 +224636,7 @@ cp cp cp "} -(95,1,4) = {" +(94,1,4) = {" cp cp cp @@ -225106,28 +224666,25 @@ PG jI MY MY +MY vE vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -hL -OZ -OZ -hL +uR +uR +uR vE +uR +uR +uR +uR +uR +uR vE +uR +GR vE vE vE @@ -225147,42 +224704,45 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ -hL -hL vE vE vE +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +GR +uR +GR vE vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +vE +vE +vE +vE +uR +uR +uR +vE +vE +vE +uR +uR +uR +uR +vE +vE +uR nR uR nR @@ -225264,7 +224824,8 @@ vE vE vE vE -Jx +vE +vE Jx Jx Jx @@ -225306,7 +224867,6 @@ PG PG PG PG -PG cp cp cp @@ -225333,7 +224893,7 @@ cp cp cp "} -(96,1,4) = {" +(95,1,4) = {" cp cp cp @@ -225359,7 +224919,7 @@ PG PG PG PG -jI +PG jI MY MY @@ -225368,25 +224928,21 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL vE +uR +uR +uR vE -OZ -OZ -hL vE +uR +uR +uR +uR vE vE +uR +uR +GR vE vE vE @@ -225404,42 +224960,46 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ -OZ -OZ vE vE vE vE vE +uR +uR +uR +uR +uR +uR +uR +uR +uR +GR +uR +GR +GR vE -hL -hL -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +vE +vE +vE +vE +vE +vE +uR +uR +uR +uR +vE +vE +vE +vE +uR +uR +vE +vE +vE +uR nR uR nR @@ -225520,7 +225080,7 @@ vE vE vE vE -Jx +vE Jx Jx Jx @@ -225590,7 +225150,7 @@ cp cp cp "} -(97,1,4) = {" +(96,1,4) = {" cp cp cp @@ -225615,7 +225175,7 @@ PG PG PG PG -jI +PG jI jI MY @@ -225625,29 +225185,22 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -vE -vE vE vE -OZ -OZ -hL -vE +uR +uR +uR vE +uR +uR +uR vE vE vE vE +uR +uR +GR vE vE vE @@ -225661,43 +225214,13 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE -OZ -hL vE vE vE vE -vE -OZ -hL -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -nR uR uR uR @@ -225708,68 +225231,362 @@ uR uR uR uR +GR uR uR uR +vE +vE +vE +vE +vE +vE +GR +GR uR uR uR uR +vE +vE uR uR uR uR uR uR -nR -nR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR +vE uR +nR uR nR nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +uR +nR +nR +uR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +uR +nR +nR +uR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +uR +nR +vE +vE +vE +vE +vE +Jx +Jx +Jx +Jx +Jx +Jx +Jx +Jx +Jx +Jx +Jx +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +"} +(97,1,4) = {" +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +PG +PG +PG +PG +PG +PG +jI +jI +jI +MY +MY +vE +vE +vE +vE +vE +vE +vE +vE +uR +uR +uR +vE +uR +vE +vE +vE +vE +vE +vE +uR +uR +GR +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +uR +uR +uR +uR +uR +uR +uR +uR +vE +vE +vE +vE +vE +uR +GR +vE +vE +vE +vE +vE +uR +GR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +nR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +nR +nR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +nR +nR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR uR uR uR uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR uR nR vE @@ -225882,32 +225699,24 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE vE vE -OZ -hL -hL vE +uR vE vE +uR vE vE vE vE vE +uR +GR +GR vE vE vE @@ -225918,42 +225727,50 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE -OZ -OZ vE vE vE vE vE -OZ -hL -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR +uR +uR +uR +vE +uR +vE +vE +vE +vE +vE +uR +uR +vE +vE +vE +vE +vE +uR +GR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR nR nR nR @@ -226155,8 +225972,8 @@ vE vE vE vE -hL -OZ +GR +uR vE vE vE @@ -226235,7 +226052,6 @@ nR nR nR nR -de nR nR nR @@ -226260,7 +226076,8 @@ nR nR nR nR -de +nR +nR nR nR nR @@ -226413,8 +226230,8 @@ vE vE vE vE -OZ -hL +uR +GR vE vE vE @@ -226469,54 +226286,54 @@ uR uR nR nR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR nR nR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR nR nR uR @@ -226670,8 +226487,8 @@ vE vE vE vE -OZ -hL +uR +GR vE vE vE @@ -226726,7 +226543,6 @@ nR uR nR nR -uR nR nR nR @@ -226748,10 +226564,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -226773,7 +226587,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -226927,9 +226744,9 @@ vE vE vE vE -hL -hL -hL +GR +GR +GR vE vE nR @@ -226983,7 +226800,6 @@ nR uR nR nR -uR nR nR nR @@ -227005,10 +226821,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -227030,7 +226844,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -227185,9 +227002,9 @@ vE vE vE vE -hL -hL -hL +GR +GR +GR vE nR uR @@ -227240,7 +227057,6 @@ nR uR nR nR -uR nR nR nR @@ -227262,10 +227078,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -227287,7 +227101,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -227442,10 +227259,10 @@ vE vE vE vE -hL -OZ -OZ -hL +GR +uR +uR +GR nR uR nR @@ -227497,7 +227314,6 @@ nR uR nR nR -uR nR nR nR @@ -227519,10 +227335,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -227544,7 +227358,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -227687,22 +227504,22 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE +uR vE -OZ -hL -OZ -OZ +vE +vE +vE +vE +vE +vE +vE +vE +vE +uR +GR +uR +uR nR uR nR @@ -227754,7 +227571,6 @@ nR uR nR nR -uR nR nR nR @@ -227776,10 +227592,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -227801,7 +227615,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -227944,19 +227761,19 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE -OZ +vE +vE +uR +uR +uR +vE +vE +vE +vE +vE +uR vE vE vE @@ -228011,7 +227828,6 @@ nR uR nR nR -uR nR nR nR @@ -228033,10 +227849,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -228058,7 +227872,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -228201,19 +228018,19 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE -OZ +uR +uR +uR +uR +uR +uR +uR +uR +vE +vE +uR vE vE vE @@ -228268,7 +228085,6 @@ nR uR nR nR -uR nR nR nR @@ -228290,10 +228106,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -228315,7 +228129,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -228458,19 +228275,19 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE -hL -OZ +uR +uR +uR +vE +vE +vE +uR +uR +uR +vE +GR +uR vE vE vE @@ -228525,7 +228342,6 @@ nR uR nR nR -uR nR nR nR @@ -228547,10 +228363,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -228572,7 +228386,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -228715,19 +228532,19 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -hL -hL +uR +uR +uR +vE +vE +vE +vE +vE +uR +uR +GR +GR +GR vE vE vE @@ -228782,7 +228599,6 @@ nR uR nR nR -uR nR nR nR @@ -228804,10 +228620,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -228829,7 +228643,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -228972,20 +228789,20 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -hL -hL -hL +uR +uR +vE +vE +vE +uR +vE +vE +uR +uR +GR +GR +GR +GR vE vE nR @@ -229039,7 +228856,6 @@ nR uR nR nR -uR nR nR nR @@ -229061,15 +228877,6 @@ nR nR nR nR -uR -nR -nR -uR -nR -nR -nR -nR -nR nR nR nR @@ -229083,12 +228890,22 @@ nR nR nR nR -nR -nR -nR -uR -nR -nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR uR nR nR @@ -229229,21 +229046,21 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL +uR +uR +uR +vE vE -hL -OZ -hL +vE +vE +uR +uR +uR +GR +vE +GR +uR +GR vE nR uR @@ -229296,7 +229113,6 @@ nR uR nR nR -uR nR nR nR @@ -229318,10 +229134,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -229343,7 +229157,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -229486,22 +229303,22 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +uR +uR +uR +uR +uR +uR +uR +uR +uR vE vE vE -OZ -OZ -hL +uR +uR +GR nR uR nR @@ -229553,7 +229370,6 @@ nR uR nR nR -uR nR nR nR @@ -229575,10 +229391,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -229600,7 +229414,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -229743,22 +229560,22 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE +uR +uR +uR +uR +uR +uR vE vE vE -OZ -OZ +vE +vE +vE +vE +uR +uR nR uR nR @@ -229810,7 +229627,6 @@ nR uR nR nR -uR nR nR nR @@ -229832,10 +229648,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -229857,7 +229671,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -230000,22 +229817,22 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE -hL -hL -OZ +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +GR +GR +uR nR uR nR @@ -230067,7 +229884,6 @@ nR uR nR nR -uR nR nR nR @@ -230089,10 +229905,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -230114,7 +229928,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -230269,10 +230086,10 @@ vE vE vE vE -hL -hL -hL -OZ +GR +GR +GR +uR nR uR nR @@ -230324,7 +230141,6 @@ nR uR nR nR -uR nR nR nR @@ -230346,10 +230162,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -230371,7 +230185,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -230525,11 +230342,11 @@ vE vE vE vE -hL -hL -OZ -OZ -hL +GR +GR +uR +uR +GR nR uR nR @@ -230581,7 +230398,6 @@ nR uR nR nR -uR nR nR nR @@ -230603,10 +230419,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -230628,7 +230442,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -230655,7 +230472,7 @@ nR nR uR nR -hL +GR vE vE vE @@ -230782,10 +230599,10 @@ vE vE vE vE -hL -OZ -OZ -hL +GR +uR +uR +GR vE nR uR @@ -230838,7 +230655,6 @@ nR uR nR nR -uR nR nR nR @@ -230860,10 +230676,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -230885,7 +230699,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -230912,7 +230729,7 @@ nR nR uR nR -OZ +uR vE vE vE @@ -231039,10 +230856,10 @@ vE vE vE vE -hL -OZ -hL -hL +GR +uR +GR +GR vE nR uR @@ -231095,7 +230912,6 @@ nR uR nR nR -uR nR nR nR @@ -231117,10 +230933,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -231142,7 +230956,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -231169,8 +230986,8 @@ nR nR uR nR -OZ -OZ +uR +uR vE vE vE @@ -231295,10 +231112,10 @@ vE vE vE vE -hL -hL -OZ -hL +GR +GR +uR +GR vE vE nR @@ -231352,7 +231169,6 @@ nR uR nR nR -uR nR nR nR @@ -231374,10 +231190,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -231399,7 +231213,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -231427,7 +231244,7 @@ nR uR nR vE -OZ +uR vE vE vE @@ -231552,10 +231369,10 @@ vE vE vE vE -hL -OZ -hL -hL +GR +uR +GR +GR vE vE nR @@ -231609,7 +231426,6 @@ nR uR nR nR -uR nR nR nR @@ -231631,10 +231447,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -231656,7 +231470,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -231684,7 +231501,7 @@ nR uR nR vE -hL +GR vE vE vE @@ -231810,10 +231627,10 @@ vE vE vE vE -OZ -hL -hL -hL +uR +GR +GR +GR vE nR uR @@ -231866,7 +231683,6 @@ nR uR nR nR -uR nR nR nR @@ -231888,10 +231704,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -231913,7 +231727,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR nR uR @@ -231941,7 +231758,7 @@ nR uR nR vE -hL +GR vE vE Jx @@ -232065,38 +231882,13 @@ vE vE vE vE -hL -OZ -hL -OZ -hL -hL -hL -nR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR +GR uR +GR uR -nR +GR +GR +GR nR uR uR @@ -232148,29 +231940,54 @@ uR uR nR nR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +Rj +nR +Rj +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR nR nR uR @@ -232197,8 +232014,8 @@ uR uR uR nR -hL -hL +GR +GR vE vE Jx @@ -232321,69 +232138,14 @@ MY MY vE vE -hL -OZ -OZ +GR +uR +uR vE -OZ -OZ -hL -hL -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR -nR +uR +uR +GR +GR nR nR nR @@ -232453,139 +232215,16 @@ nR nR nR nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR -hL -hL -vE -vE -Jx -Jx -Jx -Jx -Jx -Jx -Jx -PG -PG -PG -PG -PG -PG -PG -PG -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -"} -(124,1,4) = {" -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -PG -PG -PG -PG -PG -PG -PG -PG -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY -hL -hL -vE -vE -hL -hL -OZ -hL nR nR nR @@ -232610,7 +232249,160 @@ nR nR nR nR -de +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +GR +GR +vE +vE +Jx +Jx +Jx +Jx +Jx +Jx +Jx +PG +PG +PG +PG +PG +PG +PG +PG +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +"} +(124,1,4) = {" +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +PG +PG +PG +PG +PG +PG +PG +PG +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +GR +GR +vE +vE +GR +GR +uR +GR nR nR nR @@ -232679,13 +232471,38 @@ nR nR nR nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR nR nR nR nR nR nR -de vE vE vE @@ -232696,25 +232513,25 @@ vE vE vE vE -hL -OZ -hL -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -hL -OZ -OZ -hL -hL +GR +uR +GR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +GR +GR +uR +uR +GR +GR Jx Jx Jx @@ -232842,7 +232659,7 @@ vE vE vE vE -hL +GR nR uR uR @@ -232894,54 +232711,54 @@ uR uR nR nR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR nR nR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR nR vE vE @@ -232953,24 +232770,24 @@ vE vE vE vE -OZ -OZ +uR +uR vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE -hL -hL -hL +uR +uR +uR +uR +uR +uR +uR +uR +vE +vE +GR +GR +GR Jx Jx Jx @@ -233099,7 +232916,7 @@ vE vE vE vE -hL +GR nR uR nR @@ -233151,11 +232968,6 @@ nR uR nR nR -uR -nR -nR -nR -nR nR nR nR @@ -233171,14 +232983,20 @@ nR nR nR nR -nR -nR -uR -nR -nR -uR -nR -nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR nR nR @@ -233198,7 +233016,6 @@ nR nR nR nR -uR nR vE vE @@ -233210,19 +233027,19 @@ vE vE vE vE -OZ -hL +uR +GR +vE +vE +vE +vE +vE +uR +uR +uR +uR +uR vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE @@ -233408,15 +233225,6 @@ nR uR nR nR -uR -nR -nR -nR -nR -nR -nR -nR -nR nR nR nR @@ -233430,12 +233238,22 @@ nR nR nR nR -uR -nR -nR -uR nR nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR nR nR @@ -233455,7 +233273,6 @@ nR nR nR nR -uR nR vE vE @@ -233467,19 +233284,19 @@ vE vE vE vE -OZ +uR +vE +vE +uR +uR +uR +uR +uR +uR +uR +uR vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE @@ -233665,11 +233482,6 @@ nR uR nR nR -uR -nR -nR -nR -nR nR nR nR @@ -233685,13 +233497,20 @@ nR nR nR nR -nR -nR -uR -nR -nR -uR -nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR nR nR @@ -233713,30 +233532,28 @@ nR nR nR uR -nR -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +vE +vE +vE +vE +vE +vE +uR +GR +vE +vE +uR +uR +uR +vE +vE +vE vE vE -OZ -hL vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE @@ -233922,15 +233739,6 @@ nR uR nR nR -uR -nR -nR -nR -nR -nR -nR -nR -nR nR nR nR @@ -233944,11 +233752,22 @@ nR nR nR nR -uR -nR nR -uR nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR nR nR @@ -233970,18 +233789,16 @@ nR nR nR uR -nR -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR vE vE -OZ -hL +vE +vE +vE +vE +vE +uR +GR vE vE vE @@ -234179,8 +233996,6 @@ nR uR nR nR -uR -nR nR nR nR @@ -234196,16 +234011,20 @@ nR nR nR nR -nR -nR -nR -nR -nR -uR -nR -nR -uR -nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR nR nR @@ -234227,17 +234046,15 @@ nR nR nR uR -nR -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE -OZ +vE +uR +vE +vE +vE +vE +uR vE vE vE @@ -234436,12 +234253,6 @@ nR uR nR nR -uR -nR -nR -nR -nR -nR nR nR nR @@ -234457,12 +234268,20 @@ nR nR nR nR -nR -uR -nR -nR -uR -nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR nR nR @@ -234484,17 +234303,15 @@ nR nR nR uR -nR -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -hL -OZ +vE +uR +uR +uR +uR +uR +GR +GR +uR vE vE vE @@ -234693,11 +234510,6 @@ nR uR nR nR -uR -nR -nR -nR -nR nR nR nR @@ -234713,13 +234525,20 @@ nR nR nR nR -nR -nR -uR -nR -nR -uR -nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR nR nR @@ -234741,18 +234560,16 @@ nR nR nR uR -nR -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -hL -hL +uR +uR +uR +uR +uR +uR +uR +GR +GR +GR vE vE vE @@ -234950,9 +234767,6 @@ nR uR nR nR -uR -nR -nR nR nR nR @@ -234968,15 +234782,20 @@ nR nR nR nR -nR -nR -nR -nR -uR -nR -nR -uR -nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR nR nR @@ -234998,18 +234817,16 @@ nR nR nR uR -nR -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL +uR +vE +vE +vE +uR +uR +uR +uR +uR +GR vE vE vE @@ -235207,11 +235024,6 @@ nR uR nR nR -uR -nR -nR -nR -nR nR nR nR @@ -235228,11 +235040,18 @@ nR nR nR nR -nR -uR -nR -nR -uR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR nR nR @@ -235255,20 +235074,18 @@ nR nR nR uR -nR -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR vE -hL -OZ -hL -hL -hL +vE +uR +uR +uR +vE +GR +uR +GR +GR +GR vE vE vE @@ -235464,10 +235281,6 @@ nR uR nR nR -uR -nR -nR -nR nR nR nR @@ -235484,13 +235297,19 @@ nR nR nR nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR nR -uR -nR -nR -uR -nR nR nR nR @@ -235511,20 +235330,18 @@ nR nR nR nR +vE +uR +uR +uR +uR +uR uR -nR -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE -OZ -OZ +uR +uR vE vE vE @@ -235721,9 +235538,6 @@ nR uR nR nR -uR -nR -nR nR nR nR @@ -235741,12 +235555,17 @@ nR nR nR nR +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj +Rj nR nR -uR -nR -nR -uR nR nR nR @@ -235768,20 +235587,18 @@ nR nR nR nR +vE +uR +uR +uR +uR uR -nR -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE -OZ -hL +vE +uR +GR vE vE vE @@ -235978,8 +235795,6 @@ nR uR nR nR -uR -nR nR nR nR @@ -235998,12 +235813,16 @@ nR nR nR nR +Rj +Rj +Rj +Rj +Rj +Rj nR nR -uR nR nR -uR nR nR nR @@ -236025,19 +235844,17 @@ nR nR nR nR +vE +vE +uR uR -nR -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE -OZ -OZ +vE +vE +vE +uR +uR vE vE vE @@ -236235,7 +236052,6 @@ nR uR nR nR -uR nR nR nR @@ -236257,10 +236073,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -236282,7 +236096,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR vE vE @@ -236293,8 +236110,8 @@ vE vE vE vE -OZ -hL +uR +GR vE vE vE @@ -236492,7 +236309,6 @@ nR uR nR nR -uR nR nR nR @@ -236514,10 +236330,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -236539,7 +236353,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR vE vE @@ -236549,8 +236366,8 @@ vE vE vE vE -OZ -OZ +uR +uR vE vE vE @@ -236749,7 +236566,6 @@ nR uR nR nR -uR nR nR nR @@ -236771,10 +236587,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -236796,7 +236610,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR vE vE @@ -236805,9 +236622,9 @@ vE vE vE vE -hL -OZ -hL +GR +uR +GR vE vE vE @@ -237006,7 +236823,6 @@ nR uR nR nR -uR nR nR nR @@ -237028,10 +236844,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -237053,7 +236867,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR vE vE @@ -237062,8 +236879,8 @@ vE vE vE vE -OZ -OZ +uR +uR vE vE vE @@ -237263,7 +237080,6 @@ nR uR nR nR -uR nR nR nR @@ -237285,10 +237101,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -237310,7 +237124,10 @@ nR nR nR nR -uR +nR +nR +nR +nR nR vE vE @@ -237318,8 +237135,8 @@ vE vE vE vE -hL -hL +GR +GR vE vE vE @@ -237520,7 +237337,6 @@ nR uR nR nR -uR nR nR nR @@ -237542,10 +237358,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -237567,16 +237381,19 @@ nR nR nR nR -uR +nR +nR +nR +nR nR vE vE vE vE vE -hL -hL -hL +GR +GR +GR vE vE vE @@ -237777,7 +237594,6 @@ nR uR nR nR -uR nR nR nR @@ -237799,10 +237615,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -237824,15 +237638,18 @@ nR nR nR nR -uR +nR +nR +nR +nR nR vE vE vE vE vE -OZ -hL +uR +GR vE vE vE @@ -238034,7 +237851,6 @@ nR uR nR nR -uR nR nR nR @@ -238056,10 +237872,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -238081,14 +237895,17 @@ nR nR nR nR -uR +nR +nR +nR +nR nR vE vE vE -hL -OZ -OZ +GR +uR +uR vE vE vE @@ -238291,7 +238108,6 @@ nR uR nR nR -uR nR nR nR @@ -238313,10 +238129,8 @@ nR nR nR nR -uR nR nR -uR nR nR nR @@ -238338,13 +238152,16 @@ nR nR nR nR -uR +nR +nR +nR +nR nR vE -hL -hL -OZ -OZ +GR +GR +uR +uR vE vE vE @@ -238548,59 +238365,59 @@ uR uR nR nR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR +nR nR nR uR uR uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -uR -nR -OZ -OZ -OZ -hL +GR vE vE vE @@ -238854,8 +238671,8 @@ nR nR nR nR -OZ -hL +uR +GR vE vE vE @@ -239058,14 +238875,14 @@ vE vE vE vE -OZ +uR vE vE vE vE -hL -OZ -OZ +GR +uR +uR vE vE vE @@ -239078,17 +238895,17 @@ vE vE vE vE -OZ -OZ -OZ +uR +uR +uR vE vE vE -OZ -OZ -OZ -OZ -OZ +uR +uR +uR +uR +uR vE vE vE @@ -239111,9 +238928,9 @@ vE vE vE vE -OZ -hL -hL +uR +GR +GR vE vE vE @@ -239314,15 +239131,15 @@ vE vE vE vE -hL -OZ +GR +uR vE vE vE -OZ -OZ +uR +uR vE -hL +GR vE vE vE @@ -239336,16 +239153,16 @@ vE vE vE vE -OZ -OZ -OZ +uR +uR +uR vE vE -OZ +uR vE -OZ -OZ -OZ +uR +uR +uR vE vE vE @@ -239368,10 +239185,10 @@ vE vE vE vE -OZ -OZ -OZ -hL +uR +uR +uR +GR vE vE vE @@ -239571,12 +239388,12 @@ vE vE vE vE -hL -OZ +GR +uR vE vE -OZ -hL +uR +GR vE vE vE @@ -239593,17 +239410,21 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR +uR +uR +uR +vE +vE +uR +uR +uR +vE +vE vE vE -OZ -OZ -OZ vE vE vE @@ -239613,22 +239434,18 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +vE +vE +vE +uR +uR +uR +uR +uR +uR +uR +uR vE vE vE @@ -239827,42 +239644,21 @@ vE vE vE vE -hL -OZ -OZ +GR +uR +uR vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR vE vE -OZ -OZ vE +uR +uR +uR +uR vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE @@ -239870,23 +239666,44 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ +vE +uR +uR +vE +vE +uR +uR +uR +uR +uR +uR +uR +uR +uR +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +GR +uR vE vE vE @@ -240084,66 +239901,66 @@ vE vE vE vE -hL -hL -OZ -OZ -OZ -hL -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +GR +GR +uR +uR +uR +GR +uR vE vE -OZ -OZ vE vE +uR +uR +uR +uR vE vE -OZ -OZ vE vE vE -OZ -OZ -OZ vE vE vE +uR +uR +vE +vE +vE +vE +uR +uR +vE +vE +vE +uR +uR +uR +vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ +vE +vE +vE +vE +uR +uR +uR +uR +uR +vE +vE +vE +uR +uR +uR +uR +uR +GR +uR vE vE vE @@ -240341,66 +240158,66 @@ vE vE vE vE -hL -OZ -hL -OZ -OZ -hL -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +GR +uR +GR +uR +uR +GR +uR +uR vE -OZ -OZ vE -OZ -OZ vE -OZ -OZ +uR +uR +uR +uR +uR +uR +uR +uR vE vE vE +uR +uR vE +uR +uR vE -OZ -OZ -OZ -OZ +uR +uR vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ +vE +uR +uR +uR +uR +vE +vE +vE +vE +uR +vE +uR +uR +uR +vE +vE +vE +vE +vE +vE +uR +uR +uR +uR +vE +vE vE vE vE @@ -240597,67 +240414,67 @@ MY MY vE vE -hL -OZ -OZ +GR +uR +uR vE -hL -hL +GR +GR vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR vE -OZ +vE +uR +uR +uR +uR +uR +uR +uR +uR vE vE vE -OZ -OZ -OZ -OZ +uR +vE +vE +vE +uR +uR +uR +uR zM zM -OZ -OZ +uR +uR +vE +vE +vE +uR +uR +uR +uR +vE +uR +uR +vE +vE +uR +uR +vE +vE +vE +vE +vE +vE +uR +vE vE vE vE -OZ -OZ -OZ -OZ vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ vE vE vE @@ -240854,67 +240671,67 @@ MY MY MY MY -OZ -OZ -hL +uR +uR +GR vE vE -hL +GR vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR vE -OZ vE +uR +uR +uR +uR +uR +uR +uR +uR vE +uR vE +uR vE -OZ -OZ vE vE vE +uR +uR +vE +vE +vE +vE +uR +uR +vE +vE +vE +uR +uR +uR +uR +uR +uR +uR +vE +uR +uR +uR +uR +uR +uR +vE +vE +uR +vE vE -OZ -OZ vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL -OZ vE vE vE @@ -241111,33 +240928,30 @@ MY MY MY MY -hL -OZ +GR +uR vE vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR vE vE +uR +uR +uR +uR +uR +uR +uR +uR vE +uR +uR +uR vE vE vE @@ -241146,32 +240960,35 @@ vE vE vE vE -OZ -OZ -OZ vE vE vE +uR +uR +uR +vE +vE +vE +vE +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE @@ -241375,27 +241192,23 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR vE vE +uR +uR +uR vE vE +uR +uR +uR +uR +uR +uR +uR vE vE vE @@ -241405,29 +241218,33 @@ vE vE vE vE -OZ -OZ vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +uR +uR +vE +vE +vE +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +vE +vE +vE +uR +uR +uR +uR +uR vE vE vE @@ -241632,22 +241449,22 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR +uR +uR +uR +vE +vE +vE +vE +uR +uR +uR +uR +uR +uR vE vE vE @@ -241667,24 +241484,24 @@ zM vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL +uR +uR +uR +uR +uR +vE +vE +vE +uR +vE +vE +vE +vE +uR +uR +uR +uR +GR vE vE vE @@ -241889,22 +241706,22 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR +uR +uR +vE +vE +vE +vE +vE +uR +uR +uR +vE +uR +uR vE vE vE @@ -241920,28 +241737,28 @@ Sy Sy Xe vE -OZ -OZ +uR +uR vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL +uR +uR +uR +vE +vE +vE +vE +vE +vE +vE +vE +uR +uR +uR +uR +uR +GR vE vE vE @@ -242146,22 +241963,22 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR +uR +uR +vE +vE +vE +vE +vE +uR +uR +uR +vE +uR +uR vE vE vE @@ -242178,27 +241995,27 @@ Sy Xe vE vE -OZ +uR vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -hL +uR +uR +vE +uR +vE +vE +vE +vE +vE +uR +uR +uR +uR +uR +uR +GR vE vE vE @@ -242403,21 +242220,21 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +uR +uR +uR +uR +vE +vE +uR +uR +vE +uR +uR +uR +vE +vE vE vE vE @@ -242435,26 +242252,26 @@ Sy Jx Qk vE -OZ +uR vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR +uR +vE +uR +uR +uR +uR +uR +uR +uR +vE +vE +vE vE vE vE @@ -242660,21 +242477,21 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +vE +uR +uR +uR +vE +uR +uR +uR +uR +uR +uR +uR +vE +vE vE vE vE @@ -242697,21 +242514,21 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +uR +uR +uR +uR +uR +uR +uR +uR +uR +vE +vE +vE +vE +vE +vE vE vE vE @@ -242917,21 +242734,21 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +vE +vE +uR +uR +uR +uR +uR +uR +uR +uR +uR +uR +vE +vE vE vE vE @@ -242954,21 +242771,21 @@ Qk vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +uR +uR +uR +uR +uR +uR +uR +uR +vE +vE +vE +vE +vE +vE vE vE vE @@ -243174,21 +242991,21 @@ vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +vE +vE +vE +uR +uR +uR +uR +uR +uR +uR +uR +vE +vE +vE vE vE vE @@ -243211,21 +243028,21 @@ Qk vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ +vE +vE +vE +uR +uR +uR +vE +vE +vE +vE +vE +vE +vE +vE +vE vE vE MY @@ -243425,27 +243242,27 @@ Jx Jx Qk Qk -zw +Jx +vE +vE +vE +vE +vE +vE +vE +vE +vE +vE +uR +uR +uR +uR +vE vE vE vE vE vE -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ -OZ vE vE vE @@ -243682,8 +243499,8 @@ PG Jx Jx Qk -zw -ox +Jx +Jx vE vE vE @@ -243939,9 +243756,9 @@ PG PG Jx Jx -zw -zw -zw +Jx +Jx +Jx MY vE vE @@ -244196,9 +244013,9 @@ PG PG Jx Qk -DO -DO -DO +Qk +Qk +Qk Qk MY vE @@ -244453,9 +244270,9 @@ PG PG Jx Jx -DO -DO -DO +Qk +Jx +Jx Qk Qk MY @@ -244710,9 +244527,9 @@ PG PG PG Jx -zw -zw -zw +Jx +Jx +Jx MY Qk MY @@ -244967,24 +244784,24 @@ PG PG PG PG -zw -ox -zw +PG +Jx +Jx Jx Qk Qk MY -MY -zw -zw -zw -zw -zw -MY -MY -MY +Qk +Qk +Qk +Qk +Qk +Qk MY MY +Qk +Qk +Qk MY MY MY @@ -245224,25 +245041,25 @@ PG PG PG PG -zw -ox -ox +PG +PG +Jx Jx MY Qk MY +Qk +Qk +Qk +Qk +Qk +Qk +MY +MY +MY MY -ZG -Qy -ea -Qy -ZG MY MY -zw -zw -zw -zw MY MY MY @@ -245276,7 +245093,7 @@ vE vE vE vE -zw +MY MY MY MY @@ -245481,38 +245298,41 @@ PG PG PG PG -zw -ox -zw +PG +PG +Jx Jx Jx MY Qk MY -ZG -RV -RV -RV -RV MY MY -ZG -vG -Qy -ZG MY MY -zw -zw -zw -zw -zw -zw -zw -zw -zw -zw -zw +MY +MY +Qk +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY MY MY MY @@ -245531,9 +245351,6 @@ MY MY MY MY -zw -zw -zw MY MY MY @@ -245738,59 +245555,59 @@ PG PG PG PG -zw -vG -zw +PG +PG +PG Jx Jx MY Qk +Qk +Qk MY -ZG -rT -ea -Qy -ZG +MY +MY +MY +Qk Qk MY -ZG -ea -ox -ZG MY MY -ZG -gS -gS -gS -Jk -Bm -PH -ZO -gS -Fb -ZG MY MY MY -zw -zw -zw -zw -zw MY MY -zw -zw -zw -zw MY MY MY MY -zw -vG -zw +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY MY MY MY @@ -245995,59 +245812,59 @@ PG PG PG PG -zw -zw -zw +PG +PG +PG Jx Jx MY Qk -Qk -zw -zw -zw -zw -zw +MY +MY +MY +MY +MY +MY Qk MY -ZG -Qy -ox -ZG MY MY -ZG -gS -gS -gS -gS -gS -gS -gS -gS -ZO -ZG MY MY MY -ZG -Qy -ea -vG -ZG MY MY -ZG -ox -Qy -ZG MY MY MY MY -zw -ox -zw +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY MY MY MY @@ -246252,59 +246069,59 @@ PG PG PG PG -zw -ox -zw +PG +PG +PG PG Jx Jx MY -Qk -Qk +MY +MY +MY Qk Qk Qk Qk Qk MY -zw -zw -ox -zw MY MY -zw -gS -ea -gS -gS -gS -gS -gS -gS -gS -zw -GE MY MY -ZG -ea -ox -ox -ZG MY MY -ZG -ox -ea -ZG MY MY MY MY -ox -ox -zw +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY MY MY MY @@ -246509,59 +246326,59 @@ PG PG PG PG -zw -ox -zw +PG +PG +PG PG Jx Jx Jx MY MY +Qk +Qk +Qk +Qk +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY MY MY MY MY MY -Qk MY MY MY MY MY -GE -ea -ea -yg -fZ -gS -gS -gS -GR -yg -ea -ea -GE -GE MY -ZG -Qy -ox -ox -ZG MY MY -zw -ox -zw -zw MY MY MY MY -zw -ox -zw MY MY MY @@ -246766,46 +246583,23 @@ PG PG PG PG -zw -ox -zw +PG +PG +PG PG PG Jx Jx Jx MY -zw -zw -zw -zw -MY Qk Qk Qk Qk MY -MY -Qk -ea -ea -yg -PU -gS -IX -gS -vU -yg -gS -ea Qk MY MY -zw -zw -ox -zw -zw MY MY MY @@ -246816,9 +246610,32 @@ MY MY MY MY -zw -zw -zw +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY MY MY MY @@ -247023,38 +246840,22 @@ PG PG PG PG -zw -ox -zw +PG +PG +PG PG PG Jx Jx Jx MY -ZG -Qy -ea -ZG -MY -MY -MY -MY Qk Qk Qk -GE -zw -gS -yg -vU -gS -VB -gS -eT -yg -gS -zw +Qk +Qk +MY +MY MY Qk MY @@ -247066,16 +246867,32 @@ MY MY MY MY -Qk -Qk -Qk -Qk -Qk MY -Qk -DO -DO -DO +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY MY Qk MY @@ -247280,59 +247097,59 @@ PG PG PG PG -zw -ox -zw +PG +PG +PG PG PG PG Jx Jx MY -ZG -RV -RV -RV -MY MY MY MY -MY -MY -Qk -GE -ea -ea -yg -Nq -gS -IX -gS -qr -yg -ea -ea -GE -Qk -Qk -Qk Qk Qk Qk Qk Qk Qk +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY Qk Qk Qk -MY -MY Qk Qk Qk -DO -DO -DO Qk Qk Qk @@ -247537,39 +247354,39 @@ PG PG PG PG -zw -zw -zw +PG +PG +PG PG PG PG PG Jx -Jx -zw -zw -zw -zw -MY -zw -zw -zw -zw -MY +MP +MP +MP +MP +MP +MP +MP +MP Qk Qk -ea -ea -yg -Ku -gS -gS -gS -GJ -yg -ea -ea -GE +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY MY MY MY @@ -247587,10 +247404,10 @@ MY MY MY Qk -DO -DO -DO Qk +MY +MY +MY Qk MY MY @@ -247802,51 +247619,51 @@ PG PG PG Jx -Jx -Jx +MP +MP +MP +MP +MP +MP +MP +MP +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY +MY MY MY MY MY -ZG -RV -RV -RV MY -Qk MY -zw -gS -gS -gS -gS -gS -gS -gS -ea -gS -zw MY MY -zw -zw -zw -zw -zw MY MY -zw -zw -zw -zw MY MY MY MY MY -zw -zw -zw MY MY MY @@ -248058,52 +247875,52 @@ PG PG PG PG -PG -Jx -Jx -Jx +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MY +MY +MY +MY +MY +MY +MY +MY +MP +MP +MP +MP +MP +MY +MY +MY MY MY MY -ZG -Qy -ea -ZG MY MY MY -ZG -gS -gS -gS -gS -gS -gS -gS -gS -gS -ZG MY MY -ZG -rT -ea -Qy -ZG MY MY -RV -RV -RV -ZG MY MY MY MY MY -zw -ox -zw MY MY MY @@ -248315,52 +248132,52 @@ PG PG PG PG -PG -PG -PG -Jx -Jx -Jx -Jx -zw -zw -zw -zw +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MY +MY +MY +MY +MY +MY +MP +MP +MP +MP +MP +MP +MP +MY +MY +MY +MY +MY MY MY MY -ZG -gS -gS -gS -Jq -tr -qf -rY -gS -gS -ZG MY MY -ZG -RV -RV -RV -RV MY MY -ZG -ea -Qy -ZG MY MY MY MY MY -ox -ox -zw MY MY MY @@ -248573,51 +248390,51 @@ PG PG PG PG -PG -PG -PG -Jx -Jx -Jx -Jx -Jx -Jx +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MY +MY +MY +MY +MY +MP +MP +MP +MP +MP +MP +MP +MP MY MY MY MY -zw -zw -zw -zw -zw -zw -zw -zw -zw -zw -zw MY MY -ZG -Qy -RV -RV -ZG MY MY -zw -zw -zw -zw MY MY MY MY Jx -zw -ox -zw +MY +MY +MY MY MY MY @@ -248831,50 +248648,50 @@ PG PG PG PG -PG -PG -PG -PG -PG -Jx -Jx -Jx -Jx -Jx -MY -MY -MY -MY -MY -MY -MY -MY -MY -MY +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP MY MY MY MY +MP +MP +MP +MP +MP +MP +MP +MP +MP MY -zw -zw -zw -zw -zw MY MY MY +MP +MP +MP +MP MY MY MY +Jx +Jx MY MY MY -Jx -Jx -zw -vG -zw MY MY MY @@ -249089,22 +248906,43 @@ PG PG PG PG -PG -PG -PG -PG -PG -PG -Jx -Jx -Jx +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MY +MY Jx Jx Jx +MP +MP +MP +MP +MP +MP +MP +MP MY MY -MY -MY +MP +MP +MP +MP +MP +MP +MP +MP Jx Jx Jx @@ -249120,27 +248958,6 @@ MY MY MY MY -MY -MY -MY -MY -MY -MY -Jx -Jx -Jx -zw -zw -zw -MY -MY -MY -MY -MY -MY -MY -MY -MY Jx Jx Jx @@ -249347,26 +249164,43 @@ PG PG PG PG -PG -PG -PG -PG -PG -PG -PG -Jx -Jx -Jx -Jx -Jx -Jx -Jx +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP Jx Jx Jx Jx Jx Jx +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP Jx Jx MY @@ -249380,23 +249214,6 @@ MY MY MY MY -Jx -Jx -Jx -Jx -PG -PG -zw -ox -zw -MY -MY -MY -MY -MY -MY -MY -MY MY Jx Jx @@ -249605,28 +249422,44 @@ cp PG PG PG +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP PG PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -Jx -Jx Jx Jx Jx Jx Jx +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP Jx MY MY @@ -249636,22 +249469,6 @@ MY MY MY MY -Jx -Jx -Jx -Jx -PG -PG -PG -zw -ox -zw -MY -MY -MY -MY -MY -MY MY MY Jx @@ -249864,47 +249681,47 @@ PG PG PG PG +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP PG PG PG PG PG PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -Jx -Jx -Jx -Jx -Jx -Jx -Jx -Jx -Jx -Jx -Jx +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP Jx Jx Jx Jx -PG -PG -PG -PG -PG -zw -ox -zw -MY -MY MY MY MY @@ -250137,31 +249954,31 @@ PG PG PG PG -PG -PG -PG -Jx -Jx -Jx -Jx -Jx +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP Jx Jx Jx Jx -PG -PG -PG -PG -PG -PG -PG -PG -zw -ox -zw -MY -MY MY MY MY @@ -250395,28 +250212,28 @@ PG PG PG PG +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP +MP PG PG PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -zw -ox -zw +MP +MP +MP +MP +MP +MP Jx Jx MY @@ -250653,6 +250470,15 @@ PG PG PG PG +MP +MP +MP +MP +MP +MP +MP +MP +MP PG PG PG @@ -250662,20 +250488,11 @@ PG PG PG PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -zw -ox -zw -Jx -Jx +MP +MP +MP +MP +MP Jx Jx Jx @@ -250912,6 +250729,11 @@ PG PG PG PG +MP +MP +MP +MP +MP PG PG PG @@ -250923,16 +250745,11 @@ PG PG PG PG -PG -PG -PG -PG -PG -zw -ox -zw -PG -Jx +MP +MP +MP +MP +MP Jx Jx Jx @@ -251185,9 +251002,9 @@ PG PG PG PG -zw -ox -zw +PG +PG +PG PG PG PG @@ -251442,9 +251259,9 @@ PG PG PG PG -zw -ox -zw +PG +PG +PG PG PG PG @@ -251699,9 +251516,9 @@ PG PG PG PG -zw -ox -zw +PG +PG +PG PG PG PG @@ -251956,9 +251773,9 @@ PG PG PG PG -zw -ox -zw +PG +PG +PG PG PG PG @@ -252213,263 +252030,6 @@ PG PG PG PG -zw -zw -zw -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -PG -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -"} -(201,1,4) = {" -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -xI -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -cp -PG -PG PG PG PG @@ -252575,7 +252135,264 @@ xI xI xI "} -(202,1,4) = {" +(201,1,4) = {" +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +PG +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +cp +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +xI +"} +(202,1,4) = {" xI xI xI @@ -266709,7 +266526,7 @@ vH vH vH vH -vH +hZ "} (2,1,5) = {" Jm @@ -268405,30 +268222,30 @@ Kc Kc Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +PU +eH vH vH vH @@ -268651,41 +268468,41 @@ Kc Kc Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +bv +bv +bv +bv +bv +bv +eH +PU +PU vH vH vH @@ -268898,51 +268715,51 @@ Kc Kc Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +PU +PU vH vH vH @@ -269152,54 +268969,54 @@ Jm Kc Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +PU +PU vH vH vH @@ -269407,60 +269224,60 @@ Jm Jm Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH -yd +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +PU +PU +vH +vH +vH +eH vH vH vH @@ -269664,61 +269481,61 @@ Jm Jm Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH -yd -yd +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +PU +PU +PU +PU +vH +eH +eH VY vH vH @@ -269921,61 +269738,61 @@ Jm Jm Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +PU +PU +PU +PU +PU +eH +eH VY vH vH @@ -270178,61 +269995,61 @@ Jm Jm Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +PU +PU +PU +eH +eH +eH VY VY VY @@ -270435,64 +270252,64 @@ Jm Jm Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY qQ VY @@ -270692,64 +270509,64 @@ Jm Jm Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +eH +eH +eH +eH +eH +eH +eH +eH +eH VY fE AL @@ -270949,63 +270766,63 @@ Jm Jm Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +eH +eH +eH +eH +eH +eH +eH +eH VY VY fE @@ -271205,64 +271022,64 @@ Kc Kc Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +ZA +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH VY MX UC @@ -271459,67 +271276,67 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH VY XU qN @@ -271716,64 +271533,64 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +eH +eH +eH +eH VY VY VY @@ -271973,64 +271790,64 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +eH +eH +eH +eH pw fh fh @@ -272230,64 +272047,64 @@ Jm Jm Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH VY CT rp @@ -272486,65 +272303,65 @@ Kc Kc Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH VY fR Hz @@ -272740,68 +272557,68 @@ Jm Jm Jm Kc -Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +fA +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH VY CT QI @@ -272997,68 +272814,68 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH pw fh fh @@ -273254,68 +273071,68 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH VY VY VY @@ -273361,7 +273178,7 @@ IH rd VY VY -yd +eH vH vH vH @@ -273511,71 +273328,71 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH VY VY VY @@ -273618,9 +273435,9 @@ rd rd VY Xd -yd -yd -yd +eH +eH +eH vH vH vH @@ -273768,74 +273585,74 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH +eH OK fc UU @@ -273873,11 +273690,11 @@ VY VY rd rd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH vH vH vH @@ -274025,73 +273842,73 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH OK OK GF @@ -274130,12 +273947,12 @@ OY IH rd FW -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -274282,73 +274099,73 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH OK OK OK @@ -274387,12 +274204,12 @@ rd rd rd al -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -274539,87 +274356,87 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +Py +Py +Py +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH Tn OK OK OK OK OK -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH VY VY FY @@ -274644,12 +274461,12 @@ VY rd IH VY -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -274796,87 +274613,87 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +Py +Py +Py +Py +Py +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH OK OK OK OK -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH VY OY IH @@ -274901,14 +274718,14 @@ VY rd IH VY -yd -yd -yd -yd -yd -yd -yd -vH +eH +eH +eH +eH +eH +eH +eH +vH vH vH vH @@ -275053,87 +274870,87 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +ZA +ZA +ZA +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +Py +Py +Py +Py +Py +Py +Py +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH OK OK -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY IH IH @@ -275159,12 +274976,12 @@ FY VY VY VY -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -275310,87 +275127,87 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +Py +Py +Py +Py +Py +Py +Py +Py +Py +Py +Py +Py +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY IH IH @@ -275416,12 +275233,12 @@ IH IH QV VY -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -275567,87 +275384,87 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +ZA +Py +Py +Py +Py +Py +Py +Py +Py +Py +Py +Py +Py +Py +Py +vH +vH +vH +eH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH QV IH rd @@ -275672,13 +275489,13 @@ rD IH IH aj -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -275824,87 +275641,87 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +ZA +ZA +ZA +ZA +ZA +Py +Py +Py +Py +Py +Py +Py +Py +eH +eH +Py +Py +fC +fC +fC +eH +eH +eH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH aj rd rd @@ -275929,12 +275746,12 @@ VY rd IH VY -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -276081,87 +275898,87 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +Py +Py +fC +fC +fC +eH +eH +eH +eH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY rd rd @@ -276186,12 +276003,12 @@ VY rd rd VY -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -276338,87 +276155,87 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +Py +fC +fC +fC +eH +eH +eH +eH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY rd rd @@ -276443,12 +276260,12 @@ VY rd rd VY -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -276595,87 +276412,87 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +bv +bv +fC +fC +fC +bv +bv +eH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY iD rd @@ -276700,12 +276517,12 @@ MW rd rd VY -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -276852,87 +276669,87 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -ii +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +Py +Py +Py +bv +bv +bv +bv +fC +fC +fC +fC +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv bv ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY rd rd @@ -276957,12 +276774,12 @@ mu rd IH VY -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -277109,87 +276926,87 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -ii -ii +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +Py +Py +Py +bv +bv +bv +bv +fC +fC +fC +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv bv bv bv bv ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY rd rd @@ -277214,12 +277031,12 @@ VY IH IH VY -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -277366,65 +277183,65 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +Py +Py +Py +bv +bv +bv +bv +bv +fC +fC +bv +bv +bv +bv +bv +bv +bv +bv +ii +ii +bv +bv +bv +bv +bv +bv +bv +bv +bv ii ii ii @@ -277433,20 +277250,20 @@ bv bv ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY rd rd @@ -277471,12 +277288,12 @@ VY IH IH VY -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -277623,66 +277440,66 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +Py +Py +Py +bv +bv +ii +bv +bv +fC +fC +bv +bv +bv +bv +bv +bv ii ii ii ii +bv +bv +bv +bv +bv +bv +bv +bv +bv +ii ii ii ii @@ -277691,19 +277508,19 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY rd rd @@ -277729,11 +277546,11 @@ rd IH VY VY -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH vH vH vH @@ -277880,66 +277697,61 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +Py +Py +Py +Py +ii +ii +ii +fC +bv +bv +bv +bv +bv +bv +bv ii ii ii ii ii +bv +eH +eH +eH ii ii ii @@ -277950,17 +277762,22 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +ii +ii +ii +ii +ii +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY IH rd @@ -277986,11 +277803,11 @@ iD rd Bn VY -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH vH vH vH @@ -278137,69 +277954,60 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +Py +Py +Py ii ii ii +fC +fC +bv +bv +bv +bv +bv ii ii ii ii ii ii +eH +eH +eH ii ii ii @@ -278208,16 +278016,25 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +ii +ii +ii +ii +ii +ii +ii +ii +ii +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY Sc IH @@ -278242,12 +278059,12 @@ rd rd rd pX -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH vH vH vH @@ -278394,60 +278211,60 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +Py +Py +ii +ii +ii +fC +fC +ii +ii +eH +eH +bv +ii +ii +ii +ii +eH +eH +eH +eH +eH ii ii ii @@ -278465,16 +278282,16 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH VY VY IH @@ -278499,13 +278316,13 @@ rd rd IH VY -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -278651,59 +278468,59 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +Py +Py +ii +ii +ii +fC +ii +ii +eH +eH +eH +eH +ii +ii +ii +eH +eH +eH +eH +eH ii ii ii @@ -278723,15 +278540,15 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH VY VY Mt @@ -278756,13 +278573,13 @@ IH IH IH VY -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -278908,59 +278725,59 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +Py +Py +eH +ii +ii +fC +ii +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH ii ii ii @@ -278980,28 +278797,28 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH VY VY -yd -yd +eH +eH VY VY VY -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH VY VY VY @@ -279013,14 +278830,14 @@ Mt QV VY VY -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -279165,58 +278982,58 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +ii +fC +fC +ii +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH ii ii ii @@ -279237,47 +279054,47 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -279422,58 +279239,58 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +ii +ii +fC +ii +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH ii ii ii @@ -279494,47 +279311,47 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -279679,58 +279496,58 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH ii bv -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +ii +ii +fC +ii +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH ii ii ii @@ -279751,47 +279568,47 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -279936,58 +279753,58 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH ii ii bv bv -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +ii +ii +ii +fC +ii +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH ii ii ii @@ -280010,44 +279827,44 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -280193,58 +280010,58 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH ii ii ii bv -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +ii +ii +eH +eH +eH +eH +eH +eH +eH ii ii ii -yd -yd -yd -yd ii ii +fC +fC +eH +eH +eH +eH ii ii ii -yd -yd -yd -yd +ii +ii +eH +eH +eH +eH ii ii ii @@ -280269,42 +280086,42 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -280450,20 +280267,20 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -280488,7 +280305,7 @@ ii ii ii ii -ii +fC ii ii ii @@ -280528,40 +280345,40 @@ ii ii ii ii -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -280707,18 +280524,18 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -280744,8 +280561,8 @@ ii ii ii ii -ii -ii +fC +fC ii ii ii @@ -280787,38 +280604,38 @@ bv bv bv bv -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -280964,20 +280781,17 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -ii -ii -ii +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH ii ii ii @@ -280998,10 +280812,13 @@ ii ii ii ii +fC +fC +fC ii ii -bv -bv +fC +fC bv ii bv @@ -281013,7 +280830,7 @@ bv bv ii ii -yd +eH ii ii ii @@ -281049,33 +280866,33 @@ bv bv bv bv -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -281221,15 +281038,15 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH bv ii ii @@ -281248,17 +281065,17 @@ ii ii ii ii -ii -bv -bv -bv -bv -bv -bv -bv -bv -bv +fC +fC bv +fC +fC +fC +fC +fC +fC +fC +fC bv bv bv @@ -281269,9 +281086,9 @@ bv bv bv ii -yd -yd -yd +eH +eH +eH ii ii ii @@ -281306,33 +281123,33 @@ bv bv bv bv -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -281478,13 +281295,13 @@ Jm Jm Jm Kc -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH bv bv ii @@ -281504,12 +281321,12 @@ ii ii ii ii -ii -ii -ii -ii -ii -ii +fC +fC +fC +fC +fC +fC ii bv bv @@ -281526,9 +281343,9 @@ bv bv ii ii -yd -yd -yd +eH +eH +eH ii ii ii @@ -281551,8 +281368,8 @@ ii ii ii ii -yd -yd +eH +eH bv bv bv @@ -281564,33 +281381,33 @@ bv bv bv bv -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -281735,36 +281552,36 @@ Kc Kc Kc Kc -yd -yd -yd -yd -yd -yd -yd -yd -ii -ii -ii -ii -ii -ii -ii -ii -ii -ii -ii -ii +eH +eH +eH +eH +eH +eH +eH +eH ii ii ii ii ii ii +vH +vH +vH +vH +vH +vH +vH ii ii ii ii +vU +fZ +fZ +gS +rg ii ii ii @@ -281807,10 +281624,10 @@ ii ii ii ii -yd -yd -yd -yd +eH +eH +eH +eH bv bv bv @@ -281822,36 +281639,36 @@ bv bv bv bv -yd -yd -yd +eH +eH +eH bv bv bv bv -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH bv bv -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -281953,162 +281770,162 @@ vH vH Kc Kc -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -vH -yd -bv -bv -bv -bv -bv -bv -bv -bv -bv -bv -bv -bv -bv -bv -bv -yd -yd -yd -yd -bv -bv -bv -bv -bv -bv -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +eQ +je +je +DO +cm +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +bv +bv +bv +bv +bv +bv +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH vH vH vH @@ -282274,6 +282091,11 @@ vH vH vH vH +eQ +je +je +DO +cm vH vH vH @@ -282326,11 +282148,6 @@ vH vH vH vH -vH -vH -vH -yd -yd bv bv bv @@ -282531,6 +282348,11 @@ vH vH vH vH +eQ +je +je +DO +cm vH vH vH @@ -282583,13 +282405,8 @@ vH vH vH vH -vH -vH -vH -yd -yd -yd -yd +eH +eH bv bv bv @@ -282788,6 +282605,11 @@ vH vH vH vH +eQ +je +je +DO +cm vH vH vH @@ -282840,14 +282662,9 @@ vH vH vH vH -vH -vH -vH -yd -yd -yd -yd -yd +eH +eH +eH bv bv bv @@ -283039,17 +282856,17 @@ ii ii ii ii -bv -bv -bv -bv -bv -bv -bv -bv ii ii ii +ii +ii +ii +vU +Js +Js +qf +rg vH vH vH @@ -283100,24 +282917,24 @@ vH vH vH vH -yd -yd -yd -yd -yd -yd -yd -yd -yd +vH +vH +eH +eH +eH +eH +eH +eH +eH bv bv bv bv -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH bv bv bv @@ -283296,18 +283113,20 @@ ii ii ii ii -bv -bv -bv -bv -bv -bv -bv -bv ii ii ii ii +ii +ii +ii +ii +fC +ii +ii +ii +vH +vH vH vH vH @@ -283357,24 +283176,22 @@ vH vH vH vH -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH bv bv -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH bv bv bv @@ -283561,7 +283378,7 @@ ii ii ii ii -ii +fC ii ii ii @@ -283614,23 +283431,23 @@ vH vH vH vH -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +vH +vH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -283817,13 +283634,13 @@ ii ii ii ii +fC +fC ii ii ii ii ii -ii -bv vH vH vH @@ -283871,23 +283688,23 @@ vH vH vH vH -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +vH +vH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -284074,13 +283891,13 @@ ii ii ii ii +fC ii ii ii ii ii ii -bv vH vH vH @@ -284128,23 +283945,23 @@ vH vH vH vH -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +vH +vH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -284330,6 +284147,8 @@ bv bv bv bv +fC +fC ii ii ii @@ -284337,8 +284156,6 @@ ii ii ii ii -bv -bv vH vH vH @@ -284386,22 +284203,22 @@ vH vH vH vH -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +vH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -284587,6 +284404,8 @@ bv bv bv bv +fC +fC ii ii ii @@ -284594,8 +284413,6 @@ ii ii ii ii -bv -bv vH vH vH @@ -284643,23 +284460,23 @@ vH vH vH vH -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +vH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -284843,20 +284660,20 @@ bv bv bv bv +fC +fC bv bv bv bv bv bv -bv -bv -bv -bv -bv -bv -bv -bv +ii +ii +ii +ii +ii +ii bv bv bv @@ -284900,23 +284717,23 @@ vH vH vH vH -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +vH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -285090,17 +284907,9 @@ bv bv bv bv -ii -ii -ii -bv -bv -bv -bv -bv -bv -bv -bv +ii +ii +ii bv bv bv @@ -285108,12 +284917,20 @@ bv bv bv bv +fC +fC bv bv bv bv bv bv +ii +ii +ii +ii +ii +ii bv bv bv @@ -285157,23 +284974,23 @@ vH vH vH vH -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +vH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -285357,6 +285174,7 @@ bv bv bv bv +fC bv bv bv @@ -285366,10 +285184,9 @@ bv bv bv bv -bv -bv -bv -bv +ii +ii +ii bv bv bv @@ -285414,23 +285231,23 @@ bv bv vH vH -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -285614,6 +285431,8 @@ bv bv bv bv +fC +fC bv bv bv @@ -285623,10 +285442,8 @@ bv bv bv bv -bv -bv -bv -bv +ii +ii bv bv bv @@ -285672,20 +285489,20 @@ bv bv bv bv -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -285871,8 +285688,8 @@ bv bv bv bv -bv -bv +fC +fC bv bv bv @@ -285931,17 +285748,17 @@ bv bv bv bv -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd -yd +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH +eH bv bv bv @@ -286128,8 +285945,8 @@ bv bv bv bv -bv -bv +fC +fC bv bv bv @@ -286192,9 +286009,9 @@ bv bv bv bv -yd -yd -yd +eH +eH +eH bv bv bv @@ -286386,7 +286203,7 @@ ii ii ii bv -bv +fC bv bv bv @@ -286643,7 +286460,7 @@ bv bv bv bv -bv +fC bv bv bv @@ -286900,7 +286717,7 @@ bv bv bv bv -bv +fC bv bv bv @@ -287157,7 +286974,7 @@ bv bv bv bv -bv +fC bv bv bv @@ -287413,8 +287230,8 @@ bv bv fC fC -bv -bv +fC +fC bv fC fC @@ -308961,7 +308778,7 @@ vH vH vH vH -zw +vH nR nR vE @@ -309218,8 +309035,8 @@ vH vH vH vH -zw -ox +vH +vH nR nR nR @@ -309475,9 +309292,9 @@ vH vH vH vH -zw -zw -zw +vH +vH +vH vH nR nR @@ -309732,9 +309549,9 @@ vH vH vH vH -Km -ox -uu +vH +vH +vH vH vH nR @@ -309989,9 +309806,9 @@ vH vH vH vH -Km -ox -uu +vH +vH +vH vH vH vH @@ -310246,9 +310063,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -310503,19 +310320,19 @@ vH vH vH vH -Km -ox -uu vH vH vH vH vH -zw -zw -zw -zw -zw +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -310760,25 +310577,25 @@ vH vH vH vH -Km -ox -uu vH vH vH vH vH -ZG -qq -RV -RV -ZG vH vH -zw -zw -zw -zw +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -311017,38 +310834,15 @@ vH vH vH vH -Km -ox -uu vH vH vH vH vH -ZG -RV -RV -qq -ZG vH vH -ZG -vG -ox -ZG vH vH -qx -qx -zw -zw -zw -zw -zw -zw -zw -qx -qx vH vH vH @@ -311067,9 +310861,32 @@ vH vH vH vH -zw -zw -zw +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -311274,59 +311091,59 @@ vH vH vH vH -Km -vG -uu vH vH vH vH vH -ZG -rT -RV -RV -ZG vH vH -ZG -ox -ox -ZG vH vH -qx -qx -ZG -BL -ox -ox -ox -rg -ZG -qx -qx vH vH vH -zw -zw -zw -zw -zw vH vH -rA -rA -rA -rA vH vH vH vH -Km -vG -uu +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -311531,59 +311348,59 @@ vH vH vH vH -zw -zw -zw vH vH vH vH vH -zw -zw -zw -zw -zw vH vH -ZG -ox -zs -ZG vH vH -qx -qx -ZG -ox -ox -BL -ox -ox -ZG -qx -qx vH vH vH -ZG -ox -ox -vG -ZG vH vH -rA -rA -rA -rA vH vH vH vH -Km -ox -uu +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -311788,9 +311605,6 @@ vH vH vH vH -zw -ox -zw vH vH vH @@ -311803,44 +311617,47 @@ vH vH vH vH -zw -zw -zw -zw vH vH -qx -qx -ZG -ox -tX -ox -ox -ox -ZG -qx -qx vH vH vH -ZG -zs -ox -ox -ZG vH vH -rA -rA -rA -rA vH vH vH vH -Km -ox -uu +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -312045,9 +311862,6 @@ vH vH vH vH -zw -ox -zw vH vH vH @@ -312066,38 +311880,41 @@ vH vH vH vH -qx -qx -zw -zw -zw -zw -ox -ox -zw -qx -qx vH vH vH -ZG -ox -ox -zs -ZG vH vH -rA -rA -rA -rA vH vH vH vH -Km -ox -uu +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -312302,19 +312119,12 @@ vH vH vH vH -zw -ox -zw vH vH vH vH vH vH -rA -rA -rA -rA vH vH vH @@ -312323,25 +312133,9 @@ vH vH vH vH -qx -qx -ZG -Rj -tn -ZG -ox -ox -ZG -qx -qx vH vH vH -zw -zw -zw -zw -zw vH vH vH @@ -312352,9 +312146,32 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -312559,19 +312376,12 @@ vH vH vH vH -zw -ox -zw vH vH vH vH vH vH -rA -rA -rA -rA vH vH vH @@ -312580,17 +312390,6 @@ vH vH vH vH -qx -qx -ZG -ox -ox -ox -ox -ox -ZG -qx -qx vH vH vH @@ -312609,9 +312408,27 @@ vH vH vH vH -Km -ox -uu +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -312816,19 +312633,12 @@ vH vH vH vH -zw -ox -zw vH vH vH vH vH vH -rA -rA -rA -rA vH vH vH @@ -312837,17 +312647,6 @@ vH vH vH vH -qx -qx -ZG -VX -Rj -ZG -ox -ox -ZG -qx -qx vH vH vH @@ -312866,9 +312665,27 @@ vH vH vH vH -Km -ox -uu +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -313073,38 +312890,16 @@ vH vH vH vH -zw -zw -zw vH vH vH vH vH vH -rA -rA -rA -rA vH -rA -rA -rA -rA vH vH vH -qx -qx -zw -zw -zw -zw -ox -ox -zw -qx -qx vH vH vH @@ -313123,9 +312918,31 @@ vH vH vH vH -Km -ox -uu +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -313344,45 +313161,45 @@ vH vH vH vH -rA -rA -rA -rA vH vH vH -qx -qx -ZG -tn -ox -ZG -ox -ox -ZG -qx -qx vH vH -zw -zw -zw -zw -zw vH vH -rA -rA -rA -rA vH vH vH vH vH -zw -ox -zw +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -313601,45 +313418,45 @@ vH vH vH vH -rA -rA -rA -rA vH vH vH -qx -qx -ZG -Rj -ox -ox -ox -ox -ZG -qx -qx vH vH -ZG -vG -ox -zs -ZG vH vH -rA -rA -rA -rA vH vH vH vH vH -Km -ox -uu +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -313858,45 +313675,45 @@ vH vH vH vH -rA -rA -rA -rA vH vH vH -qx -qx -ZG -ox -eQ -ZG -ox -vG -ZG -qx -qx vH vH -ZG -ox -ox -ox -ZG vH vH -rA -rA -rA -rA vH vH vH vH vH -Km -ox -uu +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -314122,38 +313939,38 @@ vH vH vH vH -qx -qx -zw -zw -zw -zw -zw -zw -zw -qx -qx vH vH -ZG -ox -ox -zs -ZG vH vH -rA -rA -rA -rA vH vH vH vH vH -Km -ox -uu +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -314392,11 +314209,6 @@ vH vH vH vH -zw -zw -zw -zw -zw vH vH vH @@ -314408,9 +314220,14 @@ vH vH vH vH -Km -vG -uu +vH +vH +vH +vH +vH +vH +vH +vH vH vH vH @@ -314665,9 +314482,9 @@ vH vH vH vH -zw -zw -zw +vH +vH +vH vH vH vH @@ -314922,9 +314739,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -315179,9 +314996,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -315436,9 +315253,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -315693,9 +315510,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -315950,9 +315767,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -316207,9 +316024,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -316464,9 +316281,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -316721,9 +316538,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -316978,9 +316795,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -317235,9 +317052,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -317492,9 +317309,9 @@ vH vH vH vH -zw -ox -zw +vH +vH +vH vH vH vH @@ -317749,9 +317566,9 @@ vH vH vH vH -zw -zw -zw +vH +vH +vH vH vH vH diff --git a/code/game/area/roguetownareas.dm b/code/game/area/roguetownareas.dm index c38f4363cf4..d0bb04bd8b4 100644 --- a/code/game/area/roguetownareas.dm +++ b/code/game/area/roguetownareas.dm @@ -297,7 +297,7 @@ /area/under/cavelava name = "cavelava" icon_state = "cavelava" - first_time_text = "GOLERKANH'S ARTERY" + first_time_text = "MOUNT MIRACLE TUNNELS" droning_index = DRONING_CAVE_LAVA ambient_index = AMBIENCE_CAVE ambush_times = list(NIGHT,DAWN,DUSK,DAY) diff --git a/code/modules/procedural_mapping/mapGeneratorModules/decap.dm b/code/modules/procedural_mapping/mapGeneratorModules/decap.dm index ba69d2ca2c8..219a0016ada 100644 --- a/code/modules/procedural_mapping/mapGeneratorModules/decap.dm +++ b/code/modules/procedural_mapping/mapGeneratorModules/decap.dm @@ -1,8 +1,8 @@ //genstuff /obj/effect/landmark/mapGenerator/decap mapGeneratorType = /datum/mapGenerator/decap - endTurfX = 200 - endTurfY = 200 + endTurfX = 255 + endTurfY = 255 startTurfX = 1 startTurfY = 1 @@ -13,7 +13,7 @@ /datum/mapGeneratorModule/decapdirt clusterCheckFlags = CLUSTER_CHECK_DIFFERENT_ATOMS - allowed_turfs = list(/turf/open/floor/dirt) + allowed_turfs = list(/turf/open/floor/naturalstone, /turf/open/floor/dirt, /turf/open/floor/grass, /turf/open/floor/grass/cold, /turf/open/floor/grass/yellow, /turf/open/floor/grass/red, /turf/open/floor/snow, /turf/open/floor/snow/rough) excluded_turfs = list(/turf/open/floor/dirt/road) spawnableAtoms = list(/obj/structure/flora/tree/burnt = 30, /obj/structure/flora/grass/bush_meagre = 25, @@ -25,10 +25,10 @@ /obj/item/restraints/legcuffs/beartrap/armed/camouflage = 7, /obj/structure/flora/grass/pyroclasticflowers = 15) spawnableTurfs = list(/turf/open/lava = 2,/turf/open/floor/dirt/road = 36) - allowed_areas = list(/area/outdoors/mountains/decap) + allowed_areas = list(/area/outdoors/mountains, /area/outdoors/mountains/decap, /area/outdoors/seculton) /datum/mapGeneratorModule/decaproad clusterCheckFlags = CLUSTER_CHECK_DIFFERENT_ATOMS - allowed_turfs = list(/turf/open/floor/dirt/road) + allowed_turfs = list(/turf/open/floor/dirt/road, /turf/open/floor/sand) spawnableAtoms = list(/obj/item/natural/stone = 23,/obj/item/natural/rock = 8,/obj/item/grown/log/tree/stick = 6) - allowed_areas = list(/area/outdoors/mountains/decap) + allowed_areas = list(/area/outdoors/mountains, /area/outdoors/mountains/decap, /area/outdoors/seculton) From decacfbb9aac460807899360d93616bcc13c41d7 Mon Sep 17 00:00:00 2001 From: kyres1 Date: Mon, 25 May 2026 18:16:39 -0500 Subject: [PATCH 2/5] wrong path name fixed --- code/modules/procedural_mapping/mapGeneratorModules/decap.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/procedural_mapping/mapGeneratorModules/decap.dm b/code/modules/procedural_mapping/mapGeneratorModules/decap.dm index 219a0016ada..0ca75813370 100644 --- a/code/modules/procedural_mapping/mapGeneratorModules/decap.dm +++ b/code/modules/procedural_mapping/mapGeneratorModules/decap.dm @@ -13,7 +13,7 @@ /datum/mapGeneratorModule/decapdirt clusterCheckFlags = CLUSTER_CHECK_DIFFERENT_ATOMS - allowed_turfs = list(/turf/open/floor/naturalstone, /turf/open/floor/dirt, /turf/open/floor/grass, /turf/open/floor/grass/cold, /turf/open/floor/grass/yellow, /turf/open/floor/grass/red, /turf/open/floor/snow, /turf/open/floor/snow/rough) + allowed_turfs = list(/turf/open/floor/naturalstone, /turf/open/floor/dirt, /turf/open/floor/grass, /turf/open/floor/grass/cold, /turf/open/floor/grass/yel, /turf/open/floor/grass/red, /turf/open/floor/snow, /turf/open/floor/snow/rough) excluded_turfs = list(/turf/open/floor/dirt/road) spawnableAtoms = list(/obj/structure/flora/tree/burnt = 30, /obj/structure/flora/grass/bush_meagre = 25, From b3611a5f167c0974767b6b60c81c2e039e21f15b Mon Sep 17 00:00:00 2001 From: kyres1 Date: Mon, 25 May 2026 18:27:02 -0500 Subject: [PATCH 3/5] fixes lava spawning everywhere --- code/modules/procedural_mapping/mapGeneratorModules/decap.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/procedural_mapping/mapGeneratorModules/decap.dm b/code/modules/procedural_mapping/mapGeneratorModules/decap.dm index 0ca75813370..09ee6f2cff0 100644 --- a/code/modules/procedural_mapping/mapGeneratorModules/decap.dm +++ b/code/modules/procedural_mapping/mapGeneratorModules/decap.dm @@ -24,7 +24,7 @@ /obj/structure/closet/dirthole/closed/loot = 3, /obj/item/restraints/legcuffs/beartrap/armed/camouflage = 7, /obj/structure/flora/grass/pyroclasticflowers = 15) - spawnableTurfs = list(/turf/open/lava = 2,/turf/open/floor/dirt/road = 36) + spawnableTurfs = list(/turf/open/floor/dirt/road = 36) allowed_areas = list(/area/outdoors/mountains, /area/outdoors/mountains/decap, /area/outdoors/seculton) /datum/mapGeneratorModule/decaproad From 2b3c4e9757eb55dee971fe1277f7319dcdf1f8a4 Mon Sep 17 00:00:00 2001 From: kyres1 Date: Tue, 26 May 2026 11:39:26 -0500 Subject: [PATCH 4/5] tries fixing the human spawner test i guess --- .../z3_dermus/corridor/pillar_2.dmm | 9 +++++---- .../z4_surface/z4_respite_camp.dmm | 11 ++++------- _maps/map_files/domotan/domotan_east.dmm | 12 ++++++------ 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/_maps/domotan_necropolis/z3_dermus/corridor/pillar_2.dmm b/_maps/domotan_necropolis/z3_dermus/corridor/pillar_2.dmm index 6a1aae5a9ca..724093cb172 100644 --- a/_maps/domotan_necropolis/z3_dermus/corridor/pillar_2.dmm +++ b/_maps/domotan_necropolis/z3_dermus/corridor/pillar_2.dmm @@ -3,8 +3,9 @@ /turf/closed/mineral, /area/under/necropolis) "h" = ( +/obj/effect/spawner/map_spawner/necropolis/random_dirty, /obj/effect/spawner/map_spawner/necropolis/mob_spawner, -/turf/open/floor/cobble/alt, +/turf/open/floor/naturalstone, /area/under/necropolis) "i" = ( /turf/open/floor/naturalstone, @@ -27,7 +28,7 @@ /area/under/necropolis) "T" = ( /obj/effect/spawner/map_spawner/necropolis, -/turf/open/floor/cobble/alt, +/turf/open/floor/naturalstone, /area/under/necropolis) (1,1,1) = {" @@ -45,12 +46,12 @@ v (3,1,1) = {" N a -h +i i "} (4,1,1) = {" T i H -N +h "} diff --git a/_maps/domotan_necropolis/z4_surface/z4_respite_camp.dmm b/_maps/domotan_necropolis/z4_surface/z4_respite_camp.dmm index c2e55da91a8..8a170595281 100644 --- a/_maps/domotan_necropolis/z4_surface/z4_respite_camp.dmm +++ b/_maps/domotan_necropolis/z4_surface/z4_respite_camp.dmm @@ -5,11 +5,11 @@ "b" = ( /obj/structure/closet/crate/chest/crate, /obj/effect/spawner/map_spawner/loot/food, -/turf/open/floor/cobble, +/turf/open/floor/cobblerock, /area/under/cave) "d" = ( /obj/structure/closet/crate/chest/crate, -/turf/open/floor/cobble, +/turf/open/floor/cobblerock, /area/under/cave) "e" = ( /obj/structure/flora/driftwood, @@ -76,7 +76,7 @@ /area/under/cave) "v" = ( /obj/structure/fluff/railing/wood, -/turf/open/floor/cobble, +/turf/open/floor/cobblerock, /area/under/cave) "w" = ( /obj/structure/fluff/railing/wood, @@ -151,9 +151,6 @@ "P" = ( /turf/open/floor/cobblerock, /area/under/cave) -"Q" = ( -/turf/open/floor/cobble, -/area/under/cave) "R" = ( /obj/structure/fluff/railing/wood{ dir = 1; @@ -584,7 +581,7 @@ a L L t -Q +P W W W diff --git a/_maps/map_files/domotan/domotan_east.dmm b/_maps/map_files/domotan/domotan_east.dmm index 76ed890c19d..7f80563aeb5 100644 --- a/_maps/map_files/domotan/domotan_east.dmm +++ b/_maps/map_files/domotan/domotan_east.dmm @@ -1465,7 +1465,7 @@ /obj/structure/fluff/railing/tall/palisade{ dir = 8 }, -/turf/open/floor/cobble, +/turf/open/floor/naturalstone, /area/under/necropolis) "rg" = ( /obj/structure/fluff/railing/border{ @@ -3731,7 +3731,7 @@ /area/indoors/hellwatch) "Va" = ( /obj/structure/barricade/wooden, -/turf/open/floor/cobble, +/turf/open/floor/naturalstone, /area/under/necropolis) "Vd" = ( /obj/item/natural/rock, @@ -167697,7 +167697,7 @@ iL iL XF iL -dt +pt dt lc Wx @@ -167954,7 +167954,7 @@ iL iL XF iL -dt +pt dt dt Uj @@ -167978,7 +167978,7 @@ Uj pt pt Uj -Uj +pt iL XF iL @@ -168211,7 +168211,7 @@ iL iL XF iL -dt +pt dt dt dt From c1bc7283e03e7382dec067866e636076185af88f Mon Sep 17 00:00:00 2001 From: kyres1 Date: Mon, 1 Jun 2026 23:19:46 -0500 Subject: [PATCH 5/5] obliterates pipe bars and adds a ship wheel --- .../z3_dermus/corridor/corridor_8.dmm | 97 +++-- _maps/map_files/domotan/domotan_east.dmm | 23 +- _maps/map_files/domotan/domotan_north.dmm | 4 - _maps/map_files/domotan/old_doma.dmm | 357 +++++++++++------- 4 files changed, 265 insertions(+), 216 deletions(-) diff --git a/_maps/domotan_necropolis/z3_dermus/corridor/corridor_8.dmm b/_maps/domotan_necropolis/z3_dermus/corridor/corridor_8.dmm index ac8578ab25f..7052ebc12f1 100644 --- a/_maps/domotan_necropolis/z3_dermus/corridor/corridor_8.dmm +++ b/_maps/domotan_necropolis/z3_dermus/corridor/corridor_8.dmm @@ -4,10 +4,9 @@ /turf/open/floor/metal, /area/under/necropolis) "bC" = ( -/obj/structure/bars/pipe{ - dir = 8 - }, -/turf/open/lava/acid, +/obj/effect/spawner/map_spawner/necropolis/random_dirty, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/metal/alt, /area/under/necropolis) "bY" = ( /obj/structure/fluff/statue/knightalt{ @@ -43,10 +42,6 @@ "gS" = ( /turf/closed/wall/mineral/pipe, /area/under/necropolis) -"ib" = ( -/obj/structure/bars/pipe, -/turf/open/lava/acid, -/area/under/necropolis) "is" = ( /turf/open/floor/metal/barograte, /area/under/necropolis) @@ -57,12 +52,6 @@ /obj/effect/spawner/map_spawner/necropolis, /turf/open/floor/church/pale, /area/under/necropolis) -"kV" = ( -/obj/structure/bars/pipe{ - dir = 10 - }, -/turf/open/floor/church/green, -/area/under/necropolis) "lf" = ( /obj/effect/spawner/map_spawner/necropolis, /turf/open/floor/metal/alt, @@ -106,10 +95,8 @@ /turf/open/floor/church/rust, /area/under/necropolis) "sB" = ( -/obj/structure/bars/pipe{ - dir = 10 - }, -/turf/open/lava/acid, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/metal/barograte, /area/under/necropolis) "vi" = ( /obj/effect/spawner/map_spawner/necropolis/random_rock_wall, @@ -131,7 +118,8 @@ /obj/structure/fluff/walldeco/chains{ pixel_x = 6 }, -/turf/open/lava/acid, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/metal/barograte, /area/under/necropolis) "yK" = ( /obj/effect/decal/cleanable/blood/tracks, @@ -142,6 +130,9 @@ /obj/structure/fluff/railing/border{ dir = 4 }, +/obj/structure/fluff/walldeco/bath/wallpipes/innie{ + dir = 8 + }, /turf/open/floor/metal, /area/under/necropolis) "AK" = ( @@ -156,6 +147,9 @@ dir = 4 }, /obj/effect/spawner/map_spawner/necropolis/shroom_clutter, +/obj/structure/fluff/walldeco/bath/wallpipes/innie{ + dir = 8 + }, /turf/open/floor/metal, /area/under/necropolis) "Di" = ( @@ -169,18 +163,6 @@ /obj/effect/spawner/map_spawner/necropolis/random_rock_wall, /turf/open/floor/church/green, /area/under/necropolis) -"Fg" = ( -/turf/open/lava/acid, -/area/under/necropolis) -"FQ" = ( -/obj/structure/bars/pipe{ - dir = 6 - }, -/obj/structure/bars/pipe{ - dir = 8 - }, -/turf/open/floor/concrete, -/area/under/necropolis) "Ga" = ( /obj/structure/fluff/steamvent, /turf/open/floor/church/green, @@ -215,7 +197,8 @@ name = "loveless one"; desc = "Remnants of once was the soul, congealed Thauma oozing about and only barely left to linger in the air. Some time long ago, this was a person. A person with dreams, aspirations, hopes and love; in the end, something else had different plans. Some day, in the far future, what is left of them will be dust again, and only then will they see peace." }, -/turf/open/lava/acid, +/obj/effect/spawner/map_spawner/necropolis/water_tiles, +/turf/open/floor/metal/barograte, /area/under/necropolis) "MH" = ( /obj/item/flashlight/flare/torch/lantern/bronzelamptern, @@ -232,10 +215,13 @@ /turf/open/floor/church/rust, /area/under/necropolis) "OL" = ( -/obj/structure/bars/pipe{ +/obj/structure/fluff/walldeco/bath/wallpipes/innie{ + dir = 8 + }, +/obj/structure/fluff/walldeco/bath/wallpipes/innie{ dir = 4 }, -/obj/structure/bars/pipe{ +/obj/structure/fluff/railing/border{ dir = 8 }, /turf/open/floor/concrete, @@ -261,16 +247,22 @@ /turf/open/floor/church/green, /area/under/necropolis) "RU" = ( -/obj/structure/bars/pipe{ - dir = 10 +/obj/structure/fluff/walldeco/bath/wallpipes/innie{ + dir = 4 + }, +/obj/structure/fluff/railing/border{ + dir = 8 }, -/obj/structure/bars/pipe, /turf/open/floor/concrete, /area/under/necropolis) "SE" = ( /obj/structure/chair/bench/church/smallbench{ dir = 4 }, +/obj/structure/fluff/railing/border{ + icon_state = "border"; + dir = 10 + }, /turf/open/floor/church/green, /area/under/necropolis) "TH" = ( @@ -284,7 +276,12 @@ /turf/open/floor/church/rust, /area/under/necropolis) "Vk" = ( -/obj/structure/bars/pipe, +/obj/structure/fluff/walldeco/bath/wallpipes/innie{ + dir = 4 + }, +/obj/structure/fluff/railing/border{ + dir = 4 + }, /turf/open/floor/concrete, /area/under/necropolis) "YJ" = ( @@ -353,7 +350,7 @@ dT Gm Gm gS -kV +Rc gS gS dT @@ -364,10 +361,10 @@ cv Qp bt dT -bC -bC +is +is gS -FQ +OL gS Vk YJ @@ -382,8 +379,8 @@ pd pd gS LS -ib -ib +sB +sB dT "} (7,1,1) = {" @@ -395,9 +392,9 @@ Ga ce Gt gS -Fg -ib -ib +sB +sB +sB dT "} (8,1,1) = {" @@ -431,7 +428,7 @@ qJ (10,1,1) = {" dT yJ -Fg +sB gS Rc nZ @@ -445,13 +442,13 @@ oM (11,1,1) = {" dT sB -Fg +sB gS EP Zo xd IS -Zo +bC wt ny oM diff --git a/_maps/map_files/domotan/domotan_east.dmm b/_maps/map_files/domotan/domotan_east.dmm index 7f80563aeb5..8cec8513f62 100644 --- a/_maps/map_files/domotan/domotan_east.dmm +++ b/_maps/map_files/domotan/domotan_east.dmm @@ -2483,13 +2483,6 @@ }, /turf/open/floor/ruinedwood/turned, /area/outdoors/hellwatch) -"Gs" = ( -/obj/structure/bars/pipe{ - pixel_y = 8 - }, -/obj/structure/bars/grille, -/turf/open/water/ocean/abyss, -/area/under/necropolis) "Gv" = ( /obj/structure/fluff/walldeco/church/line, /turf/open/floor/churchrough, @@ -3148,12 +3141,6 @@ /obj/structure/closet/crate/coffin, /turf/open/floor/ruinedwood/turned/darker, /area/indoors/hellwatch) -"Ox" = ( -/obj/structure/bars/pipe{ - pixel_y = 8 - }, -/turf/open/water/ocean/abyss, -/area/under/necropolis) "Oz" = ( /obj/effect/landmark/map_load_mark/necropolis/z1, /turf/closed/mineral/bedrock, @@ -170277,7 +170264,7 @@ Lu Sb Sb aJ -Gs +OC sk uk HC @@ -170534,14 +170521,14 @@ Lu Sb aJ aJ -Gs +OC YT uk Sb pt pt Sb -Gs +OC Sb Sb Sb @@ -170791,14 +170778,14 @@ Lu Sb Sb Sb -Ox +Sb YT uk Sb pt pt HC -Gs +OC Sb Sb Sb diff --git a/_maps/map_files/domotan/domotan_north.dmm b/_maps/map_files/domotan/domotan_north.dmm index e6aaacdb5c6..73423c21966 100644 --- a/_maps/map_files/domotan/domotan_north.dmm +++ b/_maps/map_files/domotan/domotan_north.dmm @@ -3324,10 +3324,6 @@ }, /obj/structure/bars, /obj/structure/fluff/steamvent, -/obj/structure/bars/pipe{ - dir = 4; - pixel_x = -10 - }, /turf/open/floor/metal, /area/latejoin_area) "SE" = ( diff --git a/_maps/map_files/domotan/old_doma.dmm b/_maps/map_files/domotan/old_doma.dmm index 2af5a5d8467..709c0f78dba 100644 --- a/_maps/map_files/domotan/old_doma.dmm +++ b/_maps/map_files/domotan/old_doma.dmm @@ -645,6 +645,10 @@ "axn" = ( /turf/open/floor/blocks, /area/under/town/basement) +"axE" = ( +/obj/structure/chair/stool, +/turf/open/floor/wood, +/area/indoors/town) "axI" = ( /obj/structure/fluff/railing/tall/retaining, /turf/open/water/river{ @@ -1331,8 +1335,10 @@ pixel_y = 32; pixel_x = 28 }, +/obj/item/rope, +/obj/structure/rack, /turf/open/floor/wood, -/area/outdoors/beach) +/area/outdoors/beach/boat) "aYb" = ( /obj/structure/fluff/railing/border{ dir = 4 @@ -3356,7 +3362,7 @@ /area/indoors/town/tavern) "cxO" = ( /obj/machinery/light/fueled/torchholder/l, -/turf/open/floor/ruinedwood/two, +/turf/open/floor/ruinedwood/spiralfade, /area/indoors/town) "cxT" = ( /obj/structure/fluff/railing/wood{ @@ -3691,6 +3697,10 @@ /obj/structure/fluff/railing/wood, /turf/open/water/sewer, /area/indoors/town/clinic_large) +"cHt" = ( +/obj/structure/closet/crate/chest/old_crate, +/turf/open/floor/ruinedwood/spiralfade, +/area/indoors/town) "cHy" = ( /obj/structure/bed/wool, /obj/item/bedsheet/pelt, @@ -6113,7 +6123,7 @@ /area/outdoors/town/roofs) "exk" = ( /turf/closed/wall/mineral/wood, -/area/outdoors/beach) +/area/outdoors/beach/boat) "exV" = ( /obj/structure/bookcase/random/archive, /obj/machinery/light/fueledstreet/blue/wall{ @@ -6560,6 +6570,10 @@ /obj/structure/table/wood, /turf/open/floor/ruinedwood, /area/indoors/town/keep) +"eNL" = ( +/obj/machinery/light/fueled/torchholder/c, +/turf/open/floor/wood, +/area/outdoors/beach/boat) "eNV" = ( /obj/structure/fluff/railing/wood{ dir = 8 @@ -7101,6 +7115,10 @@ }, /turf/open/floor/ruinedwood/turned, /area/outdoors/town) +"feS" = ( +/obj/effect/landmark/backup_join, +/turf/open/floor/ruinedwood/spiralfade, +/area/indoors/town) "ffp" = ( /obj/effect/decal/cobbleedge{ dir = 4 @@ -7526,6 +7544,12 @@ "fxN" = ( /turf/closed/wall/mineral/stone/moss, /area/under/cavewet) +"fxQ" = ( +/obj/structure/closet/crate/chest/crate, +/obj/item/fishing/line/bobber, +/obj/item/fishing/line/bobber, +/turf/open/floor/wood, +/area/outdoors/beach/boat) "fxZ" = ( /obj/structure/flora/grass/water, /turf/open/water/ocean, @@ -7746,7 +7770,7 @@ opened = 1 }, /turf/open/floor/woodturned/nosmooth, -/area/outdoors/beach) +/area/outdoors/beach/boat) "fFP" = ( /obj/structure/flora/hotspring_rocks/small/three, /turf/open/floor/grass/cold, @@ -7870,7 +7894,7 @@ icon_state = "border" }, /turf/open/openspace, -/area/outdoors/beach) +/area/outdoors/beach/boat) "fKl" = ( /obj/structure/table/wood/large/corner{ dir = 5 @@ -8167,7 +8191,7 @@ dir = 4 }, /turf/open/floor/wood, -/area/outdoors/beach) +/area/outdoors/beach/boat) "fWI" = ( /obj/structure/curtain/bounty{ color = "grey" @@ -8247,12 +8271,11 @@ /turf/open/floor/cobble, /area/outdoors/town/docksmortimer) "fYx" = ( -/obj/structure/table/wood{ - dir = 1; - icon_state = "longtable" +/obj/structure/fluff/railing/border{ + dir = 8 }, /turf/open/floor/ruinedwood/darker, -/area/outdoors/beach) +/area/outdoors/beach/boat) "fYO" = ( /obj/effect/decal/cobbleedge{ dir = 8; @@ -8437,7 +8460,7 @@ "gdR" = ( /obj/structure/stairs, /turf/open/floor/wood, -/area/outdoors/beach) +/area/outdoors/beach/boat) "geM" = ( /obj/structure/flora/newtree/snow, /turf/open/floor/grass/yel, @@ -9152,7 +9175,7 @@ "gJp" = ( /obj/structure/ladder, /turf/open/floor/wood, -/area/outdoors/beach) +/area/outdoors/beach/boat) "gJy" = ( /obj/structure/window, /obj/structure/curtain/bounty/dir, @@ -11900,6 +11923,15 @@ }, /turf/open/floor/ruinedwood, /area/outdoors/exposed) +"iFW" = ( +/obj/structure/fluff/traveltile{ + aallmig = "arrivals"; + aportalgoesto = "no_escape_2"; + aportalid = "arrivals_out"; + dir = 1 + }, +/turf/open/floor/ruinedwood/spiralfade, +/area/indoors/town) "iGv" = ( /obj/structure/fluff/railing/wood{ dir = 4 @@ -12869,7 +12901,7 @@ /turf/open/water/river, /area/outdoors/town/neighborhood/east) "jox" = ( -/turf/open/floor/ruinedwood/two, +/turf/open/floor/ruinedwood/spiralfade, /area/indoors/town) "joS" = ( /obj/structure/rack/shelf/biggest, @@ -13172,6 +13204,10 @@ /obj/structure/flora/grass, /turf/open/floor/sand/sandstone, /area/indoors/town/waterworks) +"jzH" = ( +/obj/structure/fermentation_keg, +/turf/open/floor/ruinedwood/alt, +/area/indoors/town) "jzM" = ( /obj/structure/fluff/telescope, /obj/structure/fluff/railing/wood{ @@ -13537,6 +13573,15 @@ }, /turf/open/openspace, /area/outdoors/town/roofs) +"jOJ" = ( +/obj/structure/fluff/railing/border{ + dir = 1; + icon_state = "border" + }, +/obj/structure/closet/crate/chest/crate, +/obj/item/fishing/lure/deluxe, +/turf/open/floor/woodturned/nosmooth, +/area/outdoors/beach/boat) "jOL" = ( /obj/structure/chair/wood/alt/chair3{ dir = 4 @@ -14114,7 +14159,7 @@ /area/indoors/town/tavern) "khB" = ( /turf/open/floor/wood, -/area/outdoors/beach) +/area/outdoors/beach/boat) "khP" = ( /obj/structure/fluff/railing/wood{ dir = 1; @@ -14743,6 +14788,10 @@ /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/cobblerock, /area/outdoors/exposed) +"kBi" = ( +/obj/structure/train/carriage/not_train/far_travel, +/turf/open/floor/ruinedwood/spiralfade, +/area/indoors/town) "kBk" = ( /obj/machinery/light/fueled/torchholder/r, /turf/open/openspace, @@ -15232,6 +15281,11 @@ }, /turf/open/floor/ruinedwood/spiralfade, /area/indoors/town/shop) +"kYV" = ( +/obj/structure/closet/crate/chest/crate, +/obj/item/fishing/line/sinker, +/turf/open/floor/wood, +/area/indoors/town) "kZu" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/grass/cold, @@ -15319,14 +15373,10 @@ /turf/open/floor/greenstone, /area/indoors/town/clinic_large) "lec" = ( -/obj/structure/fluff/traveltile{ - aallmig = "arrivals"; - aportalgoesto = "no_escape_2"; - aportalid = "arrivals_out"; - dir = 1 - }, -/turf/open/floor/ruinedwood/two, -/area/indoors/town) +/obj/structure/closet/crate/chest/neu, +/obj/item/fishing/lure/gray, +/turf/open/floor/wood, +/area/outdoors/beach/boat) "leq" = ( /obj/structure/bed, /obj/item/bedsheet/cloth, @@ -15458,6 +15508,11 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass/cold, /area/outdoors/town) +"lko" = ( +/obj/item/rope, +/obj/structure/rack, +/turf/open/floor/wood, +/area/outdoors/beach/boat) "lkq" = ( /obj/item/reagent_containers/glass/bottle/manapot, /obj/item/reagent_containers/glass/bottle/healthpot, @@ -15811,7 +15866,7 @@ pixel_y = 33 }, /turf/open/floor/ruinedwood/darker, -/area/outdoors/beach) +/area/outdoors/beach/boat) "lyG" = ( /obj/structure/bed/wool, /obj/structure/bed/wool{ @@ -17430,12 +17485,11 @@ /turf/open/floor/wood, /area/indoors/town/keep) "mvZ" = ( -/obj/structure/table/wood{ - dir = 1; - icon_state = "longtable_mid" +/obj/structure/ship_wheel{ + dir = 2 }, /turf/open/floor/ruinedwood/darker, -/area/outdoors/beach) +/area/outdoors/beach/boat) "mwk" = ( /obj/structure/chair/wood/alt/chair_noble{ dir = 1 @@ -17513,7 +17567,7 @@ dir = 1 }, /turf/open/floor/woodturned/nosmooth, -/area/outdoors/beach) +/area/outdoors/beach/boat) "mzt" = ( /obj/item/bedsheet/pelt, /obj/effect/landmark/start/servant{ @@ -17939,7 +17993,7 @@ dir = 4 }, /turf/open/floor/ruinedwood/darker, -/area/outdoors/beach) +/area/outdoors/beach/boat) "mNn" = ( /obj/structure/stairs/stone, /obj/structure/fluff/railing/border{ @@ -18268,11 +18322,10 @@ /turf/open/floor/concrete, /area/under/town/basement) "mZA" = ( -/obj/structure/table/wood{ - dir = 8; - icon_state = "longtable" - }, -/turf/open/floor/ruinedwood/two, +/obj/structure/closet/crate/chest, +/obj/item/fishing/lure/speckled, +/obj/item/fishing/lure/dough, +/turf/open/floor/wood, /area/indoors/town) "mZG" = ( /obj/structure/hotspring/border/three, @@ -18443,6 +18496,9 @@ }, /turf/open/floor/church, /area/indoors/town/church) +"nhm" = ( +/turf/closed/wall/mineral/wooddark, +/area/outdoors/beach/boat) "nhA" = ( /obj/structure/fluff/railing/border, /obj/structure/table/wood/plain, @@ -18467,8 +18523,7 @@ /area/indoors/town/church) "nig" = ( /obj/machinery/light/fueled/torchholder/r, -/obj/structure/closet/crate/chest/old_crate, -/turf/open/floor/ruinedwood/two, +/turf/open/floor/ruinedwood/spiralfade, /area/indoors/town) "niG" = ( /turf/open/floor/blocks/stonered, @@ -18503,9 +18558,8 @@ /turf/closed/wall/mineral/stone/moss, /area/outdoors/town/noble_manor/blue) "nkH" = ( -/obj/structure/closet/crate/chest/old_crate, -/turf/open/floor/ruinedwood/two, -/area/indoors/town) +/turf/open/openspace, +/area/outdoors/beach/boat) "nkM" = ( /turf/open/openspace, /area/indoors/town/keep/archivist) @@ -18679,7 +18733,7 @@ dir = 8 }, /turf/open/openspace, -/area/outdoors/beach) +/area/outdoors/beach/boat) "npz" = ( /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/grass/yel, @@ -19004,7 +19058,7 @@ pixel_y = 34 }, /turf/open/floor/ruinedwood/darker, -/area/outdoors/beach) +/area/outdoors/beach/boat) "nCE" = ( /obj/machinery/light/fueled/hearth, /obj/item/reagent_containers/glass/bucket/pot, @@ -19207,7 +19261,7 @@ "nKP" = ( /obj/machinery/light/fueled/lanternpost/fixed, /turf/open/floor/ruinedwood/darker, -/area/outdoors/beach) +/area/outdoors/beach/boat) "nLb" = ( /turf/open/floor/herringbone, /area/indoors/town) @@ -20238,7 +20292,7 @@ dir = 9 }, /turf/open/openspace, -/area/outdoors/beach) +/area/outdoors/beach/boat) "ovZ" = ( /obj/structure/flora/newtree/snow, /turf/open/floor/snow, @@ -20840,7 +20894,7 @@ /area/indoors/town/church) "oSe" = ( /turf/open/floor/ruinedwood/darker, -/area/outdoors/beach) +/area/outdoors/beach/boat) "oTw" = ( /obj/structure/table/wood/crafted, /obj/machinery/light/fueled/wallfire/candle/l, @@ -20898,6 +20952,7 @@ /area/outdoors/town) "oVP" = ( /obj/machinery/light/fueled/torchholder/r, +/obj/machinery/light/fueled/hearth, /turf/open/floor/wood, /area/indoors/town) "oWd" = ( @@ -21102,6 +21157,10 @@ /mob/living/simple_animal/hostile/retaliate/goat, /turf/open/floor/snow, /area/outdoors/town) +"pcx" = ( +/obj/effect/spawner/map_spawner/hauntz_random, +/turf/open/floor/grass/yel, +/area/outdoors/town) "pcy" = ( /obj/item/reagent_containers/glass/bucket/wooden, /turf/open/floor/ruinedwood/two, @@ -21167,6 +21226,7 @@ /area/under/town/sewer) "pfz" = ( /obj/machinery/light/fueled/torchholder/l, +/obj/structure/table/wood/plain, /turf/open/floor/wood, /area/indoors/town) "pfD" = ( @@ -21799,7 +21859,7 @@ pixel_y = -10 }, /turf/open/floor/wood, -/area/outdoors/beach) +/area/outdoors/beach/boat) "pCB" = ( /obj/structure/table/wood/reinf_long{ dir = 8 @@ -21881,7 +21941,7 @@ pixel_y = 7 }, /turf/open/openspace, -/area/outdoors/beach) +/area/outdoors/beach/boat) "pGD" = ( /obj/structure/stairs{ dir = 1 @@ -21927,6 +21987,11 @@ }, /turf/open/floor/wood/nosmooth, /area/indoors/soilsons) +"pIB" = ( +/obj/structure/closet/crate/chest/crate, +/obj/effect/spawner/map_spawner/random_lure, +/turf/open/floor/wood, +/area/outdoors/beach/boat) "pIO" = ( /obj/structure/door/green{ name = "Garrison" @@ -22335,7 +22400,7 @@ "pXL" = ( /obj/machinery/light/fueled/torchholder/r, /turf/open/floor/wood, -/area/outdoors/beach) +/area/outdoors/beach/boat) "pXU" = ( /obj/structure/window/openclose, /turf/open/floor/tile/checkeralt, @@ -25765,7 +25830,7 @@ pixel_y = 33 }, /turf/open/floor/wood, -/area/outdoors/beach) +/area/outdoors/beach/boat) "sBU" = ( /obj/structure/fluff/walldeco/vinez, /turf/closed/wall/mineral/craftstone, @@ -25954,7 +26019,7 @@ dir = 5 }, /turf/open/openspace, -/area/outdoors/beach) +/area/outdoors/beach/boat) "sJd" = ( /obj/structure/door/viewport{ name = "Steward"; @@ -26788,7 +26853,7 @@ "tpR" = ( /obj/structure/ladder, /turf/open/floor/ruinedwood/darker, -/area/outdoors/beach) +/area/outdoors/beach/boat) "tqy" = ( /turf/open/floor/sand/sandstone, /area/outdoors/town/neighborhood/west) @@ -28419,7 +28484,7 @@ pixel_x = 28 }, /turf/open/floor/ruinedwood/darker, -/area/outdoors/beach) +/area/outdoors/beach/boat) "uDo" = ( /obj/effect/decal/cobbleedge{ dir = 10; @@ -28726,7 +28791,7 @@ "uNt" = ( /obj/structure/closet/crate/chest/crate, /obj/structure/rack/shelf, -/turf/open/floor/ruinedwood/two, +/turf/open/floor/ruinedwood/spiralfade, /area/indoors/town) "uNu" = ( /obj/structure/fluff/railing/border{ @@ -28760,7 +28825,7 @@ }, /obj/structure/closet/crate/chest/crate, /turf/open/floor/woodturned/nosmooth, -/area/outdoors/beach) +/area/outdoors/beach/boat) "uOL" = ( /obj/structure/fluff/railing/border, /obj/machinery/light/fueled/torchholder/r, @@ -28804,7 +28869,7 @@ /area/outdoors/town/neighborhood) "uPX" = ( /obj/structure/door/red, -/turf/open/floor/ruinedwood/two, +/turf/open/floor/ruinedwood/spiralfade, /area/indoors/town) "uQd" = ( /obj/effect/landmark/start/monk, @@ -29044,11 +29109,11 @@ /turf/open/floor/ruinedwood, /area/outdoors/town/roofs) "uWs" = ( -/obj/structure/table/wood{ - icon_state = "longtable" +/obj/structure/fluff/railing/border{ + dir = 4 }, /turf/open/floor/ruinedwood/darker, -/area/outdoors/beach) +/area/outdoors/beach/boat) "uWy" = ( /obj/structure/fluff/railing/wood{ dir = 8; @@ -29647,7 +29712,6 @@ /turf/open/floor/dirt/road, /area/outdoors/town) "vvC" = ( -/obj/structure/flora/grass, /obj/effect/landmark/mapGenerator/domotan/field, /turf/closed/mineral/bedrock, /area) @@ -29851,7 +29915,7 @@ dir = 4 }, /turf/open/openspace, -/area/outdoors/beach) +/area/outdoors/beach/boat) "vEy" = ( /obj/structure/chair/stool, /turf/open/floor/naturalstone, @@ -30732,7 +30796,7 @@ dir = 10 }, /turf/open/openspace, -/area/outdoors/beach) +/area/outdoors/beach/boat) "wkq" = ( /obj/structure/ladder, /obj/structure/fluff/railing/wood{ @@ -30786,7 +30850,7 @@ dir = 5 }, /turf/open/floor/wood, -/area/outdoors/beach) +/area/outdoors/beach/boat) "wlu" = ( /obj/structure/stairs{ dir = 8 @@ -30870,7 +30934,7 @@ /area/outdoors/exposed) "wnG" = ( /obj/structure/closet/crate/chest/crate, -/turf/open/floor/ruinedwood/two, +/turf/open/floor/ruinedwood/spiralfade, /area/indoors/town) "wnI" = ( /obj/structure/fluff/wallclock{ @@ -31528,7 +31592,7 @@ dir = 6 }, /turf/open/openspace, -/area/outdoors/beach) +/area/outdoors/beach/boat) "wLm" = ( /turf/open/floor/sand/sandstone, /area/outdoors/town) @@ -32973,7 +33037,7 @@ "xJO" = ( /obj/structure/fluff/railing/border, /turf/open/openspace, -/area/outdoors/beach) +/area/outdoors/beach/boat) "xKb" = ( /obj/structure/flora/grass/water/reeds, /obj/structure/fluff/railing/tall/retaining{ @@ -33205,7 +33269,7 @@ "xTQ" = ( /obj/machinery/light/fueled/torchholder/l, /turf/open/floor/wood, -/area/outdoors/beach) +/area/outdoors/beach/boat) "xUa" = ( /obj/item/bedsheet/cloth, /obj/effect/landmark/start/mercenary, @@ -33597,7 +33661,7 @@ dir = 8 }, /turf/open/floor/ruinedwood/darker, -/area/outdoors/beach) +/area/outdoors/beach/boat) "ygT" = ( /obj/structure/flora/grass, /turf/open/floor/dirt/road, @@ -33644,6 +33708,11 @@ "yhT" = ( /turf/closed/wall/mineral/decowood/vert, /area/indoors/soilsons) +"yhX" = ( +/obj/structure/closet/crate/chest/wicker, +/obj/item/fishing/lure/meat, +/turf/open/floor/wood, +/area/indoors/town) "yic" = ( /obj/structure/fluff/wallclock{ dir = 3 @@ -52953,9 +53022,9 @@ daq daq daq cgK -cgK +jzH tiz -jox +cHt jox wnG daq @@ -53087,7 +53156,7 @@ gaA sfu sfu tiz -mZA +jox jox daq daq @@ -53221,7 +53290,7 @@ sfu tiz jox jox -jox +iFW daq tiz kqx @@ -53353,8 +53422,8 @@ daq daq jox jox -jox -lec +iFW +daq tiz kqx kqx @@ -53485,8 +53554,8 @@ cxO jox jox jox -jox -lec +daq +daq tiz awb kqx @@ -53617,7 +53686,7 @@ jox jox jox jox -daq +kBi daq tiz kqx @@ -53744,12 +53813,12 @@ daq daq daq daq +feS jox +feS jox -jox -nkH nig -jox +kBi daq tiz kqx @@ -68436,7 +68505,7 @@ aCt aCt cRP uGC -aCt +nzI wyv "} (14,1,3) = {" @@ -68565,7 +68634,7 @@ aJX aJX aCt aCt -uGC +gue uGC uGC aCt @@ -69328,7 +69397,7 @@ pXL khB khB gdR -yiQ +nhm llZ vsg aJX @@ -69448,7 +69517,7 @@ aJX aJX iFr fmn -yiQ +nhm khB fWy fWy @@ -69583,9 +69652,9 @@ khB xTQ khB mzn -qxY -qxY -uOb +nkH +nkH +jOJ khB khB tiz @@ -69710,18 +69779,18 @@ aJX aJX iFr fmn -yiQ +nhm khB khB khB mzn -qxY -qxY +nkH +nkH uOb khB khB tiz -rmh +axE rmh pKD xGl @@ -69841,8 +69910,8 @@ aJX aJX aJX lvi -yiQ -yiQ +nhm +nhm gJp khB khB @@ -69850,9 +69919,9 @@ fFN exk exk exk +eNL khB -khB -tiz +cvf rmh rmh pKD @@ -69974,14 +70043,14 @@ aJX aJX xhV bcG -yiQ -khB -khB -khB +nhm khB khB khB khB +lec +fxQ +pIB khB khB cvf @@ -70116,10 +70185,10 @@ khB khB khB khB -cvf -rmh -rmh -rmh +tiz +mZA +yhX +kYV oVP tiz lCt @@ -70240,7 +70309,7 @@ aJX aJX xhV bcG -yiQ +nhm khB khB khB @@ -70375,7 +70444,7 @@ xhV pkv bcG aXO -khB +lko khB khB khB @@ -70384,7 +70453,7 @@ xTQ khB khB gdR -yiQ +nhm klN tBA aJX @@ -82030,7 +82099,7 @@ aJX uGC uGC aCt -aCt +nzI aCt aCt wyv @@ -82295,7 +82364,7 @@ aCt aCt aCt aCt -aCt +nzI aCt wyv "} @@ -82555,7 +82624,7 @@ aJX aJX aJX aCt -aCt +nzI aCt aCt aCt @@ -82690,7 +82759,7 @@ aCt aCt aCt aCt -aCt +pcx aCt aCt wyv @@ -82820,7 +82889,7 @@ aJX aJX aCt aCt -aCt +nzI aCt aCt aCt @@ -85819,11 +85888,11 @@ fNx pcT qmB dkT -qxY -qxY -qxY -qxY -qxY +nkH +nkH +nkH +nkH +nkH wLh vDW vDW @@ -85951,16 +86020,16 @@ pcT kdu oSe pGt -qxY -qxY -qxY -qxY -qxY +nkH +nkH +nkH +nkH +nkH xJO lyC oSe oSe -yiQ +nhm oSe oSe nKP @@ -86083,11 +86152,11 @@ kdu oSe oSe pGt -qxY -qxY -qxY -qxY -qxY +nkH +nkH +nkH +nkH +nkH xJO oSe oSe @@ -86345,14 +86414,14 @@ jBB nCx oSe tpR -yiQ -qxY +nhm +nkH xJO oSe oSe oSe fJx -xJO +nkH mvZ oSe oSe @@ -86611,11 +86680,11 @@ tzK oSe oSe pGt -qxY -qxY -qxY -qxY -qxY +nkH +nkH +nkH +nkH +nkH xJO oSe oSe @@ -86743,16 +86812,16 @@ lgQ tzK oSe pGt -qxY -qxY -qxY -qxY -qxY +nkH +nkH +nkH +nkH +nkH xJO uCX oSe oSe -yiQ +nhm oSe oSe oSe @@ -86875,11 +86944,11 @@ fNx lgQ mJA usB -qxY -qxY -qxY -qxY -qxY +nkH +nkH +nkH +nkH +nkH wjs npo npo