From 60433a70b63e0d3ff623473587f9de93d05778fd Mon Sep 17 00:00:00 2001 From: Zack Date: Mon, 5 Feb 2024 15:41:43 -0600 Subject: [PATCH] QOL changes to NSS kerberos (#23439) * Rechargers * Table in the kitchen * Door access fixed in cargo * Shutters with a button * borg charger * funny fix * Recharger * unfuck what I fucked * stupid random shudder * fun * doors * dam doors * damn doors * fixed access * saved a person who fell * damn I tripped * Fixed a layer --- _maps/map_files/Delta/delta.dmm | 455 +++++++++++++++++++------------- 1 file changed, 272 insertions(+), 183 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 5a186475e7b..2ea72d37f0d 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -12648,10 +12648,6 @@ /obj/item/storage/fancy/crayons, /turf/simulated/floor/plasteel, /area/station/public/storage/art) -"aPT" = ( -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "aPU" = ( /obj/structure/table/wood, /obj/item/instrument/guitar, @@ -13278,15 +13274,6 @@ icon_state = "bar" }, /area/station/service/bar) -"aRu" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance/eight, -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plasteel/airless{ - dir = 10; - icon_state = "darkblue" - }, -/area/space/nearstation) "aRv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -18683,6 +18670,19 @@ icon_state = "redfull" }, /area/station/service/kitchen) +"bdT" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/recharger{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/drinks/cans/starkist, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/engineering/break_room) "bdU" = ( /turf/simulated/wall, /area/station/hallway/primary/fore) @@ -19542,7 +19542,7 @@ }, /area/station/service/kitchen) "bgA" = ( -/obj/structure/table/reinforced, +/obj/structure/table, /obj/item/storage/bag/tray, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ @@ -19550,7 +19550,7 @@ }, /area/station/service/kitchen) "bgB" = ( -/obj/structure/table/reinforced, +/obj/structure/table, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -19929,14 +19929,6 @@ icon_state = "white" }, /area/station/service/kitchen) -"bhN" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/flour, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/service/kitchen) "bhO" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -19962,17 +19954,8 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/fore) -"bhQ" = ( -/obj/structure/table/reinforced, -/obj/item/food/snacks/dough, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/station/service/kitchen) "bhR" = ( -/obj/structure/table/reinforced, +/obj/structure/table, /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -21383,7 +21366,7 @@ /turf/simulated/floor/plasteel, /area/station/service/kitchen) "bli" = ( -/obj/structure/table/reinforced, +/obj/structure/table, /obj/item/storage/box/papersack, /obj/item/storage/box/papersack, /obj/item/storage/box/papersack, @@ -21402,14 +21385,6 @@ /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/service/kitchen) -"blk" = ( -/obj/structure/table/reinforced, -/obj/item/food/snacks/mint, -/obj/item/reagent_containers/condiment/enzyme, -/obj/machinery/reagentgrinder, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel, -/area/station/service/kitchen) "bll" = ( /obj/machinery/kitchen_machine/candy_maker, /turf/simulated/floor/plasteel, @@ -21428,7 +21403,7 @@ /turf/simulated/floor/plasteel, /area/station/service/kitchen) "blo" = ( -/obj/structure/table/reinforced, +/obj/structure/table, /obj/item/clipboard, /obj/item/toy/figure/crew/chef, /obj/effect/turf_decal/delivery/hollow, @@ -22225,6 +22200,11 @@ /area/station/aisat) "bmZ" = ( /obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "kitchenhall"; + name = "Kitchen bridge Shutters"; + dir = 2 + }, /turf/simulated/floor/plating, /area/station/service/kitchen) "bna" = ( @@ -22242,7 +22222,7 @@ /turf/simulated/wall, /area/station/service/kitchen) "bnc" = ( -/obj/structure/table/reinforced, +/obj/structure/table, /obj/item/clothing/suit/chef, /obj/item/kitchen/rollingpin, /obj/effect/turf_decal/delivery/hollow, @@ -22261,14 +22241,6 @@ }, /turf/simulated/wall, /area/station/hallway/primary/fore) -"bne" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/saltshaker, -/obj/item/reagent_containers/condiment/peppermill, -/obj/item/kitchen/knife, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel, -/area/station/service/kitchen) "bnf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/hollow, @@ -24886,10 +24858,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/hallway/primary/central) -"btJ" = ( -/obj/structure/grille, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "btL" = ( /turf/simulated/wall/r_wall, /area/station/command/vault) @@ -30071,14 +30039,6 @@ icon_state = "neutralfull" }, /area/station/engineering/break_room) -"bGD" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/drinks/cans/starkist, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/engineering/break_room) "bGE" = ( /obj/structure/table/reinforced, /obj/item/folder/yellow, @@ -33672,7 +33632,7 @@ }, /obj/machinery/button/windowtint{ dir = 1; - id = "Detective"; + id = "kitchenbar"; pixel_y = -24 }, /turf/simulated/floor/plasteel/dark, @@ -34112,9 +34072,16 @@ }, /area/station/hallway/primary/port) "bQy" = ( -/obj/structure/table/reinforced, +/obj/structure/table, /obj/machinery/kitchen_machine/microwave, /obj/effect/turf_decal/delivery/hollow, +/obj/machinery/door_control{ + id = "kitchenbar"; + name = "Kitchen Bar Shutters Control"; + pixel_x = -6; + pixel_y = -5; + req_access_txt = "28" + }, /turf/simulated/floor/plasteel, /area/station/service/kitchen) "bQz" = ( @@ -52303,6 +52270,23 @@ icon_state = "whiteblue" }, /area/station/medical/paramedic) +"cOe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkblue" + }, +/area/station/medical/storage/secondary) "cOg" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -55091,6 +55075,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/recharger{ + pixel_x = -6 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -68303,12 +68290,12 @@ /area/station/legal/magistrate) "eGT" = ( /obj/structure/table/wood, -/obj/machinery/fishtank/bowl, /obj/machinery/alarm{ dir = 4; name = "west bump"; pixel_x = -24 }, +/obj/machinery/fishtank/bowl, /turf/simulated/floor/wood, /area/station/public/pet_store) "eHg" = ( @@ -68841,6 +68828,23 @@ icon_state = "neutralfull" }, /area/station/supply/storage) +"eWt" = ( +/obj/machinery/door_control{ + id = "kitchenbar"; + name = "Kitchen Bar Shutters Control"; + pixel_x = -6; + pixel_y = -5; + req_access_txt = "28" + }, +/obj/machinery/door_control{ + id = "kitchenhall"; + name = "Kitchen Hallway Shutters Control"; + pixel_x = 6; + pixel_y = -5; + req_access_txt = "28" + }, +/turf/simulated/wall, +/area/station/service/kitchen) "eWX" = ( /obj/structure/table/reinforced, /obj/machinery/alarm{ @@ -69398,6 +69402,14 @@ icon_state = "browncorner" }, /area/station/hallway/primary/fore) +"fpe" = ( +/obj/structure/table, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, +/area/station/service/kitchen) "fpL" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable, @@ -71859,7 +71871,7 @@ /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, +/obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /turf/simulated/floor/plasteel, /area/station/supply/sorting) "gXp" = ( @@ -73913,7 +73925,6 @@ /area/station/medical/surgery/primary) "inx" = ( /obj/structure/table/wood, -/obj/machinery/fishtank/bowl, /obj/machinery/status_display{ pixel_y = 32 }, @@ -73921,6 +73932,7 @@ name = "west bump"; pixel_x = -28 }, +/obj/machinery/fishtank/bowl, /turf/simulated/floor/wood, /area/station/public/pet_store) "iny" = ( @@ -74422,6 +74434,14 @@ icon_state = "whitepurple" }, /area/station/science/break_room) +"iDz" = ( +/obj/structure/table, +/obj/effect/turf_decal/delivery/hollow, +/obj/item/reagent_containers/condiment/flour, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/station/service/kitchen) "iDA" = ( /obj/structure/cable{ d2 = 4; @@ -74953,18 +74973,6 @@ icon_state = "bar" }, /area/station/service/bar) -"iUZ" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/condiment/peppermill, -/obj/machinery/door/firedoor, -/obj/machinery/door/window, -/obj/effect/mapping_helpers/airlock/windoor/autoname, -/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/station/service/kitchen) "iVg" = ( /obj/machinery/economy/atm{ pixel_x = -32 @@ -77907,6 +77915,14 @@ icon_state = "neutral" }, /area/station/maintenance/starboard) +"kTe" = ( +/obj/structure/table, +/obj/item/kitchen/knife, +/obj/effect/turf_decal/delivery, +/obj/item/reagent_containers/condiment/saltshaker, +/obj/item/reagent_containers/condiment/peppermill, +/turf/simulated/floor/plasteel, +/area/station/service/kitchen) "kTw" = ( /obj/machinery/fishtank/tank, /turf/simulated/floor/plating, @@ -80598,6 +80614,10 @@ }, /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) +"mIl" = ( +/obj/structure/grille, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "mJw" = ( /obj/machinery/light{ dir = 8 @@ -81411,6 +81431,13 @@ /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plasteel/dark, /area/station/legal/courtroom) +"nfI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/plasteel, +/area/station/engineering/break_room) "ngg" = ( /turf/simulated/wall/r_wall, /area/station/security/armory/secure) @@ -81762,19 +81789,6 @@ /obj/machinery/economy/vending/crittercare, /turf/simulated/floor/carpet, /area/station/maintenance/starboard) -"nnP" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window, -/obj/effect/mapping_helpers/airlock/windoor/autoname, -/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, -/obj/item/reagent_containers/drinks/britcup, -/obj/item/reagent_containers/condiment/saltshaker, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - icon_state = "bar" - }, -/area/station/service/kitchen) "nnW" = ( /obj/machinery/door/airlock/security, /obj/effect/mapping_helpers/airlock/autoname, @@ -81941,16 +81955,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) -"nqK" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" - }, -/area/station/medical/storage) "nsl" = ( /obj/machinery/clonepod/biomass, /turf/simulated/floor/plasteel{ @@ -83245,10 +83249,10 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/simulated/floor/plasteel, /area/station/supply/storage) "olR" = ( @@ -83780,10 +83784,11 @@ /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay" }, -/obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/simulated/floor/plasteel, /area/station/supply/office) "ozX" = ( @@ -83981,6 +83986,11 @@ /obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, /obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "kitchenbar"; + name = "Kitchen Shutters"; + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -84418,9 +84428,14 @@ /area/station/medical/virology) "oTS" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/airlock/public/glass{ + id = "kitchenbar" + }, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/effect/mapping_helpers/airlock/polarized{ + id = "kitchenbar" + }, /turf/simulated/floor/plasteel, /area/station/service/kitchen) "oUw" = ( @@ -85341,6 +85356,10 @@ dir = 8 }, /obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "kitchenhall"; + name = "Kitchen Shutters" + }, /turf/simulated/floor/plasteel, /area/station/service/kitchen) "pAy" = ( @@ -86143,6 +86162,24 @@ /obj/machinery/optable, /turf/simulated/floor/plasteel/white, /area/station/medical/surgery/primary) +"pWI" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window, +/obj/effect/mapping_helpers/airlock/windoor/autoname, +/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "kitchenbar"; + name = "Kitchen Shutters"; + dir = 1 + }, +/obj/item/reagent_containers/drinks/britcup, +/obj/item/reagent_containers/condiment/saltshaker, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/station/service/kitchen) "pWP" = ( /obj/structure/table/glass, /obj/item/storage/box/gloves{ @@ -87161,6 +87198,20 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/service/library) +"qKd" = ( +/obj/structure/table, +/obj/machinery/reagentgrinder, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/button/windowtint{ + dir = 1; + id = "kitchenbar"; + pixel_y = -24 + }, +/obj/item/food/snacks/mint, +/obj/item/reagent_containers/condiment/enzyme, +/obj/machinery/reagentgrinder, +/turf/simulated/floor/plasteel, +/area/station/service/kitchen) "qKk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -88284,6 +88335,23 @@ icon_state = "freezerfloor" }, /area/station/public/sleep) +"rri" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window, +/obj/effect/mapping_helpers/airlock/windoor/autoname, +/obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "kitchenbar"; + name = "Kitchen Shutters"; + dir = 1 + }, +/obj/item/reagent_containers/condiment/peppermill, +/turf/simulated/floor/plasteel{ + icon_state = "bar" + }, +/area/station/service/kitchen) "rrv" = ( /obj/structure/chair/office, /obj/effect/landmark/start/coroner, @@ -89188,6 +89256,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "kitchenhall"; + name = "Kitchen Shutters" + }, /turf/simulated/floor/plasteel, /area/station/service/kitchen) "rVL" = ( @@ -90620,6 +90692,11 @@ /obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, /obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "kitchenbar"; + name = "Kitchen Shutters"; + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -92016,7 +92093,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, @@ -92025,6 +92101,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "tyQ" = ( @@ -92130,10 +92207,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/sleeper) -"tCf" = ( -/obj/effect/spawner/window/reinforced/grilled, -/turf/simulated/floor/plating, -/area/station/medical/virology) "tDw" = ( /turf/simulated/wall, /area/station/medical/reception) @@ -92421,7 +92494,6 @@ /area/station/medical/medbay) "tKX" = ( /obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable, /turf/simulated/floor/plating, /area/station/medical/virology) "tLO" = ( @@ -94495,23 +94567,6 @@ /obj/item/target/syndicate, /turf/simulated/floor/plating, /area/station/security/range) -"uWm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "darkblue" - }, -/area/station/medical/storage/secondary) "uWt" = ( /obj/machinery/light{ dir = 8 @@ -94601,6 +94656,12 @@ }, /turf/simulated/floor/plating, /area/station/security/detective) +"uYK" = ( +/obj/structure/table, +/obj/machinery/kitchen_machine/microwave, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/service/kitchen) "uYN" = ( /obj/structure/table/reinforced, /obj/item/folder/blue, @@ -95141,6 +95202,11 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/supply/miningdock) +"vuL" = ( +/obj/effect/spawner/window/reinforced/grilled, +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/station/medical/virology) "vuX" = ( /obj/machinery/alarm{ dir = 4; @@ -96417,6 +96483,16 @@ icon_state = "whitebluecorner" }, /area/station/medical/storage) +"wjh" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/station/medical/storage) "wjm" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -97880,6 +97956,10 @@ /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, /area/station/maintenance/aft) +"xcn" = ( +/obj/effect/landmark/damageturf, +/turf/simulated/floor/plating/airless, +/area/space/nearstation) "xcs" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ @@ -98852,6 +98932,15 @@ icon_state = "neutral" }, /area/station/maintenance/fsmaint) +"xGL" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance/eight, +/obj/effect/landmark/damageturf, +/turf/simulated/floor/plasteel/airless{ + dir = 10; + icon_state = "darkblue" + }, +/area/space/nearstation) "xGY" = ( /obj/structure/cable{ d1 = 1; @@ -124511,7 +124600,7 @@ bys bzR bBA bDs -bIx +nfI byl bIx bKC @@ -125540,7 +125629,7 @@ bKr bBE bKp bEX -bGD +bdT bIA bKp bMq @@ -132698,7 +132787,7 @@ azd aAp awX abj -aRu +xGL ghZ aFq aVK @@ -132954,7 +133043,7 @@ aCo azd aAq awX -aPT +xcn abj aVK aGp @@ -136317,7 +136406,7 @@ bct bcr bdM bfh -aYZ +eWt bdQ bjt blj @@ -136577,7 +136666,7 @@ bfi aYZ aYa aYC -blk +qKd aYZ boo tmq @@ -137599,11 +137688,11 @@ aWg aUo aOG aTp -iUZ +rri bdQ bfk bgA -bhQ +fpe aZk bln aZa @@ -137856,7 +137945,7 @@ aWh aUw aOG aTp -nnP +pWI bdP bgv bgB @@ -138116,10 +138205,10 @@ aVQ oHk bdQ bfm -bhN +iDz bli bdQ -bne +kTe bmZ boo tmq @@ -138633,7 +138722,7 @@ bdS bdQ bdP bdQ -bQy +uYK aYZ fJp tmq @@ -145882,7 +145971,7 @@ lGs rYe jin lky -uWm +cOe usf dmt hLd @@ -146395,7 +146484,7 @@ cUM bSe cMz eCn -nqK +wjh kQG ewa htc @@ -148233,9 +148322,9 @@ cBf wdL dGw dGw -tCf -tCf -tCf +tKX +tKX +tKX dGw dGw hGZ @@ -150548,7 +150637,7 @@ dFG dFG vOB kce -tKX +vuL dFG dFG abj @@ -151464,7 +151553,7 @@ abj aaa abj abj -btJ +mIl aaa ygH tFK @@ -151721,7 +151810,7 @@ aaa aaa aaa aaa -btJ +mIl abj ygH aJx @@ -151978,7 +152067,7 @@ aaa aaa aaa aaa -btJ +mIl aaa ygH uUu @@ -154856,7 +154945,7 @@ nlB aaa abj abj -btJ +mIl abj abj iuY @@ -155370,7 +155459,7 @@ aaa aaa aaa abj -btJ +mIl abj abj iuY @@ -155885,7 +155974,7 @@ aaa aaa abj abj -btJ +mIl abj iuY rEQ @@ -157918,10 +158007,10 @@ aaa aaa abj abj -btJ -btJ -btJ -btJ +mIl +mIl +mIl +mIl abj abj fhF @@ -158180,7 +158269,7 @@ aaa abj abj aaa -btJ +mIl fhF fhF fhF @@ -158190,7 +158279,7 @@ fhF fhF abj abj -btJ +mIl aaa aaa aaa @@ -158434,10 +158523,10 @@ aaa abj abj abj -btJ -btJ -btJ -btJ +mIl +mIl +mIl +mIl fhF fhF fhF @@ -158447,7 +158536,7 @@ fhF fhF abj aaa -btJ +mIl aaa aaa aaa @@ -158704,7 +158793,7 @@ fhF fhF abj aaa -btJ +mIl aaa aaa aaa @@ -158951,7 +159040,7 @@ aaa aaa aaa aaa -btJ +mIl fhF fhF fhF @@ -158959,9 +159048,9 @@ fhF fhF fhF fhF -btJ +mIl abj -btJ +mIl aaa aaa aaa @@ -159202,13 +159291,13 @@ aaa aaa aaa aaa -btJ +mIl aaa aaa aaa aaa aaa -btJ +mIl fhF fhF fhF @@ -159216,7 +159305,7 @@ fhF fhF fhF fhF -btJ +mIl abj abj aaa @@ -159459,20 +159548,20 @@ aaa aaa aaa aaa -btJ +mIl aaa aaa aaa aaa aaa bPS -btJ -btJ +mIl +mIl abj bPS abj -btJ -btJ +mIl +mIl bPS aaa aaa @@ -159716,7 +159805,7 @@ aaa aaa aaa aaa -btJ +mIl aaa aaa aaa @@ -159981,11 +160070,11 @@ aaa aaa aaa aaa -btJ -btJ -btJ -btJ -btJ +mIl +mIl +mIl +mIl +mIl aaa aaa aaa