diff --git a/maps/away_inf/sentinel/sentinel-1.dmm b/maps/away_inf/sentinel/sentinel-1.dmm index 6ef2454998..0d828f4f47 100644 --- a/maps/away_inf/sentinel/sentinel-1.dmm +++ b/maps/away_inf/sentinel/sentinel-1.dmm @@ -2026,9 +2026,14 @@ /turf/simulated/wall/r_wall, /area/ship/patrol/command/hangar) "dP" = ( -/obj/effect/paint/meatstation/lab, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/paint/dark_gunmetal, /turf/simulated/wall/r_wall, -/area/ship/patrol/command/lasers) +/area/ship/patrol/command/ofd) "dQ" = ( /obj/structure/cable{ d1 = 2; @@ -2246,9 +2251,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ship/patrol/maintenance/engine/starboard) "em" = ( -/obj/structure/catwalk, -/turf/simulated/floor/airless, -/area/ship/patrol/command/lasers) +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "eo" = ( /obj/machinery/power/apc{ dir = 1; @@ -2256,13 +2261,6 @@ pixel_y = 23; req_access = list("ACCESS_CAVALRY") }, -/obj/machinery/button/blast_door{ - desc = "A remote control-switch for the torpedos launcher door."; - id_tag = "las_patrol"; - name = "MRSL Platform Blastdoor Control"; - pixel_x = -24; - req_access = list("ACCESS_ENGINEERING") - }, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -2457,24 +2455,24 @@ /turf/simulated/floor/plating, /area/ship/patrol/command/hangar) "eF" = ( -/obj/machinery/shield_diffuser, -/obj/structure/catwalk, -/turf/simulated/floor/airless, -/area/ship/patrol/command/lasers) +/obj/structure/missile/he, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "eH" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor, -/obj/machinery/door/blast/regular{ - id_tag = "las_patrol" +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/effect/wallframe_spawn/reinforced, -/obj/effect/paint/meatstation/lab, -/turf/simulated/floor, -/area/ship/patrol/command/lasers) +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/patrol/command/ofd) "eI" = ( /turf/simulated/floor/plating, /area/ship/patrol/command/lasers) @@ -3661,9 +3659,10 @@ "gY" = ( /obj/machinery/button/blast_door{ desc = "A remote control-switch for the torpedos launcher door."; - id_tag = "bsap_space"; + id_tag = "patmis_space"; name = "OFD Blast Doors Control"; - pixel_y = 24 + pixel_y = 24; + req_access = list("ACCESS_CAVALRY") }, /obj/machinery/conveyor_switch{ id = "bsap" @@ -3671,6 +3670,11 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1; + icon_state = "stripe" + }, +/obj/structure/railing/mapped, /turf/simulated/floor/tiled/techfloor, /area/ship/patrol/command/ofd) "gZ" = ( @@ -3678,11 +3682,11 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/railing/mapped, /turf/simulated/floor/tiled/techfloor, /area/ship/patrol/command/ofd) "ha" = ( -/obj/item/stool, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, @@ -3699,20 +3703,21 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 23; - req_access = list("ACCESS_CAVALRY") - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, /obj/structure/cable, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24; + pixel_y = 0; + req_access = list("ACCESS_CAVALRY") + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1; + icon_state = "stripe" + }, /turf/simulated/floor/tiled/techfloor, /area/ship/patrol/command/ofd) "hd" = ( @@ -3969,11 +3974,8 @@ /turf/simulated/floor/plating, /area/ship/patrol/command/hangar) "hL" = ( -/obj/machinery/disperser/back{ - dir = 8; - id_tag = "ofdp" - }, -/turf/simulated/floor/reinforced/airless, +/obj/effect/floor_decal/industrial/outline/green, +/turf/simulated/floor/tiled/techfloor/grid, /area/ship/patrol/command/ofd) "hM" = ( /obj/effect/paint/dark_gunmetal, @@ -3981,35 +3983,37 @@ /area/ship/patrol/command/ofd) "hN" = ( /obj/machinery/door/firedoor, -/obj/structure/plasticflaps/airtight, /obj/machinery/conveyor{ dir = 8; - id = "bsap" + id = "bsa" }, -/obj/machinery/door/blast/regular{ +/obj/structure/plasticflaps/airtight, +/obj/machinery/door/blast/regular/open{ density = 0; dir = 4; - icon_state = "pdoor0"; - id_tag = "bsap_space"; - name = "OFD Compartament Hatch"; + id_tag = "patmis_space"; + name = "Unknown Compartament Shell Loader"; opacity = 0 }, /turf/simulated/floor/reinforced, /area/ship/patrol/command/ofd) "hO" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/railing/mapped, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "bsa" + }, +/turf/simulated/floor/tiled/dark, /area/ship/patrol/command/ofd) "hP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8; - icon_state = "warningcorner" - }, /turf/simulated/floor/tiled/techfloor, /area/ship/patrol/command/ofd) "hQ" = ( @@ -4019,7 +4023,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/railing/mapped, /turf/simulated/floor/tiled/techfloor, /area/ship/patrol/command/ofd) "hR" = ( @@ -4052,8 +4055,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/highsecurity/bolted{ - id_tag = "miss_pod"; +/obj/machinery/door/airlock/highsecurity{ name = "Missile Section" }, /turf/simulated/floor/tiled/techfloor/grid, @@ -4634,19 +4636,17 @@ /turf/simulated/floor/plating, /area/ship/reaper) "iD" = ( -/obj/structure/ship_munition/disperser_charge/explosive, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/sign/warning/secure_area{ dir = 4; pixel_x = -32 }, /obj/machinery/light, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, /area/ship/patrol/command/ofd) "iE" = ( -/obj/structure/ship_munition/disperser_charge/explosive, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, /area/ship/patrol/command/ofd) "iF" = ( /obj/effect/floor_decal/industrial/warning{ @@ -8417,17 +8417,27 @@ /obj/effect/paint/meatstation/lab, /turf/simulated/wall/r_wall, /area/ship/patrol/command/ofd) +"rk" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/missile/he, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "rs" = ( -/obj/machinery/disperser/middle{ - dir = 8; - id_tag = "ofdp" +/obj/machinery/mass_driver{ + id_tag = "patmissile"; + dir = 8 }, /turf/simulated/floor/reinforced/airless, /area/ship/patrol/command/ofd) "rt" = ( /obj/machinery/conveyor{ dir = 8; - id = "bsap" + id = "bsa" }, /turf/simulated/floor/reinforced/airless, /area/ship/patrol/command/ofd) @@ -8449,7 +8459,7 @@ }, /obj/machinery/door/blast/regular{ dir = 4; - id_tag = "bsap_space"; + id_tag = "patmis_space"; name = "OFD Compartament Hatch" }, /turf/simulated/floor/reinforced/airless, @@ -8467,6 +8477,12 @@ /obj/effect/paint/dark_gunmetal, /turf/simulated/wall/r_wall, /area/ship/patrol/engineering/equipment) +"si" = ( +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/patrol/command/ofd) "sJ" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -8481,14 +8497,14 @@ /turf/simulated/wall/r_wall, /area/ship/patrol/medbay) "sZ" = ( -/obj/effect/paint/meatstation/lab, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/turf/simulated/wall/r_wall, -/area/ship/patrol/command/lasers) +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "tb" = ( /obj/effect/paint/meatstation/lab, /turf/simulated/wall/r_wall, @@ -8568,14 +8584,26 @@ }, /turf/simulated/wall/ocp_wall, /area/ship/patrol/engineering/fussion/control) +"vk" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/industrial/outline/green, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "wa" = ( /obj/effect/paint/dark_gunmetal, /turf/simulated/wall/r_wall, /area/ship/patrol/crew/cargo) "wf" = ( -/obj/structure/ship_munition/disperser_charge/mining, -/obj/effect/floor_decal/industrial/outline/orange, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/techfloor, /area/ship/patrol/command/ofd) "wk" = ( /obj/machinery/atmospherics/unary/outlet_injector{ @@ -8586,6 +8614,21 @@ }, /turf/simulated/floor/reinforced/airless, /area/ship/patrol/engineering/fussion/control) +"wy" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8; + pixel_x = 0 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/patrol/command/ofd) +"wM" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/missile/he, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "wN" = ( /obj/effect/paint/dark_gunmetal, /turf/simulated/wall/r_wall, @@ -8608,18 +8651,30 @@ /turf/simulated/wall/r_wall, /area/ship/patrol/command/hangar) "yr" = ( -/obj/machinery/alarm{ - pixel_y = 24; +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/table/steel_reinforced, +/obj/item/storage/bible, +/obj/machinery/button/mass_driver{ + id_tag = "patmis_space"; + pixel_x = -32; req_access = list("ACCESS_CAVALRY") }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/computer/ship/navigation, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) +"yB" = ( +/obj/structure/missile/diffusive, +/obj/effect/floor_decal/industrial/outline/green, /turf/simulated/floor/tiled/techfloor/grid, /area/ship/patrol/command/ofd) "yR" = ( /obj/effect/paint/dark_gunmetal, /turf/simulated/wall/r_wall, /area/ship/patrol/command/lasers) +"yS" = ( +/obj/effect/floor_decal/industrial/outline/orange, +/obj/structure/missile/impact, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "zp" = ( /obj/effect/paint/meatstation/lab, /obj/structure/cable{ @@ -8629,6 +8684,12 @@ }, /turf/simulated/wall/r_wall, /area/ship/patrol/engineering/fussion/control) +"zH" = ( +/obj/machinery/computer/ship/missiles{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "zJ" = ( /obj/effect/paint/meatstation/lab, /obj/structure/cable{ @@ -8656,6 +8717,9 @@ }, /turf/simulated/wall/r_wall, /area/ship/patrol/barracks/armory) +"Az" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "AU" = ( /obj/effect/paint/dark_gunmetal, /turf/simulated/wall/r_wall, @@ -8670,9 +8734,22 @@ /obj/random/trash, /turf/simulated/floor/plating, /area/ship/patrol/maintenance/lower) +"Bz" = ( +/obj/effect/floor_decal/industrial/warning/cee, +/turf/simulated/floor/tiled/techfloor, +/area/ship/patrol/command/ofd) "BI" = ( -/obj/structure/ship_munition/disperser_charge/fire, -/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor, +/area/ship/patrol/command/ofd) +"BQ" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/computer/ship/navigation{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/ship/patrol/command/ofd) "Cb" = ( @@ -8715,6 +8792,15 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/ship/patrol/maintenance/lower) +"CF" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25; + req_access = list("ACCESS_CAVALRY") + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/ship/patrol/command/ofd) "CI" = ( /obj/effect/paint/dark_gunmetal, /obj/structure/cable{ @@ -8743,11 +8829,25 @@ /obj/structure/sign/warning/hot_exhaust, /turf/simulated/wall/r_wall, /area/ship/patrol/maintenance/engine/port) +"DD" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8; + pixel_x = 0 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/patrol/command/ofd) "DJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/railing/mapped, /turf/simulated/floor/tiled/techfloor, /area/ship/patrol/command/ofd) "DU" = ( @@ -8783,6 +8883,13 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/ship/patrol/engineering/fussion/control) +"Eh" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/techfloor, +/area/ship/patrol/command/ofd) "Ex" = ( /obj/effect/paint/meatstation/lab, /turf/simulated/wall/r_wall, @@ -8830,10 +8937,8 @@ /area/ship/patrol/maintenance/atmos) "GD" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/table/steel_reinforced, -/obj/item/storage/bible, /obj/machinery/light{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/ship/patrol/command/ofd) @@ -8844,6 +8949,20 @@ }, /turf/simulated/floor/tiled/white, /area/ship/patrol/medbay) +"Ha" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) +"HP" = ( +/obj/structure/table/steel_reinforced, +/obj/item/hand_labeler, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "HY" = ( /obj/effect/floor_decal/corner/brown{ dir = 8 @@ -8958,6 +9077,18 @@ }, /turf/simulated/wall/r_wall, /area/ship/patrol/command/hangar) +"LS" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/missile/antispace{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "Mm" = ( /obj/machinery/pointdefense{ initial_id_tag = "patrol_pd" @@ -9005,6 +9136,13 @@ }, /turf/simulated/wall/r_wall, /area/ship/patrol/command/hangar) +"NA" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "NY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -9023,6 +9161,16 @@ }, /turf/simulated/wall/r_wall, /area/ship/patrol/medbay) +"Oq" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/missile/antispace{ + dir = 2 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "Ow" = ( /obj/effect/paint/black, /turf/simulated/wall/titanium, @@ -9062,14 +9210,15 @@ /turf/space, /area/space) "PV" = ( -/obj/effect/paint/meatstation/lab, +/obj/structure/missile/he, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/wall/r_wall, -/area/ship/patrol/command/lasers) +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "PX" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -9099,6 +9248,10 @@ /obj/structure/sign/warning/hot_exhaust, /turf/simulated/wall/r_wall, /area/ship/patrol/maintenance/engine/starboard) +"Re" = ( +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "Rs" = ( /obj/machinery/atmospherics/unary/heater{ dir = 4 @@ -9163,7 +9316,10 @@ /turf/simulated/floor/tiled/dark/monotile, /area/ship/patrol/command/bridge) "UV" = ( -/obj/structure/ship_munition/disperser_charge/emp, +/obj/machinery/light/spot, +/obj/structure/missile/antispace{ + dir = 1 + }, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor/grid, /area/ship/patrol/command/ofd) @@ -9248,6 +9404,11 @@ }, /turf/simulated/floor/tiled, /area/ship/patrol/crew/hallway/lower/aft) +"Wi" = ( +/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/missile/antispace, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "Wn" = ( /obj/effect/paint/dark_gunmetal, /obj/structure/cable{ @@ -9272,24 +9433,19 @@ /turf/simulated/wall/r_wall, /area/ship/patrol/engineering/fussion/control) "Xc" = ( -/obj/machinery/computer/ship/disperser{ - id_tag = "ofdp" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/ship/patrol/command/ofd) -"Xg" = ( -/obj/structure/sign/warning/moving_parts{ - dir = 1; - pixel_y = -32 - }, /obj/effect/floor_decal/industrial/warning{ - dir = 4 + dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/ship/patrol/command/ofd) +"Xg" = ( +/obj/effect/floor_decal/industrial/outline/orange, +/obj/machinery/light/spot, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ship/patrol/command/ofd) "Xj" = ( /obj/effect/floor_decal/corner/black{ dir = 5 @@ -13750,7 +13906,7 @@ ty aa qG hM -hL +rt hM qG aa @@ -13986,10 +14142,10 @@ aa aa aa aa -aa -aa -aa -aa +qG +qG +qG +qG qt qG hM @@ -13999,10 +14155,10 @@ hM hM qG qt -aa -aa -aa -aa +qG +qG +qG +qG aa aa aa @@ -14107,12 +14263,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -qt +qG +hM +hM +hM +hM +dP hM hM gY @@ -14120,12 +14276,12 @@ hO iD hM hM -qt -aa -aa -aa -aa -aa +dP +hM +hM +hM +hM +qG aa aa aa @@ -14228,27 +14384,27 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -qt +qG +qG hM +Re +Oq +zH +BQ +HP yr gZ DJ iE wf +Re +LS +Az +Re +UV hM -qt -aa -aa -aa -aa -aa -aa +qG +qG aa aa aa @@ -14350,27 +14506,27 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -qt +qG +qG hM +si +Xc +Xc +eH +Xc Xc ha hP +Eh iF -Xg +wy +DD +wy +wy +Bz hM -qt -aa -aa -aa -aa -aa -aa +qG +qG aa aa aa @@ -14474,25 +14630,25 @@ aa al al al -dP -em +hM +Wi +eF eF -em PV -hM +yB GD hb hQ -UV +iE BI +yB +rk +wM +eF +yS hM -Op -FW -FW -FW -FW -FW -FW +qG +qG aa aa YJ @@ -14596,25 +14752,25 @@ al al tn tn -dP -em -em +hM +Re +NA em sZ -ZZ +vk ZZ hc hR +CF hM +hL +Ha +em +em +Xg hM -hM -FP -jk -jk -jk -FW -FW -FW +qG +qG FW PF ty @@ -14718,11 +14874,11 @@ al tn tn tn -dP -dP -eH -dP -dP +yR +yR +yR +yR +yR hM hM hM