From 199fffc2d017cef2ba69cefd64e4b425888aecdf Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 28 Nov 2019 14:22:56 -0500 Subject: [PATCH] Refactors translocators a bit more --- .../objects/items/devices/translocator_vr.dm | 117 +-- .../crates_lockers/closets/secure/personal.dm | 4 + maps/submaps/shelters/shelter_a.dmm | 2 +- maps/tether/tether-10-colony.dmm | 807 +++++++++++------- 4 files changed, 532 insertions(+), 398 deletions(-) diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm index a6b4b2583e..71f788f888 100644 --- a/code/game/objects/items/devices/translocator_vr.dm +++ b/code/game/objects/items/devices/translocator_vr.dm @@ -12,6 +12,9 @@ var/charge_cost = 800 // cell/device/weapon has 2400 var/battery_lock = 0 //If set, weapon cannot switch batteries + var/longrange = 0 //Can teleport very long distances + var/abductor = 0 //Can be used on teleportation blocking turfs + var/list/beacons = list() var/ready = 1 var/beacons_left = 3 @@ -181,13 +184,15 @@ if(!uT || !dT) return FALSE - if( (uT.z != dT.z) && (!(dT.z in dat["z_level_detection"])) ) - to_chat(user,"\The [src] can't teleport you that far!") - return FALSE + if(!longrange) + if( (uT.z != dT.z) && (!(dT.z in dat["z_level_detection"])) ) + to_chat(user,"\The [src] can't teleport you that far!") + return FALSE - if(uT.block_tele || dT.block_tele) - to_chat(user,"Something is interfering with \the [src]!") - return FALSE + if(!abductor) + if(uT.block_tele || dT.block_tele) + to_chat(user,"Something is interfering with \the [src]!") + return FALSE //Seems okay to me! return TRUE @@ -372,45 +377,15 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac charge_cost = 400 beacons_left = 6 failure_chance = 0 //Percent - -/obj/item/device/perfect_tele/alien/teleport_checks(mob/living/target,mob/living/user) - //Uhhuh, need that power source - if(!power_source) - to_chat(user,"\The [src] has no power source!") - return FALSE - - //Check for charge - if((!power_source.check_charge(charge_cost)) && (!power_source.fully_charged())) - to_chat(user,"\The [src] does not have enough power left!") - return FALSE - - //Only mob/living need apply. - if(!istype(user) || !istype(target)) - return FALSE - - //No, you can't teleport buckled people. - if(target.buckled) - to_chat(user,"The target appears to be attached to something...") - return FALSE - - //No, you can't teleport if it's not ready yet. - if(!ready) - to_chat(user,"\The [src] is still recharging!") - return FALSE - - //No, you can't teleport if there's no destination. - if(!destination) - to_chat(user,"\The [src] doesn't have a current valid destination set!") - return FALSE - - //Seems okay to me! - return TRUE + longrange = 1 + abductor = 1 /obj/item/device/perfect_tele/frontier icon_state = "minitrans" beacons_left = 1 //Just one battery_lock = 1 unacidable = 1 + failure_chance = 0 //Percent var/loc_network = null var/phase_power = 75 var/recharging = 0 @@ -443,6 +418,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac name = "centcom translocator" desc = "Similar to translocator technology, however, most of its destinations are hardcoded." loc_network = "centcom" + longrange = 1 /obj/item/device/perfect_tele/frontier/staff/New() ..() @@ -450,50 +426,23 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac if(nb.tele_network == loc_network) beacons[nb.tele_name] = nb -/obj/item/device/perfect_tele/frontier/staff/teleport_checks(mob/living/target,mob/living/user) - //Uhhuh, need that power source - if(!power_source) - to_chat(user,"\The [src] has no power source!") - return FALSE +/obj/item/device/perfect_tele/frontier/unknown + name = "modified translocator" + desc = "This crank-charged translocator has only one beacon, but it already has a destination preprogrammed into it." + longrange = 1 + abductor = 1 - //Check for charge - if((!power_source.check_charge(charge_cost)) && (!power_source.fully_charged())) - to_chat(user,"\The [src] does not have enough power left!") - return FALSE +/obj/item/device/perfect_tele/frontier/unknown/New() + ..() + for(var/obj/item/device/perfect_tele_beacon/stationary/nb in premade_tele_beacons) + if(nb.tele_network == loc_network) + beacons[nb.tele_name] = nb - //Only mob/living need apply. - if(!istype(user) || !istype(target)) - return FALSE - - //No, you can't teleport buckled people. - if(target.buckled) - to_chat(user,"The target appears to be attached to something...") - return FALSE - - //No, you can't teleport if it's not ready yet. - if(!ready) - to_chat(user,"\The [src] is still recharging!") - return FALSE - - //No, you can't teleport if there's no destination. - if(!destination) - to_chat(user,"\The [src] doesn't have a current valid destination set!") - return FALSE - - //No, you can't teleport if there's a jammer. - if(is_jammed(src) || is_jammed(destination)) - to_chat(user,"\The [src] refuses to teleport you, due to strong interference!") - return FALSE - - //Can port to and from away areas (required for this to work) but teleporter blockers block it - var/turf/uT = get_turf(user) - var/turf/dT = get_turf(destination) - if(!uT || !dT) - return FALSE - - if(uT.block_tele || dT.block_tele) - to_chat(user,"Something is interfering with \the [src]!") - return FALSE - - //Seems okay to me! - return TRUE +/obj/item/device/perfect_tele/frontier/unknown/one + loc_network = "unkone" +/obj/item/device/perfect_tele/frontier/unknown/two + loc_network = "unktwo" +/obj/item/device/perfect_tele/frontier/unknown/three + loc_network = "unkthree" +/obj/item/device/perfect_tele/frontier/unknown/four + loc_network = "unkfour" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 454fab779d..d5f5da1c40 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -4,14 +4,18 @@ req_access = list(access_all_personal_lockers) var/registered_name = null + /* //VOREStation Removal starts_with = list( /obj/item/device/radio/headset) + */ /obj/structure/closet/secure_closet/personal/Initialize() + /* //VOREStation Removal if(prob(50)) starts_with += /obj/item/weapon/storage/backpack else starts_with += /obj/item/weapon/storage/backpack/satchel/norm + */ return ..() /obj/structure/closet/secure_closet/personal/patient diff --git a/maps/submaps/shelters/shelter_a.dmm b/maps/submaps/shelters/shelter_a.dmm index c631e60891..6211a4937d 100644 --- a/maps/submaps/shelters/shelter_a.dmm +++ b/maps/submaps/shelters/shelter_a.dmm @@ -73,7 +73,7 @@ /obj/item/weapon/storage/box/survival/space, /obj/item/weapon/extinguisher/mini, /obj/item/device/radio{ - icon_state = "walkietalkieOLD"; + icon_state = "walkietalkiebay"; name = "emergency radio" }, /obj/item/weapon/towel{ diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index b89733b846..bd20d761db 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -6682,6 +6682,10 @@ "mQ" = ( /turf/unsimulated/wall, /area/centcom/evac) +"mR" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "mS" = ( /obj/machinery/shower{ dir = 4; @@ -16214,6 +16218,9 @@ /obj/machinery/reagentgrinder, /turf/simulated/floor/tiled/white, /area/houseboat) +"DL" = ( +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "DP" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, @@ -16236,6 +16243,10 @@ /obj/item/rig_module/device/orescanner, /turf/simulated/floor/tiled/techmaint, /area/houseboat) +"DU" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "DV" = ( /obj/machinery/computer/message_monitor{ dir = 4 @@ -16273,6 +16284,11 @@ /obj/machinery/transhuman/resleever, /turf/simulated/floor/tiled/white, /area/houseboat) +"Es" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/houseboat) "Ev" = ( /obj/effect/floor_decal/derelict/d5, /turf/unsimulated/floor/steel, @@ -16337,6 +16353,10 @@ icon_state = "dark" }, /area/centcom/specops) +"EN" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "EQ" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -16649,6 +16669,9 @@ /obj/machinery/microwave, /turf/simulated/floor/tiled/white, /area/houseboat) +"Hq" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/houseboat) "Ht" = ( /obj/effect/floor_decal/derelict/d13, /turf/unsimulated/floor/steel, @@ -16910,7 +16933,10 @@ /turf/simulated/floor/tiled/techmaint, /area/houseboat) "Jk" = ( -/obj/machinery/computer/gyrotron_control, +/obj/structure/prop/alien/computer{ + icon_state = "console-c"; + dir = 1 + }, /turf/simulated/floor/tiled/steel_grid, /area/houseboat) "Jm" = ( @@ -16980,6 +17006,13 @@ icon_state = "dark" }, /area/centcom/specops) +"JF" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unkfour" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "JM" = ( /obj/structure/window/reinforced{ dir = 8 @@ -17032,6 +17065,10 @@ icon_state = "steel" }, /area/centcom/command) +"JY" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "Ka" = ( /obj/machinery/vending/nifsoft_shop{ categories = 111; @@ -17365,6 +17402,12 @@ icon_state = "dark" }, /area/centcom/control) +"LX" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "Mc" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -17396,6 +17439,9 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/houseboat) +"Mg" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "Mh" = ( /obj/machinery/vending/food/arojoan{ density = 0; @@ -17404,6 +17450,11 @@ }, /turf/simulated/floor/carpet/blue, /area/houseboat) +"Mi" = ( +/obj/structure/bed/double, +/obj/item/weapon/bedsheet/rddouble, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "Ml" = ( /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/wood, @@ -17535,6 +17586,10 @@ /obj/item/clothing/mask/breath, /turf/simulated/floor/tiled/techmaint, /area/houseboat) +"Nl" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "Nn" = ( /obj/structure/table/steel_reinforced, /obj/item/device/flashlight/lamp, @@ -17546,6 +17601,10 @@ }, /turf/simulated/floor/tiled/white, /area/houseboat) +"Nt" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "Nw" = ( /obj/machinery/vending/hydronutrients, /turf/simulated/floor/tiled/techmaint, @@ -17685,6 +17744,10 @@ icon_state = "dark" }, /area/centcom/specops) +"Ok" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "Ol" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/box/bodybags, @@ -17877,12 +17940,29 @@ /obj/item/weapon/storage/backpack/ert/engineer, /turf/simulated/floor/tiled/techmaint, /area/houseboat) +"Pt" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unktwo" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "Pu" = ( /obj/structure/table/steel_reinforced, /obj/item/device/retail_scanner/security, /obj/item/device/retail_scanner/security, /turf/simulated/floor/tiled/techmaint, /area/houseboat) +"Pw" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "Pz" = ( /obj/structure/closet/crate/secure/weapon, /obj/item/weapon/rig/ert/assetprotection, @@ -17948,6 +18028,13 @@ /turf/unsimulated/floor/shuttle_ceiling, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/specialops/centcom) +"Qe" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unkone" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "Qg" = ( /obj/machinery/power/fractal_reactor/fluff/converter, /obj/structure/cable/green{ @@ -17955,6 +18042,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/houseboat) +"Qk" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "Ql" = ( /obj/machinery/door/airlock/multi_tile/glass{ dir = 1 @@ -18223,6 +18314,12 @@ /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techmaint, /area/houseboat) +"RV" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "RY" = ( /obj/structure/reagent_dispensers/fueltank, /turf/unsimulated/floor{ @@ -18312,6 +18409,13 @@ /obj/machinery/vending/sovietsoda, /turf/simulated/floor/wood, /area/houseboat) +"SF" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unkthree" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "SG" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/accessory/badge/holo/cord, @@ -18442,6 +18546,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/houseboat) +"Ts" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "Tx" = ( /obj/machinery/autolathe{ desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; @@ -18611,6 +18719,10 @@ }, /turf/simulated/shuttle/plating, /area/houseboat) +"UJ" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "UK" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/paper_bin{ @@ -18654,6 +18766,24 @@ /obj/item/stack/telecrystal{ amount = 240 }, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/stack/telecrystal{ + amount = 240 + }, +/obj/item/weapon/card/mining_point_card{ + mine_points = 50000 + }, +/obj/item/weapon/card/mining_point_card{ + mine_points = 50000 + }, /obj/item/weapon/card/mining_point_card{ mine_points = 50000 }, @@ -18682,6 +18812,14 @@ name = "survey point card"; survey_points = 5000 }, +/obj/item/weapon/card/mining_point_card/survey{ + name = "survey point card"; + survey_points = 5000 + }, +/obj/item/weapon/card/mining_point_card/survey{ + name = "survey point card"; + survey_points = 5000 + }, /obj/item/device/survivalcapsule/military, /obj/item/device/survivalcapsule/military, /obj/item/weapon/storage/secure/briefcase/money{ @@ -18880,6 +19018,10 @@ /obj/item/weapon/rig/ert, /turf/simulated/floor/tiled/techmaint, /area/houseboat) +"Wi" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "Wn" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/firstaid/surgery, @@ -18897,6 +19039,10 @@ /obj/item/clothing/head/helmet/solgov, /turf/simulated/floor/tiled/techmaint, /area/houseboat) +"WC" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "WI" = ( /turf/simulated/floor/wood, /area/houseboat) @@ -18974,6 +19120,9 @@ /obj/item/modular_computer/console/preset/mercenary, /turf/simulated/floor/tiled/steel_grid, /area/houseboat) +"Xp" = ( +/turf/simulated/shuttle/wall/alien, +/area/houseboat) "Xq" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -19300,6 +19449,12 @@ /obj/item/weapon/storage/briefcase/inflatable, /turf/simulated/floor/tiled/techmaint, /area/houseboat) +"Zn" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) "Zw" = ( /obj/structure/table/rack, /obj/item/weapon/gun/projectile/heavysniper, @@ -19363,6 +19518,32 @@ }, /turf/unsimulated/floor/steel, /area/centcom/living) +"ZR" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/houseboat) +"ZS" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/houseboat) "ZX" = ( /obj/structure/bed/chair/wood{ dir = 4 @@ -26762,6 +26943,19 @@ ac ac ac ac +Hq +Xp +Hq +Xp +Xp +Xp +Xp +Xp +Xp +Hq +Xp +Xp +Hq ac ac ac @@ -26862,32 +27056,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Hq +Xp +Hq +Xp +Xp +Xp +Xp +Xp +Xp +Hq +Xp +Xp +Hq ac ac ac @@ -26904,19 +27085,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Ts +Hq +UJ +mR +DU +Zn +WC +WC +Hq +DL +Es +Xp ac ac ac @@ -27017,19 +27198,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Ts +Hq +UJ +mR +DU +Zn +WC +WC +Hq +DL +Es +Xp ac ac ac @@ -27046,19 +27227,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Mg +Nt +DL +Mg +SF +Mg +Mg +DL +Nt +DL +ZS +Xp ac ac ac @@ -27159,19 +27340,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Mg +Nt +DL +Mg +Qe +Mg +Mg +DL +Nt +DL +ZS +Xp ac ac ac @@ -27188,19 +27369,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Wi +Hq +Qk +Mg +Mg +Mg +Mg +LX +Hq +DL +RV +Xp ac ac ac @@ -27301,19 +27482,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Wi +Hq +Qk +Mg +Mg +Mg +Mg +LX +Hq +DL +RV +Xp ac ac ac @@ -27330,19 +27511,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Pw +Xp +ZR +DL +Mi +Nl +EN +Ok +Xp +DL +JY +Xp ac ac ac @@ -27443,19 +27624,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Pw +Xp +ZR +DL +Mi +Nl +EN +Ok +Xp +DL +JY +Xp ac ac ac @@ -27472,19 +27653,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Hq +Xp +Hq +Xp +Xp +Xp +Xp +Xp +Xp +Hq +Xp +Xp +Hq ac ac ac @@ -27585,19 +27766,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Hq +Xp +Hq +Xp +Xp +Xp +Xp +Xp +Xp +Hq +Xp +Xp +Hq ac ac ac @@ -28466,19 +28647,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Hq +Xp +Hq +Xp +Xp +Xp +Xp +Xp +Xp +Hq +Xp +Xp +Hq ac ac ac @@ -28579,19 +28760,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Hq +Xp +Hq +Xp +Xp +Xp +Xp +Xp +Xp +Hq +Xp +Xp +Hq ac ac ac @@ -28608,19 +28789,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Ts +Hq +UJ +mR +DU +Zn +WC +WC +Hq +DL +Es +Xp ac ac ac @@ -28721,19 +28902,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Ts +Hq +UJ +mR +DU +Zn +WC +WC +Hq +DL +Es +Xp ac ac ac @@ -28750,19 +28931,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Mg +Nt +DL +Mg +JF +Mg +Mg +DL +Nt +DL +ZS +Xp ac ac ac @@ -28863,19 +29044,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Mg +Nt +DL +Mg +Pt +Mg +Mg +DL +Nt +DL +ZS +Xp ac ac ac @@ -28892,19 +29073,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Wi +Hq +Qk +Mg +Mg +Mg +Mg +LX +Hq +DL +RV +Xp ac ac ac @@ -29005,19 +29186,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Wi +Hq +Qk +Mg +Mg +Mg +Mg +LX +Hq +DL +RV +Xp ac ac ac @@ -29034,19 +29215,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Pw +Xp +ZR +DL +Mi +Nl +EN +Ok +Xp +DL +JY +Xp ac ac ac @@ -29147,19 +29328,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Xp +Pw +Xp +ZR +DL +Mi +Nl +EN +Ok +Xp +DL +JY +Xp ac ac ac @@ -29176,19 +29357,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Hq +Xp +Hq +Xp +Xp +Xp +Xp +Xp +Xp +Hq +Xp +Xp +Hq ac ac ac @@ -29289,19 +29470,19 @@ ac ac ac ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac +Hq +Xp +Hq +Xp +Xp +Xp +Xp +Xp +Xp +Hq +Xp +Xp +Hq ac ac ac