From 95ab2238b62651c3ade53a1d5d027c0c21d230a8 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sun, 3 Apr 2022 16:37:09 -0400 Subject: [PATCH 1/4] More maptweaks! --- code/modules/planet/virgo3c_vr.dm | 10 +- code/modules/power/port_gen_vr.dm | 8 +- maps/groundbase/gb-z1.dmm | 20 +- maps/groundbase/gb-z2.dmm | 8152 ++++++++++++++------------- maps/groundbase/gb-z3.dmm | 1485 +++-- maps/groundbase/groundbase_areas.dm | 35 +- 6 files changed, 4866 insertions(+), 4844 deletions(-) diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index 4118d96bcb..95cf9af4d3 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -26,7 +26,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null seconds_in_day = 6 HOURS /datum/planet/virgo3c - name = "Virgo-3c" + name = "Virgo-3C" desc = "A habitable moon of the gas giant Virgo 3. The volcanic activity of this moon keeps its atmosphere warm enough for life to flourish." current_time = new /datum/time/virgo3c() planetary_wall_type = /turf/unsimulated/wall/planetary/virgo3c @@ -53,7 +53,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null var/min = 0 switch(sun_position) - if(0 to 0.45) // Night + if(0 to 0.475) // Night low_brightness = 0.3 low_color = "#000066" @@ -61,7 +61,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null high_color = "#66004D" min = 0 - if(0.45 to 0.50) // Twilight + if(0.475 to 0.50) // Twilight low_brightness = 0.5 low_color = "#66004D" @@ -69,7 +69,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null high_color = "#CC3300" min = 0.40 - if(0.50 to 0.55) // Sunrise/set + if(0.50 to 0.525) // Sunrise/set low_brightness = 0.9 low_color = "#CC3300" @@ -77,7 +77,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null high_color = "#FF9933" min = 0.50 - if(0.55 to 1.00) // Noon + if(0.525 to 1.00) // Noon low_brightness = 3.0 low_color = "#DDDDDD" diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm index b529bd1dba..f8e018f99d 100644 --- a/code/modules/power/port_gen_vr.dm +++ b/code/modules/power/port_gen_vr.dm @@ -289,8 +289,8 @@ icon_state = "reg" circuit = /obj/item/weapon/circuitboard/machine/reg irradiate = FALSE - power_gen = 0 //It's big but it gets adjusted based on what you put into it!!! - var/default_power_gen = 1000000 + power_gen = 0 + var/default_power_gen = 1000000 //It's big but it gets adjusted based on what you put into it!!! var/part_mult = 0 pixel_x = -32 plane = ABOVE_MOB_PLANE @@ -300,8 +300,8 @@ density = FALSE /obj/machinery/power/rtg/d_type_reg/Initialize() - . = ..() pixel_x = -32 + . = ..() /obj/machinery/power/rtg/d_type_reg/Destroy() . = ..() @@ -322,6 +322,7 @@ part_mult = n /obj/machinery/power/rtg/d_type_reg/attackby(obj/item/I, mob/user, params) + pixel_x = -32 if(default_deconstruction_screwdriver(user, I)) return else if(default_deconstruction_crowbar(user, I)) @@ -329,6 +330,7 @@ return ..() /obj/machinery/power/rtg/d_type_reg/update_icon() + pixel_x = -32 if(panel_open) icon_state = "reg-o" else if(buckled_mobs && buckled_mobs.len > 0) diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index b5c9e383c7..5de5f04e04 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -4139,7 +4139,9 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "ll" = ( -/obj/structure/closet/secure_closet/personal, +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, /obj/effect/floor_decal/industrial/outline, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -7938,7 +7940,9 @@ /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/level1/southwestspur) "vP" = ( -/obj/structure/closet/secure_closet/personal, +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, /obj/effect/floor_decal/industrial/outline, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8828,7 +8832,9 @@ /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/level1/centsquare) "ye" = ( -/obj/structure/closet/secure_closet/personal, +/obj/structure/closet/secure_closet/personal{ + anchored = 1 + }, /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) @@ -16133,7 +16139,9 @@ /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/robot) "Sz" = ( -/obj/structure/closet/secure_closet/miner, +/obj/structure/closet/secure_closet/miner{ + anchored = 1 + }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -16686,7 +16694,9 @@ /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) "TY" = ( -/obj/structure/closet/secure_closet/miner, +/obj/structure/closet/secure_closet/miner{ + anchored = 1 + }, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "TZ" = ( diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index ee742b024e..3a2e2bad3c 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -54,6 +54,9 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) +"am" = ( +/turf/simulated/floor/virgo3c, +/area/groundbase/level2/eastspur) "an" = ( /turf/simulated/wall/r_wall, /area/groundbase/command/tcomms) @@ -652,7 +655,8 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/Chemistry) "bT" = ( -/turf/simulated/floor/outdoors/grass/forest/virgo3c, +/obj/machinery/light/small, +/turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/civilian/hydroponics) "bV" = ( /obj/structure/closet/l3closet/scientist, @@ -701,9 +705,6 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) -"ce" = ( -/turf/simulated/open/virgo3c, -/area/groundbase/level2/nw) "cf" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin{ @@ -1218,12 +1219,12 @@ }, /turf/simulated/floor/wood, /area/groundbase/dorms/room7) -"dJ" = ( -/obj/structure/railing/grey{ - dir = 8 +"dK" = ( +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/open/virgo3c, -/area/groundbase/level2/sw) +/turf/simulated/floor/outdoors/grass/virgo3c, +/area/groundbase/command/hop) "dL" = ( /obj/structure/table/woodentable, /obj/item/weapon/melee/chainofcommand, @@ -1309,7 +1310,7 @@ /area/groundbase/civilian/chapel) "ea" = ( /obj/structure/stairs/spawner/west, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/turf/simulated/floor/tiled, /area/groundbase/cargo/office) "ec" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -1574,7 +1575,7 @@ /area/groundbase/dorms) "eN" = ( /turf/simulated/open/virgo3c, -/area/groundbase/level2/sw) +/area/groundbase/level2/westspur) "eO" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin{ @@ -1636,12 +1637,6 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level2/se) -"eZ" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/glass/reinforced/virgo3c, -/area/groundbase/level2/se) "fa" = ( /obj/structure/table/glass, /obj/item/weapon/storage/box/gloves{ @@ -2061,6 +2056,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) +"gs" = ( +/turf/simulated/open/virgo3c, +/area/groundbase/level2/southeastspur) "gt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -2278,6 +2276,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level2/ne) +"ha" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open/virgo3c, +/area/groundbase/level2/southeastspur) "hb" = ( /obj/machinery/alarm{ dir = 4 @@ -2752,6 +2756,10 @@ "iw" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/level2/ne) +"ix" = ( +/obj/structure/railing/grey, +/turf/simulated/open/virgo3c, +/area/groundbase/level2/southeastspur) "iy" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp/green{ @@ -4664,11 +4672,8 @@ }, /area/groundbase/level2/se) "oH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, -/area/groundbase/cargo/office) +/turf/simulated/open/virgo3c, +/area/groundbase/level2/eastspur) "oI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -4733,12 +4738,6 @@ edge_blending_priority = -1 }, /area/groundbase/level2/se) -"oR" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/open/virgo3c, -/area/groundbase/level2/nw) "oS" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -5362,6 +5361,12 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/hall) +"qM" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/outdoors/newdirt/virgo3c, +/area/groundbase/command/hop) "qN" = ( /obj/effect/landmark{ name = "lightsout" @@ -6189,7 +6194,7 @@ icon_state = "4-8" }, /turf/simulated/floor/glass/reinforced/virgo3c, -/area/groundbase/level2/ne) +/area/groundbase/level2/eastspur) "tL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6396,7 +6401,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/turf/simulated/floor/tiled, /area/groundbase/cargo/office) "uq" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -6564,6 +6569,9 @@ /obj/random/vendorall, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) +"uP" = ( +/turf/simulated/floor/outdoors/grass/virgo3c, +/area/groundbase/level2/southwestspur) "uQ" = ( /obj/machinery/bookbinder, /obj/machinery/light{ @@ -6704,9 +6712,6 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) -"vx" = ( -/turf/simulated/floor/glass/reinforced/virgo3c, -/area/groundbase/level2/se) "vy" = ( /obj/structure/railing/grey{ dir = 4 @@ -7534,11 +7539,6 @@ /area/rnd/xenobiology) "yb" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass/polarized{ - dir = 2; - name = "Cargo Office"; - req_one_access = list(31) - }, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "yc" = ( @@ -7938,7 +7938,7 @@ /area/groundbase/medical/triage) "zx" = ( /turf/simulated/floor/glass/reinforced/virgo3c, -/area/groundbase/level2/ne) +/area/groundbase/level2/eastspur) "zz" = ( /obj/machinery/vending/wardrobe/janidrobe, /turf/simulated/floor/tiled, @@ -8340,12 +8340,6 @@ }, /turf/simulated/floor/wood, /area/groundbase/medical/psych) -"AJ" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/open/virgo3c, -/area/groundbase/level2/se) "AK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8476,7 +8470,7 @@ /area/groundbase/cargo/office) "AV" = ( /turf/simulated/floor/virgo3c, -/area/groundbase/level2/nw) +/area/groundbase/level2/westspur) "AY" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/box/donkpockets, @@ -8760,7 +8754,7 @@ dir = 4 }, /turf/simulated/open/virgo3c, -/area/groundbase/level2/ne) +/area/groundbase/level2/northspur) "BX" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -8783,7 +8777,7 @@ dir = 1 }, /turf/simulated/open/virgo3c, -/area/groundbase/level2/nw) +/area/groundbase/level2/westspur) "Ca" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -9615,6 +9609,8 @@ /area/groundbase/cargo/office) "Eo" = ( /obj/machinery/firealarm, +/obj/item/weapon/tool/wrench, +/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) "Ep" = ( @@ -9690,6 +9686,9 @@ /obj/machinery/meter, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) +"EB" = ( +/turf/simulated/open/virgo3c, +/area/groundbase/level2/southwestspur) "EC" = ( /obj/structure/bed/chair/sofa/corp, /obj/machinery/alarm, @@ -10057,7 +10056,7 @@ dir = 4 }, /turf/simulated/open/virgo3c, -/area/groundbase/level2/sw) +/area/groundbase/level2/westspur) "FT" = ( /obj/effect/landmark{ name = "lightsout" @@ -10517,6 +10516,9 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/science/circuits) +"Hi" = ( +/turf/simulated/floor/outdoors/grass/virgo3c, +/area/groundbase/civilian/hydroponics/out) "Hj" = ( /turf/simulated/floor/tiled/virgo3c{ edge_blending_priority = -1 @@ -10563,9 +10565,6 @@ }, /turf/simulated/floor/bmarble, /area/groundbase/civilian/chapel) -"Hr" = ( -/turf/simulated/floor/glass/reinforced/virgo3c, -/area/groundbase/level2/sw) "Hs" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -10900,10 +10899,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) -"Is" = ( -/obj/structure/railing/grey, -/turf/simulated/open/virgo3c, -/area/groundbase/level2/se) "It" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12579,6 +12574,11 @@ /obj/machinery/papershredder, /turf/simulated/floor/tiled, /area/groundbase/command/hop) +"Nf" = ( +/turf/simulated/floor/reinforced/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/level2/westspur) "Ni" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -12920,8 +12920,9 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) "Of" = ( -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, -/area/groundbase/cargo/office) +/obj/machinery/light/bigfloorlamp, +/turf/simulated/floor/outdoors/grass/virgo3c, +/area/medical/virology) "Oh" = ( /obj/structure/bed/chair/sofa/left/black{ dir = 8 @@ -13023,7 +13024,7 @@ "Oy" = ( /obj/structure/railing/grey, /turf/simulated/open/virgo3c, -/area/groundbase/level2/ne) +/area/groundbase/level2/eastspur) "Oz" = ( /obj/structure/sink/kitchen{ pixel_y = 20 @@ -13704,7 +13705,7 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, -/area/groundbase/level2/ne) +/area/groundbase/level2/eastspur) "QE" = ( /obj/machinery/appliance/mixer/cereal, /turf/simulated/floor/tiled/eris/cafe, @@ -15058,6 +15059,9 @@ }, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) +"UD" = ( +/turf/simulated/floor/virgo3c, +/area/groundbase/level2/southeastspur) "UE" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/level2/se) @@ -15335,7 +15339,7 @@ /area/medical/virology) "VA" = ( /turf/simulated/floor/glass/reinforced/virgo3c, -/area/groundbase/level2/nw) +/area/groundbase/level2/westspur) "VB" = ( /obj/machinery/door/window/brigdoor/westleft{ dir = 4; @@ -15425,7 +15429,7 @@ dir = 1 }, /turf/simulated/open/virgo3c, -/area/groundbase/level2/ne) +/area/groundbase/level2/eastspur) "VQ" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -15437,7 +15441,7 @@ /area/groundbase/command/hall) "VR" = ( /turf/simulated/open/virgo3c, -/area/groundbase/level2/ne) +/area/groundbase/level2/northspur) "VS" = ( /obj/structure/table/woodentable, /obj/structure/disposalpipe/segment{ @@ -15555,7 +15559,7 @@ dir = 8 }, /turf/simulated/open/virgo3c, -/area/groundbase/level2/ne) +/area/groundbase/level2/northspur) "We" = ( /obj/machinery/light{ dir = 8 @@ -15813,7 +15817,7 @@ dir = 8 }, /turf/simulated/open/virgo3c, -/area/groundbase/level2/nw) +/area/groundbase/level2/westspur) "WY" = ( /obj/effect/landmark/start/botanist, /turf/simulated/floor/tiled, @@ -16887,27 +16891,27 @@ xE xE xE xE -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -17029,27 +17033,27 @@ xE xE bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -17172,26 +17176,26 @@ xE bY bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -17314,26 +17318,26 @@ bY bY bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -17457,25 +17461,25 @@ bY Jc bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -17600,28 +17604,28 @@ Jc Jc bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -17752,18 +17756,18 @@ bY bY bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -17901,11 +17905,11 @@ bY bY bY bY -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN eN eN eN @@ -18045,9 +18049,9 @@ bY bY bY bY -ce -ce -ce +eN +eN +eN eN eN eN @@ -18188,8 +18192,8 @@ bY bY bY bY -ce -ce +eN +eN eN eN eN @@ -18332,9 +18336,9 @@ bY bY bY bY -ce -ce -ce +eN +eN +eN eN eN eN @@ -18474,9 +18478,9 @@ Gp Gp bY bY -ce -ce -ce +eN +eN +eN eN eN eN @@ -18617,8 +18621,8 @@ QK bY bY bY -ce -ce +eN +eN eN eN eN @@ -18759,8 +18763,8 @@ xA fD TZ bY -ce -ce +eN +eN eN eN eN @@ -18901,8 +18905,8 @@ xA fD TZ bY -ce -ce +eN +eN eN eN eN @@ -19043,8 +19047,8 @@ xA fD TZ bY -ce -ce +eN +eN eN eN eN @@ -19185,8 +19189,8 @@ xA fD TZ bY -ce -ce +eN +eN eN eN eN @@ -19327,8 +19331,8 @@ xA fD TZ bY -ce -ce +eN +eN eN eN eN @@ -19468,9 +19472,9 @@ xA xA fD TZ -ce -ce -ce +eN +eN +eN eN eN eN @@ -19610,9 +19614,9 @@ xA xA fD BZ -ce -ce -ce +eN +eN +eN eN eN eN @@ -19751,10 +19755,10 @@ vT SJ GO bY -ce -ce -ce -ce +eN +eN +eN +eN eN eN eN @@ -19893,10 +19897,10 @@ Gp Gp Gp bY -ce -ce -ce -ce +eN +eN +eN +eN eN eN eN @@ -20035,15 +20039,15 @@ bY bY bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -20179,13 +20183,13 @@ bY bY bY bY -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -20323,12 +20327,12 @@ bY bY bY bY -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN eN eN eN @@ -20466,11 +20470,11 @@ JJ JJ bY bY -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN eN eN eN @@ -20608,11 +20612,11 @@ qo JJ bY bY -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN eN eN eN @@ -20750,11 +20754,11 @@ si JJ bY bY -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN eN eN eN @@ -20892,11 +20896,11 @@ WV JJ bY bY -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN eN eN eN @@ -21034,11 +21038,11 @@ uE JJ bY bY -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN eN eN eN @@ -21177,10 +21181,10 @@ JJ bY bY bY -ce -ce -ce -ce +eN +eN +eN +eN eN eN eN @@ -21319,19 +21323,19 @@ JJ bY bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -21462,18 +21466,18 @@ bY bY bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -21613,9 +21617,9 @@ bY bY bY bY -ce -ce -ce +eN +eN +eN eN eN eN @@ -21756,8 +21760,8 @@ bY bY bY bY -ce -ce +eN +eN eN eN eN @@ -21898,8 +21902,8 @@ bY bY bY bY -ce -ce +eN +eN eN eN eN @@ -22041,10 +22045,10 @@ bY bY bY bY -ce -ce -ce -ce +eN +eN +eN +eN eN eN eN @@ -22184,9 +22188,9 @@ bY bY bY bY -ce -ce -ce +eN +eN +eN eN eN eN @@ -22326,9 +22330,9 @@ bY bY Hw Hw -oR -oR -oR +FS +FS +FS FS FS FS @@ -22468,14 +22472,14 @@ bY bY fD tO -tO +Nf VA VA -Hr -Hr -Hr -Hr -Ru +VA +VA +VA +VA +Nf Ru YM RL @@ -22610,14 +22614,14 @@ Ja Ja Ja Ja -tO +Nf VA VA -Hr -Hr -Hr -Hr -Ru +VA +VA +VA +VA +Nf xD xD xD @@ -22752,14 +22756,14 @@ bY bY fD tO -tO +Nf VA VA -Hr -Hr -Hr -Hr -Ru +VA +VA +VA +VA +Nf Ru YM RL @@ -22897,11 +22901,11 @@ wA WX WX WX -dJ -dJ -dJ -dJ -dJ +WX +WX +WX +WX +WX HQ HQ jG @@ -23036,9 +23040,9 @@ bY bY bY bY -ce -ce -ce +eN +eN +eN eN eN eN @@ -23177,10 +23181,10 @@ bY IA mS kl -ce -ce -ce -ce +eN +eN +eN +eN eN eN eN @@ -23319,10 +23323,10 @@ sF qv Hn WX -ce -ce -ce -ce +eN +eN +eN +eN eN eN eN @@ -23355,7 +23359,7 @@ mr yu fc zT -eN +EB jG jG jG @@ -23460,8 +23464,8 @@ Ja Ja Ja Hn -oR -ce +FS +eN eN eN eN @@ -23497,9 +23501,9 @@ ev Xy bM zT -eN -eN -eN +EB +EB +EB jG Fl Fl @@ -23602,8 +23606,8 @@ bY bY bY bY -ce -ce +eN +eN eN eN eN @@ -23639,9 +23643,9 @@ ku lZ kj zT -eN -eN -eN +EB +EB +EB jG jG jG @@ -23732,8 +23736,8 @@ bY bY bY bY -ce -ce +eN +eN bY bY bY @@ -23742,10 +23746,10 @@ bY bY bY bY -ce -ce -ce -ce +eN +eN +eN +eN eN eN eN @@ -23781,10 +23785,10 @@ Xa Bt KM zT -eN -eN -eN -eN +EB +EB +EB +EB jG jG jG @@ -23873,21 +23877,21 @@ In bY bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -23923,15 +23927,15 @@ zT zT zT zT -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB jG jG -eN -eN +EB +EB jG jG Zx @@ -24015,13 +24019,13 @@ In bY bY bY -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -24063,19 +24067,19 @@ jG jG jG jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB Zx ON "} @@ -24157,13 +24161,13 @@ Wl bY bY bY -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -24205,19 +24209,19 @@ jG jG jG jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB Zx ON "} @@ -24283,7 +24287,7 @@ iI iI iI iI -iI +Hi tr PM Yt @@ -24305,7 +24309,7 @@ AV AV AV AV -ce +eN eN eN eN @@ -24340,27 +24344,27 @@ jG jG jG jG -eN -eN +EB +EB jG jG jG jG jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB ON "} (55,1,1) = {" @@ -24425,8 +24429,8 @@ iI Rp iI iI -iI -bT +Hi +HH Wl Eo Tp @@ -24447,7 +24451,7 @@ AV AV AV AV -ce +eN eN eN eN @@ -24476,33 +24480,33 @@ jG jG jG jG -eN -eN +EB +EB jG jG jG -eN -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB +EB jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB ON "} (56,1,1) = {" @@ -24567,8 +24571,8 @@ iI iI iI iI -iI -bT +Hi +HH Wl WP Yt @@ -24589,7 +24593,7 @@ AV AV AV AV -ce +eN eN eN eN @@ -24617,34 +24621,34 @@ Fl jG jG jG -eN -eN -eN +EB +EB +EB jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB ON "} (57,1,1) = {" @@ -24709,7 +24713,7 @@ iI iI iI iI -iI +Hi tr PM Yt @@ -24731,7 +24735,7 @@ AV AV AV AV -ce +eN eN eN eN @@ -24759,34 +24763,34 @@ jG jG jG jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB ON "} (58,1,1) = {" @@ -24873,7 +24877,7 @@ AV AV AV AV -ce +eN eN eN eN @@ -24900,35 +24904,35 @@ jG jG jG jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB ON "} (59,1,1) = {" @@ -25015,7 +25019,7 @@ AV AV AV AV -ce +eN eN eN eN @@ -25041,36 +25045,36 @@ jG jG jG jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB ON "} (60,1,1) = {" @@ -25086,10 +25090,10 @@ xE xE xE xE -ce -ce -ce -ce +VR +VR +VR +VR xE bY bY @@ -25150,14 +25154,14 @@ Yt In bY bY -ce -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -25183,36 +25187,36 @@ jG jG jG jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB ON "} (61,1,1) = {" @@ -25226,15 +25230,15 @@ xE xE xE xE -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR bY ME ME @@ -25262,9 +25266,9 @@ HX bY bY bY -ce -ce -ce +VR +VR +VR bY bY bY @@ -25293,13 +25297,13 @@ Wl bY bY bY -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -25324,37 +25328,37 @@ jG jG jG jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB ON "} (62,1,1) = {" @@ -25364,28 +25368,28 @@ xE xE xE xE -ce -ce +VR +VR xE -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR bY bY bY -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR bY bY bY @@ -25395,18 +25399,18 @@ bY bY bY bY -ce -ce +VR +VR bY bY bY HX bY bY -ce -ce -ce -ce +VR +VR +VR +VR bY bY bY @@ -25433,13 +25437,13 @@ In Wl Wl bY -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -25465,37 +25469,37 @@ jG jG jG jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB fk je "} @@ -25506,28 +25510,28 @@ xE xE xE xE -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR bY bY bY @@ -25535,21 +25539,21 @@ bY bY bY bY -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR bY bY HX bY bY -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR bY bY bY @@ -25575,13 +25579,13 @@ bY bY bY bY -ce -ce -ce -ce -ce -ce -ce +eN +eN +eN +eN +eN +eN +eN eN eN eN @@ -25606,37 +25610,37 @@ jG jG jG jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB fk fk je @@ -25644,57 +25648,57 @@ je (64,1,1) = {" fX xE -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR bY bY bY -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR Zg bY HX bY -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR bY bY bY @@ -25715,15 +25719,6 @@ bY bY bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce eN eN eN @@ -25736,6 +25731,15 @@ eN eN eN eN +eN +eN +eN +eN +eN +eN +eN +EB +EB jG jG jG @@ -25746,100 +25750,100 @@ jG jG jG jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB Bo fk je "} (65,1,1) = {" fX -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR bY HX bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR bY bY bY @@ -25850,18 +25854,14 @@ bY bY bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR eN eN eN @@ -25879,47 +25879,51 @@ eN eN eN eN -eN -eN -jG -jG -jG -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +EB +EB +EB +EB +EB +EB +uP +uP +uP +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB Bo -Vs -Vs +EB +EB Bo Bo fk @@ -25927,83 +25931,79 @@ je "} (66,1,1) = {" fX -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR bY HX bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR bY -ce +VR bY bY bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR eN eN eN @@ -26020,36 +26020,40 @@ eN eN eN eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB Bo Bo Bo @@ -26069,83 +26073,79 @@ je "} (67,1,1) = {" fX -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR bY yn bY -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR eN eN eN @@ -26162,33 +26162,37 @@ eN eN eN eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -Vs -Vs -Vs -Vs -Vs -Vs -Vs +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB Bo Bo Bo Bo Bo Bo -Vs -Vs +EB +EB Bo Bo Bo @@ -26211,38 +26215,38 @@ je "} (68,1,1) = {" fX -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR VR VR VR @@ -26260,34 +26264,30 @@ VR VR VR VR -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR eN eN eN @@ -26303,26 +26303,30 @@ eN eN eN eN -eN -eN -eN -eN -eN -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB Bo Bo Bo @@ -26353,38 +26357,38 @@ je "} (69,1,1) = {" fX -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR VR VR VR @@ -26402,26 +26406,34 @@ VR VR VR VR -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR eN eN eN @@ -26432,31 +26444,23 @@ eN eN eN eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -Vs -Vs -Vs +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB Bo Bo -Vs -Vs -Vs +EB +EB +EB Bo Bo Bo @@ -26495,30 +26499,30 @@ je "} (70,1,1) = {" fX -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR VR VR VR @@ -26544,26 +26548,36 @@ VR VR VR VR -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce -ce +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR +VR eN eN eN @@ -26572,28 +26586,18 @@ eN eN eN eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -eN -Vs -Vs -Vs +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB +EB Bo Bo Bo @@ -26706,34 +26710,34 @@ VR VR VR VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +VR +VR +VR +VR +VR +VR +VR +VR +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -26847,35 +26851,35 @@ VR VR VR VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo UE @@ -26885,7 +26889,7 @@ UE Bo Bo Bo -Vs +gs Bo Bo Bo @@ -26984,40 +26988,40 @@ to to to VR -fp -fp -fp -fp +am +am +am +am VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo UE @@ -27025,9 +27029,9 @@ UE Bo Bo Bo -Vs -Vs -Vs +gs +gs +gs Bo Bo Bo @@ -27125,56 +27129,56 @@ to to to to -fp -fp -fp -fp -fp -fp -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +am +am +am +am +am +am +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs Bo -Vs -Vs +gs +gs Bo Bo Bo @@ -27267,57 +27271,57 @@ iw iw to to -fp -fp -fp -fp -fp -fp -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +am +am +am +am +am +am +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -27411,55 +27415,55 @@ iw to to to -fp -fp -fp -fp -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +am +am +am +am +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -27554,55 +27558,55 @@ to to to to -fp -fp -fp -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +am +am +am +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -27658,8 +27662,8 @@ to to to mj -oH -Of +FR +Lc Oi xK uS @@ -27696,58 +27700,58 @@ to to to to -fp -fp -fp -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +am +am +am +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -27839,57 +27843,57 @@ to to to to -fp -fp -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +am +am +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -27981,56 +27985,56 @@ to to to to -fp -fp -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +am +am +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -28123,58 +28127,58 @@ to to to to -fp -fp -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +am +am +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -28264,60 +28268,60 @@ to to to to -fp -fp -fp -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +am +am +am +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -28404,63 +28408,63 @@ yG yL to to -fp -fp -fp -fp -fp -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +am +am +am +am +am +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -28547,32 +28551,32 @@ yL to to to -fp -fp -fp -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -AJ -Is -Vs -Vs -Vs -Vs -Vs +am +am +am +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +ha +ix +gs +gs +gs +gs +gs Bo Bo Bo @@ -28581,31 +28585,31 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo -Vs +gs Bo Bo Bo @@ -28689,22 +28693,22 @@ fy to to to -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -28726,28 +28730,28 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -28832,20 +28836,20 @@ cR to to to -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Qc @@ -28870,26 +28874,26 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -28975,19 +28979,19 @@ to to to to -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -29015,23 +29019,23 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -29117,18 +29121,18 @@ to to to to -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -29159,23 +29163,23 @@ cJ cJ cJ fi -Vs -Vs +gs +gs Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -29259,18 +29263,18 @@ to to to to -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo -Vs -Vs +oH +oH Bo Bo Bo @@ -29306,18 +29310,18 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -29401,13 +29405,13 @@ to to to to -VR -VR -VR -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -29449,17 +29453,17 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -29543,14 +29547,14 @@ to iw to to -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -29592,18 +29596,18 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -29684,15 +29688,15 @@ to iw to to -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -29735,17 +29739,17 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -29826,15 +29830,15 @@ to iw to to -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo UE @@ -29879,15 +29883,15 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -29968,15 +29972,15 @@ to iw to to -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo UE @@ -30023,13 +30027,13 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -30110,15 +30114,15 @@ to iw iw to -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo UE UE @@ -30142,7 +30146,7 @@ vn xr GC iC -Bf +dK kU Lx Nq @@ -30165,13 +30169,13 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -30252,15 +30256,15 @@ to iw iw to -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo UE UE @@ -30307,13 +30311,13 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs +UD +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -30394,15 +30398,15 @@ to iw to to -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo UE UE @@ -30450,12 +30454,12 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs +UD +gs +gs +gs +gs +gs Bo Bo Bo @@ -30536,15 +30540,15 @@ to to to to -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo UE Bo @@ -30591,13 +30595,13 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs +UD +UD +gs +gs +gs +gs +gs Bo Bo Bo @@ -30678,15 +30682,15 @@ to iw iw to -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo UE Bo @@ -30734,13 +30738,13 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs +UD +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -30820,15 +30824,15 @@ iw iw to to -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -30875,13 +30879,13 @@ UE UE Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs +UD +UD +gs +gs +gs +gs +gs Bo Bo Bo @@ -30961,16 +30965,16 @@ iw iw to to -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo UE @@ -31017,13 +31021,13 @@ UE UE Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs +UD +UD +gs +gs +gs +gs +gs Bo Bo Bo @@ -31077,10 +31081,10 @@ to to to to -VR -VR -VR -VR +oH +oH +oH +oH to to to @@ -31102,17 +31106,17 @@ iw to to to -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH bh Bo UE @@ -31161,12 +31165,12 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -31213,22 +31217,22 @@ iw iw to to -VR -VR +oH +oH to iw to -VR -VR -VR -VR -VR -VR -VR -VR -VR +oH +oH +oH +oH +oH +oH +oH +oH +oH to -VR +oH fp fp fp @@ -31243,18 +31247,18 @@ to to to to -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH bh Bo Bo @@ -31278,7 +31282,7 @@ DA mE sV iC -ND +qM Bo Bo Bo @@ -31302,13 +31306,13 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs +UD +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -31355,27 +31359,27 @@ iw iw to to -VR -VR +oH +oH to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Oy zx tK @@ -31383,20 +31387,20 @@ zx VO to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH bh Bo Bo @@ -31445,11 +31449,11 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs Bo Bo Bo @@ -31496,49 +31500,49 @@ iw iw iw to -VR -VR -VR +oH +oH +oH to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Oy zx tK zx VO -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH bh Bo Bo @@ -31586,11 +31590,11 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs +UD +gs +gs +gs +gs Bo Bo Bo @@ -31638,49 +31642,49 @@ iw iw iw to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Oy zx tK zx VO -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -31728,12 +31732,12 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -31780,49 +31784,49 @@ iw to to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Oy zx tK zx VO -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -31870,12 +31874,12 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -31921,50 +31925,50 @@ iw iw to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Oy zx tK zx VO -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -32012,12 +32016,12 @@ UE UE Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -32063,49 +32067,49 @@ iw iw to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Oy zx tK zx VO -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -32154,12 +32158,12 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs Bo Bo UE @@ -32206,47 +32210,47 @@ to to to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Oy zx tK zx VO -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -32296,11 +32300,11 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs Bo Bo Bo @@ -32348,47 +32352,47 @@ iw iw to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Oy zx tK zx VO -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -32438,11 +32442,11 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs Bo Bo UE @@ -32490,45 +32494,45 @@ iw iw to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Oy zx tK zx VO -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -32580,11 +32584,11 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs Bo UE UE @@ -32632,43 +32636,43 @@ iw to to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Is -vx -eZ -vx -AJ -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +Oy +zx +tK +zx +VO +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -32722,11 +32726,11 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs Bo Bo UE @@ -32775,37 +32779,37 @@ iw iw to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Is -vx -eZ -vx -AJ -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +Oy +zx +tK +zx +VO +oH +oH +oH +oH +oH Bo Bo Bo @@ -32863,13 +32867,13 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -32920,33 +32924,33 @@ to to to to -VR -VR -VR -VR -VR -VR -Vs +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Is -vx -eZ -vx -AJ -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +Oy +zx +tK +zx +VO +oH +oH +oH +oH Bo UE UE @@ -33005,19 +33009,19 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo Bo @@ -33062,13 +33066,13 @@ to to to to -VR -VR -VR -VR -VR -VR -Vs +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -33076,18 +33080,18 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Is -vx -eZ -vx -AJ -Vs -Vs -Vs +oH +oH +oH +oH +Oy +zx +tK +zx +VO +oH +oH +oH Bo UE UE @@ -33147,20 +33151,20 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo fk @@ -33205,14 +33209,14 @@ to to to to -VR -VR -VR -VR -VR -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo UE @@ -33220,15 +33224,15 @@ Bo Bo Bo Bo -Vs -Vs -Is -vx -eZ -vx -AJ -Vs -Vs +oH +oH +Oy +zx +tK +zx +VO +oH +oH Bo Bo UE @@ -33289,20 +33293,20 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo fk @@ -33347,15 +33351,15 @@ iw to to to -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo UE @@ -33431,21 +33435,21 @@ fk Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo fk @@ -33489,15 +33493,15 @@ to to to to -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -33573,21 +33577,21 @@ fk Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo Bo fk @@ -33631,15 +33635,15 @@ to to to QD -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -33716,21 +33720,21 @@ fk Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs Bo fk je @@ -33773,16 +33777,16 @@ to to to QD -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -33858,22 +33862,22 @@ fk Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs fk je "} @@ -33898,37 +33902,37 @@ to to to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH to -VR -VR -VR +oH +oH +oH to QD QD -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo UE @@ -34000,22 +34004,22 @@ fk Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs +gs fk je "} @@ -34040,37 +34044,37 @@ to iw iw to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -34143,21 +34147,21 @@ fk Bo Bo Bo -Vs +gs Bo Bo -Vs +gs Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs +gs +gs fk je "} @@ -34182,38 +34186,38 @@ iw iw iw to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -34293,13 +34297,13 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs +gs fk je "} @@ -34324,41 +34328,41 @@ to to iw to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Bo +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo +Of Bo zg At @@ -34437,12 +34441,12 @@ Bo Bo Bo Bo -Vs -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs +gs je "} (126,1,1) = {" @@ -34459,46 +34463,46 @@ to to to to -VR -VR -VR -VR +oH +oH +oH +oH to to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -34580,11 +34584,11 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs je "} (127,1,1) = {" @@ -34596,53 +34600,53 @@ to to to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo At @@ -34722,11 +34726,11 @@ UE Bo Bo Bo -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs je "} (128,1,1) = {" @@ -34736,56 +34740,56 @@ ks to to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo At @@ -34864,11 +34868,11 @@ UE UE Bo Bo -Vs -Vs -Vs -Vs -Vs +gs +gs +gs +gs +gs je "} (129,1,1) = {" @@ -34877,57 +34881,57 @@ ks ks to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo At @@ -35007,10 +35011,10 @@ UE UE Bo Bo -Vs -Vs -Vs -Vs +gs +gs +gs +gs je "} (130,1,1) = {" @@ -35018,59 +35022,59 @@ ni ks to to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo At gC @@ -35149,70 +35153,70 @@ UE UE Bo Bo -Vs -Vs -Vs -Vs +gs +gs +gs +gs je "} (131,1,1) = {" ni ks to -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo sr @@ -35293,68 +35297,68 @@ Bo Bo Bo Bo -Vs -Vs +gs +gs je "} (132,1,1) = {" ni ks -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -35435,67 +35439,67 @@ Bo Bo Bo Bo -Vs -Vs +gs +gs je "} (133,1,1) = {" ni -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -35577,67 +35581,67 @@ Bo Bo Bo fk -Vs -Vs +gs +gs je "} (134,1,1) = {" ni -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Bo Bo Bo @@ -35719,67 +35723,67 @@ Bo Bo fk fk -Vs -Vs +gs +gs je "} (135,1,1) = {" ni -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH Vs fk fk @@ -35862,65 +35866,65 @@ fk fk fk fk -Vs +gs je "} (136,1,1) = {" ni -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH fk fk fk @@ -36009,56 +36013,56 @@ je "} (137,1,1) = {" ni -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH fk fk fk @@ -36151,59 +36155,59 @@ je "} (138,1,1) = {" ni -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH fk fk fk @@ -36293,60 +36297,60 @@ je "} (139,1,1) = {" ni -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -VR -Vs -Vs -Vs -Vs -Vs +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH +oH fk fk fk diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 37604d01b6..4ed6ead2d3 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -107,7 +107,7 @@ /area/groundbase/level3/se) "cj" = ( /turf/simulated/open/virgo3c, -/area/groundbase/level3/se) +/area/groundbase/level3/se/open) "cE" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -325,6 +325,7 @@ /obj/machinery/firealarm{ dir = 4 }, +/obj/structure/closet/secure_closet/guncabinet/phase, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) "gE" = ( @@ -358,12 +359,6 @@ }, /turf/simulated/floor/wood, /area/groundbase/medical/cmo) -"he" = ( -/obj/structure/fence{ - dir = 4 - }, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, -/area/groundbase/cargo/office) "ht" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -376,13 +371,6 @@ }, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) -"hD" = ( -/obj/structure/railing/grey, -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/open/virgo3c, -/area/groundbase/cargo/office) "hN" = ( /obj/structure/table/bench/marble, /obj/effect/landmark/start/medical, @@ -436,10 +424,9 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient4) "iT" = ( -/obj/structure/fence/corner{ - dir = 5 +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{ + outdoors = 0 }, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/cargo/office) "iY" = ( /obj/structure/filingcabinet, @@ -716,9 +703,6 @@ }, /turf/simulated/floor/wood, /area/groundbase/medical/cmo) -"nZ" = ( -/turf/simulated/open/virgo3c, -/area/groundbase/cargo/office) "og" = ( /obj/machinery/suit_cycler/medical, /turf/simulated/floor/tiled/white, @@ -750,8 +734,10 @@ /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level3/sw) "oK" = ( -/obj/structure/fence, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/turf/simulated/floor, /area/groundbase/cargo/office) "oN" = ( /obj/structure/table/glass, @@ -850,10 +836,11 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient2) "qg" = ( -/obj/structure/fence/corner{ - dir = 6 +/obj/machinery/door/airlock/multi_tile/glass/polarized{ + name = "Cargo Office"; + req_one_access = list(31) }, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/turf/simulated/floor/bmarble, /area/groundbase/cargo/office) "qk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1136,7 +1123,7 @@ name = "Observer-Start" }, /turf/simulated/open/virgo3c, -/area/groundbase/level3/sw) +/area/groundbase/level3/sw/open) "wU" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop{ @@ -1224,7 +1211,7 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, -/area/groundbase/level3/se) +/area/groundbase/level3/se/open) "yQ" = ( /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) @@ -1325,9 +1312,6 @@ }, /turf/simulated/floor, /area/groundbase/medical/patient2) -"Bb" = ( -/turf/simulated/open/virgo3c, -/area/groundbase/cargo/bay/above) "Bd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -1817,7 +1801,7 @@ /area/groundbase/level3/nw) "IS" = ( /turf/simulated/open/virgo3c, -/area/groundbase/level3/ne) +/area/groundbase/level3/ne/open) "IV" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -1882,7 +1866,7 @@ /area/groundbase/medical/cmo) "Kr" = ( /turf/simulated/open/virgo3c, -/area/groundbase/level3/sw) +/area/groundbase/level3/sw/open) "KG" = ( /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) @@ -2093,10 +2077,7 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) "Px" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/open/virgo3c, +/turf/simulated/open, /area/groundbase/cargo/office) "PH" = ( /turf/simulated/wall/rshull, @@ -2141,10 +2122,7 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) "Qf" = ( -/obj/structure/fence/corner{ - dir = 10 - }, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/turf/simulated/floor/bmarble, /area/groundbase/cargo/office) "Qk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2173,7 +2151,7 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, -/area/groundbase/level3/sw) +/area/groundbase/level3/sw/open) "Rg" = ( /obj/machinery/firealarm{ dir = 4 @@ -2205,7 +2183,7 @@ /area/groundbase/exploration/equipment) "RY" = ( /obj/structure/railing/grey, -/turf/simulated/open/virgo3c, +/turf/simulated/open, /area/groundbase/cargo/office) "Sa" = ( /obj/structure/closet/secure_closet/personal/patient, @@ -2234,10 +2212,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/patient1) "Sg" = ( -/obj/structure/fence/corner{ - dir = 8 - }, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/turf/simulated/wall, /area/groundbase/cargo/office) "Ss" = ( /turf/simulated/mineral/cave/virgo3c, @@ -2858,10 +2833,10 @@ lh lh lh lh -Kr -Kr -Kr -Kr +lh +lh +lh +lh Kr Kr Kr @@ -3000,10 +2975,10 @@ lh lh lh lh -Kr -Kr -Kr -Kr +lh +lh +lh +lh Kr Kr Kr @@ -3142,10 +3117,10 @@ lh lh lh lh -Kr -Kr -Kr -Kr +lh +lh +lh +lh Kr Kr Kr @@ -3284,10 +3259,10 @@ lh lh lh lh -Kr -Kr -Kr -Kr +lh +lh +lh +lh Kr Kr Kr @@ -3426,10 +3401,10 @@ lh lh lh lh -Kr -Kr -Kr -Kr +lh +lh +lh +lh Kr Kr Kr @@ -3568,10 +3543,10 @@ lh lh lh lh -Kr -Kr -Kr -Kr +lh +lh +lh +lh Kr Kr Kr @@ -3710,10 +3685,10 @@ lh lh lh lh -Kr -Kr -Kr -Kr +lh +lh +lh +lh Kr Kr Kr @@ -3852,10 +3827,10 @@ lh lh lh lh -Kr -Kr -Kr -Kr +lh +lh +lh +lh Kr Kr Kr @@ -3994,10 +3969,10 @@ lh lh lh lh -Kr -Kr -Kr -Kr +lh +lh +lh +lh Kr Kr Kr @@ -4136,10 +4111,10 @@ lh lh lh lh -Kr -Kr -Kr -Kr +lh +lh +lh +lh Kr Kr Kr @@ -4278,10 +4253,10 @@ lh lh lh lh -Kr -Kr -Kr -Kr +lh +lh +lh +lh Kr Kr Kr @@ -4420,10 +4395,10 @@ lh fN fN fN -QD -QD -Kr -Kr +fN +fN +lh +lh Kr Kr Kr @@ -4562,10 +4537,10 @@ lh fN fN fN -QD -QD -Kr -Kr +fN +fN +lh +lh Kr Kr Kr @@ -4704,10 +4679,10 @@ lh fN fN fN -QD -QD -QD -Kr +fN +fN +fN +lh Kr Kr Kr @@ -4846,10 +4821,10 @@ lh fN fN fN -QD -QD -QD -Kr +fN +fN +fN +lh Kr Kr Kr @@ -4988,10 +4963,10 @@ lh fN fN fN -QD -QD -QD -Kr +fN +fN +fN +lh Kr Kr Kr @@ -5130,10 +5105,10 @@ lh fN fN fN -QD -QD -QD -Kr +fN +fN +fN +lh Kr Kr Kr @@ -5272,10 +5247,10 @@ lh fN fN fN -QD -QD -QD -Kr +fN +fN +fN +lh Kr Kr Kr @@ -5414,10 +5389,10 @@ lh fN fN fN -QD -QD -QD -Kr +fN +fN +fN +lh Kr Kr Kr @@ -5556,10 +5531,10 @@ lh fN fN fN -QD -QD -QD -Kr +fN +fN +fN +lh Kr Kr Kr @@ -5659,11 +5634,11 @@ Qa Qa Qa Qa -Qa -Qa -Qa -Qa -Qa +qO +qO +qO +qO +qO Qa Qa Qa @@ -5698,10 +5673,10 @@ lh fN fN fN -QD -QD -Kr -Kr +fN +fN +lh +lh Kr Kr Kr @@ -5801,13 +5776,13 @@ Qa Qa Qa qO -Qa -Qa -Qa -Qa -Qa -Qa -Qa +qO +qO +qO +qO +qO +qO +qO Qa Qa Qa @@ -5944,12 +5919,12 @@ qO qO qO qO -Qa -Qa -Qa -Qa -Qa -Qa +qO +qO +qO +qO +qO +qO Qa Qa Qa @@ -6090,9 +6065,9 @@ aa aa aa aa -Qa -Qa -Qa +qO +qO +qO Qa Qa Qa @@ -6232,10 +6207,10 @@ Kj wm xH aa -Qa -Qa -Qa -Qa +qO +qO +qO +qO Qa Qa Qa @@ -6374,10 +6349,10 @@ vp Wr nN aa -Qa -Qa -Qa -Qa +qO +qO +qO +qO Qa Qa Qa @@ -6517,10 +6492,10 @@ ma Ka aa bi -Qa -Qa -Qa -Qa +qO +qO +qO +qO Qa Qa Qa @@ -6661,11 +6636,11 @@ dE Ts uF mU +qO +qO Qa Qa -Qa -Qa -Qa +qO qO qO qO @@ -6801,13 +6776,13 @@ Pf FV aa bi -Qa +qO Fx -Qa -Qa -Qa -Qa -Qa +qO +qO +qO +qO +qO qO qO qO @@ -6943,12 +6918,12 @@ KG rV aa qO -Qa +qO Fx -Qa -Qa -Qa -Qa +qO +qO +qO +qO qO qO qO @@ -7087,8 +7062,8 @@ aa qO qO Fx -Qa -Qa +qO +qO GU GU GU @@ -11844,24 +11819,24 @@ Kr Kr Kr Kr -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr cj cj cj @@ -11986,24 +11961,24 @@ Kr Kr Kr Kr -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr cj cj cj @@ -12128,24 +12103,24 @@ Kr Kr Kr Kr -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr cj cj cj @@ -12161,75 +12136,93 @@ JL "} (68,1,1) = {" mr -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr Kr Kr Kr @@ -12270,24 +12263,6 @@ Kr Kr Kr Kr -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj cj cj cj @@ -12303,75 +12278,93 @@ JL "} (69,1,1) = {" mr -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr Kr Kr Kr @@ -12412,24 +12405,6 @@ Kr Kr Kr Kr -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj cj cj cj @@ -12445,75 +12420,75 @@ JL "} (70,1,1) = {" mr -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS wP Kr Kr @@ -12554,24 +12529,24 @@ Kr Kr Kr Kr -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj -cj +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr cj cj cj @@ -13040,15 +13015,15 @@ IS IS IS IS -IS -IS -IS -IS -IS -IS -IS -IS -IS +sP +sP +sP +sP +sP +sP +sP +sP +sP IS IS IS @@ -13184,17 +13159,17 @@ IS Sg oK oK -oK -oK -oK -oK -oK -oK -oK -oK -oK -oK -Qf +Sg +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf IS IS IS @@ -13323,7 +13298,10 @@ IS IS IS IS -he +oK +iT +iT +qg Lf Lf Lf @@ -13334,9 +13312,6 @@ Lf Lf Lf Lf -Lf -Lf -he IS IS IS @@ -13465,7 +13440,10 @@ IS IS IS IS -he +oK +iT +iT +Qf Lf Lf Lf @@ -13476,9 +13454,6 @@ Lf Lf Lf Lf -Lf -Lf -he IS IS IS @@ -13607,10 +13582,10 @@ IS IS IS IS -he -nZ +oK +Px RY -Lf +Sg gc Lf Lf @@ -13620,7 +13595,7 @@ Lf Lf Lf Lf -he +Lf IS IS IS @@ -13749,9 +13724,10 @@ sP sP kB sP -he +oK Px -hD +RY +oK Lf Lf Lf @@ -13762,7 +13738,6 @@ Lf Lf Lf Lf -he IS IS IS @@ -13874,8 +13849,8 @@ Ss kB kB kB -kB -kB +ga +ga kB kB kB @@ -13891,7 +13866,10 @@ sP sP kB kB -he +Sg +oK +oK +Sg Lf Lf Lf @@ -13902,9 +13880,6 @@ Lf Lf Lf Lf -Lf -Lf -he IS IS IS @@ -14014,11 +13989,11 @@ Ss Ss Ss kB -kB -kB -kB -kB -kB +ga +ga +ga +ga +ga ga kB kB @@ -14033,7 +14008,7 @@ kB kB kB kB -he +Lf yU yU yU @@ -14046,7 +14021,7 @@ Lf Lf Lf Lf -he +Lf IS IS IS @@ -14156,11 +14131,11 @@ Ss Ss Ss kB -kB -kB -kB -kB -kB +ga +ga +ga +ga +ga ga kB kB @@ -14175,7 +14150,6 @@ kB kB kB kB -he Lf Lf Lf @@ -14188,7 +14162,8 @@ Lf Lf Lf Lf -he +Lf +Lf IS IS IS @@ -14299,10 +14274,10 @@ Ss Ss kB kB -kB -kB -kB -kB +ga +ga +ga +ga ga ga ga @@ -14317,7 +14292,7 @@ kB kB kB kB -he +Lf yU yU yU @@ -14330,7 +14305,7 @@ Lf Lf Lf Lf -he +Lf IS IS IS @@ -14441,10 +14416,10 @@ Ss Ss kB kB -kB -kB -kB -kB +ga +ga +ga +ga ga ga ga @@ -14459,7 +14434,7 @@ kB kB kB kB -he +Lf Lf Lf Lf @@ -14472,7 +14447,7 @@ Lf Lf Lf Lf -he +Lf IS IS IS @@ -14583,25 +14558,25 @@ Ss Ss kB kB -kB -kB -kB -kB ga ga ga ga ga +ga +ga +ga +ga +kB +ga +ga +ga +ga kB kB kB kB -kB -kB -kB -kB -kB -he +Lf yU yU yU @@ -14614,7 +14589,7 @@ Lf Lf Lf Lf -he +Lf IS IS IS @@ -14726,8 +14701,13 @@ Ss kB kB kB -kB -kB +ga +ga +ga +ga +ga +ga +ga ga ga ga @@ -14738,12 +14718,6 @@ kB kB kB kB -kB -kB -kB -kB -kB -he Lf Lf Lf @@ -14756,7 +14730,8 @@ Lf Lf Lf Lf -he +Lf +Lf IS IS IS @@ -14869,7 +14844,12 @@ kB kB kB kB -kB +ga +ga +ga +ga +ga +ga ga ga ga @@ -14880,25 +14860,20 @@ kB kB kB kB -kB -kB -kB -kB -kB -iT -oK -oK -oK -oK -oK -oK -oK -oK -oK -oK -oK -oK -qg +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf +Lf IS IS IS @@ -15019,10 +14994,10 @@ ga ga ga ga -kB -kB -kB -kB +ga +ga +ga +ga kB kB kB @@ -15161,10 +15136,10 @@ ga ga ga ga -kB -kB -kB -kB +ga +ga +ga +ga kB kB kB @@ -15297,16 +15272,16 @@ Ss kB kB kB -kB ga ga ga ga ga -kB -kB -kB -kB +ga +ga +ga +ga +ga kB kB kB @@ -15445,9 +15420,9 @@ ga ga ga ga -kB -kB -kB +ga +ga +ga kB kB kB @@ -15587,9 +15562,9 @@ ga ga ga ga -kB -kB -kB +ga +ga +ga kB kB kB @@ -15724,31 +15699,31 @@ Ss kB kB kB -kB ga ga ga ga -kB -kB -kB +ga +ga +ga +ga kB kB kB IS IS IS -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS IS IS IS @@ -15866,13 +15841,13 @@ Ss kB kB kB -kB -kB ga ga ga ga -kB +ga +ga +ga kB kB kB @@ -15880,17 +15855,17 @@ kB IS IS IS -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS IS IS IS @@ -16009,12 +15984,12 @@ Ss kB kB kB -kB ga ga ga ga -kB +ga +ga kB kB kB @@ -16022,17 +15997,17 @@ kB IS IS IS -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS IS IS IS @@ -16151,7 +16126,7 @@ Ss Ss kB kB -kB +ga ga ga ga @@ -16164,17 +16139,17 @@ IS IS IS IS -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS IS IS IS @@ -16293,8 +16268,8 @@ Ss kB kB kB -kB -kB +ga +ga ga ga ga @@ -16306,17 +16281,17 @@ IS IS IS IS -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS IS IS IS @@ -16435,30 +16410,30 @@ Ss kB kB kB -kB -kB +ga +ga +ga ga ga kB kB kB kB -kB IS IS IS IS -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS IS IS IS @@ -16577,8 +16552,8 @@ Ss kB kB kB -kB -kB +ga +ga ga ga kB @@ -16590,17 +16565,17 @@ IS IS IS IS -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS IS IS IS @@ -16719,8 +16694,8 @@ Ss Ss kB kB -kB -kB +ga +ga ga ga kB @@ -16732,17 +16707,17 @@ IS IS IS IS -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb -Bb +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS +IS IS IS IS @@ -16862,8 +16837,8 @@ Ss kB kB kB -kB -kB +ga +ga ga kB kB @@ -17004,9 +16979,9 @@ Ss kB kB kB -kB -kB -kB +ga +ga +ga kB kB kB @@ -17146,9 +17121,9 @@ Ss kB kB kB -kB -kB -kB +ga +ga +ga kB kB IS @@ -17288,8 +17263,8 @@ Ss kB kB kB -kB -kB +ga +ga kB kB kB @@ -17430,8 +17405,8 @@ Ss Ss kB kB -kB -kB +ga +ga kB kB kB @@ -17571,9 +17546,9 @@ Ss Ss Ss kB -kB -kB -kB +ga +ga +ga kB kB IS @@ -17713,9 +17688,9 @@ Ss Ss Ss kB -kB -kB -kB +ga +ga +ga kB kB IS @@ -18424,7 +18399,7 @@ Ss kB kB kB -kB +ga kB kB kB @@ -18849,7 +18824,7 @@ kB kB ga ga -kB +ga ga kB kB @@ -18993,7 +18968,7 @@ ga ga ga ga -kB +ga kB kB kB @@ -19274,8 +19249,8 @@ ga ga ga ga -kB -kB +ga +ga ga kB kB @@ -19416,7 +19391,7 @@ ga ga ga ga -kB +ga kB kB kB @@ -19556,7 +19531,7 @@ ga ga ga ga -kB +ga ga kB kB @@ -19692,9 +19667,9 @@ Ss kB kB ga -kB -kB -kB +ga +ga +ga ga kB kB diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index 23584544fb..347c070a97 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -57,19 +57,41 @@ /area/groundbase/level2/sw name = "Southwest Rascal's Pass Level 2" +/area/groundbase/level2/northspur + name = "\improper North Spur" + base_turf = /turf/simulated/open/virgo3c +/area/groundbase/level2/eastspur + name = "\improper East Spur" + base_turf = /turf/simulated/open/virgo3c +/area/groundbase/level2/westspur + name = "\improper West Spur" + base_turf = /turf/simulated/open/virgo3c +/area/groundbase/level2/southeastspur + name = "\improper Southeast Spur" + base_turf = /turf/simulated/open/virgo3c +/area/groundbase/level2/southwestspur + name = "\improper Southwest Spur" + base_turf = /turf/simulated/open/virgo3c + /area/groundbase/level3 name = "Rascal's Pass Level 3" flags = AREA_FLAG_IS_NOT_PERSISTENT - /area/groundbase/level3/ne name = "Northeast Rascal's Pass Level 3" +/area/groundbase/level3/ne/open + base_turf = /turf/simulated/open/virgo3c /area/groundbase/level3/nw name = "Northwest Rascal's Pass Level 3" +/area/groundbase/level3/nw/open + base_turf = /turf/simulated/open/virgo3c /area/groundbase/level3/se name = "Southeast Rascal's Pass Level 3" +/area/groundbase/level3/se/open + base_turf = /turf/simulated/open/virgo3c /area/groundbase/level3/sw name = "Southwest Rascal's Pass Level 3" - +/area/groundbase/level3/sw/open + base_turf = /turf/simulated/open/virgo3c /area/groundbase/science name = "Science" @@ -381,4 +403,13 @@ excluded |= /area/groundbase/level3/nw excluded |= /area/groundbase/level3/se excluded |= /area/groundbase/level3/sw + excluded |= /area/groundbase/level2/northspur + excluded |= /area/groundbase/level2/eastspur + excluded |= /area/groundbase/level2/westspur + excluded |= /area/groundbase/level2/southeastspur + excluded |= /area/groundbase/level2/southwestspur + excluded |= /area/groundbase/level3/ne/open + excluded |= /area/groundbase/level3/nw/open + excluded |= /area/groundbase/level3/se/open + excluded |= /area/groundbase/level3/sw/open ..() From badc2db41c3cdaed09551141b50c544a9e270753 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sun, 3 Apr 2022 16:48:25 -0400 Subject: [PATCH 2/4] This one too --- maps/groundbase/gb-z3.dmm | 8328 ++++++++++++++++++------------------- 1 file changed, 4164 insertions(+), 4164 deletions(-) diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 4ed6ead2d3..725aea2239 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -275,11 +275,6 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/paramedic) -"fN" = ( -/turf/simulated/floor/virgo3c{ - edge_blending_priority = -1 - }, -/area/groundbase/level3/nw) "fO" = ( /obj/effect/landmark/start/paramedic, /obj/structure/cable/yellow{ @@ -561,9 +556,11 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) -"lh" = ( -/turf/simulated/open/virgo3c, -/area/groundbase/level3/nw) +"kU" = ( +/turf/simulated/floor/virgo3c{ + edge_blending_priority = -1 + }, +/area/groundbase/level3/sw/open) "lk" = ( /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level3/ne) @@ -786,6 +783,9 @@ /obj/machinery/light/small, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/civilian/pilot) +"pf" = ( +/turf/simulated/open/virgo3c, +/area/groundbase/level3/sw/open) "pm" = ( /obj/machinery/computer/shuttle_control/explore/gbexplo, /turf/simulated/floor/tiled, @@ -1798,7 +1798,7 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, -/area/groundbase/level3/nw) +/area/groundbase/level3/nw/open) "IS" = ( /turf/simulated/open/virgo3c, /area/groundbase/level3/ne/open) @@ -1866,7 +1866,7 @@ /area/groundbase/medical/cmo) "Kr" = ( /turf/simulated/open/virgo3c, -/area/groundbase/level3/sw/open) +/area/groundbase/level3/nw/open) "KG" = ( /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) @@ -2151,7 +2151,7 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, -/area/groundbase/level3/sw/open) +/area/groundbase/level3/nw/open) "Rg" = ( /obj/machinery/firealarm{ dir = 4 @@ -2812,31 +2812,6 @@ jv jv jv jv -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -2844,6 +2819,31 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf Lt Lt Lt @@ -2952,33 +2952,6 @@ jv jv jv qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -2987,6 +2960,33 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Lt @@ -3094,33 +3094,6 @@ jv qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -3129,6 +3102,33 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf gE gE Lt @@ -3235,34 +3235,6 @@ jv jv qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -3272,6 +3244,34 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE Lt @@ -3377,34 +3377,6 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -3414,6 +3386,34 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -3519,34 +3519,6 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -3557,6 +3529,34 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -3661,34 +3661,6 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -3700,6 +3672,34 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -3803,34 +3803,6 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -3843,6 +3815,34 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -3945,34 +3945,6 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -3986,6 +3958,34 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -4088,33 +4088,12 @@ qO qO qO qO -lh -lh -lh -lh -lh +Kr +Kr +Kr +Kr +Kr qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -4129,6 +4108,27 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -4231,32 +4231,14 @@ qO qO qO qO -lh -lh +Kr +Kr qO qO qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -4272,8 +4254,26 @@ Kr Kr Kr Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE -Kr +pf gE gE gE @@ -4385,30 +4385,6 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr @@ -4416,8 +4392,32 @@ Kr Kr Kr Kr +QD +QD +QD +QD +QD Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -4530,41 +4530,41 @@ qO qO qO qO -lh -lh -lh -lh -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr Kr +QD +QD +QD +QD +QD Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -4672,42 +4672,42 @@ qO qO qO qO -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -4814,43 +4814,43 @@ qO qO qO qO -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -4957,42 +4957,42 @@ qO qO qO qO -lh -lh -lh -fN -fN -fN -fN -fN -fN -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -5099,43 +5099,43 @@ qO qO qO qO -lh -lh -lh -fN -fN -fN -fN -fN -fN -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -5241,44 +5241,44 @@ qO qO qO qO -lh -lh -lh -fN -fN -fN -fN -fN -fN -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -5296,12 +5296,12 @@ gE gE gE gE -QD -QD -QD -QD -QD -QD +kU +kU +kU +kU +kU +kU gE gE gE @@ -5379,49 +5379,49 @@ qO qO qO qO -fN -fN -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD Kr Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf gE gE gE @@ -5437,14 +5437,14 @@ gE gE gE gE -QD -QD -QD -QD -QD -QD -QD -QD +kU +kU +kU +kU +kU +kU +kU +kU gE gE gE @@ -5520,74 +5520,74 @@ qO qO qO qO -fN -fN -fN -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -lh +QD +QD +QD Kr Kr Kr Kr Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -gE -gE -gE -gE -gE -gE -gE -gE -gE -gE -gE -gE -gE -gE -QD -QD -QD -QD QD QD QD QD QD QD +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +gE +gE +gE +gE +gE +gE +gE +gE +gE +gE +gE +gE +gE +gE +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU gE gE gE @@ -5657,48 +5657,14 @@ qO qO qO qO -fN -fN -fN +QD +QD +QD qO qO -fN -fN -fN -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD Kr Kr Kr @@ -5706,6 +5672,40 @@ Kr Kr QD QD +QD +QD +QD +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU gE gE gE @@ -5718,18 +5718,18 @@ gE gE gE gE -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU gE gE gE @@ -5797,50 +5797,16 @@ qO qO qO qO -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -5848,9 +5814,43 @@ Kr Kr QD QD +QD +QD +QD +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU gE -QD -QD +kU +kU gE gE gE @@ -5860,19 +5860,19 @@ gE gE gE gE -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU gE gE gE @@ -5938,33 +5938,6 @@ Qa Qa qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -5988,33 +5961,60 @@ Kr Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU gE gE gE @@ -6080,33 +6080,6 @@ Qa Qa qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -6130,33 +6103,60 @@ Kr Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU gE gE ji @@ -6222,33 +6222,6 @@ Qa qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -6272,33 +6245,60 @@ Kr Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU gE gE gE @@ -6365,82 +6365,82 @@ Qa qO qO qO -fN -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh +QD +QD +QD +QD +QD Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU gE gE gE @@ -6507,82 +6507,82 @@ Qa Qa qO qO -fN -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh +QD +QD +QD +QD +QD Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU gE gE gE @@ -6649,83 +6649,83 @@ Qa Qa Qa qO -fN -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh +QD +QD +QD +QD +QD Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU gE gE gE @@ -6792,51 +6792,10 @@ Qa qO qO qO -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD Kr Kr Kr @@ -6856,22 +6815,63 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf gE gE gE @@ -6934,51 +6934,10 @@ Qa Qa qO qO -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD Kr Kr Kr @@ -6998,23 +6957,64 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf gE gE Lt @@ -7077,50 +7077,9 @@ Qa qO qO qO -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD Kr Kr Kr @@ -7140,25 +7099,66 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Lt @@ -7218,51 +7218,10 @@ Qa Qa qO qO -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD Kr Kr Kr @@ -7282,26 +7241,67 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Bg @@ -7361,50 +7361,9 @@ qO qO qO qO -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD Kr Kr Kr @@ -7424,26 +7383,67 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Bg @@ -7502,51 +7502,10 @@ Qa Qa qO qO -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD Kr Kr Kr @@ -7566,26 +7525,67 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Bg @@ -7644,51 +7644,10 @@ Qa qO qO qO -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD Kr Kr Kr @@ -7708,26 +7667,67 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Bg @@ -7786,51 +7786,10 @@ qO qO qO qO -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD Kr Kr Kr @@ -7850,26 +7809,67 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Bg @@ -7927,60 +7927,11 @@ qO qO qO qO -fN -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr QD -Kr -Kr -Kr -Kr +QD +QD +QD +QD Kr Kr Kr @@ -8000,18 +7951,67 @@ QD QD QD QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Bg @@ -8055,7 +8055,7 @@ um PH Bd cY -lh +Kr qO qO qO @@ -8069,60 +8069,11 @@ qO qO qO qO -fN -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr QD -Kr -Kr -Kr -Kr +QD +QD +QD +QD Kr Kr Kr @@ -8142,18 +8093,67 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf Lt Lt Bg @@ -8196,10 +8196,10 @@ cE PH PH Bd -lh -lh -lh -fN +Kr +Kr +Kr +QD qO qO qO @@ -8209,65 +8209,13 @@ qO qO qO qO -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -8287,15 +8235,67 @@ QD QD QD QD -QD -QD -QD -QD -QD -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf Lt Lt Bg @@ -8325,8 +8325,8 @@ qO qO qO qO -lh -lh +Kr +Kr qO uG PH @@ -8338,78 +8338,26 @@ vV PH rb Bd -lh -lh -lh -fN -fN -fN -fN -fN -fN +Kr +Kr +Kr +QD +QD +QD +QD +QD +QD qO -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -8429,15 +8377,67 @@ QD QD QD QD -QD -QD -QD -QD -QD -Kr -Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf Lt Lt Bg @@ -8467,8 +8467,8 @@ qO qO qO qO -lh -lh +Kr +Kr qO uG PH @@ -8480,78 +8480,6 @@ PH PH PH Bd -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr @@ -8572,14 +8500,86 @@ QD QD QD QD +Kr +Kr +Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD QD QD QD QD Kr Kr -Kr -Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf Lt Lt Bg @@ -8607,11 +8607,11 @@ Qa qO qO qO -lh -lh -lh -lh -lh +Kr +Kr +Kr +Kr +Kr YK VH VH @@ -8622,78 +8622,6 @@ VH VH VH vA -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr @@ -8714,14 +8642,86 @@ QD QD QD QD +Kr +Kr +Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD QD QD QD QD Kr Kr -Kr -Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf Lt Lt Bg @@ -8749,62 +8749,6 @@ Qa qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -8839,31 +8783,87 @@ Kr Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf Lt Lt Bg @@ -8891,62 +8891,6 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -8970,7 +8914,6 @@ Kr Kr Kr Kr -QD Kr Kr Kr @@ -8978,34 +8921,91 @@ Kr Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf Lt Lt Bg @@ -9033,62 +9033,6 @@ Qa qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -9112,32 +9056,6 @@ Kr Kr Kr Kr -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD Kr Kr Kr @@ -9148,6 +9066,88 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Bg @@ -9176,61 +9176,6 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -9254,32 +9199,6 @@ Kr Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD Kr Kr Kr @@ -9290,6 +9209,87 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Bg @@ -9320,59 +9320,6 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -9396,32 +9343,6 @@ Kr Kr Kr Kr -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD Kr Kr Kr @@ -9432,6 +9353,85 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Bg @@ -9463,58 +9463,20 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr Kr Kr Kr @@ -9549,31 +9511,69 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Bg @@ -9605,59 +9605,21 @@ qO qO qO qO -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -9691,32 +9653,70 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Bg "} @@ -9747,59 +9747,21 @@ qO qO qO qO -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -9833,32 +9795,70 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Bg "} @@ -9888,60 +9888,22 @@ qO qO qO qO -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -9975,32 +9937,70 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Bg "} @@ -10030,60 +10030,22 @@ qO qO qO qO -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -10117,32 +10079,70 @@ QD QD QD QD -QD -QD -QD -QD -QD -QD -QD -QD -QD -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +kU +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Bg "} @@ -10171,95 +10171,23 @@ qO qO qO qO -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD IH -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD +QD Kr Kr Kr @@ -10282,10 +10210,82 @@ Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Bg "} (55,1,1) = {" @@ -10313,95 +10313,23 @@ qO qO qO qO -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -10424,10 +10352,82 @@ Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Bg "} (56,1,1) = {" @@ -10455,95 +10455,23 @@ qO qO qO qO -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -10566,10 +10494,82 @@ Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Bg "} (57,1,1) = {" @@ -10597,95 +10597,23 @@ qO qO qO qO -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -10708,10 +10636,82 @@ Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Bg "} (58,1,1) = {" @@ -10738,96 +10738,24 @@ qO qO qO qO -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -10850,10 +10778,82 @@ Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Bg "} (59,1,1) = {" @@ -10877,99 +10877,27 @@ qO qO qO qO -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -10992,10 +10920,82 @@ Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Bg "} (60,1,1) = {" @@ -11011,107 +11011,35 @@ qO qO qO qO -lh -lh -lh -lh +Kr +Kr +Kr +Kr qO -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +Kr +Kr +Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -11134,10 +11062,82 @@ Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Bg "} (61,1,1) = {" @@ -11151,109 +11151,37 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr @@ -11276,10 +11204,82 @@ Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Bg "} (62,1,1) = {" @@ -11289,80 +11289,9 @@ qO qO qO qO -lh -lh +Kr +Kr qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -fN -lh -lh -lh -lh -Kr -Kr Kr Kr Kr @@ -11417,10 +11346,81 @@ Kr Kr Kr Kr +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD +QD Kr Kr Kr Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Bg "} @@ -11431,78 +11431,6 @@ qO qO qO qO -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -11562,6 +11490,78 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Lt Bg @@ -11569,82 +11569,6 @@ Bg (64,1,1) = {" mr jv -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -11705,88 +11629,87 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf Lt Bg "} (65,1,1) = {" mr -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -11837,6 +11760,83 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf cj cj cj @@ -11852,75 +11852,6 @@ JL "} (66,1,1) = {" mr -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -11979,6 +11910,75 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf cj cj cj @@ -11994,75 +11994,6 @@ JL "} (67,1,1) = {" mr -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh -lh Kr Kr Kr @@ -12121,6 +12052,75 @@ Kr Kr Kr Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf cj cj cj @@ -12205,64 +12205,64 @@ IS IS IS IS -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf cj cj cj @@ -12347,64 +12347,64 @@ IS IS IS IS -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf cj cj cj @@ -12490,63 +12490,63 @@ IS IS IS wP -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr -Kr +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf +pf cj cj cj From c16966540d570f822c0913f866e9a6e7671d5976 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sun, 3 Apr 2022 16:57:08 -0400 Subject: [PATCH 3/4] Also this one --- maps/groundbase/gb-misc.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maps/groundbase/gb-misc.dmm b/maps/groundbase/gb-misc.dmm index b97863878a..7da0c5f8ac 100644 --- a/maps/groundbase/gb-misc.dmm +++ b/maps/groundbase/gb-misc.dmm @@ -2485,7 +2485,7 @@ /area/holodeck/source_gym) "jZ" = ( /turf/unsimulated/map/edge, -/area/space) +/area/overmap) "kw" = ( /obj/effect/floor_decal/sign/small_5, /turf/simulated/floor/holofloor/wood, @@ -2527,7 +2527,7 @@ "mV" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; - base_turf = /turf/unsimulated/floor; + base_turf = /turf/simulated/floor/reinforced/virgo3c; landmark_tag = "supply_cc"; name = "Centcom Supply Depot" }, @@ -2871,7 +2871,7 @@ /area/holodeck/source_patient_ward) "EA" = ( /turf/unsimulated/map, -/area/space) +/area/overmap) "ED" = ( /obj/structure/fitness/weightlifter, /obj/effect/floor_decal/industrial/outline/yellow, From 5649830e0a8fa6c17281791cbbeb2b43bdc71dcf Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sun, 3 Apr 2022 17:06:05 -0400 Subject: [PATCH 4/4] These ones too --- maps/groundbase/gb-z1.dmm | 17 ++++++- maps/groundbase/gb-z2.dmm | 102 ++++++++++++++++++++++++++++++++++---- 2 files changed, 108 insertions(+), 11 deletions(-) diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index 5de5f04e04..1258fe963b 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -3978,6 +3978,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level1/centsquare) +"kR" = ( +/obj/machinery/newscaster{ + layer = 3.3; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "kT" = ( /obj/machinery/computer/telecomms/server{ dir = 8; @@ -4734,6 +4741,10 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/newscaster{ + layer = 3.3; + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "mY" = ( @@ -14755,6 +14766,10 @@ dir = 8; pixel_x = 32 }, +/obj/machinery/newscaster{ + layer = 3.3; + pixel_y = -32 + }, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "Ol" = ( @@ -23905,7 +23920,7 @@ Xg ht ht Uc -ht +kR pj MO MO diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 3a2e2bad3c..b4d1f49be2 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -640,6 +640,7 @@ /area/groundbase/command/captainq) "bQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/bookcase, /turf/simulated/floor/wood, /area/groundbase/civilian/library) "bS" = ( @@ -1756,6 +1757,13 @@ /obj/structure/bed/chair, /turf/simulated/floor/tiled, /area/groundbase/science/rd) +"fs" = ( +/obj/machinery/newscaster{ + layer = 3.3; + pixel_x = -27 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/hydroponics) "ft" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2616,6 +2624,13 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"hY" = ( +/obj/machinery/newscaster{ + layer = 3.3; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "hZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2825,6 +2840,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/newscaster{ + pixel_y = 28 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/hall) "iG" = ( @@ -3154,6 +3172,9 @@ /area/groundbase/dorms/room5) "jK" = ( /obj/machinery/medical_kiosk, +/obj/machinery/newscaster{ + pixel_y = 28 + }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "jL" = ( @@ -3395,6 +3416,10 @@ /obj/structure/window/reinforced, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"kA" = ( +/obj/structure/bookcase, +/turf/simulated/floor/wood, +/area/groundbase/civilian/library) "kC" = ( /turf/simulated/floor/wood, /area/groundbase/dorms/room3) @@ -4649,6 +4674,13 @@ outdoors = 0 }, /area/groundbase/level2/nw) +"oC" = ( +/obj/machinery/newscaster{ + layer = 3.3; + pixel_x = 27 + }, +/turf/simulated/floor/tiled, +/area/groundbase/science/hall) "oD" = ( /obj/machinery/door/firedoor, /obj/structure/table/glass, @@ -5512,6 +5544,12 @@ /obj/machinery/light, /turf/simulated/floor/wood, /area/groundbase/dorms/room7) +"rn" = ( +/obj/machinery/newscaster{ + pixel_y = 28 + }, +/turf/simulated/floor/carpet, +/area/groundbase/civilian/library) "ro" = ( /obj/structure/easel, /obj/item/paint_palette, @@ -6310,6 +6348,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"tZ" = ( +/obj/machinery/newscaster{ + layer = 3.3; + pixel_x = -27 + }, +/turf/simulated/floor/tiled/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/groundbase/level2/nw) "ua" = ( /obj/structure/table/reinforced, /obj/machinery/chemical_dispenser/full, @@ -6467,6 +6515,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/bookcase, /turf/simulated/floor/wood, /area/groundbase/civilian/library) "uC" = ( @@ -8330,6 +8379,13 @@ "AF" = ( /turf/simulated/floor/tiled/freezer/cold, /area/groundbase/civilian/kitchen/freezer) +"AG" = ( +/obj/machinery/newscaster{ + layer = 3.3; + pixel_x = -27 + }, +/turf/simulated/floor/wood, +/area/groundbase/civilian/library) "AH" = ( /obj/machinery/vending/wardrobe/genedrobe, /turf/simulated/floor/tiled, @@ -8937,6 +8993,14 @@ }, /turf/simulated/open, /area/groundbase/civilian/bar) +"Cy" = ( +/obj/structure/janitorialcart, +/obj/machinery/newscaster{ + layer = 3.3; + pixel_x = -27 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "Cz" = ( /turf/simulated/wall, /area/groundbase/cargo/qm) @@ -8987,6 +9051,13 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level2/se) +"CH" = ( +/obj/machinery/newscaster{ + layer = 3.3; + pixel_x = -27 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/dorms) "CJ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -11636,6 +11707,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/command/bridge) +"Kx" = ( +/obj/machinery/newscaster{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/chapel) "Ky" = ( /obj/structure/sink{ dir = 8; @@ -14793,6 +14870,7 @@ /area/groundbase/medical/triage) "TD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/bookcase, /turf/simulated/floor/wood, /area/groundbase/civilian/library) "TF" = ( @@ -15866,6 +15944,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/newscaster{ + layer = 3.3; + pixel_x = -27 + }, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "Xh" = ( @@ -18613,7 +18695,7 @@ bY bY Hn Ja -xA +tZ Pz KC ro @@ -19029,7 +19111,7 @@ xE Do fZ yX -yX +Cy vS KO KO @@ -20851,7 +20933,7 @@ uQ CW RP IR -MY +AG kt IR rP @@ -22124,7 +22206,7 @@ rP rP rP rP -cX +rn cX cX MY @@ -22272,7 +22354,7 @@ yp yp yp vA -MY +kA UR rP Nd @@ -22577,7 +22659,7 @@ yI Ny Ny jt -Ny +hY FF bY sZ @@ -22920,7 +23002,7 @@ qq qq qa eS -Vr +oC Xl QL Vr @@ -22962,7 +23044,7 @@ Mm cd uO Bs -Yp +CH ug jW SF @@ -23723,7 +23805,7 @@ iI iI Wl hQ -Yt +fs Wv pM UC @@ -25104,7 +25186,7 @@ cA cA sU ME -eD +Kx zS eD eD