From 37e97b8265db1ff3cb5d46294c03bf6883498e59 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:49:06 +0200 Subject: [PATCH] no stimpacks --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 550 +++++++++--------- 1 file changed, 274 insertions(+), 276 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index b21f964d1665..09aae5cd559f 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -163,19 +163,6 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) -"cE" = ( -/obj/machinery/firealarm/directional/east{ - pixel_y = 5 - }, -/obj/structure/extinguisher_cabinet/directional/east{ - pixel_y = -7 - }, -/obj/structure/bed, -/obj/item/bedsheet/black, -/obj/structure/curtain/cloth/grey, -/obj/machinery/light/small/directional/south, -/turf/open/floor/carpet/nanoweave, -/area/ship/crew/dorm) "cL" = ( /obj/effect/turf_decal/corner/opaque/white/half{ dir = 4 @@ -303,8 +290,6 @@ /obj/item/storage/firstaid/regular, /obj/item/roller, /obj/item/reagent_containers/hypospray/medipen/morphine, -/obj/item/reagent_containers/hypospray/medipen/survival, -/obj/item/reagent_containers/hypospray/medipen/survival, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, @@ -342,24 +327,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "fk" = ( -/obj/machinery/light/directional/east, -/obj/machinery/camera{ - dir = 8; - c_tag = "Hallway" - }, -/obj/effect/turf_decal/corner/opaque/white/half{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/corner, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/ship/crew) -"fO" = ( /obj/structure/bed, /obj/item/bedsheet/syndie, /obj/machinery/power/apc/auto_name/directional/north, @@ -369,6 +336,20 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/carpet/nanoweave/red, /area/ship/crew/dorm/dormtwo) +"fr" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax/syndicate{ + pixel_y = 6 + }, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/obj/effect/turf_decal/industrial/warning/corner{ + dir = 2; + color = "#555555" + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "gj" = ( /obj/machinery/light/directional/north, /obj/structure/closet/crate/secure/science{ @@ -410,6 +391,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) +"gR" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_y = 7; + pixel_x = 8 + }, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "hr" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1; @@ -796,6 +785,10 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew) +"oF" = ( +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "oN" = ( /obj/structure/railing, /obj/machinery/door/firedoor/border_only, @@ -821,7 +814,7 @@ }, /turf/open/floor/carpet/nanoweave, /area/ship/crew/dorm) -"py" = ( +"pe" = ( /obj/effect/turf_decal/spline/fancy/opaque/syndiered{ dir = 1 }, @@ -1201,18 +1194,26 @@ }, /area/ship/engineering) "tJ" = ( -/obj/structure/grille, -/obj/structure/window/plasma/reinforced/plastitanium, -/obj/machinery/door/poddoor{ - dir = 4; - id = "kansatsu_observation" +/obj/structure/chair/office, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 }, -/obj/machinery/door/firedoor/window, -/turf/open/floor/plating, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/white, /area/ship/bridge) "tV" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) +"un" = ( +/obj/structure/table/reinforced, +/obj/item/radio/intercom/table{ + dir = 4; + pixel_x = 6; + pixel_y = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/turf/open/floor/plasteel/tech, +/area/ship/bridge) "uq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1277,6 +1278,24 @@ /obj/machinery/door/firedoor/window, /turf/open/floor/plating, /area/ship/bridge) +"wm" = ( +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/machinery/door/airlock/hatch{ + dir = 4; + name = "Observation Deck"; + req_access_txt = "19" + }, +/obj/machinery/door/poddoor/shutters{ + id = "kansatsu_lockdown"; + dir = 4 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/bridge) "xf" = ( /obj/effect/turf_decal/box/white, /obj/machinery/light/directional/west, @@ -1308,24 +1327,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plasteel/tech, /area/ship/bridge) -"ys" = ( -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) -"yt" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/airlock/hatch{ - name = "Command Quarters"; - req_access_txt = "19" - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/tech/grid, -/area/ship/crew/dorm/dormtwo) "yw" = ( /obj/structure/chair/bench/red/directional/east, /obj/structure/railing, @@ -1409,17 +1410,20 @@ /turf/open/floor/plasteel/mono/white, /area/ship/cargo) "Ah" = ( -/obj/structure/table/glass, -/obj/item/flashlight/lamp{ - pixel_x = -7; - pixel_y = 2 +/obj/effect/turf_decal/corner_techfloor_grid{ + dir = 10 }, -/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ - pixel_x = 12; - pixel_y = 7 +/obj/machinery/camera{ + dir = 4; + c_tag = "Exterior - Fore-Port" }, -/obj/machinery/light/directional/south, -/turf/open/floor/plasteel/white, +/obj/machinery/porta_turret/ship/syndicate/weak{ + dir = 5; + pixel_y = -4; + pixel_x = -6; + desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." + }, +/turf/open/floor/plating/airless, /area/ship/bridge) "Ap" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -1448,6 +1452,20 @@ color = "#777777" }, /area/ship/engineering) +"BQ" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/airlock/hatch{ + name = "Command Quarters"; + req_access_txt = "19" + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/crew/dorm/dormtwo) "BS" = ( /obj/structure/chair/bench/red/directional/east, /turf/open/floor/plasteel/tech, @@ -1460,6 +1478,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) +"CF" = ( +/obj/structure/grille, +/obj/structure/window/plasma/reinforced/plastitanium, +/obj/machinery/door/poddoor{ + dir = 4; + id = "kansatsu_observation" + }, +/obj/machinery/door/firedoor/window, +/turf/open/floor/plating, +/area/ship/bridge) "CP" = ( /obj/item/kirbyplants/fullysynthetic{ pixel_y = 20 @@ -1489,6 +1517,21 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) +"Dh" = ( +/obj/structure/filingcabinet/double/grey, +/obj/item/folder/syndicate, +/obj/item/folder/red, +/obj/item/folder, +/obj/item/folder/white, +/obj/item/clipboard, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/item/pen/fourcolor, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/ship/bridge) "DB" = ( /obj/machinery/light_switch{ pixel_y = -19; @@ -1555,11 +1598,16 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "FH" = ( -/obj/structure/chair/office, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 +/obj/structure/table/glass, +/obj/item/flashlight/lamp{ + pixel_x = -7; + pixel_y = 2 }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/item/reagent_containers/food/snacks/meat/steak/chicken{ + pixel_x = 12; + pixel_y = 7 + }, +/obj/machinery/light/directional/south, /turf/open/floor/plasteel/white, /area/ship/bridge) "FJ" = ( @@ -1637,13 +1685,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew) -"Hp" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 4; - color = "#555555" - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "Hz" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -1659,12 +1700,11 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Ig" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_y = 7; - pixel_x = 8 +/obj/effect/turf_decal/industrial/warning{ + dir = 4; + color = "#555555" }, -/turf/open/floor/plasteel/tech, +/turf/open/floor/plasteel/white, /area/ship/bridge) "ID" = ( /obj/machinery/button/door{ @@ -1691,13 +1731,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/crew) -"Jg" = ( -/obj/machinery/blackbox_recorder, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "Jp" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp{ @@ -1739,6 +1772,32 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel/mono/white, /area/ship/crew/dorm) +"JE" = ( +/obj/structure/table/glass, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/item/radio{ + pixel_y = 6 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/machinery/camera{ + dir = 2; + c_tag = "Cryogenics" + }, +/turf/open/floor/plasteel/dark, +/area/ship/crew/dorm) "JI" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel/white, @@ -1779,19 +1838,6 @@ }, /turf/open/floor/plasteel/mono/white, /area/ship/cargo) -"Lq" = ( -/obj/machinery/computer/security{ - icon_state = "computer-right"; - icon_keyboard = "syndie_key" - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/obj/structure/sign/poster/contraband/cybersun{ - pixel_y = 32 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "Lr" = ( /obj/structure/toilet{ pixel_y = 15; @@ -1823,15 +1869,8 @@ /turf/open/floor/plasteel/mono/white, /area/ship/crew) "Mb" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom/table{ - dir = 4; - pixel_x = 6; - pixel_y = 1 - }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/turf/open/floor/plasteel/tech, -/area/ship/bridge) +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/crew/dorm/dormtwo) "Mn" = ( /obj/machinery/computer/cargo{ dir = 8; @@ -1864,6 +1903,24 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) +"MS" = ( +/obj/machinery/light/directional/east, +/obj/machinery/camera{ + dir = 8; + c_tag = "Hallway" + }, +/obj/effect/turf_decal/corner/opaque/white/half{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/opaque/syndiered/corner, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/ship/crew) "No" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 8 @@ -1973,21 +2030,6 @@ }, /turf/open/floor/plasteel/white, /area/ship/bridge) -"OB" = ( -/obj/structure/filingcabinet/double/grey, -/obj/item/folder/syndicate, -/obj/item/folder/red, -/obj/item/folder, -/obj/item/folder/white, -/obj/item/clipboard, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/item/pen/fourcolor, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "OD" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 4 @@ -2041,31 +2083,43 @@ /turf/open/floor/plasteel/tech, /area/ship/cargo) "Qa" = ( -/obj/structure/table/glass, -/obj/item/radio{ - pixel_y = 6 - }, -/obj/item/radio{ - pixel_y = 6 +/obj/structure/closet/secure_closet/wall/directional/north{ + name = "Command Wardrobe"; + icon_state = "sec_wall"; + req_access_txt = "19" }, -/obj/item/radio{ - pixel_y = 6 +/obj/machinery/newscaster/directional/west, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -20; + pixel_y = -10 }, -/obj/item/radio{ - pixel_y = 6 +/obj/machinery/camera{ + dir = 4; + c_tag = "Command Quarters" }, -/obj/item/radio{ - pixel_y = 6 +/obj/structure/cable/orange{ + icon_state = "2-4" }, -/obj/effect/turf_decal/trimline/opaque/syndiered/line{ - dir = 1 +/obj/item/storage/backpack/messenger/sec, +/obj/item/storage/backpack/security, +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 }, -/obj/machinery/camera{ - dir = 2; - c_tag = "Cryogenics" +/obj/item/clothing/shoes/jackboots{ + pixel_y = -7 }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/dorm) +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/gloves/combat, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/mask/gas/syndicate, +/obj/item/clothing/head/HoS/cybersun, +/obj/item/clothing/head/HoS/cybersun, +/turf/open/floor/carpet/nanoweave/red, +/area/ship/crew/dorm/dormtwo) "Ql" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1; @@ -2283,37 +2337,11 @@ /turf/open/floor/plating/airless, /area/ship/bridge) "SL" = ( -/obj/effect/turf_decal/corner/opaque/white/half, -/obj/effect/turf_decal/trimline/opaque/syndiered/line, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" +/obj/machinery/blackbox_recorder, +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/item/radio/intercom/directional/south, /turf/open/floor/plasteel/white, -/area/ship/crew) -"Tb" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/machinery/door/airlock/hatch{ - dir = 4; - name = "Observation Deck"; - req_access_txt = "19" - }, -/obj/machinery/door/poddoor/shutters{ - id = "kansatsu_lockdown"; - dir = 4 - }, -/turf/open/floor/plasteel/tech/grid, /area/ship/bridge) "Tv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -2344,21 +2372,20 @@ }, /area/ship/engineering) "Ur" = ( -/obj/effect/turf_decal/corner_techfloor_grid{ - dir = 10 +/obj/effect/turf_decal/corner/opaque/white/half, +/obj/effect/turf_decal/trimline/opaque/syndiered/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Exterior - Fore-Port" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 }, -/obj/machinery/porta_turret/ship/syndicate/weak{ - dir = 5; - pixel_y = -4; - pixel_x = -6; - desc = "Produced by Cybersun Industries, this turret is a low-powered tresspasser repellent." +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/turf/open/floor/plating/airless, -/area/ship/bridge) +/obj/item/radio/intercom/directional/south, +/turf/open/floor/plasteel/white, +/area/ship/crew) "UE" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -2512,20 +2539,6 @@ "Xw" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) -"XI" = ( -/obj/structure/table/reinforced, -/obj/machinery/fax/syndicate{ - pixel_y = 6 - }, -/obj/effect/turf_decal/corner/opaque/syndiered{ - dir = 5 - }, -/obj/effect/turf_decal/industrial/warning/corner{ - dir = 2; - color = "#555555" - }, -/turf/open/floor/plasteel/white, -/area/ship/bridge) "XJ" = ( /obj/effect/turf_decal/trimline/opaque/syndiered/line{ dir = 1 @@ -2540,19 +2553,18 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "XX" = ( -/obj/effect/turf_decal/industrial/warning{ - dir = 8; - color = "#555555" +/obj/machinery/computer/security{ + icon_state = "computer-right"; + icon_keyboard = "syndie_key" }, -/obj/machinery/power/terminal{ - dir = 8 +/obj/effect/turf_decal/corner/opaque/syndiered{ + dir = 5 }, -/obj/structure/cable/orange{ - icon_state = "0-4" +/obj/structure/sign/poster/contraband/cybersun{ + pixel_y = 32 }, -/obj/effect/decal/cleanable/oil/streak, /turf/open/floor/plasteel/white, -/area/ship/engineering) +/area/ship/bridge) "YE" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -2602,43 +2614,19 @@ /turf/open/floor/plating, /area/ship/engineering) "Zs" = ( -/obj/structure/closet/secure_closet/wall/directional/north{ - name = "Command Wardrobe"; - icon_state = "sec_wall"; - req_access_txt = "19" - }, -/obj/machinery/newscaster/directional/west, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -20; - pixel_y = -10 +/obj/effect/turf_decal/industrial/warning{ + dir = 8; + color = "#555555" }, -/obj/machinery/camera{ - dir = 4; - c_tag = "Command Quarters" +/obj/machinery/power/terminal{ + dir = 8 }, /obj/structure/cable/orange{ - icon_state = "2-4" - }, -/obj/item/storage/backpack/messenger/sec, -/obj/item/storage/backpack/security, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 - }, -/obj/item/clothing/shoes/jackboots{ - pixel_y = -7 + icon_state = "0-4" }, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/under/syndicate/cybersun/officer, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/suit/cybersun_suit, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/head/HoS/cybersun, -/obj/item/clothing/head/HoS/cybersun, -/turf/open/floor/carpet/nanoweave/red, -/area/ship/crew/dorm/dormtwo) +/obj/effect/decal/cleanable/oil/streak, +/turf/open/floor/plasteel/white, +/area/ship/engineering) "Zv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -2647,8 +2635,18 @@ /turf/open/floor/plasteel/white, /area/ship/engineering) "ZI" = ( -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/crew/dorm/dormtwo) +/obj/machinery/firealarm/directional/east{ + pixel_y = 5 + }, +/obj/structure/extinguisher_cabinet/directional/east{ + pixel_y = -7 + }, +/obj/structure/bed, +/obj/item/bedsheet/black, +/obj/structure/curtain/cloth/grey, +/obj/machinery/light/small/directional/south, +/turf/open/floor/carpet/nanoweave, +/area/ship/crew/dorm) "ZQ" = ( /obj/machinery/camera{ dir = 1; @@ -2714,7 +2712,7 @@ XJ YG Nu Va -XX +Zs jH NW yl @@ -2836,7 +2834,7 @@ Fw BS yw IJ -SL +Ur cZ cw zY @@ -2975,7 +2973,7 @@ IJ mD qo sR -cE +ZI qo YQ YQ @@ -2985,9 +2983,9 @@ YQ YQ YQ YQ -ZI +Mb ty -ZI +Mb dA oC qo @@ -3002,10 +3000,10 @@ YQ YQ YQ YQ -ZI -Zs -yt -fk +Mb +Qa +BQ +MS GG qo lh @@ -3019,13 +3017,13 @@ YQ YQ YQ YQ -ZI -fO -ZI +Mb +fk +Mb Xw aT Xw -Qa +JE qo qo YQ @@ -3036,9 +3034,9 @@ YQ YQ YQ YQ -ZI -ZI -ZI +Mb +Mb +Mb DL DB Xw @@ -3070,12 +3068,12 @@ YQ YQ YQ YQ -Ur +Ah Xw -Lq +XX JI uq -py +pe UE Xw YQ @@ -3089,7 +3087,7 @@ YQ YQ YQ Xw -Jg +SL Rz FJ Mn @@ -3106,10 +3104,10 @@ YQ YQ YQ Xw -OB +Dh QO +tJ FH -Ah Xw bO YQ @@ -3123,8 +3121,8 @@ YQ YQ YQ Xw -XI -Hp +fr +Ig Qy dZ Xw @@ -3141,7 +3139,7 @@ YQ YQ bO Xw -Tb +wm Xw Xw Xw @@ -3176,7 +3174,7 @@ YQ YQ vN aa -ys +oF vN YQ YQ @@ -3192,8 +3190,8 @@ YQ YQ YQ vN -Ig -Mb +gR +un vN YQ YQ @@ -3209,8 +3207,8 @@ YQ YQ YQ vN -tJ -tJ +CF +CF vN YQ YQ