From 9c3c37a1a0b03c9df3ed4d39d1406764e9bf2901 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 26 Apr 2020 22:14:19 -0400 Subject: [PATCH] [Map] Beep Boop. I'm Fully Charged Mapping oversight, oops. Adds cyborg rechargers I missed when moving mining ops over to space. Changelog Notes: - Adds forgotten Cyborg chargers. - Moves a few objects in Mining Ops to make room. - Adds atmos pipes to new rooms at Mining Outpost. Another oversight caught. --- maps/tether/tether-07-station3.dmm | 71 ++--- maps/tether/tether-08-mining.dmm | 475 +++++++++++++++++++---------- 2 files changed, 344 insertions(+), 202 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index d08d9a8871e..9ae6bff564a 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -28813,6 +28813,11 @@ dir = 1 }, /obj/machinery/mineral/equipment_vendor, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22; + pixel_y = 0 + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "aTC" = ( @@ -29752,9 +29757,12 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "aVx" = ( -/obj/machinery/camera/network/cargo, +/obj/structure/extinguisher_cabinet{ + pixel_x = 0; + pixel_y = -32 + }, /turf/simulated/floor/tiled, -/area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +/area/quartermaster/belterdock/gear) "aVy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -30029,13 +30037,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "aWf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/extinguisher_cabinet{ - pixel_x = -28; +/obj/structure/closet/emcloset, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24; pixel_y = 0 }, /turf/simulated/floor/tiled, -/area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +/area/quartermaster/belterdock/refinery) "aWg" = ( /turf/simulated/floor/tiled, /area/shuttle/excursion/general) @@ -31290,11 +31299,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "aYJ" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22; - pixel_y = 0 - }, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "aYK" = ( @@ -31449,14 +31454,9 @@ pixel_x = -28; pixel_y = 0 }, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 0; - pixel_y = -25 - }, -/obj/structure/closet/emcloset, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled, -/area/quartermaster/belterdock/refinery) +/area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "aZa" = ( /obj/machinery/door/airlock/hatch{ req_one_access = newlist() @@ -31958,14 +31958,8 @@ /turf/simulated/wall/r_wall, /area/security/security_lockerroom) "aZZ" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 5 - }, +/obj/machinery/camera/network/cargo, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "baa" = ( @@ -32025,14 +32019,15 @@ "bah" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 2 - }, /obj/structure/cable/green{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 5 + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "bai" = ( @@ -32072,12 +32067,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 2 + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "bao" = ( @@ -46916,7 +46911,7 @@ aMN aTv aVr aWQ -aVr +aVx aMN avt avt @@ -47201,11 +47196,11 @@ aTB aVC aXn aWI -aYJ -aYZ -aVc aWf -aZZ +aYJ +aVc +aYZ +aZS bai baO bau @@ -47488,7 +47483,7 @@ aWI aYP aZf aVc -aVx +aZZ ban bai bax diff --git a/maps/tether/tether-08-mining.dmm b/maps/tether/tether-08-mining.dmm index 7289bdc33d6..572560d98df 100644 --- a/maps/tether/tether-08-mining.dmm +++ b/maps/tether/tether-08-mining.dmm @@ -27,6 +27,9 @@ /area/outpost/mining_main/hangar) "ah" = ( /obj/effect/floor_decal/industrial/warning/corner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "ai" = ( @@ -39,8 +42,9 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "ak" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) @@ -52,7 +56,11 @@ /turf/simulated/wall/r_wall, /area/outpost/mining_main/hangar) "an" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/tiled, @@ -77,8 +85,8 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "ar" = ( -/obj/effect/floor_decal/industrial/warning{ - icon_state = "warning"; +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/tiled, @@ -91,14 +99,18 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "at" = ( -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "au" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) @@ -115,24 +127,17 @@ /area/outpost/mining_main/maintenance) "aw" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "ax" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + icon_state = "warning"; + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "ay" = ( @@ -159,15 +164,11 @@ /area/mine/explored) "aC" = ( /obj/effect/floor_decal/industrial/warning/corner{ - icon_state = "warningcorner"; - dir = 1 + dir = 4 }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 5 }, /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) @@ -251,8 +252,12 @@ /turf/simulated/floor/virgo3b, /area/mine/explored) "aK" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "aL" = ( @@ -473,29 +478,25 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "bg" = ( -/obj/machinery/alarm{ - alarm_id = null; - breach_detection = 0; - dir = 1; - icon_state = "alarm0"; - pixel_y = -22 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "bh" = ( -/obj/machinery/status_display{ - pixel_x = 32 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, /obj/structure/cable/green{ - icon_state = "1-2" + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) @@ -626,11 +627,21 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "bv" = ( -/obj/machinery/door/airlock/glass_mining, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/turf/simulated/floor/tiled/steel_grid, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "bw" = ( /obj/structure/cable{ @@ -817,53 +828,38 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) "bP" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/machinery/light, +/obj/effect/floor_decal/industrial/warning/corner{ + icon_state = "warningcorner"; + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "bQ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_x = 0; - pixel_y = 24 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 12; - pixel_y = 24 - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 1 - }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled, -/area/outpost/mining_main/secondary_gear_storage) +/area/outpost/mining_main/hangar) "bR" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/machinery/light, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled, -/area/outpost/mining_main/secondary_gear_storage) +/area/outpost/mining_main/hangar) "bS" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -893,11 +889,13 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) "bV" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/secondary_gear_storage) +/area/outpost/mining_main/hangar) "bW" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -1115,9 +1113,6 @@ icon_state = "alarm0"; pixel_y = -22 }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /obj/effect/floor_decal/borderfloor/corner2{ @@ -1126,14 +1121,22 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 9 }, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/secondary_gear_storage) -"cy" = ( -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/secondary_gear_storage) +/area/outpost/mining_main/hangar) +"cy" = ( +/obj/machinery/status_display{ + pixel_x = 32 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/hangar) "cz" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 @@ -1150,8 +1153,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, -/area/outpost/mining_main/secondary_gear_storage) +/area/outpost/mining_main/hangar) "cC" = ( /obj/structure/table/steel, /obj/item/weapon/tool/screwdriver, @@ -1187,11 +1192,47 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/break_room) "cE" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 24 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 12; + pixel_y = 24 + }, /obj/structure/cable/green{ - icon_state = "1-2" + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled, -/area/outpost/mining_main/break_room) +/area/outpost/mining_main/secondary_gear_storage) "cF" = ( /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -1241,22 +1282,18 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/outpost/mining_main/drill_equipment) "cI" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "1-8" }, -/turf/simulated/floor/tiled/steel_grid, -/area/outpost/mining_main/break_room) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/secondary_gear_storage) "cJ" = ( /obj/structure/cable/green{ d1 = 2; @@ -1415,6 +1452,116 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/outpost/mining_main/secondary_gear_storage) +"cU" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/secondary_gear_storage) +"cV" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/secondary_gear_storage) +"cW" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/secondary_gear_storage) +"cX" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/secondary_gear_storage) +"cY" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/secondary_gear_storage) +"cZ" = ( +/obj/machinery/alarm{ + alarm_id = null; + breach_detection = 0; + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/secondary_gear_storage) +"da" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/secondary_gear_storage) +"db" = ( +/obj/machinery/door/airlock/glass_mining, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_grid, +/area/outpost/mining_main/secondary_gear_storage) +"dc" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/break_room) +"dd" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_grid, +/area/outpost/mining_main/break_room) "di" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -2860,12 +3007,12 @@ ab ab ag ah -an -an -an -an -an -at +aw +aw +aw +aw +aw +aC aD ag ab @@ -3001,13 +3148,13 @@ ab ab ab ag -ai +ak aq aq aq aq aq -au +aK aE ag ab @@ -3143,14 +3290,14 @@ ab ab ab ag -ai +ak aq aq aq aq aq -au aK +bQ ag ab ab @@ -3285,14 +3432,14 @@ ab ab ab ag -as +an aq aq aq aq aq -au -bP +aK +bR ag ab ab @@ -3427,14 +3574,14 @@ ab ab ab ag -ai +ar aq aq aq aq aq -au -aK +bg +bV ag ab cu @@ -3575,7 +3722,7 @@ aq aq aq aq -au +aK aX ag ab @@ -3717,7 +3864,7 @@ aq aq aq aq -au +aK aY ag ab @@ -3859,7 +4006,7 @@ aq aq aq aq -au +aK aY ag bG @@ -4001,7 +4148,7 @@ aq aq aq aq -au +aK cw ag bO @@ -4143,13 +4290,13 @@ aq aq aq aq -aw +bh aZ ag cS +cU bU -bU -bU +cX cT cA aI @@ -4279,20 +4426,20 @@ ab ab ab ag -ai +at aq aq ao aq aq -ax -bg -ag -bQ -bV -bV -bV +bv cx +ag +cE +cV +cW +cY +cZ bG cD aW @@ -4421,23 +4568,23 @@ ab ab ab ag -ak -ar -ar -ar -ar -ar -aC -bh -bv -bR +au +ax +ax +ax +ax +ax +bP +cy +cB +cI bX ce co -cy -cB -cE -cI +da +db +dc +dd bW hK Ma