From d09ad0f1446ac1bf195e96483898e6c4b320a997 Mon Sep 17 00:00:00 2001 From: bob <49925269+BOBAMAx@users.noreply.github.com> Date: Sun, 3 Nov 2024 22:09:51 -0600 Subject: [PATCH] deck --- code/game/area/shiva.dm | 5 - .../Ice_Colony_v3/Shivas_Snowball.dmm | 560 +++++++++--------- 2 files changed, 269 insertions(+), 296 deletions(-) diff --git a/code/game/area/shiva.dm b/code/game/area/shiva.dm index 1842ec8b5264..2586927705b0 100644 --- a/code/game/area/shiva.dm +++ b/code/game/area/shiva.dm @@ -236,11 +236,6 @@ icon_state = "res0" unoviable_timer = FALSE -/area/shiva/interior/colony/deck - name = "Shiva's Snowball - Colony MegaStruct(TM) Open Deck" - icon_state = "res1" - ceiling = CEILING_GLASS - /area/shiva/interior/aerodrome name = "Shiva's Snowball - Aerodrome" icon_state = "hangars0" diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index 25acafacef86..5d1f4b9ccc7b 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -5663,7 +5663,7 @@ dir = 8 }, /turf/open/floor/shiva/multi_tiles/east, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "bbG" = ( /obj/structure/ice/thin/indestructible{ dir = 4; @@ -5826,16 +5826,6 @@ "biM" = ( /turf/open/floor/carpet, /area/shiva/interior/colony/research_hab) -"bjb" = ( -/obj/structure/prop/ice_colony/dense/planter_box{ - dir = 5 - }, -/obj/structure/flora/bush/snow{ - icon_state = "snowbush_2"; - pixel_y = 10 - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/colony/deck) "bjv" = ( /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/cp_colony_grounds) @@ -5947,9 +5937,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/asphalt/cement, /area/shiva/interior/warehouse) -"bsp" = ( -/turf/open/floor/shiva/bluefull, -/area/shiva/interior/colony/deck) "bsw" = ( /obj/effect/landmark/corpsespawner/bridgeofficer, /turf/open/auto_turf/snow/layer0, @@ -6609,6 +6596,15 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) +"cgN" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/shiva/catwalk{ + dir = 8 + }, +/turf/open/floor/plating, +/area/shiva/interior/colony/central) "cgQ" = ( /obj/item/device/taperecorder, /obj/item/clothing/glasses/sunglasses, @@ -6824,6 +6820,13 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/shiva/radiator_tile2, /area/shiva/interior/colony/medseceng) +"cwG" = ( +/obj/structure/barricade/handrail/strata{ + dir = 8 + }, +/obj/structure/barricade/handrail/strata, +/turf/open/floor/shiva/north, +/area/shiva/interior/colony/central) "cwU" = ( /obj/effect/decal/warning_stripes{ icon_state = "W-corner" @@ -7032,9 +7035,6 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) -"cKb" = ( -/turf/closed/wall/shiva/prefabricated/reinforced, -/area/shiva/interior/colony/deck) "cKB" = ( /obj/structure/machinery/light/double, /turf/open/floor/shiva/yellowfull/west, @@ -7870,10 +7870,7 @@ dir = 8 }, /turf/open/floor/strata/floor3/east, -/area/shiva/interior/colony/deck) -"dOf" = ( -/turf/open/floor/shiva/yellowcorners/east, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "dOn" = ( /obj/structure/platform/strata{ dir = 1 @@ -10778,10 +10775,6 @@ }, /turf/open/floor/shiva/multi_tiles, /area/shiva/interior/colony/research_hab) -"hzh" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) "hzJ" = ( /turf/closed/wall/shiva/prefabricated/reinforced, /area/shiva/exterior/lz1_valley) @@ -10911,7 +10904,7 @@ dir = 4 }, /turf/open/floor/plating, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "hEx" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 12; @@ -11204,9 +11197,6 @@ }, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) -"hWh" = ( -/turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) "hWK" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 1 @@ -11300,13 +11290,6 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) -"icC" = ( -/obj/structure/machinery/light/double{ - dir = 8; - pixel_y = -5 - }, -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) "idR" = ( /obj/structure/platform_decoration/strata{ dir = 1 @@ -11375,9 +11358,6 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/plating, /area/shiva/interior/caves/research_caves) -"igN" = ( -/turf/open/floor/shiva/yellow/east, -/area/shiva/interior/colony/deck) "ihh" = ( /obj/structure/surface/table, /obj/item/clipboard, @@ -11721,7 +11701,7 @@ "ixX" = ( /obj/structure/closet/toolcloset, /turf/open/floor/shiva/yellow/southwest, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "iyk" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/sliceable/cheesecake{ @@ -11924,10 +11904,6 @@ }, /turf/open/floor/shiva/radiator_tile, /area/shiva/exterior/lz2_fortress) -"iLS" = ( -/obj/item/stack/cable_coil/cut, -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) "iMb" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/valley) @@ -12054,7 +12030,7 @@ pixel_y = 7 }, /turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "iWu" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/souto{ pixel_y = 26 @@ -12357,9 +12333,6 @@ /obj/structure/platform_decoration/strata, /turf/open/auto_turf/ice/layer0, /area/shiva/interior/caves/s_lz2) -"joP" = ( -/turf/open/floor/shiva/yellowfull/west, -/area/shiva/interior/colony/deck) "jph" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -12847,9 +12820,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/caves/cp_camp) -"jVp" = ( -/turf/open/floor/shiva/yellow/west, -/area/shiva/interior/colony/deck) "jVx" = ( /obj/structure/girder/reinforced, /turf/open/floor/plating, @@ -13106,7 +13076,7 @@ }, /obj/structure/barricade/handrail/strata, /turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "kjt" = ( /obj/structure/surface/table, /turf/open/floor/shiva/north, @@ -13261,7 +13231,7 @@ /area/shiva/interior/bar) "kuM" = ( /turf/open/floor/shiva/yellow/northwest, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "kuS" = ( /obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, @@ -13779,7 +13749,7 @@ "kTZ" = ( /obj/item/tool/wirecutters, /turf/open/floor/plating, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "kVd" = ( /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) @@ -14015,9 +13985,6 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) -"ljM" = ( -/turf/open/floor/shiva/yellow/northeast, -/area/shiva/interior/colony/deck) "ljS" = ( /obj/structure/surface/table, /obj/item/tool/wrench, @@ -14482,7 +14449,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications, /turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "lNg" = ( /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/lz1_valley) @@ -14918,9 +14885,6 @@ }, /turf/open/floor/plating, /area/shiva/exterior/lz2_fortress) -"mms" = ( -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) "mnD" = ( /turf/open/floor/shiva/radiator_tile2, /area/shiva/exterior/lz2_fortress) @@ -15065,7 +15029,7 @@ "mxS" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/shiva/yellow/west, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "myR" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8 @@ -15430,7 +15394,7 @@ pixel_y = 9 }, /turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "mQL" = ( /turf/open/floor/darkgreen2/northwest, /area/shiva/interior/colony/botany) @@ -17202,7 +17166,7 @@ dir = 8 }, /turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "pfj" = ( /obj/structure/stairs/perspective/ice{ dir = 8; @@ -17640,7 +17604,7 @@ /area/shiva/interior/colony/s_admin) "pEs" = ( /turf/open/floor/shiva/multi_tiles/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "pEv" = ( /obj/structure/surface/table, /obj/structure/machinery/computer/emails{ @@ -17829,13 +17793,6 @@ /obj/structure/surface/rack, /turf/open/floor/plating, /area/shiva/interior/caves/research_caves) -"pMs" = ( -/obj/structure/machinery/light/double{ - dir = 8; - pixel_y = -5 - }, -/turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) "pME" = ( /obj/item/ammo_magazine/revolver/cmb, /turf/open/floor/shiva/floor3, @@ -18213,7 +18170,7 @@ pixel_y = 9 }, /turf/open/floor/shiva/multi_tiles/east, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "qkt" = ( /obj/item/stack/cable_coil/cut, /turf/open/floor/plating/plating_catwalk/shiva, @@ -18680,9 +18637,6 @@ }, /turf/open/floor/carpet, /area/shiva/interior/colony/research_hab) -"qOD" = ( -/turf/open/floor/shiva/yellow/north, -/area/shiva/interior/colony/deck) "qOE" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/rad, @@ -19223,7 +19177,7 @@ "rAF" = ( /obj/structure/barricade/handrail/strata, /turf/open/floor/shiva/multi_tiles/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "rAH" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_s_research) @@ -19257,9 +19211,6 @@ /obj/item/tool/wirecutters, /turf/open/auto_turf/snow/layer1, /area/shiva/interior/colony/central) -"rDn" = ( -/turf/open/floor/shiva/yellowcorners/west, -/area/shiva/interior/colony/deck) "rEd" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassgb_2" @@ -19846,7 +19797,7 @@ /obj/item/wrapping_paper, /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "srJ" = ( /obj/structure/stairs/perspective/ice{ dir = 4; @@ -19932,7 +19883,7 @@ "sxS" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/shiva/yellow/east, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "sxT" = ( /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/snow/layer0, @@ -20207,7 +20158,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/plating, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "sNk" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out" @@ -20323,7 +20274,7 @@ }, /obj/item/tool/pen/blue, /turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "sXt" = ( /obj/structure/machinery/light/double, /turf/open/asphalt/cement, @@ -20595,6 +20546,12 @@ "tnu" = ( /turf/closed/wall/shiva/prefabricated, /area/shiva/interior/bar) +"tnw" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/plating, +/area/shiva/interior/colony/central) "tnz" = ( /obj/effect/decal/cleanable/blood, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, @@ -20805,7 +20762,7 @@ /area/shiva/interior/aux_power) "tzH" = ( /turf/open/floor/shiva/multi_tiles/east, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "tAc" = ( /obj/structure/flora/bush/ausbushes/lavendergrass{ icon_state = "lavendergrass_4" @@ -21971,6 +21928,16 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/fortbiceps) +"uKm" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/shiva/catwalk{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shiva/interior/colony/central) "uKo" = ( /obj/structure/surface/table, /obj/item/ashtray/plastic, @@ -22100,7 +22067,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "uQA" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -22484,6 +22451,20 @@ }, /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/exterior/lz2_fortress) +"vph" = ( +/obj/structure/barricade/handrail/strata{ + dir = 8 + }, +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/obj/structure/barricade/handrail/strata, +/obj/structure/machinery/colony_floodlight{ + layer = 2.9; + pixel_y = 7 + }, +/turf/open/floor/shiva/north, +/area/shiva/interior/colony/central) "vpD" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/telecomm/lz1_north) @@ -22781,7 +22762,7 @@ "vJh" = ( /obj/structure/barricade/handrail/strata, /turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "vJu" = ( /turf/closed/wall/shiva/prefabricated/blue, /area/shiva/exterior/valley) @@ -23468,7 +23449,7 @@ "wMC" = ( /obj/structure/closet/toolcloset, /turf/open/floor/shiva/yellow/west, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "wMR" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -23769,9 +23750,6 @@ /obj/structure/prop/invuln/ice_prefab, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/caves/cp_camp) -"xjg" = ( -/turf/open/floor/shiva/yellow, -/area/shiva/interior/colony/deck) "xkf" = ( /obj/structure/machinery/light/double{ dir = 4; @@ -24145,7 +24123,7 @@ "xMH" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "xMQ" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/shiva/floor3, @@ -44093,10 +44071,10 @@ djn tfd aeA axz -pMs -bsp -bsp -icC +prU +jqY +jqY +cZb wag wag lJx @@ -44255,9 +44233,9 @@ axz hwJ axz aaY -hWh -bsp -bsp +ndR +jqY +jqY rAF oWG gzc @@ -44417,9 +44395,9 @@ axz ndR iwn axz -hWh -bsp -bsp +ndR +jqY +jqY rAF oWG stT @@ -44579,9 +44557,9 @@ vBg ndR iRh axz -hWh -bsp -bsp +ndR +jqY +jqY rAF eOM eOM @@ -44742,8 +44720,8 @@ ndR lHX axz xMH -bsp -bsp +jqY +jqY rAF eOM sYu @@ -44903,9 +44881,9 @@ vBg ndR fJw axz -hWh -bsp -bsp +ndR +jqY +jqY rAF eOM eOM @@ -45066,8 +45044,8 @@ ndR fKT axz mQs -bsp -bsp +jqY +jqY rAF eOM mtU @@ -45227,9 +45205,9 @@ vBg ndR ndR ord -bsp -bsp -bsp +jqY +jqY +jqY rAF eOM sYu @@ -45390,8 +45368,8 @@ ndR fcq axz mQs -bsp -bsp +jqY +jqY rAF eOM eOM @@ -45552,13 +45530,13 @@ ndR gcF axz sqy -bsp -bsp -mms +jqY +jqY +qrz bbw bbw bbw -kiS +cwG eOM sYu sYu @@ -45714,12 +45692,12 @@ ndR sII axz lNf -bsp -bsp -bsp -bsp -bsp -bsp +jqY +jqY +jqY +jqY +jqY +jqY rAF eOM sYu @@ -45877,11 +45855,11 @@ axz aaY sXr dMy -hWh -hWh -hWh -hWh -bsp +ndR +ndR +ndR +ndR +jqY rAF eOM sYu @@ -46042,8 +46020,8 @@ axz axz axz aaY -hWh -bsp +ndR +jqY rAF eOM sYu @@ -46204,8 +46182,8 @@ muN ivl ixo axz -hWh -bsp +ndR +jqY rAF sYu eOM @@ -46366,8 +46344,8 @@ kvB djn wFq axz -hWh -bsp +ndR +jqY rAF nOi rnB @@ -46528,10 +46506,10 @@ tfd djn djn gFe -bsp -bsp -mms -iWg +jqY +jqY +qrz +vph tDr sYu sYu @@ -46690,10 +46668,10 @@ jsn tfd hin axz -hWh -bsp +ndR +jqY pEs -uQy +cgN gkG sYu sYu @@ -46853,9 +46831,9 @@ axz axz aaY mQs -bsp +jqY pEs -sNi +tnw sYu sYu sYu @@ -47014,10 +46992,10 @@ muN ivl ixo axz -hWh -bsp +ndR +jqY pEs -sNi +tnw sYu sYu sYu @@ -47176,10 +47154,10 @@ kvB djn wFq axz -hWh -bsp +ndR +jqY pEs -hEa +uKm rnB sYu sYu @@ -47338,10 +47316,10 @@ tfd djn djn gFe -bsp -bsp -mms -iWg +jqY +jqY +qrz +vph tDr lwo sYu @@ -47500,8 +47478,8 @@ euZ tfd hin axz -hWh -bsp +ndR +jqY rAF gCW gkG @@ -47662,8 +47640,8 @@ axz axz axz aaY -hWh -bsp +ndR +jqY rAF sYu arX @@ -47822,10 +47800,10 @@ qrz ibN axz mQs -hWh -hWh -hWh -bsp +ndR +ndR +ndR +jqY rAF arX arX @@ -47983,11 +47961,11 @@ jqY jqY jqY czH -bsp -bsp -bsp -bsp -bsp +jqY +jqY +jqY +jqY +jqY rAF arX eOM @@ -48145,11 +48123,11 @@ jqY jqY jqY qrz -bsp -bsp -bsp -bsp -bsp +jqY +jqY +jqY +jqY +jqY rAF adZ adZ @@ -48469,12 +48447,12 @@ acT aht acT aDn -cKb -cKb -cKb -cKb -cKb -cKb +aaY +aaY +aaY +aaY +aaY +aaY hDs iXS sLs @@ -48913,7 +48891,7 @@ bJj bJj bJj bJj -sax +jrg puZ puZ puZ @@ -49075,9 +49053,9 @@ bJj bJj gpz bJj -sax -sax -sax +jrg +jrg +jrg puZ puZ puZ @@ -49237,9 +49215,9 @@ jrg ean jMB lsR -sax -sax -sax +jrg +jrg +jrg puZ puZ puZ @@ -49399,9 +49377,9 @@ jrg bJj bJj bJj -sax -sax -sax +jrg +jrg +jrg puZ puZ puZ @@ -49561,9 +49539,9 @@ bJj bJj dIE osE -sax -sax -sax +jrg +jrg +jrg puZ puZ puZ @@ -49723,10 +49701,10 @@ bJj bJj gpz osE -sax -sax -sax -sax +jrg +jrg +jrg +jrg puZ puZ puZ @@ -49885,10 +49863,10 @@ bJj bJj gpz osE -sax -sax -sax -sax +jrg +jrg +jrg +jrg puZ puZ puZ @@ -50047,10 +50025,10 @@ bJj bJj bJj amu -sax -sax -sax -sax +jrg +jrg +jrg +jrg puZ puZ puZ @@ -50209,9 +50187,9 @@ efO osE bJj amu -sax -sax -sax +jrg +jrg +jrg puZ puZ puZ @@ -52639,7 +52617,7 @@ fXX osE fXX amu -sax +jrg puZ puZ puZ @@ -52801,9 +52779,9 @@ gpz bJj osE amu -sax -sax -sax +jrg +jrg +jrg puZ puZ puZ @@ -52963,9 +52941,9 @@ rbq rbq rbq amu -sax -sax -sax +jrg +jrg +jrg puZ puZ puZ @@ -53125,7 +53103,7 @@ rbq rbq rbq amu -sax +jrg puZ puZ puZ @@ -53287,7 +53265,7 @@ fXX fXX bJj amu -sax +jrg puZ puZ puZ @@ -53449,7 +53427,7 @@ fXX bJj fXX amu -sax +jrg puZ puZ puZ @@ -53611,7 +53589,7 @@ bJj fXX fXX iTQ -sax +jrg puZ puZ puZ @@ -53773,8 +53751,8 @@ gpz fXX jrg iTQ -sax -sax +jrg +jrg puZ puZ puZ @@ -53935,8 +53913,8 @@ gpz bJj jrg jrg -sax -sax +jrg +jrg puZ puZ puZ @@ -54097,7 +54075,7 @@ gpz efO jrg jrg -sax +jrg puZ puZ puZ @@ -54259,7 +54237,7 @@ gpz bJj bJj jrg -sax +jrg puZ puZ puZ @@ -54950,8 +54928,8 @@ acT acT acT kuM -jVp -jVp +cYa +cYa wMC ixX aDn @@ -55111,11 +55089,11 @@ jVI kQF kzE acT -qOD +umm kTZ -iLS -mms -xjg +tCi +agh +uXQ aek vBl itG @@ -55273,11 +55251,11 @@ qbh ovc fMO pji -qOD -iLS -mms -mms -xjg +umm +tCi +agh +agh +uXQ aek iJY ylZ @@ -55435,11 +55413,11 @@ mLT ovc ovc aVQ -qOD -mms -hzh -mms -xjg +umm +agh +aff +agh +uXQ nMZ ivy wFa @@ -55597,11 +55575,11 @@ hDw ovc fMO pcC -qOD -mms -mms -mms -xjg +umm +agh +agh +agh +uXQ aek vey txA @@ -55759,11 +55737,11 @@ aoK jbr ovc acT -qOD -mms -mms -mms -xjg +umm +agh +agh +agh +uXQ aDn uYg aDn @@ -55921,15 +55899,15 @@ aoK ovc ovc gQR -ljM -dOf -mms -mms -rDn +vKx +mfr +agh +agh +lXj mxS -joP -mms -mms +osh +agh +agh pfg pfg kiS @@ -56083,18 +56061,18 @@ bVz pkp fuj acT -bjb -ljM -igN -igN -igN +kzE +vKx +cBe +cBe +cBe sxS -joP -mms -mms -mms -mms -mms +osh +agh +agh +agh +agh +agh iWg tDr sYu @@ -56252,11 +56230,11 @@ jQy acT acT acT -mms -mms -mms -mms -mms +agh +agh +agh +agh +agh uQy gkG sYu @@ -56414,11 +56392,11 @@ apv qCa qEC acT -mms -mms -hzh -mms -mms +agh +agh +aff +agh +agh sNi sYu sYu @@ -56576,11 +56554,11 @@ amP amP amU knC -mms -mms -mms -mms -mms +agh +agh +agh +agh +agh hEa rnB sYu @@ -56738,11 +56716,11 @@ kkw amP amU ajO -mms -mms -mms -mms -mms +agh +agh +agh +agh +agh iWg tDr sYu