diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm index 3fb33796f61..0357863726c 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm @@ -1,50 +1,57 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/closed/mineral/random, -/area/icemoon/surface/outdoors/unexplored) +/turf/open/genturf, +/area/mine/unexplored) "b" = ( /turf/closed/mineral/random/snow, -/area/icemoon/surface/outdoors/unexplored) +/area/icemoon/surface) "c" = ( /turf/closed/wall/mineral/bronze, /area/icemoon/surface) "d" = ( /obj/structure/fluff/clockwork/fallen_armor, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze, /area/icemoon/surface) "i" = ( -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze, /area/icemoon/surface) "k" = ( /obj/structure/fluff/clockwork/alloy_shards, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze, /area/icemoon/surface) "n" = ( /obj/effect/mob_spawn/human/skeleton, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze, /area/icemoon/surface) "p" = ( /obj/structure/fluff/clockwork/alloy_shards/large, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze, /area/icemoon/surface) "r" = ( /obj/structure/fluff/clockwork/blind_eye, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze, /area/icemoon/surface) "u" = ( /obj/structure/table/bronze, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze, /area/icemoon/surface) "v" = ( /obj/structure/fluff/clockwork/alloy_shards/medium_gearbit, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze, +/area/icemoon/surface) +"w" = ( +/turf/open/floor/bronze{ + initial_gas_mix = "TEMP=2.7" + }, /area/icemoon/surface) "x" = ( /obj/effect/mob_spawn/human/skeleton, /obj/item/clothing/suit/bronze, /obj/item/clothing/shoes/bronze, /obj/item/clothing/head/bronze, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze{ + initial_gas_mix = "TEMP=2.7" + }, /area/icemoon/surface) "z" = ( /obj/structure/table/bronze, @@ -52,38 +59,38 @@ desc = "You can still feel the embers of a once great empire in your hand..."; name = "drained clockwork slab" }, -/turf/open/floor/bronze/icemoon, -/area/icemoon/surface) -"H" = ( -/obj/machinery/door/airlock/bronze/seethru, -/obj/structure/fans/tiny, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze, /area/icemoon/surface) "P" = ( /obj/structure/fluff/clockwork/clockgolem_remains, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze, /area/icemoon/surface) "Q" = ( /obj/item/paper{ info = "We tried to use the power of this moon to bring him back, but we've failed... I've contained what remains of his power here... if you find this, make sure those Nar-Sian Dogs don't last a second." }, /obj/item/pen, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze{ + initial_gas_mix = "TEMP=2.7" + }, /area/icemoon/surface) "R" = ( /obj/item/nullrod/spear{ name = "empowered bronze spear" }, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze{ + initial_gas_mix = "TEMP=2.7" + }, /area/icemoon/surface) "U" = ( -/obj/machinery/door/airlock/bronze, -/obj/structure/fans/tiny, -/turf/open/floor/bronze/icemoon, +/obj/machinery/door/airlock/bronze{ + use_power = 0 + }, +/turf/open/floor/bronze, /area/icemoon/surface) "V" = ( /obj/structure/fluff/clockwork/alloy_shards/medium, -/turf/open/floor/bronze/icemoon, +/turf/open/floor/bronze, /area/icemoon/surface) (1,1,1) = {" @@ -274,8 +281,8 @@ a c c c -H -H +U +U c c c @@ -862,8 +869,8 @@ a a a c -i -i +w +w c a a @@ -889,7 +896,7 @@ b U k n -H +U a a a @@ -903,10 +910,10 @@ a a a a -i +w x -i -i +w +w a a a @@ -920,7 +927,7 @@ a a a a -H +U n i U @@ -931,7 +938,7 @@ b U i P -H +U a a a @@ -945,10 +952,10 @@ a a a a -i +w R Q -i +w a a a @@ -962,7 +969,7 @@ a a a a -H +U v d U @@ -988,8 +995,8 @@ a a a c -i -i +w +w c a a @@ -1576,8 +1583,8 @@ a c c c -H -H +U +U c c c diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm index efd3d51c1f9..840a31f90fd 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm @@ -42,7 +42,7 @@ /area/icemoon/surface/outdoors) "i" = ( /turf/template_noop, -/area/icemoon/surface/outdoors/unexplored) +/area/template_noop) "j" = ( /obj/structure/sink/kitchen, /turf/open/floor/wood, @@ -93,9 +93,17 @@ /turf/open/floor/wood, /area/ruin/unpowered) "u" = ( -/obj/structure/ladder, +/obj/structure/ladder{ + travel_time = 40 + }, /turf/open/floor/wood, /area/ruin/unpowered) +"G" = ( +/turf/open/openspace/icemoon/ruins, +/area/icemoon/surface/outdoors) +"Q" = ( +/turf/open/openspace/icemoon, +/area/template_noop) (1,1,1) = {" i @@ -132,17 +140,17 @@ i i i i -i -d -d -d -d -d -d -d -d -i -i +G +G +G +G +G +G +G +G +G +G +G i i i @@ -157,20 +165,20 @@ i i i i -d -d -d -d -d -d -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G +G +G +G +G +G +G i i i @@ -183,22 +191,22 @@ i i i d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G i i i @@ -209,24 +217,24 @@ i i i i -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G i i i @@ -235,26 +243,26 @@ i (6,1,1) = {" i i -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G i i i @@ -262,67 +270,67 @@ i (7,1,1) = {" i i -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -i +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G i i "} (8,1,1) = {" i -i -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -d -i +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G +G i i "} (9,1,1) = {" i -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G b b b @@ -330,25 +338,25 @@ b b b b -d -d -d -d -d -d -d -i +G +G +G +G +G +G +G +G i "} (10,1,1) = {" i -d -d -d -d -d -d -d +G +G +G +G +G +G +G b b b @@ -358,24 +366,24 @@ b b b b -d -d -d -d -d -d -i +G +G +G +G +G +G +G i "} (11,1,1) = {" i -d -d -d -d -d -d -d +G +G +G +G +G +G +G b b c @@ -385,24 +393,24 @@ o q b b -d -d -d -d -d -d -d +G +G +G +G +G +G +G i "} (12,1,1) = {" i -d -d -d -d -d -d -d +G +G +G +G +G +G +G b b e @@ -412,24 +420,24 @@ f r b b -d -d -d -d -d -d -d +G +G +G +G +G +G +G i "} (13,1,1) = {" i -d -d -d -d -d -d -d +G +G +G +G +G +G +G b b f @@ -439,24 +447,24 @@ f s b b -d -d -d -d -d -d -d +G +G +G +G +G +G +G i "} (14,1,1) = {" i -d -d -d -d -d -d -d +G +G +G +G +G +G +G b b g @@ -466,24 +474,24 @@ f s b b -d -d -d -d -d -d -d +G +G +G +G +G +G +G i "} (15,1,1) = {" i -d -d -d -d -d -d -d +G +G +G +G +G +G +G b b f @@ -493,24 +501,24 @@ f s b b -d -d -d -d -d -d -d +G +G +G +G +G +G +G i "} (16,1,1) = {" i -d -d -d -d -d -d -d +G +G +G +G +G +G +G b b j @@ -520,24 +528,24 @@ f s b b -d -d -d -d -d -d -d +G +G +G +G +G +G +G i "} (17,1,1) = {" i -d -d -d -d -d -d -d +G +G +G +G +G +G +G b b k @@ -547,24 +555,24 @@ f s b b -d -d -d -d -d -d -d +G +G +G +G +G +G +G i "} (18,1,1) = {" i -d -d -d -d -d -d -d +G +G +G +G +G +G +G b b l @@ -574,24 +582,24 @@ f u b b -d -d -d -d -d -d -d +G +G +G +G +G +G +G i "} (19,1,1) = {" i -d -d -d -d -d -d -d +G +G +G +G +G +G +G b b b @@ -601,25 +609,25 @@ p b b b -d -d -d -d -d -d -d +G +G +G +G +G +G +G i "} (20,1,1) = {" i -i -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G b b b @@ -627,120 +635,120 @@ f b b b -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G i "} (21,1,1) = {" i -i -d -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G +G +G b f b -d -d -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G +G +G i "} (22,1,1) = {" i -i -d -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G +G +G b f b -d -d -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G +G +G i "} (23,1,1) = {" i -i -d -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G +G +G b f b -d -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G +G i i "} (24,1,1) = {" i i -d -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G +G b n b -d -d -d -d -d -d -d -d +G +G +G +G +G +G +G +G d i i @@ -749,24 +757,24 @@ i i i i -d -d -d -d -d -d -d +G +G +G +G +G +G +G a h h h a -d -d -d -d -d -d +G +G +G +G +G +G d i i @@ -777,11 +785,11 @@ i i i d -d -d -d -d -d +G +G +G +G +G a a a @@ -789,10 +797,10 @@ h a a a -d -d -d -d +G +G +G +G d d i @@ -805,9 +813,9 @@ i i i d -d -d -d +G +G +G a a a @@ -817,8 +825,8 @@ a a a a -d -d +G +G d d i @@ -846,7 +854,7 @@ a a a d -d +Q i i i diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm index 9e8d7c5c471..7f809f10a24 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm @@ -1,14 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/closed/mineral/random/volcanic, -/area/icemoon/underground/unexplored) "b" = ( /turf/closed/mineral/random/snow, /area/icemoon/underground/unexplored) -"d" = ( -/obj/item/grown/bananapeel, -/turf/open/floor/iron/cult, -/area/icemoon/underground) "h" = ( /obj/item/paper{ info = "We have managed to seal the beast inside, the last of its kind they say... unfortunately in doing so, it seems we have spawned creatures beyond our power to contain..." @@ -18,8 +11,16 @@ initial_gas_mix = "LAVALAND_ATMOS" }, /area/icemoon/underground) -"m" = ( -/obj/structure/trap/cult, +"l" = ( +/turf/open/floor/iron/cult, +/area/icemoon/underground) +"o" = ( +/turf/open/genturf, +/area/lavaland/surface/outdoors/unexplored/danger) +"w" = ( +/obj/machinery/door/airlock/cult/friendly{ + use_power = 0 + }, /turf/open/floor/iron/cult, /area/icemoon/underground) "y" = ( @@ -35,11 +36,6 @@ initial_gas_mix = "LAVALAND_ATMOS" }, /area/icemoon/underground) -"H" = ( -/obj/machinery/door/airlock/cult/friendly, -/obj/structure/fans/tiny, -/turf/open/floor/iron/cult, -/area/icemoon/underground) "J" = ( /turf/closed/wall/mineral/cult, /area/icemoon/underground) @@ -49,15 +45,20 @@ "R" = ( /turf/open/floor/mineral/gold, /area/icemoon/underground) -"U" = ( -/turf/open/floor/iron/cult, -/area/icemoon/underground) "V" = ( /obj/item/storage/toolbox/mechanical/old/clean, /turf/open/floor/plating/asteroid{ initial_gas_mix = "LAVALAND_ATMOS" }, /area/icemoon/underground) +"X" = ( +/obj/item/grown/bananapeel, +/turf/open/floor/iron/cult, +/area/icemoon/underground) +"Y" = ( +/obj/structure/trap/cult, +/turf/open/floor/iron/cult, +/area/icemoon/underground) "Z" = ( /turf/open/floor/plating/asteroid{ initial_gas_mix = "LAVALAND_ATMOS" @@ -126,8 +127,8 @@ J J J J -H -H +w +w J J J @@ -167,10 +168,10 @@ J J J J -U -m -U -U +l +Y +l +l J J J @@ -194,40 +195,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o J -U -U -d -U +l +l +X +l J -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -236,40 +237,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J -U -m +l +Y J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -278,40 +279,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J -H -H +w +w J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -320,40 +321,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -362,40 +363,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -404,40 +405,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -446,40 +447,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -488,40 +489,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -530,40 +531,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -572,40 +573,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -614,40 +615,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -656,40 +657,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -698,40 +699,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -740,19 +741,19 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o V Z Z @@ -761,19 +762,19 @@ Z Z Z Z -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -784,17 +785,17 @@ J J J J -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o A J J @@ -803,17 +804,17 @@ J J J Z -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o J J J @@ -823,20 +824,20 @@ b (19,1,1) = {" b J -U -U +l +l J J -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o h J R @@ -845,40 +846,40 @@ P R J Z -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o J J -U -U +l +l J b "} (20,1,1) = {" b -H -m -U -U -H -a -a -a -a -a -a -a -a -a -a +w +Y +l +l +w +o +o +o +o +o +o +o +o +o +o Z J P @@ -887,40 +888,40 @@ R P J Z -a -a -a -a -a -a -a -a -a -a -H -U -U -m -H +o +o +o +o +o +o +o +o +o +o +w +l +l +Y +w b "} (21,1,1) = {" b -H -U -d -m -H -a -a -a -a -a -a -a -a -a -a +w +l +X +Y +w +o +o +o +o +o +o +o +o +o +o Z J P @@ -929,40 +930,40 @@ y P J Z -a -a -a -a -a -a -a -a -a -a -H -m -d -U -H +o +o +o +o +o +o +o +o +o +o +w +Y +X +l +w b "} (22,1,1) = {" b J -U -U +l +l J J -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o Z J R @@ -971,20 +972,20 @@ P R J Z -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o J J -U -U +l +l J b "} @@ -994,17 +995,17 @@ J J J J -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o Z J J @@ -1013,17 +1014,17 @@ J J J Z -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o J J J @@ -1034,19 +1035,19 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o Z Z Z @@ -1055,19 +1056,19 @@ Z Z Z Z -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1076,40 +1077,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1118,40 +1119,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1160,40 +1161,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1202,40 +1203,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1244,40 +1245,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1286,40 +1287,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1328,40 +1329,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1370,40 +1371,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1412,40 +1413,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1454,40 +1455,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1496,40 +1497,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J -H -H +w +w J -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1538,40 +1539,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J -U -m +l +Y J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1580,40 +1581,40 @@ b b J J -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o J -U -U -d -U +l +l +X +l J -a -a -a -a -a -a -a -a -a -a -a -a -a -a +o +o +o +o +o +o +o +o +o +o +o +o +o +o J J b @@ -1637,10 +1638,10 @@ J J J J -U -m -U -U +l +Y +l +l J J J @@ -1680,8 +1681,8 @@ J J J J -H -H +w +w J J J diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm index b504eceff93..8bf7a8a4b83 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm @@ -2,19 +2,15 @@ "a" = ( /turf/open/floor/plating/ice/icemoon, /area/icemoon/underground/explored) -"c" = ( -/obj/structure/ladder, +"b" = ( +/obj/structure/ladder{ + travel_time = 40 + }, /turf/open/floor/plating/ice/icemoon, /area/icemoon/underground/explored) "d" = ( /turf/template_noop, -/area/icemoon/underground/unexplored) -"f" = ( -/obj/item/flashlight/lantern{ - on = 1 - }, -/turf/open/floor/plating/ice/icemoon, -/area/icemoon/underground/explored) +/area/template_noop) "g" = ( /obj/item/clothing/suit/hooded/explorer, /obj/effect/decal/cleanable/blood/gibs/up, @@ -28,10 +24,18 @@ /obj/item/kitchen/knife/combat/survival, /turf/open/floor/plating/ice/icemoon, /area/icemoon/underground/explored) -"T" = ( +"l" = ( +/turf/closed/indestructible/rock/snow/ice/ore, +/area/icemoon/underground/explored) +"V" = ( +/obj/structure/frost_miner_prism, /mob/living/simple_animal/hostile/megafauna/demonic_frost_miner, /turf/open/floor/plating/ice/icemoon, /area/icemoon/underground/explored) +"Z" = ( +/obj/structure/frost_miner_prism, +/turf/open/floor/plating/ice/icemoon, +/area/icemoon/underground/explored) (1,1,1) = {" d @@ -40,19 +44,21 @@ d d d d -d -d -d -d -d -d -d -d -d -d -d -d -d +l +l +l +l +l +l +l +l +l +l +l +l +l +l +l d d d @@ -66,21 +72,23 @@ d d d d -d -d -a -a -a -a -a -a -a -a -a -a -a -d -d +l +l +l +l +l +l +l +l +l +l +l +l +l +l +l +l +l d d d @@ -92,23 +100,25 @@ d d d d -d +l +l +l +l +Z a a a a +Z a a a a -a -a -a -a -a -a -d -d +Z +l +l +l +l d d d @@ -118,7 +128,10 @@ d d d d -d +l +l +l +l a a a @@ -132,11 +145,10 @@ a a a a -a -a -a -d -d +l +l +l +l d d d @@ -144,7 +156,10 @@ d (5,1,1) = {" d d -d +l +l +l +l a a a @@ -160,17 +175,19 @@ a a a a -a -a -a -d -d +l +l +l +l d d "} (6,1,1) = {" d -d +l +l +l +l a a a @@ -188,16 +205,17 @@ a a a a -a -a -a -d -d +l +l +l +l d "} (7,1,1) = {" -d -d +l +l +l +l a a a @@ -217,13 +235,15 @@ a a a a -a -a -d -d +l +l +l +l "} (8,1,1) = {" -d +l +l +l a a a @@ -234,6 +254,7 @@ a a a a +Z a a a @@ -244,13 +265,14 @@ a a a a -a -a -d -d +l +l +l "} (9,1,1) = {" -d +l +l +Z a a a @@ -272,12 +294,13 @@ a a a a -a -a -d +Z +l +l "} (10,1,1) = {" -d +l +l a a a @@ -285,6 +308,7 @@ a a a a +Z a a a @@ -292,6 +316,7 @@ a a a a +Z a a a @@ -299,12 +324,12 @@ a a a a -a -a -d +l +l "} (11,1,1) = {" -d +l +l a a a @@ -328,10 +353,12 @@ a a a a -d +l +l "} (12,1,1) = {" -d +l +l a a a @@ -355,10 +382,12 @@ a a a a -d +l +l "} (13,1,1) = {" -d +l +l a a a @@ -382,10 +411,12 @@ a a a a -d +l +l "} (14,1,1) = {" -d +l +l a a a @@ -397,7 +428,6 @@ a a a a -T a a a @@ -409,10 +439,13 @@ a a a a -d +a +l +l "} (15,1,1) = {" -d +l +l a a a @@ -436,37 +469,41 @@ a a a a -d +l +l "} (16,1,1) = {" -d +l +l +Z +a +a +a +a +Z a a a a a +V a a a a a +Z a a a a -a -a -a -a -a -a -a -a -a -d +Z +l +l "} (17,1,1) = {" -d +l +l a a a @@ -490,10 +527,12 @@ a a a a -d +l +l "} (18,1,1) = {" -d +l +l a a a @@ -507,7 +546,6 @@ a a a a -c a a a @@ -517,10 +555,13 @@ a a a a -d +a +l +l "} (19,1,1) = {" -d +l +l a a a @@ -534,6 +575,7 @@ a a a a +b a a a @@ -543,11 +585,12 @@ a a a a -a -d +l +l "} (20,1,1) = {" -d +l +l a a a @@ -571,10 +614,12 @@ a a a a -d +l +l "} (21,1,1) = {" -d +l +l a a a @@ -598,10 +643,12 @@ a a a a -d +l +l "} (22,1,1) = {" -d +l +l a a a @@ -609,6 +656,7 @@ a a a a +Z a a a @@ -616,6 +664,7 @@ a a a a +Z a a a @@ -623,12 +672,13 @@ a a a a -a -a -d +l +l "} (23,1,1) = {" -d +l +l +Z a a a @@ -650,18 +700,48 @@ a a a a -a -d -d +Z +l +l "} (24,1,1) = {" -d -d +l +l +l +a +a +a +a +a +a +a +a +a +a +Z +a +a +a +a +a +a +a +a +a +a +l +l +l +"} +(25,1,1) = {" +l +l +l +l a a a a -f i a a @@ -677,15 +757,17 @@ a a a a -d -d -d +l +l +l +l "} -(25,1,1) = {" +(26,1,1) = {" d -d -d -a +l +l +l +l a a a @@ -703,17 +785,19 @@ a a a a -d -d -d +l +l +l +l d "} -(26,1,1) = {" +(27,1,1) = {" d d -d -d -a +l +l +l +l a a h @@ -729,36 +813,10 @@ a a a a -d -d -d -d -d -"} -(27,1,1) = {" -d -d -d -d -d -a -a -a -a -a -a -a -a -a -a -a -a -a -a -d -d -d -d +l +l +l +l d d "} @@ -766,10 +824,10 @@ d d d d -d -d -d -d +l +l +l +l a a a @@ -781,10 +839,12 @@ a a a a -d -d -d -d +a +a +l +l +l +l d d d @@ -794,21 +854,81 @@ d d d d +l +l +l +l +Z +a +a +a +a +Z +a +a +a +a +Z +l +l +l +l +d +d +d +d +"} +(30,1,1) = {" +d +d +d +d +d +l +l +l +l +l +l +l +l +l +l +l +l +l +l +l +l +l +d +d +d +d +d +"} +(31,1,1) = {" d d d d d d -d -d -d -d -d -d -d -d -d +l +l +l +l +l +l +l +l +l +l +l +l +l +l +l d d d diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm index e8dac23fd0e..6bdbee4d7d8 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( /turf/template_noop, -/area/icemoon/underground/unexplored) +/area/template_noop) "b" = ( /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/explored) diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm index 79787c7fb05..633bd6a8432 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_wendigo_cave.dmm @@ -7,7 +7,7 @@ /area/icemoon/underground/unexplored) "d" = ( /turf/template_noop, -/area/icemoon/underground/unexplored) +/area/template_noop) "j" = ( /obj/effect/mob_spawn/human/miner/explorer, /turf/open/floor/plating/asteroid/snow/ice/icemoon, diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm index b8fa4bddbc7..7a2b98e3a8d 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm @@ -4,7 +4,7 @@ /area/icemoon/underground/explored) "b" = ( /turf/closed/mineral/random/snow, -/area/icemoon/underground/unexplored) +/area/icemoon/underground/explored) "e" = ( /obj/structure/spawner/nether, /turf/open/floor/plating/asteroid/snow/icemoon, diff --git a/_maps/icebox.json b/_maps/icebox.json index 5f44ed7eca8..8d2f93276b0 100644 --- a/_maps/icebox.json +++ b/_maps/icebox.json @@ -32,7 +32,7 @@ "Linkage": null, "Gravity": true, "Ice Ruins Underground": true, - "Baseturf": "/turf/open/openspace/icemoon" + "Baseturf": "/turf/open/openspace/icemoon/keep_below" }, { "Down": -1, @@ -41,7 +41,7 @@ "Gravity": true, "Ice Ruins": true, "Weather_Snowstorm": true, - "Baseturf": "/turf/open/openspace/icemoon" + "Baseturf": "/turf/open/openspace/icemoon/keep_below" } ], "minetype": "none", diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm index 6884f1dba42..52879b96b1d 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm @@ -1,15 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aa" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 2; - height = 5; - id = "laborcamp_away"; - name = "labor camp"; - width = 9 - }, -/turf/open/genturf, -/area/icemoon/underground/unexplored/rivers) "ac" = ( /obj/effect/spawner/structure/window, /turf/open/floor/iron, @@ -118,6 +107,10 @@ /obj/structure/table, /turf/open/floor/iron, /area/mine/production) +"aw" = ( +/obj/structure/closet/crate, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "ax" = ( /obj/item/beacon, /obj/effect/turf_decal/tile/purple{ @@ -246,6 +239,11 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"ba" = ( +/obj/machinery/light, +/obj/machinery/chem_master/condimaster, +/turf/open/floor/iron/dark, +/area/hydroponics) "bd" = ( /obj/machinery/mineral/processing_unit_console, /turf/closed/wall, @@ -657,37 +655,6 @@ }, /turf/open/floor/iron, /area/mine/production) -"cf" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ - dir = 4; - piping_layer = 4 - }, -/obj/structure/lattice/catwalk, -/turf/closed/mineral/random/snow, -/area/mine/living_quarters) -"cg" = ( -/obj/machinery/light_switch{ - pixel_x = 27 - }, -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/item/clothing/head/beanie/orange, -/obj/machinery/camera{ - c_tag = "Mining Eva"; - dir = 8 - }, -/obj/machinery/light, -/turf/open/floor/iron, -/area/mine/eva) "ch" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -889,12 +856,6 @@ }, /turf/open/floor/iron, /area/mine/production) -"da" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/commons/storage/mining) "dd" = ( /obj/structure/closet/emcloset, /obj/effect/spawner/lootdrop/maintenance/two, @@ -1026,10 +987,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/mine/production) -"du" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/iron, -/area/cargo/warehouse) "dv" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -1178,6 +1135,15 @@ }, /turf/open/floor/iron, /area/mine/production) +"dL" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "dM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/iron, @@ -1531,6 +1497,17 @@ }, /turf/open/floor/iron, /area/mine/production) +"eG" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 5; + id = "laborcamp_away"; + name = "labor camp"; + width = 9 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "eH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -1884,6 +1861,9 @@ }, /turf/open/floor/iron, /area/mine/living_quarters) +"fw" = ( +/turf/open/floor/plating, +/area/storage/mining) "fy" = ( /obj/structure/table, /obj/item/clothing/glasses/meson, @@ -2086,6 +2066,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/science/xenobiology) +"fT" = ( +/obj/structure/flora/ausbushes/sunnybush, +/turf/open/floor/grass, +/area/hydroponics) "ga" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -2106,10 +2090,6 @@ }, /turf/open/floor/iron, /area/mine/production) -"gk" = ( -/obj/structure/flora/ausbushes/sunnybush, -/turf/open/floor/grass, -/area/service/hydroponics) "gn" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -2120,13 +2100,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/mine/living_quarters) -"go" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Hydroponics Exit"; - req_access_txt = "35" - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "gp" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, @@ -2138,33 +2111,21 @@ }, /turf/open/floor/iron/white, /area/mine/laborcamp) +"gq" = ( +/obj/structure/closet/crate, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "gs" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 }, /turf/open/floor/iron/freezer, /area/science/xenobiology) -"gC" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/trimline/green/filled/end{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "gG" = ( /obj/item/pickaxe, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"gN" = ( -/obj/effect/turf_decal/trimline/green/filled/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/green/filled/corner{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "gO" = ( /obj/machinery/camera{ c_tag = "Xenobiology Pens - Starboard Aft"; @@ -2204,6 +2165,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/freezer, /area/science/xenobiology) +"hu" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass, +/area/hydroponics) "hv" = ( /obj/machinery/conveyor_switch/oneway{ id = "gulag"; @@ -2220,12 +2188,6 @@ }, /turf/open/floor/iron/freezer, /area/mine/living_quarters) -"hA" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Public Mining Storage" - }, -/turf/open/floor/iron/dark, -/area/commons/storage/mining) "hB" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -2255,6 +2217,19 @@ "hM" = ( /turf/closed/wall, /area/maintenance/aft) +"hS" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Hydroponics Exit"; + req_access_txt = "35" + }, +/turf/open/floor/iron/dark, +/area/hydroponics) +"hT" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/turf/open/floor/grass, +/area/hydroponics) "hY" = ( /obj/machinery/door/airlock/public/glass{ id_tag = "gulag3"; @@ -2265,11 +2240,23 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/iron, /area/mine/laborcamp) +"hZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "ia" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, /area/mine/production) +"ic" = ( +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/plating, +/area/storage/mining) "ie" = ( /obj/machinery/vending/sustenance, /obj/effect/decal/cleanable/dirt, @@ -2286,15 +2273,21 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"ij" = ( +/obj/machinery/vending/hydronutrients, +/turf/open/floor/iron/dark, +/area/hydroponics) "ip" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 }, /turf/open/floor/iron, /area/mine/living_quarters) -"iq" = ( -/turf/closed/wall, -/area/service/hydroponics) +"iw" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/storage/mining) "ix" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ @@ -2304,6 +2297,15 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"iA" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/hydroponics) +"iC" = ( +/obj/structure/closet/crate/internals, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "iG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -2311,14 +2313,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/iron, /area/mine/laborcamp) -"iK" = ( -/obj/effect/turf_decal/trimline/green/filled/corner, -/obj/effect/turf_decal/trimline/green/filled/corner{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "iM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -2343,14 +2337,12 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"iZ" = ( -/obj/machinery/camera{ - c_tag = "Labor Camp External South"; - dir = 4; - network = list("labor") +"iX" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 9 }, -/turf/closed/mineral/random/snow, -/area/mine/laborcamp) +/turf/open/floor/iron/dark, +/area/storage/mining) "je" = ( /obj/structure/bed, /obj/effect/decal/cleanable/dirt, @@ -2359,29 +2351,6 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) -"jg" = ( -/obj/structure/table, -/obj/machinery/cell_charger{ - pixel_y = 3 - }, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high{ - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple, -/obj/machinery/camera{ - c_tag = "Mining Mech Bay"; - dir = 1; - network = list("mine") - }, -/turf/open/floor/iron, -/area/mine/mechbay) "jk" = ( /obj/machinery/computer/prisoner, /obj/effect/turf_decal/tile/red{ @@ -2449,6 +2418,10 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"jT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "jU" = ( /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, @@ -2478,10 +2451,6 @@ }, /turf/open/floor/engine, /area/science/xenobiology) -"jY" = ( -/obj/structure/cable, -/turf/open/floor/plating, -/area/service/hydroponics) "kb" = ( /obj/machinery/conveyor{ dir = 10; @@ -2490,19 +2459,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/mine/laborcamp) -"kd" = ( -/obj/structure/table, -/obj/item/clothing/glasses/meson, -/obj/item/storage/bag/ore, -/obj/item/pickaxe, -/obj/item/mining_scanner, -/obj/item/flashlight, -/obj/item/clothing/suit/hooded/wintercoat/hydro, -/obj/structure/window/reinforced{ +"kg" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ dir = 4 }, -/turf/open/floor/iron, -/area/service/hydroponics) +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/hydroponics) "kh" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -2523,6 +2487,13 @@ }, /turf/open/floor/iron, /area/science/xenobiology) +"kr" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "ks" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -2561,6 +2532,14 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"kG" = ( +/obj/machinery/camera{ + c_tag = "Labor Camp External North"; + dir = 1; + network = list("labor") + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/laborcamp) "kH" = ( /obj/structure/closet/athletic_mixed, /turf/open/floor/plating, @@ -2591,6 +2570,11 @@ }, /turf/open/floor/iron, /area/mine/living_quarters) +"kQ" = ( +/obj/effect/landmark/start/botanist, +/obj/machinery/holopad, +/turf/open/floor/iron/dark, +/area/hydroponics) "kS" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall, @@ -2614,11 +2598,22 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, /area/science/xenobiology) -"lM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/turf/open/floor/iron, -/area/cargo/warehouse) +"lA" = ( +/obj/structure/closet/decay, +/turf/open/floor/plating, +/area/maintenance/aft) +"lI" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/storage/mining) +"lL" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/hydroponics) "lO" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -2628,13 +2623,6 @@ }, /turf/open/floor/iron, /area/mine/production) -"lR" = ( -/obj/effect/turf_decal/trimline/green/filled/corner{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "lY" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -2644,29 +2632,51 @@ }, /turf/open/floor/plating, /area/science/xenobiology) -"lZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack, +"mf" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/machinery/power/apc{ + name = "Lower Hydroponics APC"; + pixel_y = -23 + }, /obj/structure/cable, -/turf/open/floor/iron, -/area/cargo/warehouse) -"mg" = ( -/turf/closed/wall, -/area/commons/storage/mining) +/obj/structure/table, +/obj/machinery/reagentgrinder, +/turf/open/floor/iron/dark, +/area/hydroponics) "mi" = ( /obj/effect/turf_decal/bot, /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) +"mk" = ( +/obj/machinery/door/morgue{ + name = "Wilderness Supplies"; + req_access_txt = "35" + }, +/turf/open/floor/iron/dark, +/area/hydroponics) +"mm" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "mu" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/aft) -"mC" = ( -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/icemoon/underground/unexplored/rivers) +"mx" = ( +/obj/structure/closet/cardboard, +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -28 + }, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "mG" = ( /obj/machinery/atmospherics/pipe/simple{ dir = 4 @@ -2676,10 +2686,6 @@ }, /turf/open/floor/iron/freezer, /area/science/xenobiology) -"mH" = ( -/obj/machinery/hydroponics/constructable, -/turf/open/floor/grass, -/area/service/hydroponics) "mL" = ( /obj/item/kirbyplants{ icon_state = "plant-10" @@ -2687,6 +2693,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) +"mO" = ( +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "mS" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -2696,17 +2705,14 @@ }, /turf/open/floor/iron/freezer, /area/mine/laborcamp) -"mU" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green, -/obj/machinery/door/airlock/highsecurity{ - name = "Hydroponics Exit"; - req_access_txt = "35" - }, +"mV" = ( +/obj/machinery/biogenerator, +/turf/open/floor/iron/dark, +/area/hydroponics) +"mW" = ( +/obj/effect/decal/cleanable/oil, /turf/open/floor/iron, -/area/service/hydroponics) +/area/quartermaster/warehouse) "na" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -2722,6 +2728,11 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"nh" = ( +/obj/structure/closet/crate, +/obj/structure/cable, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "nl" = ( /obj/machinery/button/door{ id = "xenobio2"; @@ -2752,6 +2763,9 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"ny" = ( +/turf/closed/wall, +/area/quartermaster/warehouse) "nE" = ( /obj/structure/sign/poster/official/do_not_question{ pixel_y = 32 @@ -2765,15 +2779,6 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) -"nF" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/commons/storage/mining) -"nG" = ( -/turf/open/floor/iron/dark, -/area/service/hydroponics) "nH" = ( /obj/machinery/mechpad, /turf/open/floor/iron, @@ -2783,6 +2788,9 @@ /obj/structure/cable, /turf/open/floor/plating, /area/mine/living_quarters) +"nJ" = ( +/turf/closed/wall, +/area/hydroponics) "nM" = ( /turf/closed/wall, /area/mine/mechbay) @@ -2818,20 +2826,15 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"of" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/melee/flyswatter, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/honey_frame, -/obj/item/queen_bee/bought, -/obj/item/clothing/head/beekeeper_head, -/obj/item/clothing/suit/beekeeper_suit, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/grass, -/area/service/hydroponics) +"oe" = ( +/obj/machinery/power/apc/auto_name/east, +/obj/structure/cable, +/obj/structure/closet/crate/secure/freezer/pizza, +/turf/open/floor/iron, +/area/quartermaster/warehouse) +"oh" = ( +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) "oi" = ( /obj/structure/closet, /turf/open/floor/plating, @@ -2967,6 +2970,11 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"pk" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/iron/dark, +/area/hydroponics) "pu" = ( /obj/structure/sign/poster/official/obey{ pixel_y = 32 @@ -3007,10 +3015,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) -"pN" = ( -/obj/structure/sign/warning/xeno_mining, -/turf/closed/wall, -/area/service/hydroponics) "pU" = ( /obj/machinery/door/airlock/research/glass{ name = "Mining Station Mech Bay"; @@ -3074,15 +3078,15 @@ /obj/structure/cable, /turf/open/floor/plating, /area/science/xenobiology) -"qs" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "qt" = ( /obj/structure/table, /obj/item/cigbutt, /turf/open/floor/iron, /area/mine/living_quarters) +"qw" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/iron/dark, +/area/hydroponics) "qC" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -3095,6 +3099,10 @@ }, /turf/open/floor/iron, /area/science/xenobiology) +"qG" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall, +/area/storage/mining) "qN" = ( /obj/structure/chair/stool, /obj/machinery/flasher{ @@ -3117,14 +3125,23 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"rh" = ( -/obj/structure/flora/ausbushes/ppflowers, -/turf/open/floor/grass, -/area/service/hydroponics) +"ri" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/hydroponics) "rj" = ( /obj/structure/cable, /turf/open/floor/iron, /area/mine/living_quarters) +"rm" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "rt" = ( /obj/machinery/mech_bay_recharge_port, /turf/open/floor/plating, @@ -3144,29 +3161,10 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) -"rH" = ( -/obj/effect/turf_decal/trimline/green/filled/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/green/filled/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) -"rI" = ( -/obj/effect/turf_decal/trimline/green/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/green/filled/corner, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/service/hydroponics) -"rN" = ( -/obj/machinery/power/apc/auto_name/east, -/obj/structure/cable, -/obj/structure/closet/crate/secure/freezer/pizza, -/turf/open/floor/iron, -/area/cargo/warehouse) +"rQ" = ( +/obj/machinery/hydroponics/constructable, +/turf/open/floor/grass, +/area/hydroponics) "rS" = ( /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas{ @@ -3191,13 +3189,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/xenobiology) -"rY" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/cargo/warehouse) "sa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -3324,16 +3315,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/aft) -"sY" = ( -/obj/structure/fence{ - dir = 4 - }, -/obj/effect/turf_decal/mining, -/turf/open/genturf, -/area/icemoon/underground/unexplored/rivers) -"tg" = ( -/turf/closed/wall, -/area/cargo/warehouse) "tj" = ( /obj/structure/closet/cardboard, /turf/open/floor/plating, @@ -3346,11 +3327,12 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) -"tC" = ( -/obj/structure/closet/crate, +"to" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/structure/cable, /turf/open/floor/iron, -/area/cargo/warehouse) +/area/quartermaster/warehouse) "tD" = ( /obj/machinery/firealarm{ dir = 8; @@ -3406,6 +3388,23 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/xenobiology) +"tV" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Public Mining Storage" + }, +/turf/open/floor/iron/dark, +/area/storage/mining) +"tZ" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "ub" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ @@ -3424,34 +3423,70 @@ }, /turf/open/floor/iron/freezer, /area/science/xenobiology) +"ug" = ( +/obj/structure/table, +/obj/machinery/cell_charger{ + pixel_y = 3 + }, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high{ + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/camera{ + c_tag = "Mining Mech Bay"; + dir = 1; + network = list("mine") + }, +/turf/open/floor/iron, +/area/mine/mechbay) +"uh" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/grass, +/area/hydroponics) "uk" = ( /obj/machinery/atmospherics/pipe/manifold{ dir = 8 }, /turf/open/floor/iron/freezer, /area/science/xenobiology) +"um" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ + dir = 4; + piping_layer = 4 + }, +/obj/structure/lattice/catwalk, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/living_quarters) +"un" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/living_quarters) "ur" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 }, /turf/open/floor/iron/freezer, /area/science/xenobiology) -"ut" = ( -/turf/open/floor/plating, -/area/commons/storage/mining) -"uw" = ( -/obj/effect/decal/cleanable/oil, -/turf/open/floor/iron, -/area/cargo/warehouse) -"ux" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ +"uu" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) +/turf/open/floor/iron, +/area/quartermaster/warehouse) "uz" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -3473,13 +3508,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/iron, /area/mine/laborcamp/security) -"uI" = ( -/obj/effect/turf_decal/trimline/green/filled/line, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "uJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -3488,17 +3516,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/mine/living_quarters) -"uL" = ( -/obj/machinery/door/morgue{ - name = "Wilderness Supplies"; - req_access_txt = "35" +"uP" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 }, /turf/open/floor/iron/dark, -/area/service/hydroponics) -"uX" = ( -/obj/structure/closet/crate/internals, -/turf/open/floor/iron, -/area/cargo/warehouse) +/area/storage/mining) +"uZ" = ( +/obj/structure/railing, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "vb" = ( /obj/machinery/door/window/southleft, /obj/machinery/shower{ @@ -3510,6 +3537,11 @@ /obj/effect/loot_site_spawner, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/explored) +"vo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/ore/glass, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "vq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, @@ -3556,33 +3588,15 @@ /obj/machinery/power/apc/auto_name/north, /turf/open/floor/iron, /area/mine/laborcamp/security) -"vK" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 - }, -/turf/open/floor/grass, -/area/service/hydroponics) -"vU" = ( -/obj/machinery/vending/hydronutrients, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "vW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/iron, /area/mine/living_quarters) -"vY" = ( -/obj/structure/cable, -/obj/machinery/power/apc/highcap/five_k{ - areastring = /area/commons/storage/mining; - dir = 1; - name = "Public Mining APC"; - pixel_y = 23 - }, -/obj/item/reagent_containers/food/drinks/bottle/hooch, -/turf/open/floor/plating, -/area/commons/storage/mining) +"wc" = ( +/turf/open/openspace/icemoon/keep_below, +/area/mine/living_quarters) "we" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -3598,12 +3612,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/science/xenobiology) -"wi" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/commons/storage/mining) "wj" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/purple{ @@ -3611,10 +3619,6 @@ }, /turf/open/floor/iron, /area/mine/production) -"wl" = ( -/obj/effect/turf_decal/trimline/green/filled/line, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "wq" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -3625,16 +3629,6 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) -"wt" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/white/box, -/turf/open/floor/plating, -/area/commons/storage/mining) "ww" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -3648,22 +3642,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/xenobiology) -"wC" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/commons/storage/mining) -"wE" = ( -/obj/structure/beebox, -/turf/open/floor/grass, -/area/service/hydroponics) -"wH" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/commons/storage/mining) "wN" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -3677,11 +3655,29 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"wP" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "wR" = ( /obj/structure/table/optable, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine, /area/science/xenobiology) +"wS" = ( +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/unexplored) +"wU" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "wX" = ( /obj/machinery/door/airlock{ name = "Labor Camp Library" @@ -3740,36 +3736,15 @@ }, /turf/open/floor/engine, /area/science/xenobiology) -"xF" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/service/hydroponics) -"xL" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 - }, -/obj/machinery/power/apc{ - name = "Lower Hydroponics APC"; - pixel_y = -23 - }, -/obj/structure/cable, -/obj/structure/table, -/obj/machinery/reagentgrinder, -/turf/open/floor/iron/dark, -/area/service/hydroponics) -"xR" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/trimline/green/filled/end{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) +"xz" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/grass, +/area/hydroponics) +"xB" = ( +/obj/structure/closet/crate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "xU" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/green{ @@ -3783,6 +3758,22 @@ /obj/item/seeds/onion, /turf/open/floor/iron/dark, /area/mine/laborcamp) +"xV" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) +"yj" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "yk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -3814,18 +3805,37 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/mine/laborcamp) -"yX" = ( -/obj/machinery/light/small{ +"yG" = ( +/obj/structure/window/reinforced{ dir = 1 }, -/turf/open/genturf, -/area/icemoon/underground/unexplored/rivers) +/obj/structure/disposalpipe/trunk/multiz{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/white/box, +/turf/open/floor/plating, +/area/storage/mining) +"yK" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/quartermaster/warehouse) +"yL" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "zb" = ( /obj/structure/sign/warning/coldtemp, /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, /area/science/xenobiology) +"zd" = ( +/obj/structure/lattice/catwalk, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "zk" = ( /obj/effect/turf_decal/bot, /obj/structure/ore_box, @@ -3877,13 +3887,26 @@ /obj/effect/turf_decal/stripes/box, /turf/open/floor/plating, /area/maintenance/aft) -"zN" = ( +"zH" = ( +/obj/structure/table, +/obj/item/clothing/glasses/meson, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/mining_scanner, +/obj/item/flashlight, +/obj/item/clothing/suit/hooded/wintercoat/hydro, /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass, -/area/service/hydroponics) +/turf/open/floor/iron, +/area/hydroponics) +"zM" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/iron, +/area/hydroponics) "zQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, @@ -3935,6 +3958,15 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +"Ap" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "Aw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -3951,11 +3983,23 @@ }, /turf/open/floor/iron, /area/mine/production) -"AJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/ore/glass, +"AF" = ( +/turf/closed/wall, +/area/storage/mining) +"AL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, /turf/open/floor/iron, -/area/cargo/warehouse) +/area/quartermaster/warehouse) +"AN" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "AQ" = ( /obj/machinery/light{ dir = 8 @@ -4021,12 +4065,6 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) -"Bw" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "Bz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -4034,6 +4072,9 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"BJ" = ( +/turf/open/floor/iron/dark, +/area/storage/mining) "BL" = ( /obj/machinery/light/small, /obj/machinery/camera{ @@ -4043,11 +4084,20 @@ }, /turf/open/floor/iron/freezer, /area/mine/laborcamp) -"BT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/cargo/warehouse) +"BX" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/melee/flyswatter, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/honey_frame, +/obj/item/queen_bee/bought, +/obj/item/clothing/head/beekeeper_head, +/obj/item/clothing/suit/beekeeper_suit, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/grass, +/area/hydroponics) "Cc" = ( /obj/machinery/atmospherics/components/binary/pump, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, @@ -4109,6 +4159,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) +"CT" = ( +/obj/structure/stairs/south, +/turf/open/floor/iron, +/area/hydroponics) "CV" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -4128,10 +4182,14 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"De" = ( -/obj/machinery/light/floor, -/turf/open/floor/iron, -/area/cargo/warehouse) +"Dg" = ( +/obj/machinery/requests_console{ + department = "Hydroponics"; + departmentType = 2; + pixel_y = 30 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "Dh" = ( /obj/machinery/light{ dir = 4 @@ -4139,12 +4197,10 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/iron, /area/mine/living_quarters) -"Dj" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/commons/storage/mining) +"Dm" = ( +/obj/machinery/seed_extractor, +/turf/open/floor/iron/dark, +/area/hydroponics) "Dn" = ( /obj/structure/rack, /obj/item/storage/bag/ore, @@ -4188,10 +4244,6 @@ /obj/item/clothing/suit/hooded/wintercoat/science, /turf/open/floor/plating, /area/maintenance/aft) -"DI" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/commons/storage/mining) "DM" = ( /obj/machinery/camera{ c_tag = "Xeno Test Chamber"; @@ -4258,6 +4310,10 @@ "El" = ( /turf/open/floor/iron/freezer, /area/mine/laborcamp) +"Er" = ( +/obj/machinery/light/small, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/laborcamp) "Es" = ( /obj/machinery/door/window/southright, /obj/machinery/shower{ @@ -4268,6 +4324,11 @@ "Et" = ( /turf/closed/mineral/random/snow, /area/icemoon/underground/explored) +"Eu" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/hydroponics) "Ez" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -4304,9 +4365,6 @@ }, /turf/open/floor/iron/freezer, /area/mine/laborcamp) -"ER" = ( -/turf/closed/mineral/random/snow, -/area/icemoon/surface/outdoors) "ET" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/newscaster{ @@ -4340,6 +4398,15 @@ }, /turf/open/floor/iron, /area/mine/laborcamp/security) +"Fg" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) +"Fi" = ( +/turf/open/floor/iron, +/area/quartermaster/warehouse) "Fk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /turf/open/floor/iron/white, @@ -4392,6 +4459,10 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"FE" = ( +/obj/structure/table, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "FF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -4406,6 +4477,19 @@ }, /turf/open/floor/plating, /area/science/xenobiology) +"FH" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"FI" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/corner, +/turf/open/floor/iron/dark, +/area/hydroponics) "FK" = ( /obj/machinery/button/door{ id = "misclab"; @@ -4423,12 +4507,6 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"FN" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/service/hydroponics) "FQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -4439,6 +4517,12 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"FS" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/storage/mining) "FU" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/tile/green{ @@ -4459,6 +4543,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/mine/laborcamp) +"Gf" = ( +/obj/structure/railing{ + dir = 9 + }, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) "Gm" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -4475,10 +4565,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/iron, /area/mine/laborcamp) -"Gr" = ( -/obj/machinery/biogenerator, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "Gs" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -4501,14 +4587,6 @@ /obj/item/pen, /turf/open/floor/iron, /area/mine/laborcamp) -"Gw" = ( -/obj/machinery/camera{ - c_tag = "Labor Camp External West"; - dir = 4; - network = list("labor") - }, -/turf/closed/mineral/random/snow, -/area/mine/laborcamp) "Gy" = ( /obj/machinery/computer/mechpad{ dir = 8 @@ -4541,10 +4619,6 @@ }, /turf/open/floor/iron, /area/mine/laborcamp/security) -"GJ" = ( -/obj/machinery/seed_extractor, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "GN" = ( /obj/structure/table, /obj/item/tank/internals/emergency_oxygen{ @@ -4569,13 +4643,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/science/xenobiology) -"GT" = ( -/obj/effect/turf_decal/trimline/green/filled/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/green/filled/corner, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "GU" = ( /obj/structure/closet/secure_closet/engineering_welding{ req_access = list(54) @@ -4593,13 +4660,6 @@ }, /turf/open/floor/iron, /area/mine/mechbay) -"GW" = ( -/obj/structure/table, -/turf/open/floor/iron, -/area/cargo/warehouse) -"GX" = ( -/turf/open/floor/iron/elevatorshaft, -/area/commons/storage/mining) "GY" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt, @@ -4613,9 +4673,34 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +"Hc" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "Hd" = ( /turf/closed/wall/r_wall, /area/mine/laborcamp/security) +"Hk" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = 11 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) +"Hn" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/hydroponics) "Ho" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -4625,12 +4710,6 @@ }, /turf/open/floor/iron/white, /area/mine/living_quarters) -"Hq" = ( -/turf/open/floor/grass, -/area/service/hydroponics) -"Ht" = ( -/turf/open/floor/iron, -/area/cargo/warehouse) "Hx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -4640,26 +4719,16 @@ }, /turf/open/floor/iron, /area/mine/laborcamp/security) +"Hy" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/storage/mining) "HF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/iron, /area/mine/laborcamp) -"HM" = ( -/obj/machinery/camera{ - c_tag = "Labor Camp External North"; - dir = 1; - network = list("labor") - }, -/turf/closed/mineral/random/snow, -/area/mine/laborcamp) -"HN" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/commons/storage/mining) "HO" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, @@ -4716,9 +4785,18 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/xenobiology) -"Ii" = ( +"Im" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/obj/structure/cable, /turf/open/floor/iron/dark, -/area/commons/storage/mining) +/area/hydroponics) +"Io" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/storage/mining) "Iq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -4734,6 +4812,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/laborcamp) +"Iw" = ( +/turf/open/floor/grass, +/area/hydroponics) +"Iy" = ( +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/unexplored) "IB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -4750,10 +4834,6 @@ "IH" = ( /turf/open/floor/plating/snowed/icemoon, /area/maintenance/aft) -"IJ" = ( -/obj/structure/sign/poster/contraband/random, -/turf/closed/wall, -/area/commons/storage/mining) "IK" = ( /obj/structure/toilet{ dir = 8 @@ -4779,10 +4859,20 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +"Ja" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/storage/mining) "Jd" = ( /obj/structure/table, /turf/open/floor/engine, /area/science/xenobiology) +"Jk" = ( +/obj/structure/stairs/north, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "Jo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -4819,16 +4909,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/science/xenobiology) -"JB" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/trimline/green/filled/end{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "JH" = ( /obj/structure/window/reinforced{ dir = 1; @@ -4879,10 +4959,33 @@ /obj/structure/cable, /turf/open/floor/iron, /area/mine/living_quarters) -"Kg" = ( -/obj/structure/stairs/south, +"Kj" = ( +/obj/machinery/camera{ + c_tag = "Labor Camp External South"; + dir = 4; + network = list("labor") + }, +/turf/open/openspace/icemoon/keep_below, +/area/mine/laborcamp) +"Kl" = ( +/obj/machinery/camera{ + c_tag = "Labor Camp External West"; + dir = 4; + network = list("labor") + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/laborcamp) +"Km" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green, +/obj/machinery/door/airlock/highsecurity{ + name = "Hydroponics Exit"; + req_access_txt = "35" + }, /turf/open/floor/iron, -/area/service/hydroponics) +/area/hydroponics) "Kn" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -4892,6 +4995,13 @@ }, /turf/open/floor/plating, /area/science/xenobiology) +"Ky" = ( +/obj/structure/fence{ + dir = 4 + }, +/obj/effect/turf_decal/mining, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "KD" = ( /obj/machinery/door/poddoor/preopen{ id = "xenobio2"; @@ -4912,10 +5022,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/laborcamp) -"KJ" = ( -/obj/structure/closet/crate, -/turf/open/genturf, -/area/icemoon/underground/unexplored/rivers) +"KF" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "KN" = ( /obj/machinery/door/poddoor/preopen{ id = "misclab"; @@ -4931,14 +5041,6 @@ }, /turf/open/floor/engine, /area/science/xenobiology) -"Lc" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/iron, -/area/cargo/warehouse) "Ld" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -4956,6 +5058,16 @@ }, /turf/open/floor/iron, /area/mine/living_quarters) +"Ll" = ( +/obj/structure/ladder, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/storage/mining) "Ls" = ( /obj/structure/sign/warning/biohazard{ pixel_x = -32 @@ -4973,6 +5085,13 @@ }, /turf/open/floor/iron, /area/mine/production) +"LA" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/hydroponics) "LC" = ( /obj/structure/closet/crate, /turf/open/floor/plating, @@ -5001,9 +5120,6 @@ /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, /area/science/xenobiology) -"LN" = ( -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/commons/storage/mining) "LS" = ( /obj/machinery/camera{ c_tag = "Xenobiology Pens - Port Fore"; @@ -5018,9 +5134,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) -"Me" = ( -/turf/open/openspace/icemoon, -/area/icemoon/underground/unexplored/rivers) +"LW" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/storage/mining) "Mk" = ( /obj/machinery/camera{ c_tag = "Xenobiology Kill Chamber"; @@ -5073,9 +5192,6 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"MC" = ( -/turf/open/openspace/icemoon, -/area/commons/storage/mining) "MG" = ( /obj/machinery/computer/secure_data, /obj/structure/cable, @@ -5104,6 +5220,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/science/xenobiology) +"MX" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/grass, +/area/hydroponics) "MZ" = ( /obj/machinery/door/window/southleft{ dir = 4; @@ -5118,6 +5241,11 @@ }, /turf/open/floor/iron, /area/science/xenobiology) +"Ne" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "Ni" = ( /obj/effect/landmark/blobstart, /turf/open/floor/engine, @@ -5142,31 +5270,12 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/science/xenobiology) -"Nn" = ( -/obj/structure/ore_box, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/commons/storage/mining) -"Nq" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/grass, -/area/service/hydroponics) -"Nr" = ( -/obj/machinery/light/small, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/service/hydroponics) "Nt" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 }, /turf/open/floor/iron, /area/mine/living_quarters) -"Nu" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/cargo/warehouse) "Nw" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -5207,6 +5316,9 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"NH" = ( +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/storage/mining) "NI" = ( /obj/structure/table, /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -5265,10 +5377,12 @@ }, /turf/open/floor/engine, /area/science/xenobiology) -"Of" = ( -/obj/machinery/light/small, -/turf/closed/mineral/random/snow, -/area/mine/laborcamp) +"Oe" = ( +/obj/structure/fence{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "Ol" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/public/glass{ @@ -5302,6 +5416,9 @@ /obj/item/reagent_containers/glass/bucket, /turf/open/floor/iron/dark, /area/mine/laborcamp) +"Ox" = ( +/turf/open/floor/iron/elevatorshaft, +/area/storage/mining) "Oy" = ( /obj/structure/cable, /obj/machinery/door/poddoor/preopen{ @@ -5347,11 +5464,6 @@ /obj/machinery/holopad, /turf/open/floor/iron/white, /area/science/xenobiology) -"OR" = ( -/obj/structure/closet/crate, -/obj/structure/cable, -/turf/open/floor/iron, -/area/cargo/warehouse) "OT" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -5457,6 +5569,12 @@ "PG" = ( /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) +"PU" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "PY" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -5489,25 +5607,16 @@ }, /turf/open/floor/iron, /area/science/xenobiology) -"Qf" = ( -/obj/structure/cable/multilayer/multiz, -/obj/effect/turf_decal/stripes/box, -/turf/open/floor/plating, -/area/commons/storage/mining) "Qh" = ( /obj/structure/marker_beacon{ icon_state = "markerburgundy-on" }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"Qu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -22 - }, -/turf/open/floor/iron, -/area/cargo/warehouse) +"Ql" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/hydroponics) "Qv" = ( /turf/closed/wall/r_wall, /area/science/xenobiology) @@ -5545,23 +5654,6 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"QJ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/hydroponics/constructable, -/turf/open/floor/grass, -/area/service/hydroponics) -"QK" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "QN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -5571,14 +5663,6 @@ }, /turf/open/floor/iron, /area/mine/laborcamp/security) -"QP" = ( -/obj/structure/closet/cardboard, -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -28 - }, -/turf/open/floor/iron, -/area/cargo/warehouse) "QW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -5606,29 +5690,24 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) -"Rs" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/trimline/green/filled/end{ - dir = 4 +"Rv" = ( +/obj/machinery/vending/hydroseeds{ + slogan_delay = 700 }, /turf/open/floor/iron/dark, -/area/service/hydroponics) +/area/hydroponics) "Rx" = ( /obj/structure/cable, /turf/open/floor/iron, /area/mine/production) -"RB" = ( -/obj/structure/cable/multilayer/multiz, -/obj/structure/sign/warning/electricshock{ - pixel_x = -32 +"RA" = ( +/obj/item/bikehorn{ + color = "#000"; + desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks."; + name = "charred bike horn" }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/box, -/turf/open/floor/plating, -/area/service/hydroponics) +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "RC" = ( /obj/structure/rack, /turf/open/floor/plating, @@ -5645,10 +5724,18 @@ }, /turf/open/floor/iron, /area/mine/production) -"RI" = ( -/obj/structure/closet/crate, -/turf/open/floor/iron, -/area/cargo/warehouse) +"RK" = ( +/obj/structure/cable/multilayer/multiz, +/obj/structure/sign/warning/electricshock{ + pixel_x = -32 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/hydroponics) "RN" = ( /obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/cable, @@ -5662,16 +5749,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/mine/living_quarters) -"RQ" = ( -/obj/structure/ladder, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/commons/storage/mining) "RR" = ( /obj/machinery/light{ dir = 1 @@ -5682,11 +5759,6 @@ }, /turf/open/floor/iron/freezer, /area/science/xenobiology) -"RU" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/service/hydroponics) "Sd" = ( /turf/closed/mineral/random/snow, /area/icemoon/underground/unexplored/rivers) @@ -5704,6 +5776,16 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/xenobiology) +"Sk" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/storage/mining) +"Sy" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/hydroponics) "SE" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -5731,6 +5813,12 @@ }, /turf/open/floor/iron, /area/mine/mechbay) +"SU" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/storage/mining) "SV" = ( /obj/machinery/computer/security/labor, /obj/structure/cable, @@ -5750,10 +5838,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/mine/laborcamp) -"Tj" = ( -/obj/structure/sign/warning, -/turf/closed/wall, -/area/commons/storage/mining) "Tk" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/green{ @@ -5763,6 +5847,10 @@ /obj/item/seeds/soya, /turf/open/floor/iron/dark, /area/mine/laborcamp) +"Tm" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/quartermaster/warehouse) "Tn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -5773,6 +5861,32 @@ }, /turf/open/floor/iron/freezer, /area/mine/living_quarters) +"Tq" = ( +/turf/open/floor/iron/dark, +/area/hydroponics) +"Tt" = ( +/obj/machinery/light_switch{ + pixel_x = 27 + }, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/item/clothing/head/beanie/orange, +/obj/machinery/camera{ + c_tag = "Mining Eva"; + dir = 8 + }, +/obj/machinery/light, +/turf/open/floor/iron, +/area/mine/eva) "Tv" = ( /obj/machinery/camera{ c_tag = "Crew Area Hallway West"; @@ -5791,12 +5905,6 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) -"Tx" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "TA" = ( /obj/structure/sign/departments/medbay/alt{ pixel_x = -32 @@ -5813,6 +5921,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/mine/living_quarters) +"TE" = ( +/obj/structure/ore_box, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/storage/mining) "TK" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -5826,6 +5938,13 @@ /obj/structure/sign/warning/electricshock, /turf/open/floor/plating, /area/science/xenobiology) +"TN" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/hydroponics) "TP" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -5903,6 +6022,10 @@ }, /turf/open/floor/iron, /area/mine/laborcamp/security) +"UL" = ( +/obj/structure/beebox, +/turf/open/floor/grass, +/area/hydroponics) "UM" = ( /obj/structure/table, /obj/item/paper, @@ -5951,17 +6074,6 @@ }, /turf/open/floor/iron, /area/mine/living_quarters) -"UW" = ( -/obj/structure/fence{ - dir = 4 - }, -/turf/open/genturf, -/area/icemoon/underground/unexplored/rivers) -"Va" = ( -/obj/machinery/light, -/obj/machinery/chem_master/condimaster, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "Vb" = ( /obj/machinery/button/door{ id = "xenobio1"; @@ -5974,14 +6086,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/science/xenobiology) -"Vd" = ( -/obj/machinery/requests_console{ - department = "Hydroponics"; - departmentType = 2; - pixel_y = 30 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "Vg" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ @@ -6007,23 +6111,6 @@ }, /turf/open/floor/plating, /area/maintenance/aft) -"Vm" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/cable, -/turf/open/floor/plating, -/area/service/hydroponics) -"Vn" = ( -/obj/machinery/door/airlock/maintenance, -/turf/open/floor/plating, -/area/commons/storage/mining) -"Vo" = ( -/obj/item/bikehorn{ - color = "#000"; - desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks."; - name = "charred bike horn" - }, -/turf/open/genturf, -/area/icemoon/underground/unexplored/rivers) "Vz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/general/visible{ @@ -6069,10 +6156,6 @@ }, /turf/open/floor/iron, /area/mine/living_quarters) -"VQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/cargo/warehouse) "VX" = ( /obj/machinery/door/airlock/medical/glass{ name = "Infirmary" @@ -6091,32 +6174,14 @@ }, /turf/open/floor/iron/white, /area/mine/laborcamp) -"VY" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/window{ - dir = 4; - name = "Greenhouse Access"; - req_access_txt = "35" - }, -/turf/open/floor/grass, -/area/service/hydroponics) -"VZ" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/snow/icemoon, -/area/commons/storage/mining) "Wb" = ( /turf/open/floor/engine, /area/science/xenobiology) -"Wj" = ( -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, -/turf/open/floor/iron/dark, -/area/service/hydroponics) +"Wi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/turf/open/floor/iron, +/area/quartermaster/warehouse) "Wt" = ( /obj/structure/window/reinforced, /turf/open/floor/engine, @@ -6161,10 +6226,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/xenobiology) -"WH" = ( -/obj/structure/cable, -/turf/open/floor/plating, -/area/commons/storage/mining) +"WJ" = ( +/obj/structure/sign/warning/xeno_mining, +/turf/closed/wall, +/area/hydroponics) "WM" = ( /obj/machinery/shower{ pixel_y = 22 @@ -6217,14 +6282,6 @@ }, /turf/open/floor/engine, /area/science/xenobiology) -"Xf" = ( -/obj/structure/ore_box, -/turf/open/genturf, -/area/icemoon/underground/unexplored/rivers) -"Xj" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/service/hydroponics) "Xl" = ( /obj/structure/bookcase, /turf/open/floor/iron, @@ -6239,18 +6296,6 @@ }, /turf/open/floor/iron, /area/mine/living_quarters) -"Xy" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) -"XL" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "XO" = ( /obj/structure/table, /obj/item/mecha_parts/mecha_equipment/drill, @@ -6282,6 +6327,10 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) +"XV" = ( +/obj/structure/sign/warning, +/turf/closed/wall, +/area/storage/mining) "XW" = ( /obj/machinery/door/window/northleft{ base_state = "right"; @@ -6296,12 +6345,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/science/xenobiology) -"Yi" = ( -/obj/machinery/vending/hydroseeds{ - slogan_delay = 700 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "Yk" = ( /obj/structure/cable, /obj/machinery/door/poddoor/preopen{ @@ -6333,11 +6376,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/science/xenobiology) -"Yq" = ( -/obj/effect/landmark/start/botanist, -/obj/machinery/holopad, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "Yv" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light, @@ -6356,11 +6394,6 @@ }, /turf/open/floor/iron, /area/mine/laborcamp) -"Yz" = ( -/obj/effect/turf_decal/trimline/green/filled/corner, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "YA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -6371,17 +6404,10 @@ }, /turf/open/floor/iron, /area/mine/living_quarters) -"YB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/lattice/catwalk, -/turf/closed/mineral/random/snow, -/area/mine/living_quarters) -"YH" = ( -/obj/structure/stairs/north, -/turf/open/floor/iron, -/area/cargo/warehouse) +"YF" = ( +/obj/structure/ore_box, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/explored) "YP" = ( /obj/machinery/door/airlock/public/glass{ name = "Showers" @@ -6406,13 +6432,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/iron, /area/mine/laborcamp) -"YX" = ( -/obj/effect/turf_decal/tile/green{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron, -/area/service/hydroponics) "Zd" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -6423,6 +6442,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/mine/laborcamp) +"Ze" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/hydroponics) "Zf" = ( /obj/machinery/door/airlock{ id_tag = "miningbathroom"; @@ -6490,6 +6513,29 @@ /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/open/floor/iron, /area/science/xenobiology) +"ZA" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window{ + dir = 4; + name = "Greenhouse Access"; + req_access_txt = "35" + }, +/turf/open/floor/grass, +/area/hydroponics) +"ZB" = ( +/obj/structure/cable, +/obj/machinery/power/apc/highcap/five_k{ + areastring = /area/storage/mining; + dir = 1; + name = "Public Mining APC"; + pixel_y = 23 + }, +/obj/item/reagent_containers/food/drinks/bottle/hooch, +/turf/open/floor/plating, +/area/storage/mining) "ZK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6507,210 +6553,203 @@ /obj/effect/loot_site_spawner, /turf/open/floor/plating, /area/maintenance/aft) -"ZS" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/service/hydroponics) "ZY" = ( /turf/open/floor/iron/white, /area/science/xenobiology) +"ZZ" = ( +/obj/machinery/light/small, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/hydroponics) (1,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -6780,194 +6819,194 @@ ak ak "} (2,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -7037,194 +7076,194 @@ ak ak "} (3,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -7294,194 +7333,194 @@ ak ak "} (4,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -7551,194 +7590,194 @@ ak ak "} (5,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -7808,194 +7847,194 @@ ak ak "} (6,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -8065,194 +8104,194 @@ ak ak "} (7,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -8322,194 +8361,194 @@ ak ak "} (8,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -8579,194 +8618,194 @@ ak ak "} (9,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -8836,194 +8875,194 @@ ak ak "} (10,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -9204,83 +9243,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -9461,83 +9500,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -9718,83 +9757,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -9975,83 +10014,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -10232,83 +10271,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -10489,83 +10528,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -10746,83 +10785,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -11003,83 +11042,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -11260,83 +11299,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -11517,83 +11556,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -11774,83 +11813,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -12031,83 +12070,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -12288,83 +12327,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -12545,83 +12584,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -12802,83 +12841,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -13059,83 +13098,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +rm +rm +rm +rm +rm +rm +rm +rm +rm +rm +rm +rm +rm +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -13316,83 +13355,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +uZ +zd +zd +zd +zd +zd +zd +zd +zd +zd +zd +zd +zd +zd +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -13573,83 +13612,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +uZ +zd +Gf +FH +FH +FH +FH +FH +FH +FH +FH +FH +FH +FH +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -13830,83 +13869,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -aa -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +eG +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +uZ +zd +AN +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -14087,31 +14126,31 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp yr ap ap @@ -14124,46 +14163,46 @@ yr yr bx yr -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +uZ +zd +AN +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -14344,31 +14383,31 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp yr Ee Ac @@ -14381,46 +14420,46 @@ ao aq nN yr -ak -ak -ak -ak -Vo -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +RA +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +uZ +zd +AN +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -14601,31 +14640,31 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp yr pu NI @@ -14638,46 +14677,46 @@ bi aq Zd yr -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +uZ +zd +AN +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -14858,28 +14897,28 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp ap ap ap @@ -14903,38 +14942,38 @@ Hd nI TC TC -cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wc +mO +mO +mO +mO +mO +mO +mO +uZ +zd +AN +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -15115,28 +15154,28 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp ap El BL @@ -15161,37 +15200,37 @@ qt rj Gn cM -cf -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +um +mO +mO +mO +mO +mO +mO +uZ +zd +AN +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -15372,28 +15411,28 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -HM +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +kG yr EL El @@ -15418,37 +15457,37 @@ Ym rj eM cM -YB -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +un +mO +mO +mO +mO +mO +mO +uZ +zd +AN +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -15629,28 +15668,28 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -KJ +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +aw yr WM mS @@ -15678,34 +15717,34 @@ cM uJ nI cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +uZ +zd +AN +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -15886,25 +15925,25 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp ap ap ap @@ -15935,34 +15974,34 @@ dZ yk ju cM -ak -ak -ak -ak +mO +mO +mO +mO cR US cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -16143,25 +16182,25 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp ap gp nV @@ -16192,34 +16231,34 @@ QW RO Tv cM -ak -ak -ak -ak +mO +mO +mO +mO cR dZ cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -16400,25 +16439,25 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp ap tL oB @@ -16456,27 +16495,27 @@ cM cR oL cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -16657,25 +16696,25 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp ap Bd Ny @@ -16713,27 +16752,27 @@ kO eL Pl cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -16914,25 +16953,25 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp yr Du aq @@ -16948,8 +16987,8 @@ aq Fy sA ap -iZ -ak +Kj +mO FF jk cC @@ -16970,27 +17009,27 @@ dZ dZ dZ cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -17171,25 +17210,25 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -Xf +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +YF yr Du aq @@ -17205,8 +17244,8 @@ Cr Cd je ap -ak -ak +mO +mO FF FF FF @@ -17227,27 +17266,27 @@ fy dZ SJ cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -17428,25 +17467,25 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -Xf +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +YF yr VX aq @@ -17462,13 +17501,13 @@ aq aq aq yr -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO cQ di dy @@ -17484,27 +17523,27 @@ fy dZ dZ cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -17685,23 +17724,23 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -Of +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Er yr yr yr @@ -17719,13 +17758,13 @@ aq rz UM ap -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO cQ dj dz @@ -17741,27 +17780,27 @@ dZ dZ eM cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -17942,23 +17981,23 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp vw Ou vw @@ -17976,13 +18015,13 @@ Zk iG je ap -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO cQ dk dA @@ -17998,27 +18037,27 @@ GN fB ku cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -18199,23 +18238,23 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -Of +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Er yr yr yr @@ -18233,13 +18272,13 @@ aq aq aq yr -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO cQ cQ cQ @@ -18257,25 +18296,25 @@ cM cM cM cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -18456,24 +18495,24 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -KJ +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +aw ap GY Ee @@ -18490,13 +18529,13 @@ aq qN HW ap -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO cM dl dB @@ -18514,25 +18553,25 @@ cM fe fr cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +wS +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -18713,24 +18752,24 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp ap Ee Ee @@ -18747,13 +18786,13 @@ hY Cd je ap -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO cR dm dC @@ -18771,25 +18810,25 @@ cM ff fP cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -18970,24 +19009,24 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp ap jU Ps @@ -19004,13 +19043,13 @@ yr yr yr yr -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO cR Ho dD @@ -19028,25 +19067,25 @@ cM fO cM cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -19227,24 +19266,24 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp ap jU jo @@ -19258,16 +19297,16 @@ yr zU TT ap -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cM dn dE @@ -19285,25 +19324,25 @@ eL fh ec cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -19484,24 +19523,24 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp ap ap ap @@ -19515,15 +19554,15 @@ yr ap ap ap -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO cM cM cM @@ -19542,25 +19581,25 @@ eN HO fp cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -19741,46 +19780,46 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -Gw -ak -ak -UW -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Kl +Fp +Fp +Oe +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cM cS do @@ -19799,25 +19838,25 @@ cM Nj cM cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -19998,46 +20037,46 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -sY -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Ky +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cM cT cV @@ -20055,26 +20094,26 @@ cM vb hz cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -20255,46 +20294,46 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -UW -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Oe +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cM cU dp @@ -20312,26 +20351,26 @@ cM Es Tn cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -20512,46 +20551,46 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -UW -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Oe +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cM cV dq @@ -20569,26 +20608,26 @@ cM cM Zf cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -20769,46 +20808,46 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cM cW dr @@ -20826,26 +20865,26 @@ cM UP ss cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -21026,46 +21065,46 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cM cM cM @@ -21083,26 +21122,26 @@ cM IK tI cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -21283,50 +21322,50 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cR dZ er @@ -21340,26 +21379,26 @@ cM cM cM cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -21540,50 +21579,50 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cR ek ew @@ -21594,29 +21633,29 @@ cR cR cR cM -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -21797,83 +21836,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cR cR ex cR cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -22054,83 +22093,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cR ey cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -22311,83 +22350,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cR er cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -22568,83 +22607,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cR er cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -22825,83 +22864,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cR er cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -23082,83 +23121,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO cR er cR -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -23339,83 +23378,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO bq ai bq -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -23596,83 +23635,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO br ez br -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -23853,83 +23892,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO br ez br -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -24110,83 +24149,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO br ez br -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -24367,83 +24406,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Fp +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO br ez br -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -24624,36 +24663,36 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +mO +mO +mO +mO +mO +mO nM na na @@ -24664,43 +24703,43 @@ aA aA aA aA -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO br UQ br -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -24881,83 +24920,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +wS +mO +mO +mO +mO +mO +mO nM rt WC -jg +ug nM br ax aD aE br -ak -ak -ak -ak +mO +mO +mO +mO br br eA br br -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -25138,36 +25177,36 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +wS +mO +mO +mO +mO +mO +mO nM ky qd @@ -25188,33 +25227,33 @@ eB cD br bq -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -25395,36 +25434,36 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +wS +wS +mO +mO +mO +mO +mO +mO nM OD oY @@ -25445,33 +25484,33 @@ ez bP eS bq -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +mO +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -25652,36 +25691,36 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +wS +wS +wS +mO +mO +mO +mO +mO +mO nM GU nH @@ -25702,33 +25741,33 @@ eC eP eT bq -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +mO +mO +mO +mO +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -25798,150 +25837,150 @@ ak ak "} (76,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -tg -VQ -tg -tg -VQ -tg +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +ny +Tm +ny +ny +Tm +ny bf bf bE @@ -25962,30 +26001,30 @@ bq bq bq bq -yX -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +PU +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -26055,150 +26094,150 @@ ak ak "} (77,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -VQ -GW -Qu -QP -AJ -RI +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +Tm +FE +hZ +mx +vo +gq bf bf bF @@ -26219,30 +26258,30 @@ br wj dU br -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -26312,150 +26351,150 @@ ak ak "} (78,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -tg -YH -BT -RI -du -Lc +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +ny +Jk +Ne +gq +jT +AL bl bo bA @@ -26476,30 +26515,30 @@ sH lO sj zn -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -26569,150 +26608,150 @@ ak ak "} (79,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -tg -YH -Ht -Nu -uX -rY +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +ny +Jk +Fi +KF +iC +uu bm bp LL @@ -26733,30 +26772,30 @@ br jV RE br -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -26826,157 +26865,157 @@ ak ak "} (80,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -tg -YH -De -uw -Ht -OR +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +ny +Jk +yK +mW +Fi +nh bn bs bH bV bt aI -cg +Tt bq ar Rx @@ -26990,30 +27029,30 @@ bq bq bq bq -yX -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +PU +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -27083,150 +27122,150 @@ ak ak "} (81,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -MC -MC -MC -MC -MC -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -VQ -lM -RI -tC -rN -lZ +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +Tm +Wi +gq +xB +oe +to bf bu bC @@ -27244,33 +27283,33 @@ eI bq eX bq -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -27340,150 +27379,150 @@ ak ak "} (82,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -MC -MC -MC -MC -MC -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -tg -tg -VQ -tg -tg -tg +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +ny +ny +Tm +ny +ny +ny bf bf bg @@ -27501,33 +27540,33 @@ av dV eY bq -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -27597,151 +27636,151 @@ ak ak "} (83,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -MC -MC -MC -MC -MC -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO bf bJ bY @@ -27758,33 +27797,33 @@ dV dV eY bq -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -27854,151 +27893,151 @@ ak ak "} (84,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO bf bK bW @@ -28015,33 +28054,33 @@ dY dY eZ bq -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -28111,151 +28150,151 @@ ak ak "} (85,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +mO +mO +mO +mO +mO +mO +mO bf bg WD @@ -28272,33 +28311,33 @@ bq bq bq bq -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -28368,194 +28407,194 @@ ak ak "} (86,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -28625,194 +28664,194 @@ ak ak "} (87,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +mO +mO +mO +mO +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -28882,194 +28921,194 @@ ak ak "} (88,1,1) = {" -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +wS +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Fp +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -29250,83 +29289,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -29507,83 +29546,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -29764,83 +29803,83 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy +Iy ak ak ak @@ -33638,11 +33677,11 @@ ak ak ak ak -LN -LN -LN -LN -LN +NH +NH +NH +NH +NH ak ak ak @@ -33894,13 +33933,13 @@ ak ak ak ak -LN -LN -LN -LN -LN -LN -LN +NH +NH +NH +NH +NH +NH +NH ak ak ak @@ -34150,15 +34189,15 @@ ak ak ak ak -LN -LN -LN -wi -LN -wi -LN -LN -LN +NH +NH +NH +FS +NH +FS +NH +NH +NH ak ak ak @@ -34407,15 +34446,15 @@ ak ak ak ak -LN -LN -mg -Tj -hA -Tj -mg -Nn -LN +NH +NH +AF +XV +tV +XV +AF +TE +NH ak ak ak @@ -34664,15 +34703,15 @@ ak ak ak ak -LN -LN -IJ -GX -GX -GX -mg -Nn -LN +NH +NH +qG +Ox +Ox +Ox +AF +TE +NH ak ak ak @@ -34921,15 +34960,15 @@ ak ak ak ak -mg -mg -mg -GX -GX -GX -mg -Nn -LN +AF +AF +AF +Ox +Ox +Ox +AF +TE +NH ak ak ak @@ -35178,15 +35217,15 @@ ak ak ak ak -mg -vY -mg -mg -mg -mg -Tj -Dj -LN +AF +ZB +AF +AF +AF +AF +XV +lI +NH ak ak ak @@ -35435,15 +35474,15 @@ ak ak ak ak -mg -WH -ut -Vn -Ii -Ii -hA -LN -LN +AF +Hy +fw +ic +BJ +BJ +tV +NH +NH ak ak ak @@ -35692,15 +35731,15 @@ ak ak ak ak -mg -Qf -mg -mg -Ii -mg -Tj -Dj -LN +AF +iw +AF +AF +BJ +AF +XV +lI +NH ak ak ak @@ -35949,15 +35988,15 @@ ak ak ak ak -mg -mg -mg -HN -nF -wH -mg -LN -LN +AF +AF +AF +iX +uP +Ja +AF +NH +NH ak ak ak @@ -36206,15 +36245,15 @@ ak ak ak ak -LN -LN -mg -wC -RQ -da -mg -LN -LN +NH +NH +AF +Sk +Ll +LW +AF +NH +NH ak ak ak @@ -36463,15 +36502,15 @@ ak ak ak ak -LN -LN -mg -mg -mg -mg -mg -LN -LN +NH +NH +AF +AF +AF +AF +AF +NH +NH ak ak ak @@ -36720,15 +36759,15 @@ ak ak ak ak -LN -LN -VZ -Nn -Nn -Nn -VZ -LN -LN +NH +NH +SU +TE +TE +TE +SU +NH +NH ak ak ak @@ -36978,13 +37017,13 @@ ak ak ak ak -LN -LN -LN -LN -LN -LN -LN +NH +NH +NH +NH +NH +NH +NH ak ak ak @@ -37236,11 +37275,11 @@ ak ak ak ak -LN -LN -LN -LN -LN +NH +NH +NH +NH +NH ak ak ak @@ -46212,20 +46251,20 @@ Fp Fp Fp Et -Nr -iq -pN -iq -iq -iq -iq -iq -iq -iq -iq -iq -iq -iq +ZZ +nJ +WJ +nJ +nJ +nJ +nJ +nJ +nJ +nJ +nJ +nJ +nJ +nJ ak ak ak @@ -46470,19 +46509,19 @@ Fp Fp Fp Fp -go -XL -go -nG -nG -Kg -iq -wE -Hq -rh -mH -gk -iq +hS +Fg +hS +Tq +Tq +CT +nJ +UL +Iw +xz +rQ +fT +nJ ak ak ak @@ -46727,19 +46766,19 @@ Fp Fp Fp Fp -mU -YX -mU -YX -YX -Kg -iq -of -Nq -Hq -Hq -vK -iq +Km +zM +Km +zM +zM +CT +nJ +BX +uh +Iw +Iw +hT +nJ ak ak ak @@ -46983,20 +47022,20 @@ Fp Fp Fp Fp -Nr -iq -uL -iq -Vd -nG -nG -Wj -GJ -Gr -VY -QJ -zN -iq +ZZ +nJ +mk +nJ +Dg +Tq +Tq +pk +Dm +mV +ZA +MX +hu +nJ ak ak ak @@ -47241,19 +47280,19 @@ Et Et Fp Fp -iq -kd -iq -Bw -nG -nG -nG -Yq -nG -nG -nG -Va -iq +nJ +zH +nJ +xV +Tq +Tq +Tq +kQ +Tq +Tq +Tq +ba +nJ ak ak ak @@ -47498,19 +47537,19 @@ Et Et Fp Fp -RB -jY -Vm -ZS -rI -xF -lR -qs -Yz -xF -iK -xL -iq +RK +Sy +Hn +tZ +kg +TN +ri +Ze +Eu +TN +Im +mf +nJ ak ak ak @@ -47755,19 +47794,19 @@ Et Et Fp Fp -iq -iq -iq -JB -uI -gC -Tx -vU -wl -gC -uI -gC -iq +nJ +nJ +nJ +yj +kr +LA +mm +ij +qw +LA +kr +LA +nJ ak ak ak @@ -48012,19 +48051,19 @@ Et Fp Fp Fp -wt -DI -RU -xR -uI -Rs -Tx -Yi -wl -Rs -uI -Rs -iq +yG +Io +iA +Hc +kr +yL +mm +Rv +qw +yL +kr +yL +nJ ak ak ak @@ -48054,7 +48093,7 @@ CG sX Fa Fa -oi +lA hM hM hM @@ -48269,19 +48308,19 @@ Et Et Et Fp -mg -mg -iq -Xy -gN -ux -GT -QK -rH -ux -gN -Xy -iq +AF +AF +nJ +wP +wU +dL +FI +Hk +Ap +dL +wU +wP +nJ ak ak ak @@ -48528,17 +48567,17 @@ Et Fp Fp Fp -iq -iq -Xj -iq -Xj -iq -Xj -iq -Xj -iq -iq +nJ +nJ +Ql +nJ +Ql +nJ +Ql +nJ +Ql +nJ +nJ Et Et ak @@ -48786,15 +48825,15 @@ Et Et Fp Fp -FN +lL Fp Fp Fp -FN +lL Fp Fp Fp -FN +lL Et Fp Et @@ -51653,7 +51692,7 @@ Qv Qv tK Qv -ER +Sd Qv Wb Wb @@ -52936,9 +52975,9 @@ hM hM hM hM -ak -ak -ak +Et +Et +Et hM hM hM @@ -53190,13 +53229,13 @@ Et Et Et Et -ak -ak -ak -ak -ak -ak -ak +Et +Et +Et +Fp +Fp +Et +Et ak ak ak @@ -53447,13 +53486,13 @@ Et Et Et Et -ak -ak -ak -ak -ak -ak -ak +Et +Fp +oh +oh +oh +Fp +Et ak ak ak @@ -53704,13 +53743,13 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak -ak +Et +Et +Et +Fp +Fp +Fp +Et ak ak ak @@ -53962,12 +54001,12 @@ ak ak ak ak -ak -ak -ak -ak -ak -ak +Et +Et +Et +Et +Et +Et ak ak ak @@ -55255,10 +55294,10 @@ ak ak ak ak -Sd -Sd -Sd -Sd +ak +ak +ak +ak ak ak ak @@ -55512,10 +55551,10 @@ ak ak ak ak -Sd -mC -mC -Sd +ak +ak +ak +ak ak ak ak @@ -55767,12 +55806,12 @@ ak ak ak ak -Sd -Sd -Sd -Me -mC -Sd +ak +ak +ak +ak +ak +ak ak ak ak @@ -56024,12 +56063,12 @@ ak ak ak ak -Sd -mC -mC -Me -Sd -Sd +ak +ak +ak +ak +ak +ak ak ak ak @@ -56281,11 +56320,11 @@ ak ak ak ak -Sd -mC -mC -Me -Sd +ak +ak +ak +ak +ak ak ak ak @@ -56538,11 +56577,11 @@ ak ak ak ak -Sd -Sd -mC -Sd -Sd +ak +ak +ak +ak +ak ak ak ak @@ -56795,10 +56834,10 @@ ak ak ak ak -Sd -Sd -Sd -Sd +ak +ak +ak +ak ak ak ak diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 075fd8cc3f3..89acf2b6cae 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -70,7 +70,6 @@ SUBSYSTEM_DEF(mapping) repopulate_sorted_areas() process_teleport_locs() //Sets up the wizard teleport locations preloadTemplates() - run_map_generation() #ifndef LOWMEMORYMODE // Create space ruin levels @@ -119,6 +118,8 @@ SUBSYSTEM_DEF(mapping) seedRuins(space_ruins, CONFIG_GET(number/space_budget), list(/area/space), space_ruins_templates) loading_ruins = FALSE #endif + // Run map generation after ruin generation to prevent issues + run_map_generation() // Add the transit level transit = add_new_zlevel("Transit/Reserved", list(ZTRAIT_RESERVED = TRUE)) repopulate_sorted_areas() diff --git a/code/datums/mapgen/CaveGenerator.dm b/code/datums/mapgen/CaveGenerator.dm index a0b23175f01..4d6ae0ae07d 100644 --- a/code/datums/mapgen/CaveGenerator.dm +++ b/code/datums/mapgen/CaveGenerator.dm @@ -1,22 +1,19 @@ /datum/map_generator/cave_generator var/name = "Cave Generator" ///Weighted list of the types that spawns if the turf is open - var/open_turf_types = list(/turf/open/floor/plating/asteroid = 1) + var/open_turf_types = list(/turf/open/floor/plating/asteroid/airless = 1) ///Weighted list of the types that spawns if the turf is closed - var/closed_turf_types = list(/turf/closed/mineral/random/volcanic = 1) + var/closed_turf_types = list(/turf/closed/mineral/random = 1) - ///Weighted list of extra features that can spawn in the area, such as geysers. - var/list/feature_spawn_list = list(/obj/structure/geyser/random = 1) ///Weighted list of mobs that can spawn in the area. - var/list/mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50, /obj/structure/spawner/lavaland/goliath = 3, \ - /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 2, \ - /mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \ - SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10) - ///Weighted list of flora that can spawn in the area. - var/list/flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2) + var/list/mob_spawn_list // Weighted list of Megafauna that can spawn in the caves var/list/megafauna_spawn_list + ///Weighted list of flora that can spawn in the area. + var/list/flora_spawn_list + ///Weighted list of extra features that can spawn in the area, such as geysers. + var/list/feature_spawn_list ///Base chance of spawning a mob @@ -39,8 +36,14 @@ /datum/map_generator/cave_generator/New() . = ..() + if(!mob_spawn_list) + mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3) if(!megafauna_spawn_list) - megafauna_spawn_list = GLOB.megafauna_spawn_list + megafauna_spawn_list = GLOB.megafauna_spawn_list + if(!flora_spawn_list) + flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2) + if(!feature_spawn_list) + feature_spawn_list = list(/obj/structure/geyser/random = 1) /datum/map_generator/cave_generator/generate_terrain(list/turfs) . = ..() diff --git a/code/datums/mapgen/Cavegens/IcemoonCaves.dm b/code/datums/mapgen/Cavegens/IcemoonCaves.dm index c03b2abb43d..a7c4c7fd674 100644 --- a/code/datums/mapgen/Cavegens/IcemoonCaves.dm +++ b/code/datums/mapgen/Cavegens/IcemoonCaves.dm @@ -3,12 +3,12 @@ closed_turf_types = list(/turf/closed/mineral/random/snow = 1) - feature_spawn_list = list(/obj/structure/geyser/random = 1) mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/wolf = 50, /obj/structure/spawner/ice_moon = 3, \ /mob/living/simple_animal/hostile/asteroid/polarbear = 30, /obj/structure/spawner/ice_moon/polarbear = 3, \ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10, \ /mob/living/simple_animal/hostile/asteroid/lobstrosity = 15) flora_spawn_list = list(/obj/structure/flora/tree/pine = 2, /obj/structure/flora/rock/icy = 2, /obj/structure/flora/rock/pile/icy = 2, /obj/structure/flora/grass/both = 6, /obj/structure/flora/ash/chilly = 2) + feature_spawn_list = list(/obj/structure/geyser/random = 1) /datum/map_generator/cave_generator/icemoon/surface flora_spawn_chance = 4 @@ -22,5 +22,7 @@ closed_turf_types = list(/turf/closed/mineral/random/snow/underground = 1) mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/ice_demon = 50, /obj/structure/spawner/ice_moon/demonic_portal = 3, \ /mob/living/simple_animal/hostile/asteroid/ice_whelp = 30, /obj/structure/spawner/ice_moon/demonic_portal/ice_whelp = 3, \ - /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /obj/structure/spawner/ice_moon/demonic_portal/snowlegion = 3) + /mob/living/simple_animal/hostile/asteroid/hivelord/legion/snow = 50, /obj/structure/spawner/ice_moon/demonic_portal/snowlegion = 3, \ + SPAWN_MEGAFAUNA = 2) + megafauna_spawn_list = list(/mob/living/simple_animal/hostile/megafauna/colossus = 1) flora_spawn_list = list(/obj/structure/flora/rock/icy = 6, /obj/structure/flora/rock/pile/icy = 6, /obj/structure/flora/ash/chilly = 1) diff --git a/code/datums/mapgen/Cavegens/LavalandGenerator.dm b/code/datums/mapgen/Cavegens/LavalandGenerator.dm index 31f5fcf5095..b895ad44142 100644 --- a/code/datums/mapgen/Cavegens/LavalandGenerator.dm +++ b/code/datums/mapgen/Cavegens/LavalandGenerator.dm @@ -3,12 +3,12 @@ closed_turf_types = list(/turf/closed/mineral/random/volcanic = 1) - feature_spawn_list = list(/obj/structure/geyser/random = 1) mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goliath/beast/random = 50, /obj/structure/spawner/lavaland/goliath = 3, \ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 2, \ /mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \ SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10) flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2) + feature_spawn_list = list(/obj/structure/geyser/random = 1) initial_closed_chance = 45 smoothing_iterations = 50 diff --git a/code/game/area/areas/mining.dm b/code/game/area/areas/mining.dm index f4fd675b9b6..7b17281a432 100644 --- a/code/game/area/areas/mining.dm +++ b/code/game/area/areas/mining.dm @@ -32,7 +32,8 @@ outdoors = TRUE flags_1 = NONE ambience_index = AMBIENCE_MINING - area_flags = VALID_TERRITORY | UNIQUE_AREA | FLORA_ALLOWED | CAVES_ALLOWED | NO_ALERTS + area_flags = VALID_TERRITORY | UNIQUE_AREA | NO_ALERTS | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED + map_generator = /datum/map_generator/cave_generator min_ambience_cooldown = 70 SECONDS max_ambience_cooldown = 220 SECONDS @@ -131,11 +132,11 @@ /area/lavaland/surface/outdoors/unexplored //monsters and ruins spawn here icon_state = "unexplored" area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | NO_ALERTS + map_generator = /datum/map_generator/cave_generator/lavaland /area/lavaland/surface/outdoors/unexplored/danger //megafauna will also spawn here icon_state = "danger" area_flags = VALID_TERRITORY | UNIQUE_AREA | CAVES_ALLOWED | FLORA_ALLOWED | MOB_SPAWN_ALLOWED | MEGAFAUNA_SPAWN_ALLOWED | NO_ALERTS - map_generator = /datum/map_generator/cave_generator/lavaland /area/lavaland/surface/outdoors/explored name = "Lavaland Labor Camp" diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index 7da6d18edfa..181b72da708 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -80,6 +80,10 @@ GLOBAL_LIST_INIT(ore_probability, list( light_range = 1 light_color = COLOR_SOFT_RED +/obj/structure/spawner/ice_moon/demonic_portal/Initialize() + . = ..() + AddComponent(/datum/component/gps, "Netheric Signal") + /obj/structure/spawner/ice_moon/demonic_portal/clear_rock() for(var/turf/F in RANGE_TURFS(3, src)) if(abs(src.x - F.x) + abs(src.y - F.y) > 5) diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index 00bb3867a95..3a7ee07bcb8 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -5,10 +5,12 @@ icon = 'icons/obj/structures.dmi' icon_state = "ladder11" anchored = TRUE + obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN var/obj/structure/ladder/down //the ladder below this one var/obj/structure/ladder/up //the ladder above this one var/crafted = FALSE - obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN + /// Optional travel time for ladder in deciseconds + var/travel_time = 0 /obj/structure/ladder/Initialize(mapload, obj/structure/ladder/up, obj/structure/ladder/down) ..() @@ -70,8 +72,11 @@ /obj/structure/ladder/proc/travel(going_up, mob/user, is_ghost, obj/structure/ladder/ladder) if(!is_ghost) - show_fluff_message(going_up, user) ladder.add_fingerprint(user) + if(!do_after(user, travel_time, target = src)) + return + show_fluff_message(going_up, user) + var/turf/T = get_turf(ladder) var/atom/movable/AM diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index e045b1ae4a3..6c5a67c617a 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -1,3 +1,5 @@ +#define MINING_MESSAGE_COOLDOWN 20 + /**********************Mineral deposits**************************/ /turf/closed/mineral //wall piece @@ -22,6 +24,8 @@ var/last_act = 0 var/scan_state = "" //Holder for the image we display when we're pinged by a mining scanner var/defer_change = 0 + // If true you can mine the mineral turf with your hands + var/weak_turf = FALSE /turf/closed/mineral/Initialize() . = ..() @@ -80,6 +84,22 @@ else return attack_hand(user) +/turf/closed/mineral/attack_hand(mob/user) + if(!weak_turf) + return ..() + var/turf/user_turf = user.loc + if (!isturf(user_turf)) + return + if(last_act + MINING_MESSAGE_COOLDOWN > world.time)//prevents message spam + return + last_act = world.time + to_chat(user, "You start pulling out pieces of [src] with your hands...") + if(!do_after(user, 15 SECONDS, target = src)) + return + if(ismineralturf(src)) + to_chat(user, "You finish pulling apart [src].") + gets_drilled(user) + /turf/closed/mineral/proc/gets_drilled(user, give_exp = FALSE) if (mineralType && (mineralAmt > 0)) new mineralType(src, mineralAmt) @@ -97,9 +117,10 @@ var/flags = NONE if(defer_change) // TODO: make the defer change var a var for any changeturf flag flags = CHANGETURF_DEFER_CHANGE - ScrapeAway(null, flags) + var/turf/open/mined = ScrapeAway(null, flags) addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE) playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction + mined.update_visuals() /turf/closed/mineral/attack_animal(mob/living/simple_animal/user, list/modifiers) if((user.environment_smash & ENVIRONMENT_SMASH_WALLS) || (user.environment_smash & ENVIRONMENT_SMASH_RWALLS)) @@ -241,6 +262,7 @@ turf_type = /turf/open/floor/plating/asteroid/snow/icemoon baseturfs = /turf/open/floor/plating/asteroid/snow/icemoon initial_gas_mix = ICEMOON_DEFAULT_ATMOS + weak_turf = TRUE /turf/closed/mineral/random/snow/Change_Ore(ore_type, random = 0) . = ..() @@ -630,3 +652,5 @@ /turf/closed/mineral/strong/ex_act(severity, target) return + +#undef MINING_MESSAGE_COOLDOWN diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm index ad7675c68da..445d1a3d079 100644 --- a/code/game/turfs/open/floor/plating/misc_plating.dm +++ b/code/game/turfs/open/floor/plating/misc_plating.dm @@ -254,6 +254,9 @@ initial_gas_mix = ICEMOON_DEFAULT_ATMOS slowdown = 0 +/turf/open/floor/plating/ice/icemoon/no_planet_atmos + planetary_atmos = FALSE + /turf/open/floor/plating/snowed name = "snowed-over plating" desc = "A section of heated plating, helps keep the snow from stacking up too high." diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index 1d52fee6a95..50664418d5e 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -152,17 +152,27 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr initial_gas_mix = ICEMOON_DEFAULT_ATMOS planetary_atmos = TRUE var/replacement_turf = /turf/open/floor/plating/asteroid/snow/icemoon + /// Replaces itself with replacement_turf if the turf below this one is in a no ruins allowed area (usually ruins themselves) + var/protect_ruin = TRUE + /// If true mineral turfs below this openspace turf will be mined automatically + var/drill_below = TRUE /turf/open/openspace/icemoon/Initialize() . = ..() var/turf/T = below() - if(T.flags_1 & NO_RUINS_1) + if(T.flags_1 & NO_RUINS_1 && protect_ruin) ChangeTurf(replacement_turf, null, CHANGETURF_IGNORE_AIR) return - if(!ismineralturf(T)) + if(!ismineralturf(T) || !drill_below) return var/turf/closed/mineral/M = T M.mineralAmt = 0 M.gets_drilled() baseturfs = /turf/open/openspace/icemoon //This is to ensure that IF random turf generation produces a openturf, there won't be other turfs assigned other than openspace. +/turf/open/openspace/icemoon/keep_below + drill_below = FALSE + +/turf/open/openspace/icemoon/ruins + protect_ruin = FALSE + drill_below = FALSE diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index fbe52fee1a5..45c506162a7 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -249,13 +249,6 @@ baseturfs = /turf/open/lava/plasma/mafia slowdown = 0 -/obj/vehicle/ridden/lavaboat/plasma - name = "plasma boat" - desc = "A boat used for traversing the streams of plasma without turning into an icecube." - icon_state = "goliath_boat" - icon = 'icons/obj/lavaland/dragonboat.dmi' - resistance_flags = FREEZE_PROOF - can_buckle = TRUE /////////// papers diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index 708a4f5a8ad..26070bac1a1 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -74,8 +74,10 @@ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/spear) armor = list(MELEE = 70, BULLET = 30, LASER = 50, ENERGY = 50, BOMB = 70, BIO = 60, RAD = 50, FIRE = 100, ACID = 100) hoodtype = /obj/item/clothing/head/hooded/cloakhood/drake - heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF transparent_protection = HIDEGLOVES|HIDESUITSTORAGE|HIDEJUMPSUIT|HIDESHOES @@ -86,6 +88,8 @@ desc = "The skull of a dragon." armor = list(MELEE = 70, BULLET = 30, LASER = 50, ENERGY = 50, BOMB = 70, BIO = 60, RAD = 50, FIRE = 100, ACID = 100) clothing_flags = SNUG_FIT + cold_protection = HEAD + min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT heat_protection = HEAD max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index c3e4bc3e3e6..da54ce23dc1 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -46,6 +46,7 @@ new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000), new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2500), new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), + new /datum/data/mining_equipment("Ice Hiking Boots", /obj/item/clothing/shoes/winterboots/ice_boots, 2500), new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000), new /datum/data/mining_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxuryelite, 10000), new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800), diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index b0be59f1a85..7ed341a50ef 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -1,3 +1,5 @@ +GLOBAL_LIST_EMPTY(frost_miner_prisms) + /* Difficulty: Extremely Hard @@ -23,10 +25,11 @@ Difficulty: Extremely Hard armour_penetration = 100 melee_damage_lower = 10 melee_damage_upper = 10 - aggro_vision_range = 18 // large vision range so combat doesn't abruptly end when someone runs a bit away + vision_range = 18 // large vision range so combat doesn't abruptly end when someone runs a bit away rapid_melee = 4 speed = 20 move_to_delay = 20 + gps_name = "Bloodchilling Signal" ranged = TRUE crusher_loot = list(/obj/effect/decal/remains/plasma, /obj/item/crusher_trophy/ice_block_talisman) loot = list(/obj/effect/decal/remains/plasma) @@ -51,6 +54,8 @@ Difficulty: Extremely Hard /mob/living/simple_animal/hostile/megafauna/demonic_frost_miner/Initialize() . = ..() + for(var/obj/structure/frost_miner_prism/prism_to_set in GLOB.frost_miner_prisms) + prism_to_set.set_prism_light(LIGHT_COLOR_BLUE, 5) AddComponent(/datum/component/knockback, 7, FALSE, TRUE) AddComponent(/datum/component/lifesteal, 50) @@ -77,7 +82,7 @@ Difficulty: Extremely Hard /mob/living/simple_animal/hostile/megafauna/demonic_frost_miner/OpenFire() check_enraged() - projectile_speed_multiplier = 1 - enraged * 0.25 + projectile_speed_multiplier = 1 - enraged * 0.5 SetRecoveryTime(100, 100) if(client) @@ -129,7 +134,7 @@ Difficulty: Extremely Hard icon_state = "nuclear_particle" damage = 5 armour_penetration = 100 - speed = 4 + speed = 3 damage_type = BRUTE /obj/projectile/ice_blast @@ -137,7 +142,7 @@ Difficulty: Extremely Hard icon_state = "ice_2" damage = 15 armour_penetration = 100 - speed = 4 + speed = 3 damage_type = BRUTE /obj/projectile/ice_blast/on_hit(atom/target, blocked = FALSE) @@ -252,6 +257,8 @@ Difficulty: Extremely Hard icon_state = "demonic_miner_phase2" animate(src, pixel_y = pixel_y - 96, time = 8, flags = ANIMATION_END_NOW) spin(8, 2) + for(var/obj/structure/frost_miner_prism/prism_to_set in GLOB.frost_miner_prisms) + prism_to_set.set_prism_light(LIGHT_COLOR_PURPLE, 5) SLEEP_CHECK_DEATH(8) for(var/mob/living/L in viewers(src)) shake_camera(L, 3, 2) @@ -265,6 +272,8 @@ Difficulty: Extremely Hard return var/turf/T = get_turf(src) var/loot = rand(1, 3) + for(var/obj/structure/frost_miner_prism/prism_to_set in GLOB.frost_miner_prisms) + prism_to_set.set_prism_light(COLOR_GRAY, 1) switch(loot) if(1) new /obj/item/resurrection_crystal(T) @@ -312,7 +321,7 @@ Difficulty: Extremely Hard desc = "A pair of winter boots contractually made by a devil, they cannot be taken off once put on." actions_types = list(/datum/action/item_action/toggle) var/on = FALSE - var/change_turf = /turf/open/floor/plating/ice/icemoon + var/change_turf = /turf/open/floor/plating/ice/icemoon/no_planet_atmos var/duration = 6 SECONDS /obj/item/clothing/shoes/winterboots/ice_boots/ice_trail/Initialize() @@ -376,12 +385,17 @@ Difficulty: Extremely Hard /datum/status_effect/ice_block_talisman id = "ice_block_talisman" - duration = 40 - status_type = STATUS_EFFECT_REFRESH + duration = 4 SECONDS + status_type = STATUS_EFFECT_REPLACE alert_type = /atom/movable/screen/alert/status_effect/ice_block_talisman /// Stored icon overlay for the hit mob, removed when effect is removed var/icon/cube +/datum/status_effect/ice_block_talisman/on_creation(mob/living/new_owner, set_duration) + if(isnum(set_duration)) + duration = set_duration + return ..() + /atom/movable/screen/alert/status_effect/ice_block_talisman name = "Frozen Solid" desc = "You're frozen inside an ice cube, and cannot move!" @@ -406,3 +420,22 @@ Difficulty: Extremely Hard to_chat(owner, "The cube melts!") owner.cut_overlay(cube) UnregisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE) + +/obj/structure/frost_miner_prism + name = "frost miner light prism" + desc = "A magical crystal enhanced by a demonic presence." + icon = 'icons/obj/slimecrossing.dmi' + icon_state = "lightprism" + density = FALSE + anchored = TRUE + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF + +/obj/structure/frost_miner_prism/Initialize(mapload) + . = ..() + GLOB.frost_miner_prisms |= src + set_prism_light(LIGHT_COLOR_BLUE, 5) + +/obj/structure/frost_miner_prism/proc/set_prism_light(new_color, new_range) + color = new_color + set_light_color(new_color) + set_light(new_range) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index f94776f59ec..71f0198833c 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -276,19 +276,26 @@ dragon_fire_line(src, turfs) //fire line keeps going even if dragon is deleted -/proc/dragon_fire_line(atom/source, list/turfs) +/proc/dragon_fire_line(atom/source, list/turfs, frozen = FALSE) var/list/hit_list = list() for(var/turf/T in turfs) if(istype(T, /turf/closed)) break - new /obj/effect/hotspot(T) + var/obj/effect/hotspot/drake_fire_hotspot = new /obj/effect/hotspot(T) + if(frozen) + drake_fire_hotspot.add_atom_colour(COLOR_BLUE_LIGHT, FIXED_COLOUR_PRIORITY) T.hotspot_expose(DRAKE_FIRE_TEMP,DRAKE_FIRE_EXPOSURE,1) for(var/mob/living/L in T.contents) if(L in hit_list || istype(L, source.type)) continue hit_list += L - L.adjustFireLoss(20) - to_chat(L, "You're hit by [source]'s fire breath!") + if(!frozen) + L.adjustFireLoss(20) + to_chat(L, "You're hit by [source]'s fire breath!") + continue + L.adjustFireLoss(10) + L.apply_status_effect(/datum/status_effect/ice_block_talisman, 20) + to_chat(L, "You're hit by [source]'s freezing breath!") // deals damage to mechs for(var/obj/vehicle/sealed/mecha/M in T.contents) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 996a132aed2..c600cc3b08b 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -154,7 +154,7 @@ /mob/living/simple_animal/hostile/megafauna/proc/SetRecoveryTime(buffer_time, ranged_buffer_time) recovery_time = world.time + buffer_time ranged_cooldown = world.time + buffer_time - if(ranged_buffer_time) + if(isnum(ranged_buffer_time)) ranged_cooldown = world.time + ranged_buffer_time /// Grants medals and achievements to surrounding players diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm index c9260fa8871..bafc459e52d 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm @@ -30,6 +30,7 @@ Difficulty: Hard ranged = TRUE pixel_x = -16 base_pixel_x = -16 + gps_name = "Berserk Signal" loot = list() butcher_results = list() guaranteed_butcher_results = list(/obj/item/wendigo_blood = 1) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm index 20bd36ee931..feaec5d750d 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm @@ -15,7 +15,7 @@ projectilesound = 'sound/weapons/pierce.ogg' ranged = TRUE ranged_message = "manifests ice" - ranged_cooldown_time = 30 + ranged_cooldown_time = 3 SECONDS minimum_distance = 3 retreat_distance = 3 maxHealth = 150 @@ -46,20 +46,20 @@ /obj/projectile/temp/basilisk/ice name = "ice blast" damage = 5 + speed = 4 nodamage = FALSE temperature = -75 /mob/living/simple_animal/hostile/asteroid/ice_demon/OpenFire() + ranged_cooldown = world.time + ranged_cooldown_time // Sentient ice demons teleporting has been linked to server crashes if(client) return ..() if(teleport_distance <= 0) return ..() - var/list/possible_ends = list() - for(var/turf/T in view(teleport_distance, target.loc) - view(teleport_distance - 1, target.loc)) - if(isclosedturf(T)) - continue - possible_ends |= T + var/list/possible_ends = view(teleport_distance, target.loc) - view(teleport_distance - 1, target.loc) + for(var/turf/closed/turf_to_remove in possible_ends) + possible_ends -= turf_to_remove if(!possible_ends.len) return ..() var/turf/end = pick(possible_ends) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice whelp.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice whelp.dm index 9f44062a709..917de76645b 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice whelp.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice whelp.dm @@ -10,12 +10,12 @@ friendly_verb_continuous = "stares down" friendly_verb_simple = "stare down" speak_emote = list("roars") - speed = 30 - move_to_delay = 30 + speed = 12 + move_to_delay = 12 ranged = TRUE - ranged_cooldown_time = 50 - maxHealth = 350 - health = 350 + ranged_cooldown_time = 5 SECONDS + maxHealth = 300 + health = 300 obj_damage = 40 armour_penetration = 20 melee_damage_lower = 20 @@ -23,6 +23,7 @@ attack_verb_continuous = "chomps" attack_verb_simple = "chomp" attack_sound = 'sound/magic/demon_attack1.ogg' + ranged_message = "breathes fire at" vision_range = 9 aggro_vision_range = 9 move_force = MOVE_FORCE_VERY_STRONG @@ -39,10 +40,10 @@ /// How far the whelps fire can go var/fire_range = 4 -/mob/living/simple_animal/hostile/asteroid/ice_whelp/OpenFire() - var/turf/T = get_ranged_target_turf_direct(src, target, fire_range) - var/list/burn_turfs = getline(src, T) - get_turf(src) - dragon_fire_line(src, burn_turfs) +/mob/living/simple_animal/hostile/asteroid/ice_whelp/Shoot() + var/turf/target_fire_turf = get_ranged_target_turf_direct(src, target, fire_range) + var/list/burn_turfs = getline(src, target_fire_turf) - get_turf(src) + dragon_fire_line(src, burn_turfs, frozen = TRUE) /mob/living/simple_animal/hostile/asteroid/ice_whelp/Life(delta_time = SSMOBS_DT, times_fired) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm index 80760c6c768..f4f9141f65c 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm @@ -10,8 +10,8 @@ friendly_verb_continuous = "growls at" friendly_verb_simple = "growl at" speak_emote = list("growls") - speed = 12 - move_to_delay = 12 + speed = 8 + move_to_delay = 8 maxHealth = 300 health = 300 obj_damage = 40 @@ -28,7 +28,6 @@ butcher_results = list(/obj/item/food/meat/slab/bear = 3, /obj/item/stack/sheet/bone = 2) guaranteed_butcher_results = list(/obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide = 1) loot = list() - crusher_loot = /obj/item/crusher_trophy/goliath_tentacle stat_attack = HARD_CRIT robust_searching = TRUE footstep_type = FOOTSTEP_MOB_CLAW diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm index d48c5736ab4..a76535a3872 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm @@ -30,7 +30,6 @@ pull_force = MOVE_FORCE_WEAK butcher_results = list(/obj/item/food/meat/slab = 2, /obj/item/stack/sheet/sinew/wolf = 2, /obj/item/stack/sheet/bone = 2) loot = list() - crusher_loot = /obj/item/crusher_trophy/watcher_wing stat_attack = HARD_CRIT robust_searching = TRUE footstep_type = FOOTSTEP_MOB_CLAW diff --git a/code/modules/vehicles/lavaboat.dm b/code/modules/vehicles/lavaboat.dm index 62af4831e95..2019b43af9c 100644 --- a/code/modules/vehicles/lavaboat.dm +++ b/code/modules/vehicles/lavaboat.dm @@ -41,6 +41,19 @@ time = 50 category = CAT_PRIMAL +/obj/vehicle/ridden/lavaboat/plasma + name = "plasma boat" + desc = "A boat used for traversing the streams of plasma without turning into an icecube." + icon_state = "goliath_boat" + icon = 'icons/obj/lavaland/dragonboat.dmi' + resistance_flags = FREEZE_PROOF + can_buckle = TRUE + +/datum/crafting_recipe/boat/plasma + name = "Polar Bear Hide Boat" + result = /obj/vehicle/ridden/lavaboat/plasma + reqs = list(/obj/item/stack/sheet/animalhide/goliath_hide/polar_bear_hide = 3) + //Dragon Boat diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 43ae7d396dc..bd41b2f15ff 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 5db947c6021..dad15ac811e 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/icemoon/icemoon_monsters.dmi b/icons/mob/icemoon/icemoon_monsters.dmi index 02b39cc3c70..ce25dce5307 100644 Binary files a/icons/mob/icemoon/icemoon_monsters.dmi and b/icons/mob/icemoon/icemoon_monsters.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index eace8ba5210..97efb0dc22b 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 7c4c1b780c7..ff2163386b2 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ