From f7bd6c28508bd337a85efeac8743b4d9d6e97fd2 Mon Sep 17 00:00:00 2001 From: LightFire53 Date: Sat, 16 Jul 2022 00:05:12 -0700 Subject: [PATCH] Remaps DeltaStation Arrivals for Better Shuttle Docking (#18226) * Docking Clearance * Arrivals Renovations * Bye bye airlock * Lattice Time * Classic post pr posting tweaks Featuring yours truly * Fills more space And maybe CI won't fail randomly? * No Parking Zone * Denth Request --- _maps/map_files/Delta/delta.dmm | 1194 ++++++++++++++++--------------- 1 file changed, 618 insertions(+), 576 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index b693667b128..e94ec7aebef 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -251,18 +251,6 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"adv" = ( -/obj/machinery/alarm{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "adx" = ( /obj/machinery/status_display{ pixel_x = 32 @@ -283,13 +271,6 @@ }, /turf/space, /area/space/nearstation) -"adK" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "adL" = ( /obj/structure/shuttle/engine/propulsion/burst, /turf/simulated/wall/mineral/titanium, @@ -538,17 +519,6 @@ /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) -"afw" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 8; - height = 15; - id = "admin_home"; - name = "port bay 1"; - width = 18 - }, -/turf/space, -/area/space) "afx" = ( /obj/machinery/power/smes, /obj/machinery/light/small{ @@ -726,17 +696,6 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"agf" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Arrivals Port Fore"; - dir = 8 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "agg" = ( /obj/machinery/status_display{ pixel_x = -32 @@ -960,10 +919,6 @@ icon_state = "neutralfull" }, /area/hallway/secondary/entry) -"ahv" = ( -/obj/structure/lattice, -/turf/space, -/area/hallway/secondary/entry) "ahw" = ( /obj/machinery/door/airlock/maintenance{ name = "Auxiliary Storage"; @@ -1291,22 +1246,11 @@ /area/maintenance/fore2) "akG" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/light{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" }, /area/hallway/secondary/entry) -"akU" = ( -/obj/machinery/door/airlock/external{ - id_tag = "specops_home"; - locked = 1 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "akY" = ( /obj/machinery/status_display, /turf/simulated/wall/mineral/titanium, @@ -1352,20 +1296,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"alu" = ( -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/machinery/camera{ - c_tag = "Arrivals Port Aft"; - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "alv" = ( /obj/machinery/light/small{ dir = 1 @@ -1397,16 +1327,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"alE" = ( -/obj/docking_port/stationary{ - dwidth = 2; - height = 12; - id = "ferry_home"; - name = "port bay 3"; - width = 5 - }, -/turf/space, -/area/space) "alG" = ( /obj/machinery/status_display{ pixel_x = -32 @@ -1499,13 +1419,6 @@ icon_state = "neutral" }, /area/maintenance/fore2) -"alY" = ( -/obj/machinery/door/airlock/external{ - id_tag = "ferry_home"; - locked = 1 - }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "alZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1632,21 +1545,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/permabrig) -"amx" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry) -"amy" = ( -/obj/structure/sign/vacuum, -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/hallway/secondary/entry) "amz" = ( /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -1940,17 +1838,6 @@ icon_state = "arrival" }, /area/hallway/secondary/entry) -"anI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "arrival" - }, -/area/hallway/secondary/entry) "anJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -52736,6 +52623,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/port) +"cvc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/hallway/secondary/entry) "cvd" = ( /obj/structure/cable{ d1 = 4; @@ -88509,11 +88408,6 @@ icon_state = "darkred" }, /area/security/warden) -"eYL" = ( -/obj/effect/decal/warning_stripes/west, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "faB" = ( /obj/structure/cable{ d1 = 4; @@ -89033,6 +88927,18 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/brig) +"fVf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/hallway/secondary/entry) "fVZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -89048,6 +88954,18 @@ icon_state = "showroomfloor" }, /area/medical/surgery1) +"fWg" = ( +/obj/machinery/alarm{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "fZU" = ( /obj/structure/chair/stool/bar{ dir = 1 @@ -90635,21 +90553,6 @@ icon_state = "showroomfloor" }, /area/medical/surgery1) -"jmB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/item/radio/intercom{ - name = "south bump"; - pixel_y = -28 - }, -/turf/simulated/floor/plasteel{ - icon_state = "arrival" - }, -/area/hallway/secondary/entry) "jnJ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -91544,6 +91447,15 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/fore) +"lwH" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/hallway/secondary/entry) "lxh" = ( /obj/structure/rack, /obj/effect/decal/warning_stripes/southeast, @@ -92277,6 +92189,14 @@ }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) +"mWX" = ( +/obj/effect/decal/warning_stripes/east, +/obj/machinery/camera{ + c_tag = "Arrivals Port Aft"; + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "mXZ" = ( /obj/machinery/camera{ c_tag = "Brig - Hallway North-East"; @@ -92751,6 +92671,17 @@ /obj/machinery/optable, /turf/simulated/floor/plasteel/dark, /area/medical/surgery1) +"nRM" = ( +/obj/machinery/status_display{ + pixel_x = 32 + }, +/obj/effect/decal/warning_stripes/east, +/obj/machinery/camera{ + c_tag = "Arrivals Port Fore"; + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "nXf" = ( /obj/machinery/computer/security/wooden_tv, /turf/simulated/floor/carpet, @@ -93885,6 +93816,17 @@ }, /turf/simulated/floor/plating, /area/maintenance/fsmaint) +"qdO" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 2; + height = 12; + id = "ferry_home"; + name = "port bay 3"; + width = 5 + }, +/turf/space, +/area/space) "qdY" = ( /obj/structure/cable{ d1 = 1; @@ -93999,6 +93941,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel/dark, /area/crew_quarters/courtroom) +"qpI" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/northeast, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "qpZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -94116,6 +94065,16 @@ icon_state = "darkredcorners" }, /area/security/brig) +"qEq" = ( +/obj/item/radio/intercom{ + name = "north bump"; + pixel_y = 28 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/hallway/secondary/entry) "qET" = ( /obj/effect/spawner/random_spawners/wall_rusted_always, /turf/simulated/wall, @@ -94134,24 +94093,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/crew_quarters/theatre) -"qHs" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "sol_airlock"; - name = "interior access button"; - pixel_x = -25; - pixel_y = -25 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - initialize_directions = 10 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "arrival" - }, -/area/hallway/secondary/entry) "qJC" = ( /obj/machinery/door/poddoor{ density = 0; @@ -94549,6 +94490,12 @@ icon_state = "red" }, /area/hallway/secondary/exit) +"rmI" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "rnA" = ( /obj/structure/chair/stool{ dir = 8 @@ -94655,6 +94602,18 @@ icon_state = "arrival" }, /area/hallway/secondary/entry) +"rCd" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 9; + height = 18; + id = "admin_home"; + name = "port bay 1"; + timid = 1; + width = 19 + }, +/turf/space, +/area/space) "rCe" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 10 @@ -94816,6 +94775,15 @@ }, /turf/simulated/floor/carpet, /area/assembly/showroom) +"rXq" = ( +/obj/machinery/camera{ + c_tag = "Arrivals Hall Port" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" + }, +/area/hallway/secondary/entry) "rZK" = ( /obj/structure/cable{ d1 = 1; @@ -95202,6 +95170,23 @@ icon_state = "dark" }, /area/security/brig) +"sFX" = ( +/obj/effect/decal/warning_stripes/west, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "sol_airlock"; + name = "interior access button"; + pixel_x = -25; + pixel_y = -25 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10; + initialize_directions = 10 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "sGz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -95255,6 +95240,13 @@ icon_state = "barber" }, /area/civilian/barber) +"sOH" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "sPz" = ( /obj/machinery/light/small{ dir = 1 @@ -95426,6 +95418,13 @@ icon_state = "vault" }, /area/medical/morgue) +"tfe" = ( +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "tge" = ( /obj/structure/sign/electricshock{ pixel_y = 32 @@ -95926,6 +95925,16 @@ icon_state = "freezerfloor" }, /area/crew_quarters/sleep) +"tYN" = ( +/obj/machinery/status_display{ + pixel_x = 32 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "uaL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -96931,6 +96940,21 @@ icon_state = "darkredcorners" }, /area/security/prison/cell_block) +"wop" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) +"wpq" = ( +/obj/effect/decal/warning_stripes/southeast, +/obj/item/radio/intercom{ + name = "east bump"; + pixel_x = 28 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) "wpr" = ( /obj/structure/cable{ d1 = 4; @@ -97408,6 +97432,13 @@ /obj/structure/shuttle/engine/propulsion/burst, /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) +"xCH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "arrival" + }, +/area/hallway/secondary/entry) "xDn" = ( /obj/structure/sign/electricshock{ pixel_y = 32 @@ -97537,6 +97568,17 @@ icon_state = "darkred" }, /area/security/seceqstorage) +"xMM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/hallway/secondary/entry) "xMN" = ( /obj/structure/cable{ d1 = 4; @@ -115588,7 +115630,7 @@ aaa aaa aaa aaa -aaa +dZV aaa aaa aaa @@ -115844,8 +115886,8 @@ aaa dmq dmq dmq -cJK -cJK +cHA +cHA cHA aaa aaa @@ -116619,8 +116661,8 @@ sPz cXU cHA cHA -cJK -cJK +cHA +cHA cHA cHA aaa @@ -117137,7 +117179,7 @@ drn dhG drn cCy -cHA +cJK aaa abj seE @@ -118691,7 +118733,7 @@ aaa aaa aaa aaa -dZV +aaa aaa aaa aaa @@ -128326,6 +128368,7 @@ aaa aaa aaa aaa +rCd aaa aaa aaa @@ -128344,8 +128387,7 @@ aaa aaa aaa aaa -aaa -aaa +qcA aaa aaa aaa @@ -128578,37 +128620,37 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj +abj +abj +acC +aef +aef +acC +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +acC +mWj +siv +abj +abj +abj +abj +abj apH aqA art @@ -128834,37 +128876,37 @@ aaa aaa aaa aaa +abj +abj +aaa +aaa +acC +afb +afb +acC +abj aaa aaa aaa aaa +abj +acC +acC +acC +acC +acC +acC aaa aaa aaa +abj +acC +gHn +acC aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abj aaa apH aqB @@ -129089,39 +129131,39 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +adb +acC +adb +acC +acC +acC +acC +aef +aef +adb +acC +acC +adb +acC +acC +acC +acC +aik +aiE +afb +ajf +acC +acC +acC +acC +adb +acC +kpH +acC +adb +adb +adb +adb aaa apH aqC @@ -129344,41 +129386,41 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +acC +acC +acC +buc +fWg +adZ +wop +adZ +aeI +adZ +adZ +afJ +adZ +adZ +agd +age +adZ +adZ +adZ +adZ +adZ +adZ +adZ +adZ +adZ +aip +agA +agg +adZ +sFX +rmI +xCH +ani +anH +adb aaa apH aqz @@ -129601,41 +129643,41 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -afw -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -ajX -aaa -aaa -aaa -aaa -aaa -aaa -qcA -aaa -aaa -aaa +acD +acO +adc +adt +afh +aea +xMM +asB +lwH +asB +asB +asB +asB +asB +asB +ahg +ajZ +ajZ +ajZ +ajZ +cMP +ajZ +ajZ +ajZ +ajZ +ahg +ajZ +ajZ +ajZ +amA +amM +anu +wvH +cvc +adb aaa apG aqD @@ -129858,41 +129900,41 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -abj -abj acC -aef -aef acC -abj -abj -abj -abj -abj -aaa -aaa -aaa -abj acC -akU -acC -abj -abj -abj -abj -acC -mWj -siv -aaa -aaa +adu +qpI +aeb +tfe +aeb +aeO +aeb +aeb +nRM +aeb +aeb +sOH +agB +aeb +aeb +aeb +aeb +aeb +aeb +aeb +mWX +aeb +agB +aeb +tYN +aeb +wpq +amL +anv +ank +anP +adb aaa apH aqE @@ -130117,39 +130159,39 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -abj -abj -aaa +adb acC -afb -afb +adb acC -aaa -aaa -aaa -ahv +acC +acC +adb +acC +acC +adb +acC +acC +adb acC acC acC acC +aio +aiF +aiI +ajy acC acC -afb acC -aaa -abj -aaa -aaa acC -gHn +adb acC -aaa -aaa +adb +adb +adb +iIw +anK +adb aaa apH apH @@ -130376,36 +130418,36 @@ aaa aaa aaa aaa +abj +abj +aaa +aaa +aaa +abj +aaa +aaa +aaa +aaa +abj +aaa +aaa +abj +acC +acC +acC +acC +acC +acC +abj +aaa +abj +aaa +aaa +aaa aaa adb -acC -adb -acC -acC -acC -aef -aef -adb -acC -acC -acC -acC -acC -aik -aiE -afb -ajf -acC -akU -acC -acC -adb -acC -adb -acC -kpH -acC -adb +rXq +anL adb abj abj @@ -130632,37 +130674,37 @@ aaa aaa aaa aaa +aaa +aaa +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj +abj acC -acC -acC -buc -adv -adZ -adZ -aeI -adZ -adZ -afJ -agd -age -adZ -adZ -adZ -adZ -adZ -adZ -adZ -adZ -adZ -aip -agA -agg -adZ -eYL -amL -qHs -ani -anH +ant +anP adb awX awX @@ -130889,37 +130931,37 @@ aaa aaa aaa aaa -acD -acO -adc -adt -afh -aea -aea -aeJ -aea -aea -aea -aea -agJ -ajZ -ajZ -ajZ -ajZ -cMP -ajZ -ajZ -ajZ -ajZ -ahg -ajZ -ajZ -ajZ -amA -amM -anu -wvH -anI +aaa +aaa +aaa +aaa +aaa +acF +aaa +abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abj +aaa +acC +ant +anP adb aor aoR @@ -131146,36 +131188,36 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +acF +aaa +abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abj +aaa acC -acC -acC -adu -adK -aeb -aeb -aeO -aeb -aeb -akb -agf -agB -aeb -aeb -aeb -aeb -aeb -aeb -aeb -aeb -aeb -agB -aeb -alu -aeb -amB -amL -anv -ank +ant anJ ahw apJ @@ -131405,35 +131447,35 @@ aaa aaa aaa aaa -adb +aaa +aaa +aaa +acF +aaa +abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abj +aaa acC -adb -acC -acC -adb -acC -acC -adb -acC -acC -acC -acC -acC -aio -aiF -aiI -ajy -acC -acC -acC -acC -adb -acC -adb -adb -adb -iIw -anK +ant +anP adb aoS apK @@ -131664,33 +131706,33 @@ aaa aaa aaa aaa +aaa +acF abj abj aaa aaa -abj +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa abj aaa -aaa -abj acC -acC -acC -acC -acC -acC -abj -aaa -abj -aaa -aaa -aaa -aaa -adb ant -anL +anP aoo aoo aoo @@ -131922,29 +131964,29 @@ aaa aaa aaa aaa -abj -abj -abj -abj -abj -abj -abj -abj -abj -abj +acF +aaa abj aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa abj -abj -abj -abj -abj -abj -alW -abj +aaa acC ant anP @@ -132201,9 +132243,9 @@ aaa aaa aaa abj -acC +aaa adb -ann +ant anP aoo aoU @@ -132458,10 +132500,10 @@ aaa aaa aaa abj -amx -ajy +aaa +adb ant -anP +fVf aoo aoV apM @@ -132714,8 +132756,8 @@ aaa aaa aaa aaa -acC -acC +abj +aaa acC ant anP @@ -132970,10 +133012,10 @@ aaa aaa aaa aaa -alE -alY -afb -alY +aaa +abj +aaa +acC ant rBP aoo @@ -133228,8 +133270,8 @@ aaa aaa aaa aaa -acC -acC +abj +aaa acC ant anP @@ -133486,8 +133528,8 @@ aaa aaa aaa abj -amy -ajf +aaa +acC ant alm ahy @@ -133730,21 +133772,21 @@ aaa aaa aaa aaa +qdO aaa aaa aaa aaa aaa aaa -aaa -aaa +ajX aaa aaa aaa aaa abj +aaa acC -adb akG als aoo @@ -134259,8 +134301,8 @@ aaa aaa aaa adb -ant -jmB +qEq +fVf aoo apc apT @@ -145049,7 +145091,7 @@ aaa abj aaa aaa -dZG +aaa aaa aaa aaa @@ -148410,7 +148452,7 @@ abj alW abj aaa -rDp +eNt xZU bWr vId @@ -148667,13 +148709,13 @@ aaa abj alW abj -rDp +eNt bWr weH weH eNt -eNt -eNt +rDp +rDp eNt aaa tgE @@ -148924,7 +148966,7 @@ aaa aaa abj abj -rDp +eNt xRD eNt aZu @@ -149434,7 +149476,7 @@ aaa aaa aaa aaa -aaa +dZG aaa aaa aaa