From 4811e6bd6445696f2ef351fdb275a3df8f963238 Mon Sep 17 00:00:00 2001 From: Bierkraan Date: Sat, 8 Jun 2024 19:36:40 +0200 Subject: [PATCH 1/3] Fix map --- maps/campaign/campaign2.dmm | 71 ++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/maps/campaign/campaign2.dmm b/maps/campaign/campaign2.dmm index fccbda4896..7106c5e009 100644 --- a/maps/campaign/campaign2.dmm +++ b/maps/campaign/campaign2.dmm @@ -2,7 +2,6 @@ "ac" = (/obj/structure/toilet{dir = 8; icon_state = "toilet00"},/mob/living/simple_animal/civilian,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) "aj" = (/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/grenade/smokebomb,/obj/item/weapon/grenade/smokebomb,/obj/structure/closet/crate/ww2,/turf/floor/dirt/dust,/area/caribbean/no_mans_land/temperate) "am" = (/obj/structure/closet/crate/ww2,/obj/item/ammo_magazine/ak47,/obj/item/ammo_magazine/ak47,/obj/item/ammo_magazine/ak47,/obj/item/ammo_magazine/ak47,/obj/item/ammo_magazine/ak47,/obj/item/ammo_magazine/ak47,/obj/item/ammo_magazine/ak47,/obj/item/ammo_magazine/ak47,/obj/item/ammo_magazine/ak47,/obj/item/ammo_magazine/ak47,/obj/item/ammo_magazine/ak47,/obj/item/ammo_magazine/ak47,/turf/floor/dirt/dust,/area/caribbean/no_mans_land/temperate) -"an" = (/obj/item/weapon/storage/briefcase,/turf/floor/plating/road/yellowline{dir = 4; icon_state = "road_yellowline"},/area/caribbean/no_mans_land/temperate) "ar" = (/obj/structure/grille/chainlinkfence{dir = 1},/obj/structure/grille/chainlinkfence{dir = 8},/turf/floor/dirt/dust,/area/caribbean/no_mans_land/temperate) "av" = (/obj/structure/window/classic,/obj/structure/barricade,/obj/structure/curtain/open/red,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) "aw" = (/mob/living/simple_animal/civilian,/turf/floor/plating/road/yellowline{dir = 1; icon_state = "road_yellowline"},/area/caribbean/no_mans_land/temperate) @@ -18,6 +17,7 @@ "bl" = (/obj/structure/grille/chainlinkfence,/obj/structure/grille/chainlinkfence{dir = 4},/turf/floor/dirt/dust,/area/caribbean/faction1/collector) "bn" = (/obj/structure/grille/chainlinkfence,/turf/floor/dirt/dust,/area/caribbean/faction1/collector) "bt" = (/obj/structure/toilet{dir = 4; icon_state = "toilet00"},/obj/structure/lamp/lamp_small/alwayson{dir = 8; icon_state = "bulb"},/turf/floor/plating/white,/area/caribbean/roofed/temperate) +"bu" = (/obj/structure/drone/flying/grenade,/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate) "bw" = (/obj/covers/tatami,/obj/structure/table,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/beermug,/turf/floor/dirt,/area/caribbean/roofed/temperate) "by" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/snacks/stew_wood{pixel_y = -5; pixel_x = -7},/obj/item/weapon/reagent_containers/food/snacks/stew_wood{pixel_y = 3; pixel_x = -1},/obj/item/weapon/reagent_containers/food/snacks/stew_wood{pixel_y = -6; pixel_x = 5},/turf/floor/ship/wood_ship,/area/caribbean/roofed/temperate) "bA" = (/obj/structure/window/classic,/obj/structure/curtain/open/blue,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) @@ -93,11 +93,11 @@ "ik" = (/obj/structure/grille/chainlinkfence{dir = 1},/turf/floor/dirt/dust,/area/caribbean/faction2/collector) "is" = (/obj/structure/closet/cabinet,/obj/item/clothing/head/turban,/turf/floor/wood/fancywood,/area/caribbean/roofed/temperate) "it" = (/obj/structure/simple_door/key_door/anyone/wood,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) -"iu" = (/turf/wall/brick,/turf/floor/dirt,/area/caribbean/roofed/temperate) -"iG" = (/obj/structure/sign/armory,/turf/wall/brick,/turf/floor/beach/sand,/area/caribbean/no_mans_land/temperate) +"iu" = (/obj/item/drone_controller,/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate) +"iG" = (/obj/structure/sign/armory,/turf/wall/brick,/area/caribbean/no_mans_land/temperate) "iL" = (/obj/effects/premadevehicles/yamasaki/kazoku,/turf/floor/plating/road/yellowline{dir = 8; icon_state = "road_yellowline"},/area/caribbean/no_mans_land/temperate) "iT" = (/mob/living/simple_animal/civilian,/turf/floor/dirt,/area/caribbean/no_mans_land/temperate) -"iW" = (/obj/structure/drone/flying/grenade,/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate) +"iW" = (/obj/item/weapon/saw,/turf/floor/plating/steel,/area/caribbean/roofed/temperate) "iZ" = (/obj/covers/wood_ship,/turf/floor/dirt,/area/caribbean/faction1/inside) "jc" = (/obj/structure/window/barrier/sandbag{dir = 4},/turf/floor/dirt/dust,/area/caribbean/no_mans_land/temperate) "jl" = (/obj/structure/barbwire{dir = 8},/turf/floor/plating/road/whiteline,/area/caribbean/no_mans_land/temperate) @@ -160,7 +160,7 @@ "nu" = (/turf/floor/dirt/underground,/area/caribbean/no_mans_land/temperate) "nH" = (/obj/structure/table/modern/table,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) "nM" = (/turf/floor/plating/road/whiteline{dir = 1; icon_state = "road_line"},/area/caribbean/no_mans_land/temperate) -"nO" = (/obj/structure/sign/bank,/turf/wall/brick,/turf/floor/beach/sand,/area/caribbean/no_mans_land/temperate) +"nO" = (/obj/structure/sign/bank,/turf/wall/brick,/area/caribbean/no_mans_land/temperate) "nV" = (/obj/item/clothing/accessory/medal/pin/worker/lumberjack,/turf/floor/plating/steel,/area/caribbean/roofed/temperate) "nZ" = (/obj/structure/barbwire,/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate) "of" = (/obj/structure/bed/chair/comfy/fancy_sofa/l{dir = 8},/turf/floor/wood,/area/caribbean/roofed/temperate) @@ -343,7 +343,6 @@ "DK" = (/obj/structure/window/classic/reinforced,/obj/structure/curtain/open/red,/turf/floor/ship/wood_ship,/area/caribbean/roofed/temperate) "DM" = (/obj/covers/wood_ship,/obj/item/weapon/folder/red,/turf/floor/dirt,/area/caribbean/faction1/inside) "DY" = (/obj/structure/bed/chair,/turf/floor/ship/wood_ship,/area/caribbean/roofed/temperate) -"Ec" = (/obj/item/weapon/material/hatchet/steel,/turf/floor/dirt,/area/caribbean/no_mans_land/temperate) "Ef" = (/obj/structure/closet/crate/dumpster,/turf/floor/grass,/area/caribbean/no_mans_land/temperate) "Ek" = (/obj/structure/iv_drip,/turf/floor/dirt/dust,/area/caribbean/no_mans_land/temperate) "Et" = (/obj/structure/sign/flag/red2,/turf/wall/stone/stonebrick,/area/caribbean/faction1/inside) @@ -405,7 +404,6 @@ "Kb" = (/obj/covers/wood_ship,/obj/structure/table/modern/table/flipped{dir = 8},/obj/structure/lamp/lamp_small/alwayson{dir = 8; icon_state = "bulb"},/turf/floor/dirt,/area/caribbean/faction1/inside) "Kf" = (/obj/structure/railing/steel{dir = 8; icon_state = "railing0"},/turf/floor/grass,/area/caribbean/no_mans_land/temperate) "Kg" = (/obj/structure/redmailbox,/turf/floor/plating/cobblestone/vertical,/area/caribbean/faction1) -"Kp" = (/obj/structure/closet/crate/ww2,/obj/item/weapon/grenade/coldwar/m67,/obj/item/weapon/grenade/coldwar/m67,/obj/item/weapon/grenade/coldwar/m67,/obj/item/weapon/grenade/coldwar/m67,/obj/item/weapon/grenade/coldwar/m67,/obj/item/weapon/grenade/coldwar/m67,/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate) "KA" = (/obj/structure/simple_door/key_door/anyone/wood,/turf/floor/dirt,/area/caribbean/roofed/temperate) "KB" = (/obj/structure/props/coatrack,/obj/structure/lamp/lamp_small{dir = 1; icon_state = "bulb"},/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) "KD" = (/obj/structure/window/barrier/sandbag{dir = 4},/obj/structure/window/barrier/sandbag,/turf/floor/trench,/area/caribbean/no_mans_land/temperate) @@ -423,7 +421,6 @@ "LA" = (/obj/structure/gate/barrier,/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate) "LB" = (/obj/structure/bed/chair{dir = 4},/obj/structure/lamp/lamp_big/alwayson{dir = 1},/turf/floor/ship/wood_ship,/area/caribbean/roofed/temperate) "LC" = (/turf/floor/grass,/area/caribbean/no_mans_land/invisible_wall/temperate/one) -"LF" = (/obj/item/weapon/material/hatchet/steel,/turf/floor/plating/steel,/area/caribbean/roofed/temperate) "Mi" = (/obj/structure/lamp/lamp_big/alwayson{dir = 4},/mob/living/simple_animal/civilian,/turf/floor/ship/wood_ship,/area/caribbean/roofed/temperate) "Mm" = (/obj/structure/barbwire{dir = 8},/turf/floor/plating/cobblestone/vertical,/area/caribbean/no_mans_land/temperate) "Ms" = (/obj/covers/wood_ship,/obj/structure/table/modern/table,/obj/item/weapon/telephone/mobile/campaign/red,/turf/floor/dirt,/area/caribbean/faction1/inside) @@ -433,7 +430,6 @@ "MR" = (/obj/effect/landmark{name = "JoinLateRed_Reinforcement"; icon_state = "x1"},/turf/floor/dirt/dust,/area/caribbean/no_mans_land/temperate) "MV" = (/obj/structure/window/barrier/sandbag{dir = 4},/obj/structure/window/barrier/sandbag{dir = 1},/turf/floor/trench,/area/caribbean/faction1) "Nc" = (/turf/floor/plating/road/whiteline{dir = 1; icon_state = "road_line"},/area/caribbean/no_mans_land/invisible_wall/temperate{icon_state = "green1"}) -"Ni" = (/obj/item/weapon/storage/briefcase,/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate) "Nk" = (/obj/structure/window/barrier/sandbag{dir = 8},/obj/structure/barbwire{dir = 4},/turf/floor/plating/road/whiteline{dir = 1; icon_state = "road_line"},/area/caribbean/no_mans_land/temperate) "Nl" = (/mob/living/simple_animal/civilian,/turf/floor/wood,/area/caribbean/roofed/temperate) "Nx" = (/obj/structure/sink{layer = 4; pixel_y = 20},/obj/structure/lamp/lamp_small/alwayson,/turf/floor/plating/white,/area/caribbean/roofed/temperate) @@ -446,7 +442,9 @@ "Ob" = (/obj/structure/bed,/obj/item/weapon/bedsheet/brown,/turf/floor/ship/wood_ship,/area/caribbean/roofed/temperate) "Od" = (/obj/structure/sign/painting4{pixel_x = 31},/turf/floor/ship/wood_ship,/area/caribbean/roofed/temperate) "Om" = (/obj/item/ammo_magazine/pkm,/obj/item/ammo_magazine/pkm,/obj/item/ammo_magazine/pkm,/turf/floor/grass,/area/caribbean/no_mans_land/temperate) +"Ow" = (/obj/item/weapon/storage/briefcase,/turf/floor/plating/road/yellowline{dir = 4; icon_state = "road_yellowline"},/area/caribbean/no_mans_land/temperate) "OA" = (/turf/floor/plating/white,/area/caribbean/roofed/temperate) +"OE" = (/obj/item/weapon/material/hatchet/steel,/turf/floor/dirt/dust,/area/caribbean/no_mans_land/temperate) "OO" = (/obj/structure/wild/rock,/turf/floor/grass,/area/caribbean/no_mans_land/temperate) "OQ" = (/obj/structure/wild/rock/basalt,/turf/floor/grass,/area/caribbean/no_mans_land/temperate) "OS" = (/obj/covers/wood_ship,/mob/living/simple_animal/hostile/human/redmenian_ng/sl,/obj/structure/bed/chair/wood{dir = 8; icon_state = "wooden_chair"},/turf/floor/dirt,/area/caribbean/faction1/inside) @@ -463,7 +461,7 @@ "PE" = (/turf/floor/plating/cobblestone/vertical/dark,/area/caribbean/no_mans_land/temperate) "PI" = (/obj/structure/window/barrier/sandbag{dir = 4},/obj/structure/lamp/lamp_small/alwayson/red{dir = 4},/turf/floor/dirt,/area/caribbean/no_mans_land/temperate) "PJ" = (/obj/structure/wild/berrybush,/turf/floor/grass,/area/caribbean/no_mans_land/temperate) -"PR" = (/turf/wall/brick,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) +"PR" = (/obj/item/weapon/material/hatchet/steel,/turf/floor/plating/steel,/area/caribbean/roofed/temperate) "PU" = (/obj/structure/simple_door/key_door/anyone/wood,/turf/floor/plating/white,/area/caribbean/roofed/temperate) "Qa" = (/obj/structure/potted_plant{dir = 9; icon_state = "potted_plant"},/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) "Qm" = (/obj/structure/roof_support,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) @@ -508,7 +506,6 @@ "TE" = (/obj/structure/railing/steel{dir = 4; icon_state = "railing0"},/turf/floor/dirt/dust,/area/caribbean/no_mans_land/temperate) "TM" = (/obj/structure/lamp/lamp_big/alwayson{dir = 8},/turf/floor/wood,/area/caribbean/roofed/temperate) "TO" = (/obj/structure/wild/tallgrass,/turf/floor/grass,/area/caribbean/no_mans_land/invisible_wall/temperate/two) -"TZ" = (/obj/item/weapon/material/hatchet/steel,/turf/floor/dirt/dust,/area/caribbean/no_mans_land/temperate) "Ub" = (/obj/structure/barbwire{dir = 4},/obj/structure/sign/traffic/zebracrossing{dir = 4},/turf/floor/plating/road/whiteline{dir = 1; icon_state = "road_line"},/area/caribbean/no_mans_land/temperate) "Ui" = (/obj/structure/lamp/lamppost_small/alwayson,/obj/structure/barbwire,/turf/floor/plating/cobblestone/vertical,/area/caribbean/no_mans_land/temperate) "Up" = (/obj/structure/lamp/lamp_big/alwayson{dir = 1},/turf/floor/wood,/area/caribbean/roofed/temperate) @@ -523,10 +520,11 @@ "UX" = (/obj/structure/oven/stove,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) "Vc" = (/obj/covers/wood_ship,/obj/structure/bed/chair/wood,/obj/effect/landmark{name = "JoinLateRed"; icon_state = "x1"},/turf/floor/dirt,/area/caribbean/faction1/inside) "Vd" = (/turf/floor/dirt/dust,/area/caribbean/no_mans_land/temperate) -"Vi" = (/turf/wall/brick,/turf/floor/ship/wood_ship,/area/caribbean/roofed/temperate) +"Vi" = (/obj/item/weapon/material/hatchet/steel,/turf/floor/dirt,/area/caribbean/no_mans_land/temperate) "Vv" = (/obj/structure/sink/kitchen,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) "VH" = (/obj/structure/wild/smallbush,/turf/floor/grass,/area/caribbean/no_mans_land/invisible_wall/temperate{icon_state = "green1"}) "VL" = (/obj/structure/window/classic,/obj/structure/curtain/closed/green,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) +"VN" = (/obj/structure/closet/crate/ww2,/obj/item/weapon/grenade/coldwar/m67,/obj/item/weapon/grenade/coldwar/m67,/obj/item/weapon/grenade/coldwar/m67,/obj/item/weapon/grenade/coldwar/m67,/obj/item/weapon/grenade/coldwar/m67,/obj/item/weapon/grenade/coldwar/m67,/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate) "VQ" = (/obj/structure/safe,/turf/floor/wood,/area/caribbean/roofed/temperate) "Wa" = (/obj/structure/bed/chair{dir = 8; icon_state = "chair"},/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) "Wg" = (/obj/covers/carpet/redcarpet,/obj/covers/carpet/redcarpet,/obj/structure/closet/cabinet,/turf/floor/wood/fancywood,/area/caribbean/roofed/temperate) @@ -557,11 +555,10 @@ "Yi" = (/obj/structure/vending/sales/drinks/cola,/turf/floor/plating/cobblestone/vertical,/area/caribbean/no_mans_land/temperate) "Yj" = (/obj/structure/potted_plant{dir = 1; icon_state = "potted_plant"},/turf/floor/wood,/area/caribbean/roofed/temperate) "Yl" = (/obj/structure/table/wood,/turf/floor/ship/wood_ship,/area/caribbean/roofed/temperate) -"Ym" = (/obj/item/drone_controller,/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate) "Yo" = (/obj/structure/window/barrier/sandbag{dir = 4},/obj/structure/floodlight/on,/turf/floor/plating/cobblestone/vertical,/area/caribbean/faction1) "Yp" = (/obj/covers/wood_ship,/obj/item/taperoll/no_tape{pixel_x = -10},/obj/item/taperoll/no_tape{pixel_x = 5; pixel_y = 7},/turf/floor/dirt,/area/caribbean/faction1/inside) "Yr" = (/obj/effect/landmark{name = "JoinLateRed_Reinforcement"; icon_state = "x1"},/turf/floor/plating/road/whiteline{dir = 1; icon_state = "road_line"},/area/caribbean/no_mans_land/temperate) -"Yw" = (/obj/structure/sign/clock{pixel_y = 4},/turf/wall/brick,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) +"Yw" = (/obj/structure/sign/clock{pixel_y = 4},/turf/wall/brick,/area/caribbean/roofed/temperate) "YA" = (/obj/structure/poster/faction/red/mil1,/turf/wall/stone/stonebrick,/area/caribbean/roofed/temperate) "YQ" = (/obj/effect/landmark{name = "JoinLateBlue"},/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate) "YU" = (/obj/structure/bed,/obj/item/weapon/bedsheet/orange,/obj/structure/lamp/lamp_small/alwayson,/turf/floor/plating/tiled/woodh,/area/caribbean/roofed/temperate) @@ -581,7 +578,7 @@ "ZR" = (/obj/structure/table/modern/table,/turf/floor/wood/fancywood,/area/caribbean/roofed/temperate) "ZT" = (/obj/item/stack/material/barbwire/ten,/turf/floor/grass,/area/caribbean/no_mans_land/temperate) "ZU" = (/obj/covers/wood_ship,/obj/effect/landmark{name = "JoinLateRed"; icon_state = "x1"},/turf/floor/dirt,/area/caribbean/faction1/inside) -"ZV" = (/obj/item/weapon/saw,/turf/floor/plating/steel,/area/caribbean/roofed/temperate) +"ZV" = (/obj/item/weapon/storage/briefcase,/turf/floor/plating/road,/area/caribbean/no_mans_land/temperate) (1,1,1) = {" kjkjkjkjkjkjkjkjkjkjLCLCLCkjkjkjkjkjkjkjkjkjkjkjkjGmGmPgGmGmGmGmGmGmGmGmGmkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjPgGmHVpNpNHVGmkjPhkjkjkjkjkjPJkjkjPhkjkjkjkjkjkjkjkjkjkjPhXkXkXkkjkjkjkjkjkjkjkjPhkjPh @@ -603,9 +600,9 @@ kjkjkjPhkjkjkjkjkjkjLCLCLCkjkjkjkjkjkjkjPhkjkjkjkjPgGmGmGmGmGmGmGmGmGmPgGmkjkjkj OaOaOaOaOaOaOaOaOaOarnLCLCkjkjkjkjPhHjkjkjkjPhkjkjGmGmGmGmPgPgGmGmGmGmPgGmkjkjkjkjkjkjkjkjkjHjkjkjkjHjkjrocurocurorocurocurorocurocuroroPhkjsTGrHnQzsTkjkjrovJvfrovJvfrotDvfSDrokjkjkjkjkjkjPhkjkjkjkjkjHjkjkjkjPhkjkjkjPhkjkjkjkjPhGmGmHVHVHVGmGmGmGmGmkjkjkjkjHjPhkjkjkjkjkjkjkjPhkjkjkjkjkjkjkjkjXkXkWZOaOaOaOaOaOaOaOaOaOaOa kjkjkjkjkjkjkjkjkjkjrnLCLCkjkjkjkjkjkjkjkjkjkjkjHjGmGmPgGmGmGmGmGmGmGmGmGmkjPhkjkjPhkjkjkjkjkjkjkjkjkjkjroHnHnHnwxroHnHnHnQsroHnHnHnjHrokjOOsTfMHnzmsTkjPhroSTsOroIlxOrotDvfUBroAWrororororororokjkjkjkjkjkjkjkjkjkjPhkjkjkjkjkjkjkjGmGmHVHVHVGmGmGmPgGmkjkjkjPhkjkjkjkjkjHjPhkjkjkjkjkjkjkjPhkjkjkjXkXkWZkjkjkjkjkjkjHjkjkjkjkj xzbnbnbnbnbnblkjkjkjrnLCLCPhkjkjkjkjkjkjPhkjkjkjkjGmGmGmGmGmGmGmGmPgGmGmPgkjkjAWsTsTsTsTsTsTsTsTsTZLkjkjroqQmUHnHnroHOHOZjHnroHOmUNlIurokjkjsTsTcusTsTkjkjroTnrorororororoLvJProzXroYhHurooiWgrokjkjkjkjhOkjkjkjkjkjkjkjkjkjkjkjkjkjGmHVHVpNHVGmGmGmGmGmkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjRoXkWZkjPhkjkjsvXxXxXxXxXxlI -oudkdkdkdkdkMFkjkjkjrnLCLCkjkjkjPhkjkjkjkjkjHjkjkjPgGmGmmsGmGmPgGmGmGmGmGmkjkjAWbAKBCFvfoGsThwuSsTAWkjkjroqQHnHnNlrosiHOmUHnroHOHnHnofroAWAWAWAWAWAWAWAWKpXDEXfmvHoAoAoAoAAWAWZLAWrobtOArotPRYrokjkjPhkjkjkjkjPhkjkjkjkjkjkjklkjkjPhGmHVpNpNHVHVGmGmGmPgkjPhkjkjkjOOkjkjPhkjkjkjkjkjkjkjkjkjkjkjkjkjRoXkWZkjkjkjkjxMehehehehehcn -oudkdkdkdkdkMFkjPhkjrnLCLCkjkjkjkjkjkjPhkjkjkjkjPhGmGmGmGmGmGmGmGmGmGmsbGmkjkjAWsTvfvfWDvfitvfWDbAAWPhkjroXmHnmNQsroXmGZNlQsroHOmUYjQsroZLnZnZTxTxTxTxTxTxYmYmTxTxTxTxTxTxTxTxTxAWrodUPUroDBrorokjkjkjkjkjPhkjkjkjkjkjPhkjkjkjkjkjGmGmHVpNHVHVHVGmGmGmOYkjkjkjHjkjkjkjPhkjkjOOkjkjPhkjPhkjkjPhkjkjkjXkXkWZkjOOkjkjxMehehehehehcn -oudkdkdkdkdkMFkjkjkjrnLCLCkjhOkjkjkjkjkjkjkjkjkjHjGmGmGmGmGmGmGmsbGmGmGmGmkjkjAWbAaGaGQmvfsTsTsTsTAWAWAWrorogxgxcurorogxgxcurorogxgxcuroAWTxTxTxTxTxTxTxTxiWiWTxTxTxTxTxTxTxTxTxvHWAcyUsUsUsjRrokjHjkjkjkjkjkjkjPhkjkjkjkjkjkjkjkjGmHVHVpNHVHVHVGmGmGmGmkjkjPhkjkjkjkjkjkjkjkjkjPhkjkjkjkjkjkjkjkjkjXkXkWZkjkjHjVdxMehehehehehcn +oudkdkdkdkdkMFkjkjkjrnLCLCkjkjkjPhkjkjkjkjkjHjkjkjPgGmGmmsGmGmPgGmGmGmGmGmkjkjAWbAKBCFvfoGsThwuSsTAWkjkjroqQHnHnNlrosiHOmUHnroHOHnHnofroAWAWAWAWAWAWAWAWVNXDEXfmvHoAoAoAoAAWAWZLAWrobtOArotPRYrokjkjPhkjkjkjkjPhkjkjkjkjkjkjklkjkjPhGmHVpNpNHVHVGmGmGmPgkjPhkjkjkjOOkjkjPhkjkjkjkjkjkjkjkjkjkjkjkjkjRoXkWZkjkjkjkjxMehehehehehcn +oudkdkdkdkdkMFkjPhkjrnLCLCkjkjkjkjkjkjPhkjkjkjkjPhGmGmGmGmGmGmGmGmGmGmsbGmkjkjAWsTvfvfWDvfitvfWDbAAWPhkjroXmHnmNQsroXmGZNlQsroHOmUYjQsroZLnZnZTxTxTxTxTxTxiuiuTxTxTxTxTxTxTxTxTxAWrodUPUroDBrorokjkjkjkjkjPhkjkjkjkjkjPhkjkjkjkjkjGmGmHVpNHVHVHVGmGmGmOYkjkjkjHjkjkjkjPhkjkjOOkjkjPhkjPhkjkjPhkjkjkjXkXkWZkjOOkjkjxMehehehehehcn +oudkdkdkdkdkMFkjkjkjrnLCLCkjhOkjkjkjkjkjkjkjkjkjHjGmGmGmGmGmGmGmsbGmGmGmGmkjkjAWbAaGaGQmvfsTsTsTsTAWAWAWrorogxgxcurorogxgxcurorogxgxcuroAWTxTxTxTxTxTxTxTxbubuTxTxTxTxTxTxTxTxTxvHWAcyUsUsUsjRrokjHjkjkjkjkjkjkjPhkjkjkjkjkjkjkjkjGmHVHVpNHVHVHVGmGmGmGmkjkjPhkjkjkjkjkjkjkjkjkjPhkjkjkjkjkjkjkjkjkjXkXkWZkjkjHjVdxMehehehehehcn arZmZmnnTueGeekjkjOOrnLCHzkjkjkjkjkjkjkjkjuuuuwlJyGmGmGmGmGmGmPgGmGmGmGmGmPhkjAWsTtDldWavfitvfacsTAWAWAWAWAWAWAWAWAWvHAWAWAWAWAWAWAWAWAWvHTxdfjZjZjZjZjZjZjZmfKIKIKIMVxHjZTxTxTxbHWABwUsIxUsqGrorororororororokjkjkjkjkjkjkjkjkjhOPgGmHVpNHVHVGmPgGmGmPgkjkjkjkjkjPhkjkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjRoXkWZkjkjkjVdTimodCmoikikSJ qsqsSOHwVdHwkjkjhOkjrnLCLCkjkjkjkjkjPhkjkjqbqbYZJyGmPgGmGmGmGmGmGmGmGmPgGmaxkjAWsTbAsTsTLvsTYAsTsTAWTxTxTxTxTxdfTxTxTxoOoOTxTxmWTxTxTxTxTxTxTxAnjZAnAnAnjZCsmfmfmfmfubxHjZTxTxTxAWvxUsUsUsUsidZRroRBHnPUNxIWrokjkjPJkjkjPhkjPhkjkjGmGmHVHVHVGmGmGmGmGmGmkjkjkjkjkjkjkjkjkjkjPhkjkjkjkjkjkjPhkjkjkjkjXkXkWZHjkjhOkjkjcgVdHwWESOZa mTmTmTKfVdkjkjPhkjkjrnLCLCkjrDrDkjkjkjkjkjkjqbYZJyGmGmGmGmGmGmGmOYGmGmGmGmkjkjAWMmAWAWAWAWAWAWAWAWAWTxTxTxTxTxTxTxTxTxoOoOTxTxmWTxTxTxTxTxTxTxAnjZjZjZjZjZEtHGHGaFNJHGEtjZWTWTWTvPWAUsIxUsmGZRWqroHnNlrorororokjOOkjPhkjkjkjkjkjkjGmGmHVHVHVPgGmGmGmGmfNckuukjPhkjPhkjkjkjkjkjkjkjkjPJkjkjkjrDrDkjkjTOXkWZkjkjkjkjkjkjVdWREyEyEy @@ -623,11 +620,11 @@ YrnMTxnMnMTxnMnMTxnMrKUOrKnMTxnMnMTxnMnMTxnMnMTxnMNcszNcNcszNcNcszNcNcszNcnMTxnM BrTxTxTxTxTxTxTxTxTxUOUOUOTxTxTxTxTxTxTxTxTxTxTxTxszszszszszszszszszszszszTxTxTxDrTxTxTxTxTxoOoOTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxAITxTxTxmWTxTxTxTxTxTxLeoOTxTxTxTxTxTxTxqJTxTxTxTxTxTxTxTxTxTxTxTxTxAITxTxTxTxTxTxTxTxTxTxTxTxTxTxszszszszszszszszszszszTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxeSeSeSTxTxTxTxTxTxTxTxTxTxYQ FEkjVdVdVdVdcgVdVdVdrnLCLCkjPhkjkjkjkjkjkjPhkjkjkjGmGmGmGmGmGmGmGmGmGmGmGmAWAWAWwOAWTxTxvHAWAWAWupAWvHAWAWAWAWAWAWvHTxTxTxvHAWAWAWAWAWAWedvHAWTxTxAWAWAWAWvHAWAWAWAWAWAWvHTxTxTxvHAWAWAWvHAWAWAWAWAWMmAWAWAWAWAWkjkjkjkjkjkjkjkjkjGmGmGmGmGmGmGmGmGmGmGmkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjXkXkWZkjVdVdcgVdVdVdVdkjkjDz zNVdVdVdVdVdkjkjVdVdrnLCLCkjkjkjkjkjkjkjkjkjkjkjkjGmPgGmGmGmGmGmGmGmGmGmGmAWAWAWAWAWTxTxAWAWAWAWAWAWAWAWAWAWAWvPAWAWTxTxTxWMAWAWAWAWAWAWAWAWAWTxTxWMAWvPAWAWAWAWAWAWZLAWAWTxTxTxWMAWvPAWAWAWAWAWAWAWAWAWAWAWAWAWkjkjkjkjOOkjkjkjkjGmGmGmGmAcGmGmGmGmGmGmPJkjkjkjPhkjPhkjkjPhkjPhkjkjkjkjkjkjkjkjPhkjXkXkWZkjkjkjVdVdVdpZVdVdkjDC -kjrDrDpZVdVdVdGIVdVdrnLCLCkjkjkjkjkjkjkjkjkjkjkjkjGmGmGmGmGmGmGmGmGmPgGmGmkjkjkjkjAWTxTxWMkjkjkjkjhOkjrorororororoAWTxTxTxAWUNvhvhHtHtvhvhUNAWTxTxAWrororororororororoAWAWTxTxTxAWrodUQWQWrorokjkjViVicuViViVikjkjkjPhkjkjkjPhkjGmGmHVHVGmGmGmPgGmGmGmGmkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjkjkjkjkjkjRoXkWZkjkjkjVdVdjcyNcVVdVdkj -kjrDcVbYfGkjkjVdVdVdrnLCHzkjkjkjkjkjPhkjkjkjkjPhkjGmsbGmGmGmGmPgGmGmGmGmPgPhkjkjkjAWTxTxAWkjPhkjHjkjOOwjqeeVbStQroczTxTxTxAWrorGgIRSRSjrsLroAMTxTxAWroEJeJgirorzDGewroAWvPWTWTWTAWcuHnHnHnmJrokjHjViZBHnUpuLVikjkjkjkjkjkjkjkjkjGmHVHVHVHVHVGmGmGmGmGmfNckuukjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjkjXkXkWZkjPhVdVdVdjcqghPhPrDkj -kjtBhPPIfGVdPhkjkjVdrnLCLCkjkjPhkjkjkjkjkjkjkjkjkjGmGmGmPgGmGmGmGmGmGmGmGmkjkjkjkjAWTxTxAWrororowjrororonHWDWDvfitAWWTWTWTAWBUgIxhRSRSkhmhBUYiTxTxAWdpDGDGDGroDGDGSsdpAWAWWTWTWTAWroyBNlHnXErokjkjViHnmONlHnVikjPhkjkjkjkjkjkjGmGmHVpNHVHVGmGmGmGmPgGmfNCdqbkjkjPhkjkjkjkjkjkjkjkjkjkjkjkjhOkjPhkjkjXkXkWZkjkjVdVdVdaHpcphSyVdkj -kjtBeKSdQEVdVdVdVdVdrnLCLCkjkjOOkjkjkjkjkjPhkjPJkjGmGmGmGmGmGmGmGmGmPgGmGmkjkjkjPhvHTxTxAWrojshpvfyTyLrolJtQbStQroZLWTWTWTZLBUgIUTmhgIjrgIBUAWTxTxAWroDGDGDGonDGDGDGroAWupTxTxTxAWQWHbHnNlQzrokjkjViHOHOlFyBVikjkjkjkjPhkjkjPhGmHVHVpNHVHVGmGmGmGmGmGmfNCdqbkjkjHjkjkjkjkjHjkjkjkjkjkjPhkjkjkjkjkjkjRoXkWZkjGIVdVdVdjcpcuNSyVdkj -kjtBHXSdfGVdVdVdVdVdrnLCLCPhkjkjkjPhkjPhkjkjkjkjPhGmGmGmGmGmPgGmPgGmGmGmGmkjPhkjkjAWTxTxAWwjvfvfvfvfvfrorororororoAWTxTxTxCGrogINPgIgIgIgIroAWTxTxvHroonrororojzDGDGonAWAWTxTxTxAWQWwGvjHnuLroPhkjViViroViViVikjkjPhkjkjkjkjkjGmHVHVpNHVHVGmGmGmGmGmGmfNCdqbkjkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjXkXkWZkjVdVdVdVdjcqgkHSykjkj +kjrDrDpZVdVdVdGIVdVdrnLCLCkjkjkjkjkjkjkjkjkjkjkjkjGmGmGmGmGmGmGmGmGmPgGmGmkjkjkjkjAWTxTxWMkjkjkjkjhOkjrorororororoAWTxTxTxAWUNvhvhHtHtvhvhUNAWTxTxAWrororororororororoAWAWTxTxTxAWrodUQWQWrorokjkjrorocurororokjkjkjPhkjkjkjPhkjGmGmHVHVGmGmGmPgGmGmGmGmkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjkjkjkjkjkjRoXkWZkjkjkjVdVdjcyNcVVdVdkj +kjrDcVbYfGkjkjVdVdVdrnLCHzkjkjkjkjkjPhkjkjkjkjPhkjGmsbGmGmGmGmPgGmGmGmGmPgPhkjkjkjAWTxTxAWkjPhkjHjkjOOwjqeeVbStQroczTxTxTxAWrorGgIRSRSjrsLroAMTxTxAWroEJeJgirorzDGewroAWvPWTWTWTAWcuHnHnHnmJrokjHjroZBHnUpuLrokjkjkjkjkjkjkjkjkjGmHVHVHVHVHVGmGmGmGmGmfNckuukjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjkjXkXkWZkjPhVdVdVdjcqghPhPrDkj +kjtBhPPIfGVdPhkjkjVdrnLCLCkjkjPhkjkjkjkjkjkjkjkjkjGmGmGmPgGmGmGmGmGmGmGmGmkjkjkjkjAWTxTxAWrororowjrororonHWDWDvfitAWWTWTWTAWBUgIxhRSRSkhmhBUYiTxTxAWdpDGDGDGroDGDGSsdpAWAWWTWTWTAWroyBNlHnXErokjkjroHnmONlHnrokjPhkjkjkjkjkjkjGmGmHVpNHVHVGmGmGmGmPgGmfNCdqbkjkjPhkjkjkjkjkjkjkjkjkjkjkjkjhOkjPhkjkjXkXkWZkjkjVdVdVdaHpcphSyVdkj +kjtBeKSdQEVdVdVdVdVdrnLCLCkjkjOOkjkjkjkjkjPhkjPJkjGmGmGmGmGmGmGmGmGmPgGmGmkjkjkjPhvHTxTxAWrojshpvfyTyLrolJtQbStQroZLWTWTWTZLBUgIUTmhgIjrgIBUAWTxTxAWroDGDGDGonDGDGDGroAWupTxTxTxAWQWHbHnNlQzrokjkjroHOHOlFyBrokjkjkjkjPhkjkjPhGmHVHVpNHVHVGmGmGmGmGmGmfNCdqbkjkjHjkjkjkjkjHjkjkjkjkjkjPhkjkjkjkjkjkjRoXkWZkjGIVdVdVdjcpcuNSyVdkj +kjtBHXSdfGVdVdVdVdVdrnLCLCPhkjkjkjPhkjPhkjkjkjkjPhGmGmGmGmGmPgGmPgGmGmGmGmkjPhkjkjAWTxTxAWwjvfvfvfvfvfrorororororoAWTxTxTxCGrogINPgIgIgIgIroAWTxTxvHroonrororojzDGDGonAWAWTxTxTxAWQWwGvjHnuLroPhkjrorororororokjkjPhkjkjkjkjkjGmHVHVpNHVHVGmGmGmGmGmGmfNCdqbkjkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjXkXkWZkjVdVdVdVdjcqgkHSykjkj kjhPmLPIfGVdIIIIIIIIrnLCLCkjkjkjkjkjkjkjkjkjkjkjkjGmGmGmGmGmGmGmsbGmGmGmGmkjkjkjkjAWTxTxAWwjtknHCRvfXSrotQvftQvfwjAWTxTxTxAWBUgIITgIRpnggIBUAWTxTxAWroDGDmroZJDGDYYlroAWbHTxTxTxvHrorororororokjkjHjkjkjkjkjkjkjkjkjkjkjkjkjkjGmHVHVHVHVGmGmGmGmGmGmGmfNCdqbkjkjHjPhkjkjkjHjPhkjkjkjkjkjkjkjkjPhkjkjXkXkWZIIIIIIIIkjjcmbzSrDhOkj kjrDzSTzfGVdjMzUzUSnrnLCLCkjkjkjkjkjkjkjkjPhkjHjkjGmPgGmGmGmGmGmGmGmPgGmGmPhkjHjkjvPTxTxbHroCcnHCRvfWDitvfvfWDvfwjbHTxTxTxAWBUFfgIgIgIgIFfBUAWTxTxAWropzvaroEJDbYlYldpAWAWTxTxTxAWkjkjkjkjkjkjkjkjkjkjPhkjkjkjkjPhkjkjkjPhkjGmGmHVHVHVGmGmGmGmGmGmGmGmfNCdqbkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjkjkjkjXkXkWZSnzUzUjMVdVdVdrDrDkjkj kjkjVdVdVdVdwSEkEkAJrnLCHzkjkjkjkjPhkjkjkjkjkjkjkjGmGmPgGmGmPgGmGmVHGmGmGmkjkjkjkjAWTxTxAWrorororoitrororowjwjroroAWTxTxTxAWUNroBUBUBUBUroUNAWTxTxAWrororororororororoAWtwTxTxTxAWsTsTsesTmAmAsTsTsTsTsTkjPhkjkjkjkjkjkjkjkjPgGmHVpNHVGmsbGmGmGmGmGmGmfNCdqbkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjkjkjkjkjPhXkXkWZAJEkEkwSVdVdVdVdkjkjkj @@ -636,17 +633,17 @@ kjkjHjkjVdVdxcOQmIVdrnLCHzkjkjkjkjkjkjkjkjPhkjkjkjGmPgXpXpGmGmGmGmGmPgGmGmkjPhkj OaOaOaOaCHCHOaOaOaOarnLCLCkjaxkjkjkjkjHjkjkjkjkjPhGmGmGmXpGmGmGmGmGmGmGmGmkjkjkjkjAWTxTxTxTxTxTxTxTxTxTxTxmWTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxDrTxTxTxTxTxTxTxTxTxTxTxLgTxTxTxTxTxAWmAvfWDvfvfWDxuvfvfvfsTkjkjkjkjkjaxkjkjkjkjGmGmHVpNHVHVGmGmGmNOGmGmGmGmkjrDkjHjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjXkXkWZOaOaOaOaOaOaOaOaOaOaOa kjkjkjkjkjkjkjkjkjkjLCLCLCkjkjkjkjkjPhkjkjPhkjkjkjGmGmGmGmGmGmPgGmGmPgGmGmkjkjkjPJvHTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxDrTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxAWsThWSDCwUXHFsTjuvfYUmAkjkjPhkjPhkjkjPhkjkjGmGmHVpNHVPgGmGmGmGmGmGmGmGmkjrDrDkjkjPhkjkjkjkjPhkjkjkjkjPhkjkjOOkjPhkjXkXkXkkjkjkjkjkjkjkjkjkjkjkj kjkjkjkjkjkjkjkjkjkjrjLCLCkjkjPhkjkjkjkjPhkjHjkjkjGmGmGmPgGmGmGmGmPgGmGmGmPhkjkjkjAWTxTxvHAWAWAWAWAWvPAWAWvHAWAWAWAWAWAWAWAWvHTxTxTxAWAWAWAWAWAWvHAWAWAWvPAWTxTxTxAWvHbHAWAWAWAWvHsTsTsTsTsTsTsTsTsTsTsTkjkjkjkjkjkjkjkjHjHjGmHVHVpNHVGmGmGmGmGmGmGmGmGmkjkjrDrDkjkjkjkjkjkjkjkjkjkjkjaxkjkjkjkjPJkjXkXkXkkjkjkjkjkjkjkjkjkjkjkj -kjHjkjkjkjkjkjkjkjkjLCLCLCPhkjkjkjkjkjkjkjkjkjkjPhGmGmPgGmGmGmGmGmGmGmGmGmPhkjkjkjAWWTWTAWrorororororoitrorozVzVrorororororoAWTxTxTxAWkjiuiuiuiuiuiuiuiukjAWTxTxTxAWJgaAdiawaAdiaAaAdiTxAWAWAWkjkjkjkjkjkjkjkjkjPhkjhOkjkjGmGmHVHVHVHVGmGmPgGmGmGmGmPgGmPhkjkjhOkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjkjkjkjRoXkXkkjkjkjkjkjPhkjOOkjPhkj -kjkjkjkjPhkjkjkjkjkjLCLCLCkjkjkjkjPhkjkjkjkjPhkjkjGmGmGmGmGmPgGmsbGmGmPgGmkjkjkjkjAWWTWTAWVLVvfyYafSrovfroEJJEJErobGbGDGDGonbHTxZdTxAWkjiuNWaKmRmRaKNWPRaxAWTxTxTxAWcXTxGeTxpUzgTxTxGeTxAWAWAWkjkjkjkjkjkjPhkjkjkjkjkjkjkjGmHVHVpNHVHVGmGmGmGmPgGmmsGmGmkjkjkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjkjXkXkXkPhkjkjkjkjkjkjkjkjkjkj -kjkjPhkjkjkjPhaxkjkjLCLCLCkjkjkjPhkjkjkjkjkjkjkjkjGmGmGmGmPgGmGmGmGmGmGmGmkjkjkjkjAWTxTxAWVLvfvfWDvfitvfropzDGDGKADGDGPnzEroAWTxTxTxAWaxiuUFvfaKvfvfUFPREfAWTxTxTxAWcXTxGeTxTxanTxTxGeTxAWAWAWkjkjkjPhkjkjkjkjkjkjkjkjkjkjGmHVHVpNHVHVGmGmGmGmsbGmGmGmGmPhkjPJkjkjkjkjHjkjkjkjkjHjkjkjPhkjkjPhkjkjkjXkXkXkkjkjkjkjkjkjkjkjkjkjkj -kjkjkjkjkjkjkjkjPJPhLCLCHzkjkjkjkjkjkjkjPhkjkjkjkjGmGmPgGmGmGmGmGmPgGmGmGmkjkjkjPhAWTxTxuproabjuabKVrozoroDvDGMirojKDIrororoZLTxTxTxvHkjiuPRzMPRYwPRPRPRiGAWTxTxTxAWiLTxGeTxZdGeGNTxGeTxAWAWAWkjkjkjkjkjkjkjkjkjPhkjkjkjPhGmGmHVpNHVHVGmGmPgGmGmGmGmGmGmkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjHjkjkjkjkjkjXkRoXkkjkjrDJGkjkjkjPhkjkjkj -PhkjkjkjkjPhkjkjkjkjLCLCLCkjkjkjkjkjPhkjkjkjkjPhkjGmGmGmGmGmGmPgGmGmGmGmPgPhkjHjkjvHTxTxAWrorororororovfroroHKDGonDGDGLBJEFFAWnZnZnZAWkjiuUBvfrBkaPzSDavPEvHTxTxTxupTxTxTxNiTxTxzcTxTxTxAWAWAWkjkjkjkjkjPhkjkjkjkjkjkjkjkjGmGmHVHVHVHVGmGmGmGmNOGmGmPgGmkjkjkjPhkjkjkjPJkjkjkjkjPJkjkjkjkjkjkjkjkjkjRoXkXkkjkjkjrDrDHjkjkjkjkjPh -kjkjkjkjkjkjkjHjHjkjLCLCLCkjkjPhkjHjkjkjkjkjkjkjkjGmGmGmPgGmGmGmGmGmGmGmGmkjkjkjkjAWTxTxAWVLqeeVbStQrovfvfroroonrogiDGguJEFFupTxTxTxAWPhiuvfvfvfnknHvfLvPEAWWTWTWTAWTxZdTxTxTxTxZdTxTxTxvPAWAWkjkjHjkjkjkjOOkjPhkjkjhOkjkjsbGmHVHVHVGmGmPgGmGmGmGmPgGmGmkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjkjkjPhkjXkXkXkkjPhkjkjkjkjkjaxPhkjkj -kjkjPhHjkjkjkjkjkjkjHzLCLCkjkjkjkjkjkjkjkjPJkjHjkjPgGmGmGmGmGmmssbsbGmGmGmkjkjkjkjAWTxTxvPVLnHWDvfWDitvfzorofWDGroObguDGEJrobHWTWTWTAWkjiubCvfvfvfvfvfavPEbHWTWTWTAWTxTxTxTxTxTxTxTxTxTxAWAWAWkjkjkjkjkjkjrDrDrDPhkjkjkjkjGmHVHVpNHVGmGmGmGmGmGmGmGmGmGmkjPhkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjkjkjXkXkRoHjkjkjkjPhkjkjkjkjkjkj -kjkjkjkjkjkjkjkjkjOOLCLCHzkjkjkjkjkjkjkjkjkjkjkjkjGmPgGmGmGmGmGmGmGmGmGmGmkjkjkjkjAWTxTxAWrolJtQbStQrovfvfrororororororororoAWsnWTWTAWkjiuPRLvPRPRPRPRPRnOAWTxTxTxAWrNAWTxTxTxTxAWrNAWAWAWAWAWkjkjkjkjkjkjkjkjkjkjkjkjPhkjGmHVHVHVHVHVGmGmGmGmPgGmGmGmPgkjkjkjkjkjkjkjPhkjkjkjkjPhkjPhkjkjkjkjkjkjkjXkXkXkkjkjkjkjkjkjkjkjkjkjkj -kjPhkjkjPhkjkjPhkjkjLCLCLCkjkjkjkjkjkjkjkjkjkjkjkjGmGmGmGmGmGmGmGmGmGmGmsbkjkjkjkjAWTxTxAWrorororororocvrorokjkjkjkjOOkjkjkjeLTxTxTxvPkjiuZHvfmRmRaKkZPRaxAWTxTxTxTxTxTxTxTxTxTxAWAWAWAWAWAWAWkjkjkjkjkjPhkjkjkjPhkjkjkjkjGmHVHVpNHVHVGmGmPgGmGmGmGmGmGmkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjkjkjPhXkXkXkkjPJkjkjkjkjkjkjkjPhkj -kjkjkjkjkjkjkjhOkjkjrjfKfKkjkjPhkjkjkjkjPhkjkjkjkjPgGmGmPgGmGmGmGmPgGmXpGmkjkjPhkjAWTxTxvHAWAWAWAWAWAWAWAWvHAWAWAWAWvPAWAWAWvHTxTxTxAWkjiuUFvfvfaKvfLdPRkjAWTxTxTxTxTxTxTxTxTxTxAWAWAWAWAWAWkjkjkjPhkjkjkjkjkjkjkjkjaxkjkjGmHVpNpNHVGmGmGmGmGmOYGmNOPgGmPhkjkjPhkjkjkjhOkjkjkjkjhOkjkjkjkjkjPhkjkjkjXkRoXkkjkjkjklkjkjkjPhkjkjkj -kjkjkjkjkjkjkjkjkjkjLCfKLCkjkjkjkjkjkjkjkjkjkjPhkjGmGmGmGmGmGmGmGmGmXpXpPgPhkjkjkjAWTxTxTxTxZdTxTxTxTxTxTxTxTxTxTxTxDrTxTxTxTxTxTxTxAWkjiuiuiuiuiuiuiuiukjAWTxTxTxAWvHAWTxTxTxTxAWAWAWAWkjkjkjkjkjkjkjkjkjPhkjkjkjkjkjkjsbGmHVpNpNHVGmGmPgGmAcGmGmGmGmGmkjHjkjkjPhkjOOkjkjPhkjOOkjkjkjPhkjkjkjkjkjkjXkXkXkkjkjkjkjkjPhkjkjkjkjkj +kjHjkjkjkjkjkjkjkjkjLCLCLCPhkjkjkjkjkjkjkjkjkjkjPhGmGmPgGmGmGmGmGmGmGmGmGmPhkjkjkjAWWTWTAWrorororororoitrorozVzVrorororororoAWTxTxTxAWkjrorororororororokjAWTxTxTxAWJgaAdiawaAdiaAaAdiTxAWAWAWkjkjkjkjkjkjkjkjkjPhkjhOkjkjGmGmHVHVHVHVGmGmPgGmGmGmGmPgGmPhkjkjhOkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjkjkjkjRoXkXkkjkjkjkjkjPhkjOOkjPhkj +kjkjkjkjPhkjkjkjkjkjLCLCLCkjkjkjkjPhkjkjkjkjPhkjkjGmGmGmGmGmPgGmsbGmGmPgGmkjkjkjkjAWWTWTAWVLVvfyYafSrovfroEJJEJErobGbGDGDGonbHTxZdTxAWkjroNWaKmRmRaKNWroaxAWTxTxTxAWcXTxGeTxpUzgTxTxGeTxAWAWAWkjkjkjkjkjkjPhkjkjkjkjkjkjkjGmHVHVpNHVHVGmGmGmGmPgGmmsGmGmkjkjkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjkjXkXkXkPhkjkjkjkjkjkjkjkjkjkj +kjkjPhkjkjkjPhaxkjkjLCLCLCkjkjkjPhkjkjkjkjkjkjkjkjGmGmGmGmPgGmGmGmGmGmGmGmkjkjkjkjAWTxTxAWVLvfvfWDvfitvfropzDGDGKADGDGPnzEroAWTxTxTxAWaxroUFvfaKvfvfUFroEfAWTxTxTxAWcXTxGeTxTxOwTxTxGeTxAWAWAWkjkjkjPhkjkjkjkjkjkjkjkjkjkjGmHVHVpNHVHVGmGmGmGmsbGmGmGmGmPhkjPJkjkjkjkjHjkjkjkjkjHjkjkjPhkjkjPhkjkjkjXkXkXkkjkjkjkjkjkjkjkjkjkjkj +kjkjkjkjkjkjkjkjPJPhLCLCHzkjkjkjkjkjkjkjPhkjkjkjkjGmGmPgGmGmGmGmGmPgGmGmGmkjkjkjPhAWTxTxuproabjuabKVrozoroDvDGMirojKDIrororoZLTxTxTxvHkjrorozMroYwrororoiGAWTxTxTxAWiLTxGeTxZdGeGNTxGeTxAWAWAWkjkjkjkjkjkjkjkjkjPhkjkjkjPhGmGmHVpNHVHVGmGmPgGmGmGmGmGmGmkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjHjkjkjkjkjkjXkRoXkkjkjrDJGkjkjkjPhkjkjkj +PhkjkjkjkjPhkjkjkjkjLCLCLCkjkjkjkjkjPhkjkjkjkjPhkjGmGmGmGmGmGmPgGmGmGmGmPgPhkjHjkjvHTxTxAWrorororororovfroroHKDGonDGDGLBJEFFAWnZnZnZAWkjroUBvfrBkaPzSDavPEvHTxTxTxupTxTxTxZVTxTxzcTxTxTxAWAWAWkjkjkjkjkjPhkjkjkjkjkjkjkjkjGmGmHVHVHVHVGmGmGmGmNOGmGmPgGmkjkjkjPhkjkjkjPJkjkjkjkjPJkjkjkjkjkjkjkjkjkjRoXkXkkjkjkjrDrDHjkjkjkjkjPh +kjkjkjkjkjkjkjHjHjkjLCLCLCkjkjPhkjHjkjkjkjkjkjkjkjGmGmGmPgGmGmGmGmGmGmGmGmkjkjkjkjAWTxTxAWVLqeeVbStQrovfvfroroonrogiDGguJEFFupTxTxTxAWPhrovfvfvfnknHvfLvPEAWWTWTWTAWTxZdTxTxTxTxZdTxTxTxvPAWAWkjkjHjkjkjkjOOkjPhkjkjhOkjkjsbGmHVHVHVGmGmPgGmGmGmGmPgGmGmkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjkjkjPhkjXkXkXkkjPhkjkjkjkjkjaxPhkjkj +kjkjPhHjkjkjkjkjkjkjHzLCLCkjkjkjkjkjkjkjkjPJkjHjkjPgGmGmGmGmGmmssbsbGmGmGmkjkjkjkjAWTxTxvPVLnHWDvfWDitvfzorofWDGroObguDGEJrobHWTWTWTAWkjrobCvfvfvfvfvfavPEbHWTWTWTAWTxTxTxTxTxTxTxTxTxTxAWAWAWkjkjkjkjkjkjrDrDrDPhkjkjkjkjGmHVHVpNHVGmGmGmGmGmGmGmGmGmGmkjPhkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjkjkjXkXkRoHjkjkjkjPhkjkjkjkjkjkj +kjkjkjkjkjkjkjkjkjOOLCLCHzkjkjkjkjkjkjkjkjkjkjkjkjGmPgGmGmGmGmGmGmGmGmGmGmkjkjkjkjAWTxTxAWrolJtQbStQrovfvfrororororororororoAWsnWTWTAWkjroroLvrororororonOAWTxTxTxAWrNAWTxTxTxTxAWrNAWAWAWAWAWkjkjkjkjkjkjkjkjkjkjkjkjPhkjGmHVHVHVHVHVGmGmGmGmPgGmGmGmPgkjkjkjkjkjkjkjPhkjkjkjkjPhkjPhkjkjkjkjkjkjkjXkXkXkkjkjkjkjkjkjkjkjkjkjkj +kjPhkjkjPhkjkjPhkjkjLCLCLCkjkjkjkjkjkjkjkjkjkjkjkjGmGmGmGmGmGmGmGmGmGmGmsbkjkjkjkjAWTxTxAWrorororororocvrorokjkjkjkjOOkjkjkjeLTxTxTxvPkjroZHvfmRmRaKkZroaxAWTxTxTxTxTxTxTxTxTxTxAWAWAWAWAWAWAWkjkjkjkjkjPhkjkjkjPhkjkjkjkjGmHVHVpNHVHVGmGmPgGmGmGmGmGmGmkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjkjkjPhXkXkXkkjPJkjkjkjkjkjkjkjPhkj +kjkjkjkjkjkjkjhOkjkjrjfKfKkjkjPhkjkjkjkjPhkjkjkjkjPgGmGmPgGmGmGmGmPgGmXpGmkjkjPhkjAWTxTxvHAWAWAWAWAWAWAWAWvHAWAWAWAWvPAWAWAWvHTxTxTxAWkjroUFvfvfaKvfLdrokjAWTxTxTxTxTxTxTxTxTxTxAWAWAWAWAWAWkjkjkjPhkjkjkjkjkjkjkjkjaxkjkjGmHVpNpNHVGmGmGmGmGmOYGmNOPgGmPhkjkjPhkjkjkjhOkjkjkjkjhOkjkjkjkjkjPhkjkjkjXkRoXkkjkjkjklkjkjkjPhkjkjkj +kjkjkjkjkjkjkjkjkjkjLCfKLCkjkjkjkjkjkjkjkjkjkjPhkjGmGmGmGmGmGmGmGmGmXpXpPgPhkjkjkjAWTxTxTxTxZdTxTxTxTxTxTxTxTxTxTxTxDrTxTxTxTxTxTxTxAWkjrorororororororokjAWTxTxTxAWvHAWTxTxTxTxAWAWAWAWkjkjkjkjkjkjkjkjkjPhkjkjkjkjkjkjsbGmHVpNpNHVGmGmPgGmAcGmGmGmGmGmkjHjkjkjPhkjOOkjkjPhkjOOkjkjkjPhkjkjkjkjkjkjXkXkXkkjkjkjkjkjPhkjkjkjkjkj kjPhkjkjkjPhkjaxkjkjfKLCHzkjkjkjkjPhPhkjkjkjkjPhkjsbGmmsGmGmPgPgGmXpXpGmPgkjkjkjkjAWTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxDrTxTxTxTxTxTxTxAWPhkjkjhOkjkjkjkjkjPhAWnZnZTxAWjtSLVdLATxTxSLSLSLSLSLSLSLSLkjkjkjkjkjkjkjkjPhkjkjkjGmHVHVpNHVHVsbGmGmGmGmGmGmGmGmsbkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjPhXkXkXkHjkjkjkjkjkjkjPhkjkjkj kjkjkjPhkjHjkjkjkjkjfKLCLCkjkjPhkjkjkjkjkjkjkjkjkjGmGmGmPgGmGmGmXpXpGmGmGmkjkjkjkjAWTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxDrTxTxTxgKTxTxTxAWkjkjkjkjkjPhkjkjHjkjAWTxnZnZAWyHkjVdVdrDVdkjkjkjkjkjkjkjQvkjkjkjkjkjkjkjkjkjkjPhkjGmHVHVpNHVGmGmPgGmGmGmGmPgGmGmGmkjPhkjPJkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjXkXkXkPhkjkjPhkjkjkjkjPJkjkj kjHjkjkjkjkjkjkjkjPhLCLCHzkjkjkjkjkjkjkjkjPhkjkjkjGmGmGmGmGmGmGmGmGmPgGmGmkjkjkjkjvHAWAWAWAWAWAWAWvHAWAWAWAWAWAWAWAWwOAWvHAWAWAWTxTxAWAWvHAWAWAWAWAWAWAWAWvHTxTxTxAWyHHjrDVdrDrDkjaxHjkjkjHjkjQvPhkjkjPhPhkjkjkjkjkjkjGmPgHVHVHVHVHVGmGmGmGmGmGmGmGmGmGmkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjHjkjkjkjkjaxkjRoXkXkkjkjkjkjkjkjkjkjkjkjkj @@ -654,9 +651,9 @@ kjkjkjkjkjkjkjkjkjkjLCLCLCkjkjkjkjkjkjPhkjkjkjkjPhGmGmGmGmGmGmsbPgGmGmGmGmkjPhkj kjkjkjkjkjkjPhkjkjPhLCLCLCkjPhkjkjkjkjkjkjkjHjkjkjOYGmPgGmGmGmGmGmGmsbGmGmkjkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjkjkjkjkjkjkjkjkjkjAWTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxTxAWyHrDVdVdrDrDEfkjHjkjkjHjkjQvkjkjkjkjkjOOkjkjkjkjkjGmHVHVpNHVHVGmGmGmGmGmGmGmGmGmPgGmkjJGkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjXkXkXkkjkjkjkjkjkjZFkjkjkjkj PhkjkjkjPhkjkjkjkjkjLCLCLCkjkjkjkjkjkjkjkjkjkjkjkjGmGmGmGmGmGmGmGmGmGmGmGmhOPJkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjAWAWvHAWAWAWAWAWAWAWAWvHAWAWAWAWAWAWAWyHrDVdHjrDTpuAxIxIZGZGxIxIQvPhkjkjkjkjkjkjhOkjkjGmGmHVHVpNHVHVGmNOGmGmGmGmPgGmGmGmGmrDrDkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjkjPhkjkjkjXkRoXkPhkjkjkjOOkjkjkjkjkjkj kjkjPhkjkjkjkjkjkjkjLCLCHzkjkjkjkjkjkjPhHjkjkjkjkjGmGmGmGmGmGmGmPgGmGmGmGmkjkjkjkjkjkjkjkjkjPhkjkjkjkjHjkjPhkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjrDkjrDrDrDrDrDrDrDVdrDdnrDkjVdrDFWgIEAgIEARsgIxIQvkjkjkjkjkjkjkjkjkjkjGmHVHVHVpNHVGmGmGmGmGmGmGmGmGmGmGmGmrDkjkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjkjkjkjPhkjTOXkXkkjkjkjkjkjkjkjkjkjkjkj -kjkjkjkjkjkjkjPhkjkjHzLCLCkjkjPhkjkjkjaxkjkjkjPhkjPgGmGmPgGmGmGmGmGmGmGmPgkjkjPhkjkjkjkjPhkjkjkjkjPhkjkjkjkjhOkjkjPhkjkjkjkjkjkjkjHjkjkjkjkjPhkjrDrDrDvcvcqVwVwVVdVdVdVdVdVdrDtLgIgJnVmhgIZVZGQvkjkjkjPhPhkjkjkjkjHjGmHVHVHVpNHVGmGmGmGmsbGmGmGmGmGmGmGmkjOOHjkjHjkjkjkjkjHjkjkjkjkjkjkjkjkjkjkjkjkjXkXkXkPhkjkjkjkjPhkjkjPhkjkj -kjkjkjkjkjPhkjkjhOkjLCLCLCHjkjkjkjkjkjkjkjkjkjkjkjGmGmGmGmGmGmGmGmGmGmGmGmkjkjkjkjkjkjkjkjkjHjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjrDrDrDEcrDrDrDVdVdVdrDDJrDVdrDrDtLLFmhRsgIgJgIZGQvkjPhkjkjkjkjaxkjkjkjPgHVHVpNpNHVGmGmGmPgGmGmGmGmPgGmPgGmkjkjkjkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjPhkjkjkjXkXkXkkjkjkjkjkjkjkjkjkjkjkj -kjkjkjPhkjkjkjkjkjkjLCLCLCkjkjPJkjPhkjkjkjkjPhkjkjXpGmPgGmGmPgGmGmAcGmPgGmkjPhkjkjkjPhkjkjkjkjkjrDrDrDPhkjkjkjkjPhkjkjPhkjkjPhkjkjhOkjkjkjrDkjrDrDkjrDkjrDiTrDTZVdVdVdVdVdVdVdtLZVEAgIEAgIgIxIQvkjkjkjkjkjkjkjkjkjkjGmHVHVpNHVHVHVGmGmGmsbPgGmGmGmGmGmGmkjkjkjkjHjPhkjkjkjHjPhkjkjkjPhHjkjkjkjkjkjkjXkRoXkkjkjkjPhkjkjkjkjkjkjkj +kjkjkjkjkjkjkjPhkjkjHzLCLCkjkjPhkjkjkjaxkjkjkjPhkjPgGmGmPgGmGmGmGmGmGmGmPgkjkjPhkjkjkjkjPhkjkjkjkjPhkjkjkjkjhOkjkjPhkjkjkjkjkjkjkjHjkjkjkjkjPhkjrDrDrDvcvcqVwVwVVdVdVdVdVdVdrDtLgIgJnVmhgIiWZGQvkjkjkjPhPhkjkjkjkjHjGmHVHVHVpNHVGmGmGmGmsbGmGmGmGmGmGmGmkjOOHjkjHjkjkjkjkjHjkjkjkjkjkjkjkjkjkjkjkjkjXkXkXkPhkjkjkjkjPhkjkjPhkjkj +kjkjkjkjkjPhkjkjhOkjLCLCLCHjkjkjkjkjkjkjkjkjkjkjkjGmGmGmGmGmGmGmGmGmGmGmGmkjkjkjkjkjkjkjkjkjHjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjrDrDrDVirDrDrDVdVdVdrDDJrDVdrDrDtLPRmhRsgIgJgIZGQvkjPhkjkjkjkjaxkjkjkjPgHVHVpNpNHVGmGmGmPgGmGmGmGmPgGmPgGmkjkjkjkjkjkjkjkjPhkjkjkjkjPhkjkjkjkjPhkjkjkjXkXkXkkjkjkjkjkjkjkjkjkjkjkj +kjkjkjPhkjkjkjkjkjkjLCLCLCkjkjPJkjPhkjkjkjkjPhkjkjXpGmPgGmGmPgGmGmAcGmPgGmkjPhkjkjkjPhkjkjkjkjkjrDrDrDPhkjkjkjkjPhkjkjPhkjkjPhkjkjhOkjkjkjrDkjrDrDkjrDkjrDiTrDOEVdVdVdVdVdVdVdtLiWEAgIEAgIgIxIQvkjkjkjkjkjkjkjkjkjkjGmHVHVpNHVHVHVGmGmGmsbPgGmGmGmGmGmGmkjkjkjkjHjPhkjkjkjHjPhkjkjkjPhHjkjkjkjkjkjkjXkRoXkkjkjkjPhkjkjkjkjkjkjkj kjkjkjkjkjHjkjkjkjHjLCLCLCkjkjkjkjkjPhkjkjkjkjHjkjXpGmGmGmGmGmPgGmGmGmGmGmkjkjkjkjkjkjkjkjkjkjkjrDnunurDPhkjrDkjkjkjkjkjkjkjkjkjkjkjkjPhkjrDkjkjrDrDrDkjvcvcvcvcwVVdSHVdVdrDrDxIxIxIxIZGMzxIxIQvkjkjkjPhkjkjkjkjkjkjGmHVHVpNHVHVHVGmGmGmGmGmGmGmGmGmPgGmkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjPhkjkjkjkjRoXkXkkjkjkjkjkjkjhOkjkjkjPh kjkjkjkjkjkjkjPJkjkjLCLCLCkjkjkjkjkjkjkjkjkjkjkjkjGmXpGmGmGmGmGmGmGmGmGmGmkjkjkjkjkjHjkjOOkjkjkjrDrDnurDrDkjrDkjkjkjkjkjkjkjkjkjkjkjkjkjkjrDrDrDrDrDrDrDkjkjrDrDrDVddnrDrDkjkjkjkjkjkjkjkjkjkjQvkjkjkjkjkjkjHjPhkjPhGmGmHVHVHVHVGmGmGmPgGmGmGmGmGmGmGmGmkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjkjXkXkXkkjPhkjkjkjkjkjkjPhkjkj kjkjPhkjkjkjkjkjkjrDhHLCHzkjkjkjkjPhkjkjkjPJkjkjkjGmGmkWGmGmPgGmGmGmGmGmGmkjHjkjkjkjkjkjkjkjPhkjkjrDnurDkjkjkjkjkjkjOOkjPhkjkjkjkjkjPhkjkjrDrDvcqVvcvcvcrDrDkjkjrDrDyaSLgUgUSLSLSLSLSLSLSLSLSLSLkjhOkjkjkjkjkjkjkjkjGmGmHVpNHVHVGmGmGmGmGmAcGmGmPgGmGmGmkjPhkjkjkjOOkjkjPhkjOOkjkjPhkjkjkjkjkjkjPhkjXkXkRokjkjkjkjPhkjkjkjkjkjkj From f29ef035c91e0a48d9e2e229424486aca006d6ca Mon Sep 17 00:00:00 2001 From: Bierkraan Date: Sat, 8 Jun 2024 19:50:51 +0200 Subject: [PATCH 2/3] Civ collector fix --- code/game/objects/map_metadata/campaign.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/map_metadata/campaign.dm b/code/game/objects/map_metadata/campaign.dm index a014587cb4..896b9f55ed 100644 --- a/code/game/objects/map_metadata/campaign.dm +++ b/code/game/objects/map_metadata/campaign.dm @@ -134,7 +134,7 @@ return 7 MINUTES /obj/map_metadata/campaign/proc/civ_collector() - for(var/turf/T in get_area_turfs(/area/caribbean/japanese/land)) + for(var/turf/T in get_area_turfs(/area/caribbean/faction2/collector)) for (var/mob/living/simple_animal/civilian/CVL in T) if(CVL.stat != DEAD) if(istype(CVL, /mob/living/simple_animal/civilian/greenistani_ambassador) && CVL.stat != DEAD) @@ -142,7 +142,7 @@ else civilians_evacuated["Blugoslavia"]++ qdel(CVL) - for(var/turf/T in get_area_turfs(/area/caribbean/pirates/land)) + for(var/turf/T in get_area_turfs(/area/caribbean/faction1/collector)) for (var/mob/living/simple_animal/civilian/CVL in T) if(CVL.stat != DEAD) if(istype(CVL, /mob/living/simple_animal/civilian/greenistani_ambassador)) From 4630e75e8c4d6effed61139b82e3dfcb392cfdd4 Mon Sep 17 00:00:00 2001 From: Bierkraan Date: Sat, 8 Jun 2024 20:02:53 +0200 Subject: [PATCH 3/3] Hotfix --- code/game/objects/map_metadata/campaign.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/map_metadata/campaign.dm b/code/game/objects/map_metadata/campaign.dm index 896b9f55ed..9bd7a15d2f 100644 --- a/code/game/objects/map_metadata/campaign.dm +++ b/code/game/objects/map_metadata/campaign.dm @@ -142,7 +142,7 @@ else civilians_evacuated["Blugoslavia"]++ qdel(CVL) - for(var/turf/T in get_area_turfs(/area/caribbean/faction1/collector)) + for(var/turf/T in get_area_turfs(/area/caribbean/pirates/land)) for (var/mob/living/simple_animal/civilian/CVL in T) if(CVL.stat != DEAD) if(istype(CVL, /mob/living/simple_animal/civilian/greenistani_ambassador)) @@ -555,6 +555,7 @@ var/no_loop_ca = FALSE /obj/map_metadata/campaign/proc/after_round_checks() + to_chat(world, "Civilians Rescued: Blugoslavia [civilians_evacuated["Blugoslavia"]], Redmenia [civilians_evacuated["Redmenia"]]") to_chat(world, "Civilians Killed: Blugoslavia [civilians_killed["Blugoslavia"]], Redmenia [civilians_killed["Redmenia"]], Unknown [civilians_killed["Unknown"]]") spawn(5 SECONDS) to_chat(world, "AP mines placed: [ap_mines_placed]")