From fff94c8bdc109865d912d846501c22ae93b9cdd9 Mon Sep 17 00:00:00 2001 From: tallfission <140837937+kirieee@users.noreply.github.com> Date: Fri, 5 Jan 2024 21:22:19 -0500 Subject: [PATCH] firing range! --- code/game/area/golden_arrow.dm | 4 + maps/map_files/golden_arrow/golden_arrow.dmm | 667 ++++++++++++++----- 2 files changed, 509 insertions(+), 162 deletions(-) diff --git a/code/game/area/golden_arrow.dm b/code/game/area/golden_arrow.dm index 11656d7da4..7c35640d06 100644 --- a/code/game/area/golden_arrow.dm +++ b/code/game/area/golden_arrow.dm @@ -65,3 +65,7 @@ /area/golden_arrow/synthcloset name = "\improper Synthetic Storage Closet" icon_state = "livingspace" + +/area/golden_arrow/firingrange + name = "\improper Firing Range" + icon_state = "firingrange" diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 3558338e21..3c04b1c358 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -237,6 +237,9 @@ /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/cryo_cells) +"bi" = ( +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/firingrange) "bo" = ( /obj/structure/window/framed/almayer, /turf/open/floor/almayer{ @@ -354,6 +357,19 @@ "ca" = ( /turf/closed/wall/almayer/outer, /area/golden_arrow/hangar) +"ce" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/golden_arrow/firingrange) "cj" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -710,6 +726,9 @@ icon_state = "cargo" }, /area/golden_arrow/hangar) +"dV" = ( +/turf/closed/wall/almayer/outer, +/area/golden_arrow/firingrange) "dX" = ( /obj/structure/machinery/light{ dir = 4 @@ -1261,6 +1280,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_two) +"hD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/golden_arrow/firingrange) "hF" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer, @@ -1477,9 +1505,7 @@ dir = 4 }, /obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/turf/open/floor/almayer, /area/golden_arrow/prep_hallway) "iN" = ( /turf/open/floor/almayer{ @@ -1597,6 +1623,13 @@ icon_state = "plate" }, /area/golden_arrow/squad_two) +"jt" = ( +/obj/structure/target, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/golden_arrow/firingrange) "jy" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/computer/station_alert{ @@ -1634,6 +1667,14 @@ icon_state = "dark_sterile" }, /area/golden_arrow/medical) +"jM" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "jN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/cell_charger, @@ -1762,6 +1803,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) +"ky" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Firing Range"; + req_one_access_txt = "8;12;40"; + dir = 2 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/firingrange) "kB" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -1957,6 +2008,12 @@ icon_state = "plate" }, /area/golden_arrow/platoon_sergeant) +"lT" = ( +/obj/structure/barricade/metal{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/golden_arrow/firingrange) "lV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ @@ -2237,6 +2294,15 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/golden_arrow/squad_one) +"nH" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "cargo_arrow" + }, +/area/golden_arrow/prep_hallway) "nK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/power/apc/almayer{ @@ -2504,6 +2570,23 @@ /obj/item/ammo_box/magazine/heap/empty, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_two) +"ph" = ( +/obj/structure/surface/rack, +/obj/item/ammo_magazine/rifle/m41aMK1{ + current_rounds = 0; + pixel_x = -5 + }, +/obj/item/ammo_magazine/rifle/m41aMK1{ + current_rounds = 0 + }, +/obj/item/ammo_magazine/rifle/m41aMK1{ + current_rounds = 0; + pixel_x = 5 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "pl" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -2950,12 +3033,17 @@ }, /area/golden_arrow/briefing) "so" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "cargo_arrow" }, -/turf/open/floor/almayer, /area/golden_arrow/prep_hallway) +"st" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/firingrange) "sv" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -2979,6 +3067,19 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"sz" = ( +/obj/structure/sign/safety/firingrange{ + pixel_x = -24; + pixel_y = 7 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = -7; + pixel_x = -24 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/prep_hallway) "sC" = ( /turf/closed/wall/almayer/outer, /area/golden_arrow/platoon_sergeant) @@ -3338,6 +3439,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/supply) +"vj" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/golden_arrow/prep_hallway) "vk" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -3979,6 +4089,11 @@ icon_state = "dark_sterile" }, /area/golden_arrow/cryo_cells) +"zv" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "zy" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -4079,12 +4194,7 @@ }, /area/golden_arrow/squad_one) "Ad" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - name = "\improper Hangar Lockdown Blast Door" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, +/turf/open/floor/almayer, /area/golden_arrow/prep_hallway) "Ap" = ( /obj/structure/surface/table/almayer, @@ -4097,6 +4207,17 @@ icon_state = "plate" }, /area/golden_arrow/briefing) +"Av" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "Aw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -4118,6 +4239,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/cryo_cells) +"Ay" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 2; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/prep_hallway) "AA" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -4346,6 +4476,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/golden_arrow/hangar) +"BU" = ( +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "BW" = ( /obj/structure/sign/safety/hazard{ pixel_x = -19; @@ -4448,6 +4584,14 @@ }, /turf/open/floor/almayer, /area/golden_arrow/supply) +"Co" = ( +/obj/structure/barricade/plasteel{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "Cr" = ( /turf/open/space/basic, /area/space) @@ -4502,6 +4646,10 @@ icon_state = "plate" }, /area/golden_arrow/supply) +"CA" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/prep_hallway) "CC" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/flamer_tank, @@ -4590,7 +4738,7 @@ /area/golden_arrow/platoon_commander_rooms) "Db" = ( /obj/effect/decal/cleanable/dirt, -/turf/closed/wall/almayer/outer, +/turf/closed/wall/almayer, /area/golden_arrow/squad_two) "Dc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -4779,6 +4927,14 @@ }, /turf/open/floor/almayer, /area/golden_arrow/prep_hallway) +"Ev" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "Ey" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -5014,6 +5170,20 @@ }, /turf/open/floor/almayer, /area/golden_arrow/dorms) +"FK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/golden_arrow/firingrange) "FN" = ( /obj/structure/machinery/medical_pod/sleeper{ dir = 8; @@ -5151,6 +5321,9 @@ icon_state = "dark_sterile" }, /area/golden_arrow/canteen) +"Gl" = ( +/turf/closed/wall/almayer/outer, +/area/golden_arrow/prep_hallway) "Gq" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -5347,6 +5520,16 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoon_sergeant) +"Hu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/target, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/golden_arrow/firingrange) "Hv" = ( /obj/item/frame/camera{ desc = "The Staff Officer insisted he needed to monitor everyone at all times."; @@ -5465,12 +5648,31 @@ icon_state = "dark_sterile" }, /area/golden_arrow/cryo_cells) +"Ib" = ( +/obj/structure/barricade/metal{ + dir = 8 + }, +/obj/structure/machinery/light, +/obj/structure/sign/safety/two{ + pixel_y = -22 + }, +/turf/open/floor/almayer, +/area/golden_arrow/firingrange) "Ii" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer{ icon_state = "cargo" }, /area/golden_arrow/cryo_cells) +"Is" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/golden_arrow/firingrange) "It" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/autoname{ dir = 1; @@ -5597,6 +5799,12 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"Ja" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "Jc" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -5613,6 +5821,14 @@ icon_state = "plate" }, /area/golden_arrow/platoon_commander_rooms) +"Jj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/golden_arrow/firingrange) "Jk" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -5655,6 +5871,12 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"Js" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/golden_arrow/firingrange) "Jv" = ( /obj/structure/machinery/light{ dir = 8 @@ -5720,6 +5942,14 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"Kb" = ( +/obj/structure/surface/rack, +/obj/item/tool/screwdriver, +/obj/item/prop/helmetgarb/gunoil, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "Kd" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -6286,6 +6516,18 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/golden_arrow/squad_two) +"Nu" = ( +/obj/structure/barricade/metal{ + dir = 8 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/sign/safety/one{ + pixel_y = 22 + }, +/turf/open/floor/almayer, +/area/golden_arrow/firingrange) "Nx" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -6439,6 +6681,9 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/briefing) +"Of" = ( +/turf/closed/wall/almayer, +/area/golden_arrow/firingrange) "Oj" = ( /obj/structure/machinery/camera/autoname/golden_arrow, /turf/open/floor/almayer{ @@ -6453,12 +6698,23 @@ /obj/structure/janitorialcart, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/engineering) +"Op" = ( +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/prep_hallway) "Os" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/almayer{ icon_state = "dark_sterile" }, /area/golden_arrow/canteen) +"Oy" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/golden_arrow/firingrange) "Oz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -6736,6 +6992,16 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/platoon_sergeant) +"PS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/golden_arrow/firingrange) "PW" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Private Briefing Room"; @@ -7206,6 +7472,12 @@ }, /turf/open/floor/almayer, /area/golden_arrow/supply) +"RY" = ( +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/golden_arrow/prep_hallway) "Sc" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -7363,6 +7635,15 @@ "SC" = ( /turf/closed/wall/almayer/outer, /area/space) +"SE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/target, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/golden_arrow/firingrange) "SL" = ( /obj/structure/machinery/light{ dir = 8 @@ -7411,6 +7692,17 @@ }, /turf/open/floor/almayer, /area/golden_arrow/platoon_commander_rooms) +"SW" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "SY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -7659,6 +7951,12 @@ icon_state = "cargo_arrow" }, /area/golden_arrow/canteen) +"Ua" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer, +/area/golden_arrow/prep_hallway) "Ub" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -7822,6 +8120,12 @@ icon_state = "plating" }, /area/golden_arrow/engineering) +"Vn" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/golden_arrow/firingrange) "Vp" = ( /turf/closed/wall/almayer, /area/golden_arrow/dorms) @@ -7858,6 +8162,12 @@ icon_state = "plate" }, /area/golden_arrow/hangar) +"VG" = ( +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/golden_arrow/firingrange) "VJ" = ( /obj/structure/ladder{ height = 1; @@ -8084,16 +8394,13 @@ pixel_x = -1; pixel_y = 1 }, -/obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ dir = 8 }, /obj/structure/sign/safety/bulkhead_door{ pixel_x = -19 }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/turf/open/floor/almayer, /area/golden_arrow/prep_hallway) "Xa" = ( /obj/effect/decal/warning_stripes{ @@ -8147,6 +8454,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) +"Xu" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/golden_arrow/firingrange) "Xv" = ( /obj/structure/sign/safety/rewire{ pixel_x = 14; @@ -8190,6 +8505,15 @@ /obj/structure/foamed_metal, /turf/open/floor/plating, /area/space) +"XB" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/golden_arrow/firingrange) "XI" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -8315,6 +8639,16 @@ "Yj" = ( /turf/closed/wall/almayer, /area/golden_arrow/hangar) +"Yk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/golden_arrow/firingrange) "Yl" = ( /obj/structure/machinery/cm_vending/gear/synth{ pixel_x = -30; @@ -8508,6 +8842,15 @@ icon_state = "plate" }, /area/golden_arrow/squad_two) +"Zr" = ( +/obj/structure/target, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "redfull" + }, +/area/golden_arrow/firingrange) "Zw" = ( /obj/structure/largecrate/supply/generator, /turf/open/floor/almayer{ @@ -15369,13 +15712,13 @@ ot Qw Cr Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr +dV +dV +dV +dV +dV +dV +dV Cr Cr Cr @@ -15521,13 +15864,13 @@ gd Qw Cr Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr +dV +Oy +SE +jM +Hu +Js +dV Cr Cr Cr @@ -15673,13 +16016,13 @@ gd Qw Cr Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr +dV +VG +hD +zv +Yk +VG +dV Cr Cr Cr @@ -15825,13 +16168,13 @@ Me Qw Qw Qw -Cr -Cr -Cr -Cr -Cr -Cr -Cr +dV +VG +hD +zv +Yk +VG +dV Cr Cr Cr @@ -15976,14 +16319,14 @@ Yp gd ST Df -Qw -Qw -Cr -Cr -Cr -Cr -Cr -Cr +Me +Me +Zr +Jj +zv +Is +jt +dV Cr Cr Cr @@ -16129,13 +16472,13 @@ Fg Fg gd tS -Qw -Cr -Cr -Cr -Cr -Cr -Cr +Me +VG +hD +zv +Yk +VG +dV Cr Cr Cr @@ -16281,13 +16624,13 @@ ty Fg Fg Ku -Qw -Cr -Cr -Cr -Cr -Cr -Cr +Me +PS +ce +zv +FK +PS +dV Cr Cr Cr @@ -16433,13 +16776,13 @@ mf Fy DR tS -Qw -Cr -Cr -Cr -Cr -Cr -Cr +Me +Nu +lT +Co +lT +Ib +dV Cr Cr Cr @@ -16585,14 +16928,14 @@ pf sV Yp Db -Qw -Cr -Cr -Cr -Cr -Cr -Cr -Cr +Me +Vn +bi +zv +bi +Vn +dV +dV Cr Cr Cr @@ -16736,15 +17079,15 @@ dX pB Fg TT -Qw -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr +Me +Of +Av +Ja +st +Ja +Ev +Kb +dV Cr Cr Cr @@ -16888,15 +17231,15 @@ Qw qD cA RO -Qw -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr +Me +Of +SW +zv +XB +BU +zv +ph +dV Cr Cr Cr @@ -17031,24 +17374,24 @@ qA qA jc Jc -XQ +nH GG Zk Me -Qw -Qw -Qw -Qw -Qw -Qw -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr +Me +Me +Me +Me +Me +Me +Of +Xu +ky +Of +Of +dV +dV +dV Cr Cr Cr @@ -17187,18 +17530,18 @@ XI Wl uu WY -Ad -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr +iN +iN +iN +iN +iN +iN +sz +vj +RY +iN +oh +Ay Cr Cr Cr @@ -17339,18 +17682,18 @@ wn iK SO so +SO +iK +iK +SO +SO +iK +iK +Ua Ad -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr +Op +CA +Ay Cr Cr Cr @@ -17491,18 +17834,18 @@ XI gq Va iL -Ad -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr -Cr +iN +iN +iN +iN +iN +iN +iN +pZ +pZ +iN +iN +Ay Cr Cr Cr @@ -17643,18 +17986,18 @@ TC GG jc ZC +ZC +ZC +ZC +ZC +ZC Ty -Ty -Ty -Ty -Ty -Ty -Cr -Cr -Cr -Cr -Cr -Cr +Gl +pt +pt +Gl +Gl +Gl Cr Cr Cr