diff --git a/Bayupdate.WinMerge b/Bayupdate.WinMerge new file mode 100644 index 00000000000..4b5441636a9 --- /dev/null +++ b/Bayupdate.WinMerge @@ -0,0 +1,12 @@ + + + + + C:\Users\Rob\Documents\Projects\Baystation12\ + C:\Users\Rob\Documents\Projects\vgstation13\ + Exclude Source Control + 1 + 1 + 0 + + diff --git a/OLDVG.WinMerge b/OLDVG.WinMerge new file mode 100644 index 00000000000..d7dbff89c83 --- /dev/null +++ b/OLDVG.WinMerge @@ -0,0 +1,12 @@ + + + + + C:\Users\Rob\Documents\Projects\vg-station\ + C:\Users\Rob\Documents\Projects\vgstation13\ + Exclude Source Control + 1 + 1 + 0 + + diff --git a/TGupdate.WinMerge b/TGupdate.WinMerge new file mode 100644 index 00000000000..d53d9be5691 --- /dev/null +++ b/TGupdate.WinMerge @@ -0,0 +1,12 @@ + + + + + C:\Users\Rob\Documents\Projects\tgstation\ + C:\Users\Rob\Documents\Projects\vgstation13\ + Exclude Source Control + 1 + 1 + 0 + + diff --git a/cleanLogs.bat b/cleanLogs.bat new file mode 100644 index 00000000000..571260b13e0 --- /dev/null +++ b/cleanLogs.bat @@ -0,0 +1 @@ +python tools/cleanLogs.py data/logs/ data/cleaned_logs/ \ No newline at end of file diff --git a/compareOldVGIcons.bat b/compareOldVGIcons.bat new file mode 100644 index 00000000000..f718202cb64 --- /dev/null +++ b/compareOldVGIcons.bat @@ -0,0 +1,2 @@ +python tools/DMITool/DMI.py compare-all ../vg-station/icons/ icons/ compare_report_old.txt +pause \ No newline at end of file diff --git a/getChangesSince.bat b/getChangesSince.bat new file mode 100644 index 00000000000..1f83c9527e6 --- /dev/null +++ b/getChangesSince.bat @@ -0,0 +1 @@ +git log --no-merges --pretty=oneline --format="%an %s" %1..HEAD > changes.txt \ No newline at end of file diff --git a/get_dmi_header.bat b/get_dmi_header.bat new file mode 100644 index 00000000000..e2103f10fc6 --- /dev/null +++ b/get_dmi_header.bat @@ -0,0 +1,2 @@ +python tools/DMITool/DMI.py get-dmi-data icons/mob/human_races/r_def_plant.dmi icons/mob/human_races/r_def_plant.dmi.txt +pause \ No newline at end of file diff --git a/maps/tgstation.2.1.0.0.1.dmm b/maps/tgstation.2.1.0.0.1.dmm index 0a3e865fe1f..323050a8af9 100644 --- a/maps/tgstation.2.1.0.0.1.dmm +++ b/maps/tgstation.2.1.0.0.1.dmm @@ -1049,10 +1049,10 @@ "aui" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/disposalpipe/junction{tag = "icon-pipe-j2"; icon_state = "pipe-j2"; dir = 2},/turf/simulated/floor{icon_state = "neutral"; dir = 9},/area/crew_quarters/fitness) "auj" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/disposal,/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness) "auk" = (/obj/item/device/radio/intercom{broadcasting = 0; listening = 1; name = "Station Intercom (General)"; pixel_y = 20},/obj/structure/closet/athletic_mixed,/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness) -"aul" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/closet/lasertag/blue,/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness) -"aum" = (/obj/machinery/camera{c_tag = "Fitness Room"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/closet/lasertag/red,/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness) -"aun" = (/obj/machinery/vending/cola,/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness) -"auo" = (/obj/machinery/vending/snack,/turf/simulated/floor{icon_state = "neutral"; dir = 5},/area/crew_quarters/fitness) +"aul" = (/obj/machinery/door/window/eastright{base_state = "left"; dir = 8; icon_state = "left"; name = "Fitness Ring"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) +"aum" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) +"aun" = (/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,/turf/simulated/floor,/area/crew_quarters/fitness) +"auo" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) "aup" = (/turf/simulated/wall,/area/hallway/secondary/entry) "auq" = (/obj/structure/stool/bed/chair{dir = 1},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod1/station) "aur" = (/obj/structure/stool/bed/chair{dir = 1},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/shuttle/floor,/area/shuttle/escape_pod2/station) @@ -1129,11 +1129,11 @@ "avK" = (/obj/machinery/door/airlock{id_tag = "Dorm6"; name = "Cabin 2"},/turf/simulated/floor/wood,/area/crew_quarters/sleep) "avL" = (/obj/machinery/alarm{dir = 4; pixel_x = -23; pixel_y = 0},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/fitness) "avM" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor,/area/crew_quarters/fitness) -"avN" = (/obj/machinery/door/window/eastright{base_state = "left"; dir = 8; icon_state = "left"; name = "Fitness Ring"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/fitness) -"avO" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/fitness) -"avP" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/fitness) -"avQ" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/window/eastright{base_state = "left"; icon_state = "left"; name = "Fitness Ring"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/fitness) -"avR" = (/obj/machinery/atmospherics/pipe/manifold{_color = "blue"; dir = 8; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor,/area/crew_quarters/fitness) +"avN" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) +"avO" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) +"avP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/crew_quarters/fitness) +"avQ" = (/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/crew_quarters/fitness) +"avR" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) "avS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/crew_quarters/fitness) "avT" = (/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor,/area/crew_quarters/fitness) "avU" = (/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor,/area/crew_quarters/fitness) @@ -1172,10 +1172,10 @@ "awB" = (/turf/simulated/floor{icon_state = "neutral"; dir = 5},/area/crew_quarters/sleep) "awC" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/crew_quarters/fitness) "awD" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters/fitness) -"awE" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/beach/water,/area/crew_quarters/fitness) -"awF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/beach/water,/area/crew_quarters/fitness) -"awG" = (/turf/simulated/floor/beach/water,/area/crew_quarters/fitness) -"awH" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/beach/water,/area/crew_quarters/fitness) +"awE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/coin/silver,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/crew_quarters/fitness) +"awF" = (/obj/structure/table/woodentable,/obj/item/clothing/mask/balaclava,/turf/simulated/floor,/area/crew_quarters/sleep) +"awG" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) +"awH" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) "awI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = "0"},/turf/simulated/floor,/area/crew_quarters/fitness) "awJ" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/crew_quarters/fitness) "awK" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/crew_quarters/fitness) @@ -1216,7 +1216,7 @@ "axt" = (/turf/simulated/floor,/area/crew_quarters/sleep) "axu" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor,/area/crew_quarters/sleep) "axv" = (/obj/structure/table/woodentable,/turf/simulated/floor,/area/crew_quarters/sleep) -"axw" = (/obj/structure/table/woodentable,/obj/item/weapon/coin/silver,/turf/simulated/floor,/area/crew_quarters/sleep) +"axw" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) "axx" = (/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/glass{name = "Fitness"},/turf/simulated/floor,/area/crew_quarters/fitness) "axy" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/fitness) "axz" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/crew_quarters/fitness) @@ -1259,10 +1259,10 @@ "ayk" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor,/area/crew_quarters/sleep) "ayl" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/glass{name = "Fitness"},/turf/simulated/floor,/area/crew_quarters/fitness) "aym" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/fitness) -"ayn" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/beach/water,/area/crew_quarters/fitness) -"ayo" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor/beach/water,/area/crew_quarters/fitness) -"ayp" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/beach/water,/area/crew_quarters/fitness) -"ayq" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/beach/water,/area/crew_quarters/fitness) +"ayn" = (/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/window/eastright{base_state = "left"; icon_state = "left"; name = "Fitness Ring"},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) +"ayo" = (/obj/structure/closet/lasertag/blue,/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness) +"ayp" = (/obj/structure/closet/lasertag/red,/turf/simulated/floor{icon_state = "neutral"; dir = 5},/area/crew_quarters/fitness) +"ayq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/closet/boxinggloves,/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness) "ayr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = "0"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/crew_quarters/fitness) "ays" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "green"; dir = 4},/area/crew_quarters/fitness) "ayt" = (/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/obj/machinery/door/airlock/glass{name = "Holodeck Door"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor,/area/crew_quarters/fitness) @@ -10251,6 +10251,7 @@ "dPg" = (/obj/machinery/mineral/stacking_machine,/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/production) "dPh" = (/obj/machinery/conveyor{tag = "icon-conveyor0 (SOUTHWEST)"; icon_state = "conveyor0"; dir = 10; id = "mining_internal"},/obj/machinery/mineral/input,/turf/simulated/floor{dir = 8; icon_state = "loadingarea"; tag = "loading"},/area/mine/production) "dPi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/insulated/hidden{tag = "icon-intact-f (SOUTHEAST)"; icon_state = "intact-f"; dir = 6},/turf/simulated/floor/plating,/area/maintenance/asmaint) +"dPj" = (/obj/machinery/camera{c_tag = "Fitness Room"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/closet/masks,/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters/fitness) "dPk" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint) "dPp" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/vent{tag = "icon-intact (NORTH)"; icon_state = "intact"; dir = 1},/turf/space,/area) "dPq" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/insulated/hidden,/turf/space,/area) @@ -10386,12 +10387,12 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaneaabaqhaqiaqiaqiaqiaqjaqkaqlaqmaqmaqmaqmaqnaabaneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEapaarUarVarVarVarWarXarYarVarVarZarZarZarZasaarZarZasbascasdaseapxanIapxasfapxapxaqEarRarcarcarcarcarcasgarOaqCarcarcarcarcashasiasjapxaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaneaabaqHaqHaqHaqHaqHaabaqdaabaqHaqHaqHaqHaqHaabaneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaangangangangangangangangangangangangangangangangangaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaskaslaskaaaaaaaaaaaaaaaaaaaaaaneaabaqIaqIaqIaqIaqIaabaqkaabaqIaqIaqIaqIaqIaabaneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaacaoEasmaqoarVasnasoaspasqasrassarVastasuasvaswasxasyaszasAaqQasBasCasDasEasFasFasFasFasFasGasFasFasFasHasFasIasJasKasLasMasNasNancasOasPapxaabasQasRasRasSasRasRasTaaaaaaaaaaaaaaaanfaaaaaaaaaaabaaaaaaaaaaqdaaaaaaaaaaabaaaaaaaaaanfaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaangangangaaaaaaangangangangangangangaaaaaaangangangaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasUasVasWaaaasXasYasZaaaaabataatbataaaaaaaaaaaaaaaaaaaaaaanfaaaaaaaaaaabaaaaaaaaaaqkaaaaaaaaaaabaaaaaaaaaanfaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaoEaoEaoEaoEatcatdateatfatgatgatgatharVauHatjatjatjasxatkatlatmatnatoapxatpatqatratratratratsatqatrattatratqatratrattatratuatvatwatwatxatyatzatzatzatAatBatBatBatBatBatAatzaaaaaaaaaaaaaneaabapyapyapyapyapyaabaqdaabapyapyapyapyapyaabaneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaangangangangangangangaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatCatDatEatDatCatFatGatFatCaabataatbataaaaaaaaaaaaaaaaaaaaaaaneaabapAapAapAapAapAaabaqkaabapAapAapAapAapAaabaneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaoEatHatIaoEatJarVatKatLatMatNatOatParVatQatjatRatRasxatjatlaqLaqQatSapxatTatUatVatWatXatYatZauaatYaubaucaudatYaueaufaugauhauiaujaukaulaumaunauoatzatAatBatBatBatBatBatAatzaabaaaaaaaaaanfaabaqaaqbaqbaqbaqbaqcaqdaqeaqfaqfaqfaqfaqgaabaneaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaangangangangangangangaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatCatDatEatDatCatFatGatFatCaabataatbataaaaaaaaaaaaaaaaaaaaaaaneaabapAapAapAapAapAaabaqkaabapAapAapAapAapAaabaneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaoEatHatIaoEatJarVatKatLatMatNatOatParVatQatjatRatRasxatjatlaqLaqQatSapxatTatUatVatWatXatYatZauaatYaubaucaudatYaueaufaugauhauiaujaukayqdPjayoaypatzatAatBatBatBatBatBatAatzaabaaaaaaaaaanfaabaqaaqbaqbaqbaqbaqcaqdaqeaqfaqfaqfaqfaqgaabaneaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaangangangangangangangaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaupatDauqatDaupatFauratFaupausautauuauvauwauwauxausausaabaaaaneaabaqhaqiaqiaqiaqiaqjaqkaqlaqmaqmaqmaqmaqnaabaneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaoEauyauzauAatJarVauBauCauDatOatOauEarVauFauGatiauIauJauKatlaqLaqQasBapxatTatUauLauMatXatYauNauOatYauPauQauRatYauSauQauTatzauUauVauWauXauYauZavaavbavcatBatBatBatBatBavdatzatzatzaaaaaaanfaaaaqHaqHaqHaqHaqHaabaqdaabaqHaqHaqHaqHaqHaaaanJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaangangangangangangangaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaupaveavfavgaupavhaviavjaupatbatbatbavkavlavmavnavoausaaaaaaanJaaaaqIaqIaqIaqIaqIaabaqkaabaqIaqIaqIaqIaqIaaaaneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaacaoEavpapaaoEavqarVavravsavtasqavuavvarVavwavxavyavyavzavAavBavCavDavEavFavGavHauLatWatXatYavIauOatYatYavJatYatYatYavKatYatzavLavMavNavOavPavQavRavSavTatBatBatBatBatBavUavVavWavXaaaaaaanfaaaaabaaaaabaabaaaaaaaqdaaaaaaaabaaaaaaaabaaaaneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaangangangangangaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaupavYavZawaaupavYavZawaaupawbawcawdawdawdawdaweawfaskaaaaaaaneaaaaabaaaaabaabaaaaaaawgaaaaaaaabaaaaaaaabaaaaneaabaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaacaoEaoEaoEaoEavqarVawhawiawiawjawiawkawiawlawmawmawmawmawnawoawpaqQawqapxawratqawsatWawtawuavIawvawwawxawyawyawzawAawyawBawCawDavMawEawFawGawHawIawJawKatBatBatBatBatBawKawLawMawNaaaaaaanfanfaneaaaaaaaabaaaaaaaqdaaaaabaabaabaabaneaneaneaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaatCaupawOawPatCaupawOawPatCausawQausausausausausawRataaaaaaaaneaneaneaaaaaaaabaaaawSawTawSaabaabaabaabaneaneaneaabaoEaoEaoEaoEawUawVawVawVawVawVawVawVawWaoEaoEawXawYawZaoEaxaapaaxbaxcaxdaxeaxeaxeaxeaxeaxfaxeaxgaxhaxiaxiaxjaxjaxkaxlaxmaxnartaxoaxpaxqaxraxsatYavIaxtaxtaxuaxvaxvaxwaxuaxtaxtaxxaxyaxzawEawFawGawHawIaxAaxBatBatBatBatBatBaxBaxCawMawNaaaaaaaaaaaaaabaabaaaaabaaaaaaaxDaaaaaaaabaaaaaaaabaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxEaxFaxFaxFaxGaxFaxFaxFaxHaxIaxJaxHaxHaxHaxKausaxLataaaaaabaabaaaaaaaaaaaaaabaaaaxMaxNaxMaabaaaaabaaaaaaaaaaaaaaaaoEapaapaaxOapaapaapaapaapaapaapaapaaxPaxQaxRaxSaxSaxSaxSaxSaxSaxTaxUaxVaxWaxWaxWaxWaxXaxYaxWaxZayaaxXaxWaxWaxWaxWaybaycaydayeayfavHatYatYatYatYauNaygaxtaxuaxvayhaxvayiayjaykaylaymauVaynayoaypayqayraysaytatBatBatBatBatBayuayvaywayxaaaaaaaaaaaaaaaaabaaaaabaaaayyayzayyaaaaabaaaaaaaabaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaupaveavfavgaupavhaviavjaupatbatbatbavkavlavmavnavoausaaaaaaanJaaaaqIaqIaqIaqIaqIaabaqkaabaqIaqIaqIaqIaqIaaaaneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaacaoEavpapaaoEavqarVavravsavtasqavuavvarVavwavxavyavyavzavAavBavCavDavEavFavGavHauLatWatXatYavIauOatYatYavJatYatYatYavKatYatzavLavMaulauoavNaumaunavSavTatBatBatBatBatBavUavVavWavXaaaaaaanfaaaaabaaaaabaabaaaaaaaqdaaaaaaaabaaaaaaaabaaaaneaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaangangangangangaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaupavYavZawaaupavYavZawaaupawbawcawdawdawdawdaweawfaskaaaaaaaneaaaaabaaaaabaabaaaaaaawgaaaaaaaabaaaaaaaabaaaaneaabaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaabaacaoEaoEaoEaoEavqarVawhawiawiawjawiawkawiawlawmawmawmawmawnawoawpaqQawqapxawratqawsatWawtawuavIawvawwawxawyawyawzawAawyawBawCawDavMavOavPavQavRawIawJawKatBatBatBatBatBawKawLawMawNaaaaaaanfanfaneaaaaaaaabaaaaaaaqdaaaaabaabaabaabaneaneaneaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaatCaupawOawPatCaupawOawPatCausawQausausausausausawRataaaaaaaaneaneaneaaaaaaaabaaaawSawTawSaabaabaabaabaneaneaneaabaoEaoEaoEaoEawUawVawVawVawVawVawVawVawWaoEaoEawXawYawZaoEaxaapaaxbaxcaxdaxeaxeaxeaxeaxeaxfaxeaxgaxhaxiaxiaxjaxjaxkaxlaxmaxnartaxoaxpaxqaxraxsatYavIaxtaxtaxuawFaxvaxvaxuaxtaxtaxxaxyaxzavOawEavQavRawIaxAaxBatBatBatBatBatBaxBaxCawMawNaaaaaaaaaaaaaabaabaaaaabaaaaaaaxDaaaaaaaabaaaaaaaabaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxEaxFaxFaxFaxGaxFaxFaxFaxHaxIaxJaxHaxHaxHaxKausaxLataaaaaabaabaaaaaaaaaaaaaabaaaaxMaxNaxMaabaaaaabaaaaaaaaaaaaaaaaoEapaapaaxOapaapaapaapaapaapaapaapaaxPaxQaxRaxSaxSaxSaxSaxSaxSaxTaxUaxVaxWaxWaxWaxWaxXaxYaxWaxZayaaxXaxWaxWaxWaxWaybaycaydayeayfavHatYatYatYatYauNaygaxtaxuaxvayhaxvayiayjaykaylaymauVawGawHaxwaynayraysaytatBatBatBatBatBayuayvaywayxaaaaaaaaaaaaaaaaabaaaaabaaaayyayzayyaaaaabaaaaaaaabaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayAayBayCayDayEayCayCayFayDayCayGayHayIayIayJausaxLautaabaabaaaaaaaaaaaaaaaaabayKayLayMayNayOaaaaabaaaaaaaaaaaaaaaaoEapaaoEayPayQayRayRayRayRayRayRayRaySayPayTayUayUayUayUayUayUayUayVayWaxWayXayYayZazaazbazcazdazeazfazgayYazhaxWaziaqQazjapxazkatUatVatWatXatYavIazlazmaykaykaznazoazpazqazrawCazsaztazuazvazwazxazyazzazAatBatBatBatBatBazBatzatzatzaaaaaaaaaaaaaabaabaabaabaaaazCazDazCaaaaabaaaaaaaabaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaabaupaxEazEaxEazFayCayCazGaxEazEaxEazHayBayEazIausaxLausausazJauwauwauwauwauxausazKazLazMazNazKaoEaoEawXawYawZaoEaoEaoEapaasmayPaaaaabaaaaabaaaaabaaaaabaaaayPayTayUazOazPazQazRazSayUayVapaaxWazTazTazUazVazWazXazYazZaAaaAbaAcaAcaxWaziaqQaAdapxazkatUauLatWatXatYauNaAeaAfaAgaAhaAiaAjaAkaAkaAlaAkatzaAmaAnaAoaApaAqaAratzaAsatBatBatBatBatBaAsatzaabaaaaaaaaaaaaaaaaabaabaaaaabaAtaAuaAvaAwaAxaabaaaaaaaabaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaAyatCaAzavZaAAaABaACaADaAEaAAavZaAFaAGatCaAHaAIausaAJaAKaAKaAKaAKaAKaAKawfaALaAMazKaANaAOaAPazKaAQapaapaapaapaapaapaapaapaaARayPaabaASaASaASaASaASaASaASaabayPayTayUaATaAUaAVaAWaATayUayVaAXaxWaxWaxWaxWaAYaAZayYaBaaAZaBbaxWaxWaxWaxWaziaqQaBcapxazkatUauLatWatXatYavIaBdaAkaAkaAkaAkaAkaAkaBeaBfaBgaAkatzatzatzatzaBhatzatzaAsatBatBatBatBatBaAsatzaaaaaaaaaaaaaagaaaaaaaaaaaaaabaBiaBjaBkaBlaBiaabaaaaaaaabaaaaaaaaaaaaaaaaaaaabaabaaaaaaaaaaaaaabaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa