diff --git a/maps/southern_cross/submaps/gateway/maddnesslab.dm b/maps/southern_cross/submaps/gateway/maddnesslab.dm index bac29812a9..7d24288e04 100644 --- a/maps/southern_cross/submaps/gateway/maddnesslab.dm +++ b/maps/southern_cross/submaps/gateway/maddnesslab.dm @@ -84,13 +84,13 @@ name = "Delta Mines" /area/awaymission/mol/realitycore - name = "Realitycore" + name = "Void" /area/awaymission/mol/audiotorium name = "Audiotorium" /area/awaymission/mol/conveyorcontrol - name = "Conveyor Control Room" + name = "Beta Control Room" /area/awaymission/mol/dorm name = "Dorm" @@ -101,6 +101,8 @@ /area/awaymission/mol/securitycheckpoint name = "Security Checkpoint" +/area/awaymission/mol/engi + name = "Lab Enginering" /obj/structure/prop/blackbox/maddnesslab catalogue_data = list(/datum/category_item/catalogue/information/blackbox/maddnesslab) diff --git a/maps/southern_cross/submaps/gateway/maddnesslab.dmm b/maps/southern_cross/submaps/gateway/maddnesslab.dmm index 5f38733321..68e1565613 100644 --- a/maps/southern_cross/submaps/gateway/maddnesslab.dmm +++ b/maps/southern_cross/submaps/gateway/maddnesslab.dmm @@ -15,7 +15,9 @@ /area/awaymission/mol/vistortunnel) "az" = ( /obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass2, +/turf/simulated/floor/grass2{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "aB" = ( /obj/structure/undies_wardrobe, @@ -39,6 +41,10 @@ /obj/machinery/door/blast/puzzle, /turf/simulated/floor/dungeon, /area/awaymission/mol/vr/shattered) +"aU" = ( +/mob/living/simple_mob/vr/firewiz, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/vr/observation) "aW" = ( /obj/structure/table/standard, /obj/random/maintenance/research, @@ -84,12 +90,20 @@ /obj/machinery/vending/blood, /turf/simulated/floor/bmarble, /area/awaymission/mol/medical) +"bC" = ( +/obj/random/maintenance, +/turf/simulated/floor, +/area/awaymission/mol/vistortunnel) "bF" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/steel, /obj/structure/curtain, /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room3) +"bI" = ( +/mob/living/simple_mob/vr/frostwiz, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/vr/observation) "bM" = ( /obj/machinery/door/blast/puzzle{ id = "VistorGreen" @@ -99,7 +113,9 @@ "bS" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "ca" = ( /obj/effect/floor_decal/corner/lightorange, @@ -149,6 +165,13 @@ }, /turf/simulated/floor/tiled/kafel_full, /area/awaymission/mol/kitchen/ChamberD) +"ct" = ( +/obj/effect/floor_decal/corner/green/diagonal, +/mob/living/bot/cleanbot{ + name = "Reality Destroyer" + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/vistortunnel) "cz" = ( /obj/structure/table/hardwoodtable, /obj/machinery/light{ @@ -191,7 +214,9 @@ /area/awaymission/mol/kitchen/ChamberD) "db" = ( /mob/living/simple_mob/vr/firewiz, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "dc" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -220,7 +245,9 @@ /area/awaymission/mol/vistortunnel) "dk" = ( /obj/structure/flora/tree/jungle_small, -/turf/simulated/floor/grass2, +/turf/simulated/floor/grass2{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "ds" = ( /obj/structure/table/borosilicate, @@ -238,7 +265,9 @@ /turf/simulated/floor/wood, /area/awaymission/mol/audiotorium) "dH" = ( -/turf/simulated/floor/wood, +/turf/simulated/floor/wood{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "dI" = ( /obj/structure/table/marble, @@ -278,6 +307,10 @@ "dQ" = ( /turf/unsimulated/ai_visible, /area/awaymission/mol/vr/observation) +"dR" = ( +/obj/machinery/door/airlock/security, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/conveyorcontrol) "dT" = ( /obj/structure/cliff/automatic{ dir = 2 @@ -321,7 +354,9 @@ "ed" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "ee" = ( /obj/structure/table/standard, @@ -370,6 +405,12 @@ temperature = 293.15 }, /area/awaymission/mol/mines) +"eF" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass{ + outdoors = 1 + }, +/area/awaymission/mol/vr/shattered) "eL" = ( /obj/effect/floor_decal/corner/grey/diagonal, /mob/living/simple_mob/mechanical/cyber_horror/ling_cyber_horror, @@ -453,6 +494,10 @@ /obj/structure/bed/chair/bar_stool, /turf/simulated/floor/tiled/kafel_full, /area/awaymission/mol/kitchen/ChamberD) +"fJ" = ( +/mob/living/simple_mob/vr/poisonwiz, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/vr/observation) "fQ" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/steel, @@ -497,7 +542,9 @@ /area/awaymission/mol/audiotorium) "gB" = ( /obj/structure/flora/ausbushes/fernybush, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "gG" = ( /obj/effect/floor_decal/corner/yellow/bordercorner{ @@ -513,7 +560,9 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "gR" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -533,6 +582,13 @@ /obj/item/weapon/bedsheet/blue, /turf/simulated/floor/carpet/bcarpet, /area/awaymission/mol/vistortunnel/yellow) +"he" = ( +/obj/machinery/door/airlock, +/obj/machinery/door/blast/regular/open{ + id = "MoLockC" + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/securitycheckpoint) "hf" = ( /obj/structure/table/standard, /obj/item/weapon/grenade/chem_grenade/cleaner, @@ -616,7 +672,9 @@ "hS" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "ia" = ( /obj/effect/floor_decal/corner/yellow/border, @@ -890,6 +948,12 @@ temperature = 293.15 }, /area/awaymission/mol/mines) +"kS" = ( +/obj/machinery/conveyor_switch{ + id = "Candy Zone" + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/conveyorcontrol) "kV" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/effect/map_helper/no_phaseshift, @@ -938,6 +1002,14 @@ }, /turf/simulated/floor/tiled/kafel_full, /area/awaymission/mol/kitchen/ChamberD) +"lC" = ( +/obj/structure/table/standard, +/obj/random/maintenance/research, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/vr/observationroom) "lD" = ( /turf/simulated/floor/carpet/bcarpet, /area/awaymission/mol/vistortunnel/yellow) @@ -992,6 +1064,10 @@ temperature = 293.15 }, /area/awaymission/mol/outside) +"mg" = ( +/obj/structure/door_assembly/door_assembly_hatch, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/serverroom) "mi" = ( /obj/effect/floor_decal/corner/yellow/border{ dir = 4 @@ -1033,6 +1109,9 @@ }, /turf/simulated/floor/tiled/white, /area/awaymission/mol/kitchen/ChamberD) +"mx" = ( +/turf/simulated/wall/r_wall, +/area/awaymission/mol/engi) "my" = ( /obj/effect/floor_decal/corner/red/bordercorner{ dir = 4 @@ -1060,6 +1139,12 @@ }, /turf/simulated/floor/wmarble, /area/awaymission/mol/medical) +"mE" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec/raised, +/area/awaymission/mol/serverroom) "mI" = ( /turf/simulated/wall/solidrock, /area/awaymission/mol/realitycore) @@ -1078,6 +1163,11 @@ /obj/machinery/door/airlock, /turf/simulated/floor/bmarble, /area/awaymission/mol/vistortunnel) +"mS" = ( +/obj/structure/closet/crate/hydroponics/exotic, +/obj/effect/floor_decal/corner/green/diagonal, +/turf/simulated/floor/tiled/freezer, +/area/awaymission/mol/kitchen/chamberA) "mY" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/map_helper/no_phaseshift, @@ -1096,7 +1186,9 @@ /turf/simulated/floor/wood, /area/awaymission/mol/audiotorium) "ni" = ( -/turf/simulated/floor/beach/sand, +/turf/simulated/floor/beach/sand{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "nj" = ( /obj/effect/floor_decal/corner/lime/diagonal, @@ -1122,6 +1214,9 @@ name = "Just Stop"; info = "Boss man is gone. I sent a syndi distress signal, and I hope they tear this place apart before anyone finds it. And if you get past them, and all our mistakes, you're not going to be able to use it. Just give up and go home." }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/wood, /area/awaymission/mol/audiotorium) "nu" = ( @@ -1153,6 +1248,12 @@ /obj/random/trash_pile, /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room3) +"nT" = ( +/obj/machinery/door/blast/regular{ + id = "MolFluffV1" + }, +/turf/simulated/floor/wmarble, +/area/awaymission/mol/vistortunnel) "nX" = ( /obj/machinery/conveyor{ dir = 4; @@ -1170,7 +1271,9 @@ /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room3) "of" = ( -/turf/simulated/floor/grass2, +/turf/simulated/floor/grass2{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "oi" = ( /obj/machinery/conveyor{ @@ -1258,6 +1361,10 @@ }, /turf/simulated/floor/bmarble, /area/awaymission/mol/vistortunnel) +"oZ" = ( +/obj/random/maintenance/engineering, +/turf/simulated/floor, +/area/awaymission/mol/vistortunnel) "pc" = ( /obj/effect/floor_decal/corner/yellow/border{ dir = 9 @@ -1349,7 +1456,9 @@ /area/awaymission/mol/kitchen) "pI" = ( /obj/structure/flora/tree/bigtree, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "pJ" = ( /obj/machinery/conveyor{ @@ -1373,6 +1482,10 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled/kafel_full, /area/awaymission/mol/kitchen/ChamberD) +"pV" = ( +/obj/machinery/light, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/engi) "pW" = ( /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -1402,7 +1515,9 @@ /area/awaymission/mol/mines) "qo" = ( /obj/structure/railing, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "qq" = ( /obj/effect/floor_decal/corner/yellow/bordercorner{ @@ -1414,6 +1529,13 @@ /obj/structure/table/hardwoodtable, /turf/simulated/floor/carpet/brown, /area/awaymission/mol/vistortunnel/orange) +"qv" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/scraptunnels) "qA" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/steel, @@ -1455,7 +1577,9 @@ /area/awaymission/mol/vistortunnel) "qO" = ( /obj/item/weapon/gun/magic/firestaff/vrwizard/poison, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "qP" = ( /obj/structure/table/rack/shelf, @@ -1531,6 +1655,16 @@ "rt" = ( /turf/simulated/floor/bmarble, /area/awaymission/mol/entrancetunnel) +"ry" = ( +/obj/machinery/door/blast/puzzle{ + id = "FinaleGate2" + }, +/obj/machinery/light{ + dir = 1; + layer = 3 + }, +/turf/simulated/floor/tiled/red, +/area/awaymission/mol/security) "rA" = ( /obj/machinery/door/blast/puzzle{ id = "VistorPurple" @@ -1600,6 +1734,9 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/awaymission/mol/vr/shattered) +"so" = ( +/turf/simulated/shuttle/wall/alien, +/area/awaymission/mol/audiotorium) "sq" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/vr/observation) @@ -1746,6 +1883,16 @@ "tX" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/audiotorium) +"tY" = ( +/obj/machinery/door/blast/puzzle{ + id = "FinaleGate3" + }, +/obj/machinery/light{ + dir = 1; + layer = 3 + }, +/turf/simulated/floor/tiled/red, +/area/awaymission/mol/security) "uc" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/scraptunnels/room3) @@ -1778,9 +1925,7 @@ /turf/unsimulated/ai_visible, /area/awaymission/mol/vr/observationroom) "uA" = ( -/obj/effect/floor_decal/corner/yellow/bordercorner{ - dir = 3 - }, +/obj/effect/floor_decal/corner/yellow/bordercorner, /turf/simulated/floor/bmarble, /area/awaymission/mol/medical) "uD" = ( @@ -1791,19 +1936,13 @@ /turf/simulated/floor/dungeon, /area/awaymission/mol/vr/shattered) "uN" = ( -/obj/machinery/door/airlock/hatch, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "xenostation_airlock_control"; - name = "Xenobiology Access Button"; - pixel_y = -26; - req_access = list(55) +/obj/machinery/door/blast/regular{ + id = "MolFluffV2" }, /turf/simulated/floor/wmarble, /area/awaymission/mol/vistortunnel) "uQ" = ( -/obj/machinery/door/airlock/hatch, +/obj/structure/door_assembly/door_assembly_hatch, /turf/simulated/floor/bmarble, /area/awaymission/mol/vr/observation) "uS" = ( @@ -1851,6 +1990,9 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/awaymission/mol/vr/shattered) +"vz" = ( +/turf/simulated/wall/solidrock, +/area/awaymission/mol/engi) "vB" = ( /obj/machinery/conveyor{ dir = 1; @@ -1947,7 +2089,9 @@ /area/awaymission/mol/vistortunnel) "wr" = ( /obj/structure/flora/tree/palm, -/turf/simulated/floor/beach/sand, +/turf/simulated/floor/beach/sand{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "wv" = ( /obj/effect/floor_decal/corner/red/bordercorner{ @@ -1974,6 +2118,10 @@ "wB" = ( /turf/simulated/wall/dungeon, /area/awaymission/mol/entrancetunnel) +"wF" = ( +/obj/machinery/door/airlock/gold, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/engi) "wI" = ( /obj/structure/janitorialcart, /obj/effect/floor_decal/corner/paleblue/border{ @@ -1995,7 +2143,7 @@ /turf/simulated/floor/bmarble, /area/awaymission/mol/entrancetunnel) "wW" = ( -/obj/machinery/door/airlock, +/obj/machinery/door/airlock/medical, /turf/simulated/floor/bmarble, /area/awaymission/mol/medical) "xa" = ( @@ -2017,6 +2165,14 @@ /obj/structure/grille, /turf/simulated/floor/wmarble, /area/awaymission/mol/vistortunnel) +"xi" = ( +/obj/structure/closet/toolcloset, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/weapon/storage/toolbox/electrical, +/obj/item/clothing/gloves/yellow, +/obj/machinery/light, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/engi) "xj" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/random/obstruction, @@ -2143,7 +2299,9 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "yu" = ( /turf/simulated/floor/grass, @@ -2153,6 +2311,12 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/mines) +"yB" = ( +/obj/machinery/door/blast/regular{ + id = "MoLockA" + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/securitycheckpoint) "yE" = ( /obj/effect/floor_decal/corner/green/diagonal, /turf/simulated/floor/tiled/freezer, @@ -2227,7 +2391,9 @@ /area/awaymission/mol/entrancetunnel) "zl" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "zm" = ( /turf/simulated/floor/tiled/neutral, @@ -2263,6 +2429,27 @@ /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels) +"zx" = ( +/obj/structure/barricade/planks, +/obj/item/tape/police, +/turf/simulated/floor, +/area/awaymission/mol/vistortunnel) +"zB" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + health = 1e+006 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/blast/regular/open{ + id = "MoLockC" + }, +/turf/simulated/floor, +/area/awaymission/mol/securitycheckpoint) "zC" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/kitchen/chamberC) @@ -2308,6 +2495,17 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/mines) +"zZ" = ( +/obj/machinery/door/airlock/security, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/securitycheckpoint) +"Ab" = ( +/obj/structure/table/marble, +/obj/machinery/button/remote/blast_door{ + id = "MolFluffV1" + }, +/turf/simulated/floor, +/area/awaymission/mol/vistortunnel) "Ad" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -2404,9 +2602,11 @@ /turf/simulated/floor/lava/harmless, /area/awaymission/mol/vr/shattered) "Bf" = ( -/obj/machinery/door/airlock, -/turf/simulated/floor/tiled/steel, -/area/awaymission/mol/kitchen) +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/engi) "Bj" = ( /obj/machinery/light{ dir = 1 @@ -2420,6 +2620,21 @@ }, /turf/simulated/floor/tiled/red, /area/awaymission/mol/security) +"Bt" = ( +/obj/item/clothing/accessory/poncho/roles/cloak/security, +/obj/item/weapon/gun/projectile/gyropistol, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/clothing/glasses/sunglasses/sechud/tactical, +/obj/structure/closet/secure_closet/guncabinet{ + name = "security cabinet" + }, +/obj/item/weapon/melee/baton, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/conveyorcontrol) "BA" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/vistortunnel/red) @@ -2495,13 +2710,25 @@ /turf/simulated/floor/tiled/freezer, /area/awaymission/mol/kitchen/chamberA) "Cs" = ( -/obj/machinery/light{ - dir = 8 +/obj/structure/closet/secure_closet/guncabinet{ + name = "ammo cabinet" }, -/obj/item/modular_computer/console{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/turf/simulated/floor/bmarble, /area/awaymission/mol/conveyorcontrol) "Cx" = ( /obj/effect/floor_decal/corner/lightorange, @@ -2552,6 +2779,12 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/wmarble, /area/awaymission/mol/medical) +"Dc" = ( +/obj/item/modular_computer/console{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/conveyorcontrol) "Di" = ( /obj/item/weapon/material/shard, /obj/structure/grille/broken, @@ -2594,12 +2827,36 @@ /obj/machinery/light, /turf/simulated/floor/tiled/kafel_full, /area/awaymission/mol/kitchen/ChamberD) +"Du" = ( +/obj/machinery/porta_turret/poi{ + faction = "syndicate"; + check_weapons = 1; + installation = /obj/item/weapon/gun/energy/lasershotgun + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/securitycheckpoint) +"Dw" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/awaymission/mol/audiotorium) +"DE" = ( +/turf/simulated/shuttle/wall/alien, +/area/awaymission/mol/realitycore) "DL" = ( /obj/effect/floor_decal/corner/yellow/bordercorner{ dir = 1 }, /turf/simulated/floor/bmarble, /area/awaymission/mol/medical) +"DM" = ( +/obj/machinery/light{ + dir = 1; + layer = 3 + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/engi) "DO" = ( /obj/structure/table/hardwoodtable, /turf/simulated/floor/carpet/oracarpet, @@ -2723,6 +2980,14 @@ /mob/living/simple_mob/mechanical/mecha/vistor/vistorgreen, /turf/simulated/floor/carpet/green, /area/awaymission/mol/vistortunnel/green) +"EW" = ( +/obj/machinery/door/blast/puzzle{ + id = "FinaleGate1" + }, +/obj/effect/floor_decal/corner/orange/diagonal, +/obj/machinery/light, +/turf/simulated/floor/tiled/red, +/area/awaymission/mol/security) "EY" = ( /obj/machinery/light{ dir = 1 @@ -2730,15 +2995,11 @@ /turf/simulated/floor/carpet/brown, /area/awaymission/mol/vistortunnel/orange) "EZ" = ( -/obj/effect/floor_decal/corner/red/bordercorner{ - dir = 3 +/obj/item/modular_computer/console{ + dir = 8 }, -/turf/simulated/floor/tiled/asteroid_steel{ - temperature = 293.15; - oxygen = 21.8366; - nitrogen = 82.1472 - }, -/area/awaymission/mol/entrancetunnel) +/turf/simulated/floor/bmarble, +/area/awaymission/mol/conveyorcontrol) "Fa" = ( /mob/living/simple_mob/vr/glitch, /turf/unsimulated/ai_visible, @@ -2788,6 +3049,10 @@ nitrogen = 82.1472 }, /area/awaymission/mol/entrancetunnel) +"Fp" = ( +/obj/machinery/door/airlock/security, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/entrancetunnel) "Fq" = ( /turf/simulated/wall/dungeon, /area/awaymission/mol/medical) @@ -2822,15 +3087,12 @@ /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room1) "FB" = ( -/obj/machinery/conveyor_switch{ - id = "Candy Zone" +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/conveyor_switch{ - id = "Candy Zone" - }, -/obj/machinery/light, -/turf/simulated/floor/tiled/steel, -/area/awaymission/mol/conveyorcontrol) +/turf/simulated/floor/bmarble, +/area/awaymission/mol/scraptunnels) "FG" = ( /obj/structure/table/hardwoodtable, /obj/machinery/light{ @@ -2894,6 +3156,12 @@ /obj/effect/floor_decal/corner/yellow/border, /turf/simulated/floor/wmarble, /area/awaymission/mol/medical) +"Go" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/engi) "Gp" = ( /mob/living/simple_mob/humanoid/cultist/magus/rift, /turf/simulated/floor/carpet/retro_red, @@ -2906,6 +3174,13 @@ temperature = 293.15 }, /area/awaymission/mol/outside) +"Gy" = ( +/obj/structure/table/marble, +/obj/machinery/button/remote/blast_door{ + id = "MolFluffV2" + }, +/turf/simulated/floor, +/area/awaymission/mol/vistortunnel) "GB" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/light{ @@ -2928,7 +3203,9 @@ /area/awaymission/mol/vistortunnel/purple) "GJ" = ( /mob/living/simple_mob/vr/firewiz, -/turf/simulated/floor/beach/sand, +/turf/simulated/floor/beach/sand{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "GP" = ( /obj/machinery/conveyor{ @@ -3049,6 +3326,13 @@ /obj/effect/decal/cleanable/blood/gibs/body, /turf/simulated/floor/tiled/freezer, /area/awaymission/mol/kitchen/chamberC) +"HP" = ( +/obj/structure/closet/crate/secure/loot, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/awaymission/mol/audiotorium) "HW" = ( /obj/structure/window/reinforced{ dir = 1 @@ -3069,15 +3353,8 @@ /turf/simulated/floor/wmarble, /area/awaymission/mol/vistortunnel) "HZ" = ( -/obj/machinery/door/airlock/hatch, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "xenostation_airlock_control"; - name = "Xenobiology Access Button"; - pixel_x = -26; - pixel_y = 6; - req_access = list(55) +/obj/machinery/door/blast/regular/open{ + id = "MolFluffV2" }, /turf/simulated/floor/wmarble, /area/awaymission/mol/vistortunnel) @@ -3121,12 +3398,14 @@ /turf/simulated/floor/wood, /area/awaymission/mol/audiotorium) "Im" = ( -/obj/structure/table/glass, -/obj/item/device/radio, -/obj/item/clothing/accessory/poncho/roles/cloak/security, -/obj/item/clothing/glasses/hud/security/jensenshades, -/turf/simulated/floor/tiled/steel, -/area/awaymission/mol/conveyorcontrol) +/turf/simulated/floor/bmarble, +/area/awaymission/mol/securitycheckpoint) +"In" = ( +/obj/machinery/door/blast/regular{ + id = "MoLockB" + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/securitycheckpoint) "Is" = ( /obj/effect/floor_decal/corner/yellow/border{ dir = 1 @@ -3159,6 +3438,14 @@ "ID" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/kitchen) +"IK" = ( +/obj/structure/table/standard, +/obj/random/maintenance/research, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/vr/observationroom) "IM" = ( /obj/structure/flora/desert_planet/barrelcacti, /turf/simulated/floor/outdoors/desert_planet/deep_sand{ @@ -3195,7 +3482,9 @@ /area/awaymission/mol/medical) "IY" = ( /obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "IZ" = ( /obj/structure/table/marble, @@ -3206,6 +3495,10 @@ }, /turf/simulated/floor/tiled/freezer, /area/awaymission/mol/kitchen/chamberC) +"Jc" = ( +/obj/machinery/door/airlock/gold, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/entrancetunnel) "Jh" = ( /obj/item/weapon/flame/candle/everburn, /obj/item/weapon/flame/candle/everburn, @@ -3303,7 +3596,9 @@ /area/awaymission/mol/vr/observation) "Kk" = ( /obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass2, +/turf/simulated/floor/grass2{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "Kp" = ( /obj/machinery/gateway{ @@ -3332,11 +3627,10 @@ /turf/simulated/floor/bmarble, /area/awaymission/mol/medical) "KP" = ( -/obj/machinery/door/airlock/hatch{ - req_one_access = list(200) +/turf/simulated/floor/grass{ + outdoors = 1 }, -/turf/simulated/floor/bmarble, -/area/awaymission/mol/serverroom) +/area/awaymission/mol/vr/shattered) "KV" = ( /obj/structure/fireaxecabinet{ locked = 0 @@ -3377,7 +3671,9 @@ /area/awaymission/mol/kitchen/ChamberD) "Lz" = ( /mob/living/simple_mob/vr/poisonwiz, -/turf/simulated/floor/grass2, +/turf/simulated/floor/grass2{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "LA" = ( /mob/living/simple_mob/mechanical/cyber_horror/tajaran, @@ -3427,7 +3723,9 @@ /area/awaymission/mol/kitchen/chamberA) "Mc" = ( /mob/living/simple_mob/vr/glitch, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "Md" = ( /obj/effect/floor_decal/corner/white/diagonal, @@ -3491,6 +3789,13 @@ }, /turf/simulated/floor/bmarble, /area/awaymission/mol/vistortunnel/orange) +"MP" = ( +/obj/structure/closet/crate/secure/loot, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/awaymission/mol/audiotorium) "MQ" = ( /mob/living/simple_mob/vore/ashy, /turf/simulated/floor/carpet/oracarpet, @@ -3540,6 +3845,9 @@ "Nh" = ( /turf/simulated/wall/solidrock, /area/awaymission/mol/mines) +"Ni" = ( +/turf/simulated/floor/bmarble, +/area/awaymission/mol/engi) "Nj" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/corner/grey/diagonal, @@ -3575,6 +3883,17 @@ /obj/effect/map_helper/no_phaseshift, /turf/simulated/floor/tiled/kafel_full, /area/awaymission/mol/kitchen/ChamberD) +"Ny" = ( +/obj/structure/closet/toolcloset, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/weapon/storage/toolbox/electrical, +/obj/item/clothing/gloves/yellow, +/obj/machinery/light{ + dir = 1; + layer = 3 + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/engi) "Nz" = ( /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -3727,7 +4046,12 @@ /turf/simulated/floor/carpet/brown, /area/awaymission/mol/vistortunnel/orange) "Pf" = ( -/turf/simulated/floor/outdoors/shelfice, +/turf/simulated/floor/outdoors/shelfice{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 293.15; + outdoors = -1 + }, /area/awaymission/mol/vr/shattered) "Ph" = ( /obj/structure/table/standard, @@ -3774,6 +4098,9 @@ }, /turf/simulated/floor/carpet/retro_red, /area/awaymission/mol/vistortunnel/red) +"PG" = ( +/turf/simulated/floor, +/area/awaymission/mol/vistortunnel) "PH" = ( /obj/effect/floor_decal/corner/yellow/border{ dir = 4 @@ -3813,11 +4140,21 @@ /obj/machinery/light, /turf/simulated/floor/bmarble, /area/awaymission/mol/entrancetunnel) +"Qm" = ( +/obj/structure/closet/toolcloset, +/obj/item/weapon/storage/toolbox/brass, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/engi) "Qs" = ( /obj/structure/railing{ dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "QA" = ( /obj/effect/decal/mecha_wreckage/gygax/serenity, @@ -3844,7 +4181,9 @@ /area/awaymission/mol/kitchen/ChamberD) "QP" = ( /mob/living/simple_mob/vr/firewiz, -/turf/simulated/floor/wood, +/turf/simulated/floor/wood{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "QS" = ( /mob/living/simple_mob/vore/candy/redcabold, @@ -3895,6 +4234,10 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/red, /area/awaymission/mol/kitchen) +"Ry" = ( +/obj/machinery/power/rtg/advanced, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/engi) "Rz" = ( /obj/machinery/door/blast/puzzle{ id = "SuperBossGate" @@ -3904,7 +4247,20 @@ nitrogen = 82.1472; temperature = 293.15 }, -/area/awaymission/mol/mines) +/area/awaymission/mol/realitycore) +"RB" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + health = 1e+006 + }, +/obj/machinery/door/blast/regular/open{ + id = "MoLockC" + }, +/turf/simulated/floor, +/area/awaymission/mol/securitycheckpoint) "RE" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/light{ @@ -3959,11 +4315,10 @@ /turf/simulated/floor/tiled/red, /area/awaymission/mol/kitchen) "RQ" = ( -/obj/structure/table/glass, -/obj/item/weapon/gun/projectile/gyropistol, -/obj/item/ammo_magazine/m75, -/turf/simulated/floor/tiled/steel, -/area/awaymission/mol/conveyorcontrol) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/scraptunnels) "RT" = ( /obj/structure/table/hardwoodtable, /obj/machinery/light{ @@ -4008,6 +4363,9 @@ }, /turf/simulated/floor/wmarble, /area/awaymission/mol/medical) +"Sv" = ( +/turf/simulated/floor/bmarble, +/area/awaymission/mol/conveyorcontrol) "Sy" = ( /obj/structure/table/standard, /obj/item/weapon/paper{ @@ -4019,7 +4377,9 @@ /area/awaymission/mol/vistortunnel) "SB" = ( /mob/living/simple_mob/vr/poisonwiz, -/turf/simulated/floor/grass, +/turf/simulated/floor/grass{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "SC" = ( /obj/machinery/light{ @@ -4112,6 +4472,22 @@ nitrogen = 82.1472 }, /area/awaymission/mol/entrancetunnel) +"Tw" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + health = 1e+006 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/blast/regular/open{ + id = "MoLockC" + }, +/turf/simulated/floor, +/area/awaymission/mol/securitycheckpoint) "Tx" = ( /mob/living/simple_mob/vr/doomknight, /turf/simulated/floor/tiled/yellow, @@ -4121,6 +4497,13 @@ /obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/vistortunnel) +"TA" = ( +/obj/structure/table/reinforced, +/obj/machinery/button/remote/blast_door{ + id = "MoLockC" + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/securitycheckpoint) "TC" = ( /obj/effect/floor_decal/corner/lightorange, /obj/effect/floor_decal/corner/pink{ @@ -4208,6 +4591,13 @@ /obj/effect/map_helper/no_phaseshift, /turf/simulated/floor/bmarble, /area/awaymission/mol/vr/observationroom) +"Ur" = ( +/obj/machinery/light{ + dir = 1; + layer = 3 + }, +/turf/simulated/floor/tiled/milspec/raised, +/area/awaymission/mol/serverroom) "Us" = ( /obj/effect/floor_decal/corner/red/border{ dir = 3 @@ -4242,6 +4632,13 @@ /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, /area/awaymission/mol/mines) +"UE" = ( +/obj/structure/table/marble, +/obj/machinery/button/remote/blast_door{ + id = "MoLockB" + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/securitycheckpoint) "UI" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -4296,6 +4693,10 @@ /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled/freezer, /area/awaymission/mol/kitchen/chamberB) +"UT" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/securitycheckpoint) "UU" = ( /obj/structure/table/hardwoodtable, /obj/random/maintenance/foodstuff, @@ -4362,6 +4763,13 @@ "VD" = ( /turf/simulated/wall/r_wall, /area/awaymission/mol/vistortunnel/yellow) +"VG" = ( +/mob/living/simple_mob/vr/poisonwiz, +/obj/structure/flora/tree/bigtree, +/turf/simulated/floor/grass{ + outdoors = 1 + }, +/area/awaymission/mol/vr/shattered) "VH" = ( /obj/structure/table/hardwoodtable, /turf/simulated/floor/carpet/blue, @@ -4387,6 +4795,10 @@ /obj/item/weapon/bedsheet/blue, /turf/simulated/floor/carpet/green, /area/awaymission/mol/vistortunnel/green) +"VV" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/milspec/raised, +/area/awaymission/mol/serverroom) "VW" = ( /obj/effect/map_helper/no_phaseshift, /turf/simulated/floor/water{ @@ -4395,6 +4807,10 @@ temperature = 293.15 }, /area/awaymission/mol/vr/shattered) +"Wa" = ( +/obj/structure/table/marble, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/securitycheckpoint) "We" = ( /obj/machinery/door/blast/puzzle{ id = "FinaleGate4" @@ -4425,12 +4841,8 @@ /turf/simulated/floor/bmarble, /area/awaymission/mol/scraptunnels/room1) "Wp" = ( -/obj/structure/bed/chair/office{ - dir = 1 - }, -/mob/living/simple_mob/humanoid/merc/ranged/space/suppressor/elite, -/turf/simulated/floor/tiled/neutral, -/area/awaymission/mol/audiotorium) +/turf/simulated/wall/r_wall, +/area/awaymission/mol/securitycheckpoint) "Wu" = ( /obj/effect/floor_decal/corner/yellow/border{ dir = 4 @@ -4441,6 +4853,13 @@ }, /turf/simulated/floor/bmarble, /area/awaymission/mol/medical) +"Wv" = ( +/obj/structure/table/reinforced, +/obj/machinery/button/remote/blast_door{ + id = "MoLockA" + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/securitycheckpoint) "WB" = ( /obj/effect/floor_decal/corner/yellow/border{ dir = 8 @@ -4449,6 +4868,14 @@ /obj/item/weapon/storage/firstaid/regular, /turf/simulated/floor/wmarble, /area/awaymission/mol/medical) +"WD" = ( +/obj/machinery/door/blast/puzzle{ + id = "FinaleGate4" + }, +/obj/effect/floor_decal/corner/orange/diagonal, +/obj/machinery/light, +/turf/simulated/floor/tiled/red, +/area/awaymission/mol/security) "WL" = ( /obj/machinery/appliance/cooker/grill, /obj/effect/floor_decal/corner/white/diagonal, @@ -4478,6 +4905,11 @@ blocks_nonghost_incorporeal = 1 }, /area/awaymission/mol/audiotorium) +"WZ" = ( +/obj/structure/table/marble, +/obj/machinery/recharger, +/turf/simulated/floor/tiled/red, +/area/awaymission/mol/security) "Xk" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/bmarble, @@ -4517,26 +4949,15 @@ /turf/simulated/floor/wmarble, /area/awaymission/mol/medical) "XF" = ( -/obj/machinery/door/airlock/hatch, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "xenostation_airlock_control"; - name = "Xenobiology Access Button"; - pixel_y = -26; - req_access = list(55) +/obj/machinery/door/blast/regular/open{ + id = "MolFluffV1" }, /turf/simulated/floor/wmarble, /area/awaymission/mol/vistortunnel) "XG" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/item/modular_computer/console{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/awaymission/mol/conveyorcontrol) +/mob/living/carbon/human/ai_controlled/replicant, +/turf/simulated/floor/lino, +/area/awaymission/mol/mines) "XK" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/light, @@ -4568,8 +4989,13 @@ /turf/simulated/floor/tiled/white, /area/awaymission/mol/kitchen/ChamberD) "Yc" = ( -/turf/simulated/floor/tiled/steel, -/area/awaymission/mol/conveyorcontrol) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light{ + dir = 1; + layer = 3 + }, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/scraptunnels) "Ye" = ( /obj/structure/railing{ dir = 4 @@ -4583,7 +5009,9 @@ "Yl" = ( /obj/structure/flora/tree/jungle_small, /obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass2, +/turf/simulated/floor/grass2{ + outdoors = 1 + }, /area/awaymission/mol/vr/shattered) "Yp" = ( /turf/simulated/floor/bmarble, @@ -4618,6 +5046,12 @@ /obj/random/maintenance/foodstuff, /turf/simulated/floor/tiled/kafel_full, /area/awaymission/mol/kitchen/ChamberD) +"YL" = ( +/obj/item/stack/material/wood{ + amount = 3 + }, +/turf/simulated/floor, +/area/awaymission/mol/vistortunnel) "YQ" = ( /obj/effect/map_helper/no_phaseshift, /turf/simulated/floor/bmarble, @@ -4662,6 +5096,13 @@ /mob/living/simple_mob/vore/candy/marshmellowserpent, /turf/simulated/floor/tiled/kafel_full, /area/awaymission/mol/kitchen/ChamberD) +"Zm" = ( +/obj/structure/closet/toolcloset, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/weapon/storage/toolbox/electrical, +/obj/item/clothing/gloves/yellow, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/engi) "Zo" = ( /obj/structure/window/reinforced{ dir = 8 @@ -4690,13 +5131,16 @@ "Zx" = ( /turf/simulated/floor/carpet/purple, /area/awaymission/mol/vistortunnel/purple) -"ZG" = ( -/turf/simulated/floor/outdoors/dirt{ - oxygen = 21.8366; - nitrogen = 82.1472; - temperature = 293.15 +"ZE" = ( +/obj/machinery/light{ + dir = 8 }, -/area/awaymission/mol/realitycore) +/turf/simulated/floor/tiled/milspec/raised, +/area/awaymission/mol/serverroom) +"ZG" = ( +/mob/living/simple_mob/vr/lightingwiz, +/turf/simulated/floor/bmarble, +/area/awaymission/mol/vr/observation) "ZH" = ( /obj/effect/floor_decal/corner/black/diagonal, /turf/simulated/floor/bmarble, @@ -8568,7 +9012,7 @@ cJ cJ tG Ek -YG +XG YG Nf cl @@ -9497,11 +9941,11 @@ uF TE jd En +aU Yp Yp Yp -Yp -Yp +fJ En sq Nh @@ -9756,9 +10200,9 @@ TE jd Lg Yp +aU Yp -Yp -Yp +fJ Yp aW sq @@ -11562,9 +12006,9 @@ xd jd Lg Yp +bI Yp -Yp -Yp +ZG Yp aW sq @@ -11819,11 +12263,11 @@ Fa xd jd En +bI Yp Yp Yp -Yp -Yp +ZG En sq Nh @@ -13371,7 +13815,7 @@ Lb Lb Lb Lb -oO +mg Lb Lb Lb @@ -13628,9 +14072,9 @@ Nh Lb oo oo +ZE oo -oo -oo +ZE oo oo Lb @@ -14142,13 +14586,13 @@ TE jd Nh Lb -oo +Ur nu LJ nu ZH nu -oo +VV Lb Nh Nh @@ -14872,10 +15316,10 @@ xd xd Jw Jw -AQ -AQ -AQ -AQ +xd +xd +xd +xd Jw Jw Jw @@ -15131,8 +15575,8 @@ Jw Jw Jw AQ -AQ -AQ +xd +xd AQ AQ Jw @@ -15174,13 +15618,13 @@ NL jd Nh Lb -oo +Ur nu ZH nu ZH nu -oo +VV Lb Nh Nh @@ -15207,39 +15651,39 @@ HF zv zv zv +qv zv zv zv +qv zv zv zv +qv zv zv zv +qv zv zv zv +qv zv zv zv +qv zv zv zv +qv zv zv zv +qv zv zv zv -zv -zv -zv -zv -zv -zv -zv -zv -zv +qv zv zv zv @@ -15386,7 +15830,7 @@ Jw Jw Jw Jw -lo +Pf AQ AQ AQ @@ -15628,7 +16072,7 @@ Jw Jw Jw Jw -lo +Pf AQ AQ AQ @@ -15643,7 +16087,7 @@ Jw Jw Jw Jw -lo +Pf AQ AQ AQ @@ -15692,9 +16136,9 @@ Nh Lb oo oo +mE oo -oo -oo +mE oo oo Lb @@ -15723,39 +16167,39 @@ HF zv zv zv +FB zv zv zv +FB zv zv zv +FB zv zv zv +FB zv zv zv -zv -zv -zv -zv -zv +FB zv mY zv +FB zv zv zv +FB zv zv zv +FB zv zv zv -zv -zv -zv -zv +FB zv zv zv @@ -15885,7 +16329,7 @@ Jw Jw Jw Jw -lo +Pf AQ AQ AQ @@ -15900,7 +16344,7 @@ Jw Jw Jw Jw -lo +Pf AQ AQ AQ @@ -15910,7 +16354,7 @@ AQ AQ AQ AQ -lo +Pf Jw jd NL @@ -15951,7 +16395,7 @@ Lb Lb Lb Lb -KP +oO Lb Lb Lb @@ -15978,45 +16422,45 @@ Nh Nh Nh HF +Yc zv +RQ +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +HF +Yc zv -zv -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -HF -zv -zv -zv +RQ HF Nh Nh @@ -17046,9 +17490,9 @@ uc uc uc HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -17201,7 +17645,7 @@ AQ AQ AQ AQ -Jw +Pf jd NL NL @@ -17268,9 +17712,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF uc uc @@ -17458,7 +17902,7 @@ tP AQ AQ AQ -lo +Pf Jw jd NL @@ -17699,8 +18143,8 @@ lo AQ AQ AQ -lo -lo +Pf +Pf AQ AQ Jw @@ -17820,9 +18264,9 @@ uc uc uc HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -17956,7 +18400,7 @@ Jw Jw AQ AQ -lo +Pf xd xd lo @@ -17973,7 +18417,7 @@ AQ AQ AQ AQ -lo +Pf Jw Jw jd @@ -18013,7 +18457,7 @@ jd Ph Ph Ph -Ph +lC Gj Gj Gj @@ -18042,9 +18486,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF uc uc @@ -18109,7 +18553,7 @@ Nh Nh Nh Nh -Nh +ch ch ch cJ @@ -18213,7 +18657,7 @@ Jw Jw Jw Pf -lo +Pf xd xd xd @@ -18852,9 +19296,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -18986,7 +19430,7 @@ Jw Jw Jw Jw -lo +Pf xd JO xd @@ -19074,9 +19518,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -19245,11 +19689,11 @@ Jw Jw Jw AQ -lo +Pf xd xd xd -lo +Pf Jw Jw Jw @@ -19258,7 +19702,7 @@ Jw Jw Jw Jw -lo +Pf AQ AQ Od @@ -19401,7 +19845,7 @@ ch ch ch ch -Nh +ch ch ch ch @@ -19504,11 +19948,11 @@ Jw lo AQ AQ -lo -lo -lo +Pf +Pf +Pf AQ -lo +Pf Jw Jw Jw @@ -19626,9 +20070,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -19660,7 +20104,7 @@ Nh Nh Nh Nh -Nh +ch ch ch ch @@ -19780,7 +20224,7 @@ AQ AQ AQ AQ -lo +Pf Jw xd xd @@ -19848,9 +20292,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -20025,19 +20469,19 @@ AQ AQ AQ AQ -lo +Pf Jw Jw Jw Jw Jw -lo +Pf AQ AQ AQ AQ AQ -lo +Pf Jw Jw jd @@ -20400,9 +20844,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -20622,9 +21066,9 @@ ch ch Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -21067,7 +21511,7 @@ AQ AQ AQ AQ -lo +Pf Jw Jw Jw @@ -21109,7 +21553,7 @@ jd Ph Ph Ph -Ph +IK Gj Gj Gj @@ -21432,9 +21876,9 @@ uc uc uc HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -21567,7 +22011,7 @@ AQ AQ AQ AQ -lo +Pf Jw Jw Jw @@ -21654,9 +22098,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF uc uc @@ -21831,7 +22275,7 @@ Jw Jw Jw Jw -lo +Pf AQ AQ AQ @@ -22091,7 +22535,7 @@ Jw Jw Jw Jw -lo +Pf AQ AQ AQ @@ -22206,9 +22650,9 @@ uc uc uc HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -22428,9 +22872,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF uc uc @@ -23104,10 +23548,10 @@ Nh Nh Nh jd -yu -yu -um -yu +KP +KP +eF +KP xd xd Fa @@ -23118,14 +23562,14 @@ xd xd xd xd -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP yu xd xd @@ -23133,9 +23577,9 @@ xd xd xd xd -yu -yu -yu +KP +KP +KP jd of of @@ -23362,12 +23806,12 @@ Nh Nh Nh jd -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP xd xd Fa @@ -23375,25 +23819,25 @@ xd xd xd xd -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP pI -yu +KP yu xd xd xd Fa xd -yu -yu -yu -yu +KP +KP +KP +KP jd of of @@ -23460,9 +23904,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -23496,9 +23940,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -23620,28 +24064,28 @@ Nh Nh Nh jd -yu -yu -yu -yu -yu -yu -yu -um -yu +KP +KP +KP +KP +KP +KP +KP +eF +KP xd xd xd yu -yu +KP pI -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP um yu yu @@ -23650,8 +24094,8 @@ yu yu yu hS -yu -yu +KP +KP jd of of @@ -23878,38 +24322,38 @@ Nh Nh Nh jd -yu -yu -yu -yu +KP +KP +KP +KP pI -yu -yu -yu -yu +KP +KP +KP +KP bS -yu -yu -yu -yu -yu -yu -um -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +eF +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP jd of of @@ -24136,38 +24580,38 @@ Nh Nh Nh jd -yu -um -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +eF +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP ed -yu -yu -yu -yu -um -yu -yu -yu -yu +KP +KP +KP +KP +eF +KP +KP +KP +KP IY -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP jd of of @@ -24394,38 +24838,38 @@ Nh Nh Nh jd -yu -yu -yu +KP +KP +KP gB -yu -yu -um +KP +KP +eF SB -yu -yu +KP +KP gB -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP zl -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP pI -yu +KP jd of of @@ -24492,9 +24936,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Cy Cy @@ -24528,9 +24972,9 @@ Cy Cy Cy HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -24652,38 +25096,38 @@ Nh Nh Nh jd -yu +KP zl -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP qO -yu +KP pI -yu +KP db -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP pI -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP jd of of @@ -24910,38 +25354,38 @@ Nh Nh Nh jd -yu -yu +KP +KP IY -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP pI -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP zl -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP jd of of @@ -25168,38 +25612,38 @@ Nh Nh Nh jd -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP pI -yu +KP IY -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +pI +KP gB -yu -yu -yu -yu -yu -yu -um -yu -yu -yu +KP +KP +KP +KP +KP +KP +eF +KP +KP +KP gB -yu +KP jd of of @@ -25266,9 +25710,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Cy Cy @@ -25302,9 +25746,9 @@ Cy Cy Cy HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -25426,38 +25870,38 @@ Nh Nh Nh jd -yu +KP pI -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -um -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +eF +KP +KP zl -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +pI +KP +KP +KP +KP +KP +KP +KP jd of of @@ -25684,38 +26128,38 @@ Nh Nh Nh jd -yu -yu -um -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -um -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +eF +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +eF +KP +KP +KP +KP +KP +KP +KP +KP jd of of @@ -25942,38 +26386,38 @@ Nh Nh Nh jd -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP pI -yu -yu -yu -yu +KP +KP +KP +KP pI -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP pI -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP pI -yu -yu +KP +KP jd of of @@ -26200,38 +26644,38 @@ Nh Nh Nh jd -yu +KP zl -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP IY -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP jd of of @@ -26298,9 +26742,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -26334,9 +26778,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -26458,38 +26902,38 @@ Nh Nh Nh jd -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP zl -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -SB -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +VG +KP +KP +KP +KP +KP +KP +KP +KP +KP jd of of @@ -26716,38 +27160,38 @@ Nh Nh Nh jd -yu -yu -yu -yu +KP +KP +KP +KP pI -yu +KP IY -yu -yu -yu +KP +KP +KP gB -yu -yu -um -yu -yu +KP +KP +eF +KP +KP zl -yu -yu -yu -yu +KP +KP +KP +KP gB -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP gB -yu -yu +KP +KP IY -yu +KP jd of of @@ -26974,38 +27418,38 @@ Nh Nh Nh jd -yu -yu -yu -yu -yu -yu -yu -um -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +eF +KP +KP +KP +KP +pI +KP Mc -yu -yu -yu -um -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +eF +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP jd of of @@ -27232,38 +27676,38 @@ Nh Nh Nh jd -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP pI -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP jd of of @@ -27330,9 +27774,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -27366,9 +27810,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -27490,38 +27934,38 @@ Nh Nh Nh jd -yu -yu -yu +KP +KP +KP gB -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP pI -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP pI -yu +KP IY -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -um -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +pI +eF +KP jd of of @@ -27748,38 +28192,38 @@ Nh Nh Nh jd -yu +KP zl -yu -yu +KP +KP db -yu -yu -yu +KP +KP +KP pI -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP gB -yu -yu -yu -yu +KP +KP +KP +KP jd of of @@ -28006,38 +28450,38 @@ Nh Nh Nh jd -yu +KP hS -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -um -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +eF +KP +KP +KP +KP +KP gB -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP IY -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP jd of of @@ -28264,38 +28708,38 @@ Nh Nh Nh jd -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP zl hS -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +pI +KP +KP +KP +KP +KP +KP +KP +pI +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP jd of of @@ -28362,9 +28806,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Cy Cy @@ -28398,9 +28842,9 @@ Cy Cy Cy HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -28522,38 +28966,38 @@ Nh Nh Nh jd -yu -yu -yu -yu +KP +KP +KP +KP pI -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP db -yu -yu -yu -yu +KP +KP +KP +KP pI -yu -yu -yu -yu +KP +KP +KP +KP pI -yu -yu +KP +KP jd of of @@ -28781,37 +29225,37 @@ Nh Nh jd xd -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP IY -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP pI -yu -um -yu +KP +eF +KP IY -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP jd of of @@ -29039,37 +29483,37 @@ Nh Nh jd xd -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP pI -yu -yu -um -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -um -yu -yu -yu -yu -yu -yu +KP +KP +eF +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +eF +KP +KP +KP +KP +KP +KP jd of of @@ -29136,9 +29580,9 @@ Nh Nh Nh HF +Yc zv -zv -zv +RQ HF Cy Cy @@ -29172,9 +29616,9 @@ Cy Cy Cy HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -29298,36 +29742,36 @@ Nh jd xd xd -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP jd of of @@ -29557,35 +30001,35 @@ jd xd xd xd -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP gB -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP pI -yu -yu -um -yu -yu +KP +KP +eF +KP +KP zl -yu -yu -yu +KP +KP +KP IY -yu -yu -yu +KP +KP +KP jd of of @@ -29816,34 +30260,34 @@ xd xd xd xd -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu -yu +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP +KP jd of of @@ -30069,39 +30513,39 @@ Nh Nh Nh Nh -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG -tG +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd +jd jd jd jd @@ -30204,9 +30648,9 @@ HF HF HF HF +Yc zv -zv -zv +RQ HF Nh Nh @@ -30373,17 +30817,17 @@ kL rt rt rt +kL rt rt +kL +rt rt kL rt rt rt -rt -rt -rt -rt +kL rt rt rt @@ -30442,23 +30886,23 @@ wa zv zv zv +qv zv zv zv +qv zv zv zv +qv zv zv zv +qv zv zv zv -zv -zv -zv -zv -zv +qv zv zv zv @@ -30889,17 +31333,17 @@ ZY rt rt rt +ZY rt rt +ZY +rt rt ZY rt rt rt -rt -rt -rt -rt +ZY rt rt rt @@ -30958,27 +31402,27 @@ wa zv zv zv +FB zv zv zv +FB zv zv zv +FB zv zv zv +FB zv zv zv +FB zv zv zv -zv -zv -zv -zv -zv -zv +FB zv zv HF @@ -32730,19 +33174,19 @@ Ae Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +vz +mx +mx +mx +mx +mx +mx +mx +mx +mx +mx +mx +mx Ae Ae Ae @@ -32988,19 +33432,19 @@ EP Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +mx +Zm +Qm +Zm +mx +mx +Ni +Ni +Bf +Ni +Ni +mx Ae EP rt @@ -33246,19 +33690,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +Zm +Ni +Ni +Ni +Zm +mx +Ry +Ni +Ry +Ni +Ry +mx Ae rt rt @@ -33468,32 +33912,32 @@ Ae oH rt rt +ZY rt rt rt rt rt +ZY rt rt rt rt rt -rt -rt -rt +ZY rt rt sY rt rt rt +ZY rt rt rt rt rt -rt -rt +ZY rt rt rt @@ -33504,19 +33948,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +Ny +Ni +Ni +Ni +xi +mx +DM +Ni +Ni +Ni +pV +mx Ae rt rt @@ -33762,19 +34206,19 @@ Qh Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +Zm +Ni +Ni +Ni +Zm +mx +Ry +Ni +Ry +Ni +Ry +mx Ae oH CY @@ -34020,19 +34464,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +mx +Ni +Ni +pV +mx +mx +Ni +Ni +Ni +Ni +Ni +mx Ae rt rt @@ -34278,19 +34722,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +Zm +Ni +Ni +Ni +Zm +mx +Ry +Ni +Ry +Ni +Ry +mx Ae rt CY @@ -34536,19 +34980,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +Ny +Ni +Ni +Ni +xi +mx +DM +Ni +Ni +Ni +pV +mx Ae rt rt @@ -34794,19 +35238,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +Zm +Ni +Ni +Ni +Zm +mx +Ry +Ni +Ry +Ni +Ry +mx Ae rt CY @@ -35052,19 +35496,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +mx +Ni +Ni +Ni +mx +mx +Ni +Ni +Go +Ni +Ni +mx Ae EP rt @@ -35310,19 +35754,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +mx +mx +wF +mx +mx +mx +wF +mx +mx +mx +wF +mx Ae rt rt @@ -35569,18 +36013,18 @@ Ae Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +Ni +Ni +Ni +Bf +Ni +Ni +Ni +Bf +Ni +Ni +Ni Ae rt rt @@ -35723,26 +36167,26 @@ Nh Nh YJ YJ -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +YJ +YJ +YJ +YJ +YJ +YJ +YJ +YJ +YJ +YJ +YJ +YJ +YJ +YJ tX Pr -Fh +MP IT tX -TO +Dw TO lV zm @@ -35827,19 +36271,19 @@ Ae Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Ae +mx +Ni +Ni +Ni +Ni +Ni +Ni +Ni +Ni +Ni +Ni +Ni +Jc rt rt CY @@ -36062,7 +36506,7 @@ Nh iA iA iA -CO +ry iA iA iA @@ -36070,7 +36514,7 @@ iA iA iA iA -Fb +EW iA iA iA @@ -36085,18 +36529,18 @@ Ae Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +mx +Ni +Ni +Ni +Go +Ni +Ni +Ni +Go +Ni +Ni +Ni Ae rt rt @@ -36254,7 +36698,7 @@ qJ qJ qJ tX -TO +Dw TO TO vU @@ -36322,11 +36766,11 @@ iA iA CO iA +WZ +WZ iA -iA -iA -iA -iA +WZ +WZ iA Fb iA @@ -36669,7 +37113,7 @@ YW YW YW YW -EZ +Fk mQ Ib Ib @@ -36790,7 +37234,7 @@ HI HI HI HI -Wp +ze zm zm zm @@ -37286,7 +37730,7 @@ qJ qJ qJ tX -TO +Dw TO TO vU @@ -37354,11 +37798,11 @@ iA iA Bn iA +WZ +WZ iA -iA -iA -iA -iA +WZ +WZ iA We iA @@ -37610,7 +38054,7 @@ Nh iA iA iA -Bn +tY iA iA iA @@ -37618,7 +38062,7 @@ iA iA iA iA -We +WD iA iA iA @@ -37633,18 +38077,18 @@ Ae Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv Ae rt rt @@ -37793,20 +38237,20 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh +mI +mI +mI +mI +DE Rz Rz -Nh +DE tX Fh -Fh +HP IT tX -TO +Dw TO lV zm @@ -37891,19 +38335,19 @@ Ae Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Ae +uo +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Fp rt rt rt @@ -38051,14 +38495,14 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh +mI +mI +mI +mI +DE Rz Rz -Nh +DE tX tX tX @@ -38149,18 +38593,18 @@ Ae Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv Ae rt CY @@ -38306,21 +38750,21 @@ YJ Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -Nh +mI +mI +mI +mI +mI +mI +DE +kj +kj +kj +kj +DE +mI +mI +mI tX be be @@ -38406,19 +38850,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +uo +Sv +Sv +Sv +uo +uo +uo +uo +uo +uo +dR +uo Ae EP rt @@ -38564,21 +39008,21 @@ YJ Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -Nh +mI +mI +mI +mI +mI +mI +DE +kj +kj +kj +kj +DE +mI +mI +mI tX zm zm @@ -38664,19 +39108,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +Bt +Sv +Sv +Sv +Bt +uo +Dc +Dc +Sv +Sv +Sv +Sv Ae rt rt @@ -38822,21 +39266,21 @@ YJ Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -Nh -Nh -Nh +mI +mI +mI +mI +mI +mI +DE +kj +kj +kj +kj +DE +mI +mI +mI tX zm zm @@ -38922,19 +39366,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +Bt +Sv +Sv +Sv +Bt +uo +Sv +Sv +Sv +Sv +Sv +Sv Ae rt rt @@ -39080,21 +39524,21 @@ YJ Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh +mI +mI +mI +mI +DE +DE +kj +kj +kj +kj +kj +kj +DE +DE +mI tX zm zm @@ -39180,19 +39624,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +Bt +Sv +Sv +Sv +Bt +uo +Sv +Sv +Sv +Sv +Sv +Sv Ae rt rt @@ -39338,22 +39782,22 @@ YJ Nh Nh Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -tX +mI +mI +DE +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +so tX tX tX @@ -39438,19 +39882,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +uo +Sv +Sv +Sv +uo +uo +EZ +EZ +Sv +Sv +Sv +Sv Ae rt rt @@ -39592,32 +40036,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +mI +TD Nh Nh Nh @@ -39696,19 +40140,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +Cs +Sv +Sv +Sv +Cs +uo +Dc +Dc +Sv +Sv +EZ +EZ Ae rt CY @@ -39850,32 +40294,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +mI +TD Nh Nh Nh @@ -39954,19 +40398,19 @@ Qh Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +Cs +Sv +Sv +Sv +Cs +uo +Sv +Sv +Sv +Sv +Dc +Dc Ae oH rt @@ -40108,32 +40552,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +TD Nh Nh Nh @@ -40176,6 +40620,13 @@ Ae oH rt rt +kL +rt +rt +rt +rt +rt +kL rt rt rt @@ -40183,19 +40634,12 @@ rt rt rt rt +kL rt rt rt rt -rt -rt -rt -rt -rt -rt -rt -rt -rt +kL rt rt rt @@ -40212,19 +40656,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +Cs +Sv +Sv +Sv +Cs +uo +Sv +Sv +Sv +Sv +Sv +Sv Ae rt rt @@ -40366,32 +40810,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -ch -ch -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -ch -ch -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +DE +kj +kj +DE +DE +kj +kj +kj +kj +kj +kj +kj +kj +DE +DE +kj +kj +DE +mI +mI +mI +TD Nh Nh Nh @@ -40470,19 +40914,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +uo +Cs +Cs +Cs +uo +uo +kS +Sv +Sv +Sv +Sv +Sv Ae rt rt @@ -40624,32 +41068,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -ch -ch -ch -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -ch -ch -ch -Nh -Nh -Nh -Nh +TD +mI +mI +DE +kj +kj +kj +DE +DE +kj +kj +kj +kj +kj +kj +kj +kj +DE +DE +kj +kj +kj +DE +mI +mI +TD Nh Nh Nh @@ -40728,19 +41172,19 @@ rt Ae Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +uo +uo +uo +uo +uo +uo +Sv +Sv +Sv +Sv +EZ +EZ Ae rt EP @@ -40882,32 +41326,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh +TD +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +TD Nh Nh Nh @@ -40992,17 +41436,17 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Ae -Ae -Ae -Ae +uo +uo +dR +uo +uo +uo +uo +uo +uo +uo +uo Ae Ae yO @@ -41140,32 +41584,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +DE +DE +DE +DE +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +TD Nh Nh Nh @@ -41250,17 +41694,17 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv Ae rt rt @@ -41398,32 +41842,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +DE +kj +kj +kj +kj +DE +DE +DE +DE +DE +DE +kj +kj +kj +kj +DE +mI +mI +mI +mI +TD Nh Nh Nh @@ -41508,17 +41952,17 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv Ae rt rt @@ -41656,32 +42100,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +DE +kj +kj +kj +kj +kj +DE +DE +DE +DE +kj +kj +kj +kj +kj +DE +mI +mI +mI +mI +TD Nh Nh Nh @@ -41766,17 +42210,17 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +uo +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv +Sv Ae rt rt @@ -41914,32 +42358,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +TD Nh Nh Nh @@ -42024,22 +42468,22 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +uo +uo +uo +uo +uo +uo +uo +Wp +Wp +zZ +Wp +Wp +Wp +he +Wp +Wp Nh Nh Nh @@ -42172,32 +42616,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -ch -ch -ch -Nh -Nh -ch -ch -ch -ch -ch -ch -Nh -Nh -ch -ch -ch -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +DE +kj +kj +kj +DE +DE +kj +kj +kj +kj +kj +kj +DE +DE +kj +kj +kj +DE +mI +mI +mI +TD Nh Nh Nh @@ -42289,15 +42733,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Im +Wp +Im +Im +Im +Wp Nh Nh Nh @@ -42430,32 +42874,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -Nh +TD +mI +mI +DE +kj +kj +kj +kj +DE +DE +DE +kj +kj +kj +kj +DE +DE +DE +kj +kj +kj +kj +DE +mI +mI +TD Nh Nh Nh @@ -42547,15 +42991,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -oH -rt -Qh -Ae +Wp +Im +Im +Im +Tw +Im +Im +Im +Wp Nh Nh Nh @@ -42688,32 +43132,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -ch -ch -ch -ch -ch -Nh -Nh -ch -ch -ch -ch -Nh -Nh -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh +TD +mI +mI +DE +kj +kj +kj +kj +kj +DE +DE +kj +kj +kj +kj +DE +DE +kj +kj +kj +kj +kj +DE +mI +mI +TD Nh Nh Nh @@ -42805,15 +43249,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Im +RB +Im +Im +Im +Wp Nh Nh Nh @@ -42946,32 +43390,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh +TD +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +TD Nh Nh Nh @@ -43063,15 +43507,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Im +zB +Im +Im +Im +Wp Nh Nh Nh @@ -43204,32 +43648,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh +TD +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +DE +DE +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +TD Nh Nh Nh @@ -43321,15 +43765,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +UT +Wp +Im +Im +Im +Wp Nh Nh Nh @@ -43462,32 +43906,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh +TD +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +DE +DE +DE +DE +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +TD Nh Nh Nh @@ -43560,11 +44004,11 @@ Sd Sd Sd pF -uo -uo -uo -uo -uo +ID +ch +ch +ch +ch Nh Nh Nh @@ -43579,15 +44023,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Wv +Wp +yB +yB +yB +Wp Nh Nh Nh @@ -43720,32 +44164,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh +TD +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +DE +DE +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +TD Nh Nh Nh @@ -43818,11 +44262,11 @@ Sd Sd Sd ID -uo -Yc -Cs -Im -uo +ID +ch +ch +ch +ch ch Nh Nh @@ -43837,15 +44281,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +UT +Wp +Du +Im +Du +Wp Nh Nh Nh @@ -43978,32 +44422,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh +TD +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +TD Nh Nh Nh @@ -44075,12 +44519,12 @@ ID Sd Sd Sd -Bf -Yc -Yc -Yc -FB -uo +ID +ch +ch +ch +ch +ch ch ch Nh @@ -44095,15 +44539,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Wa +Tw +Im +Im +Im +Wp Nh Nh Nh @@ -44236,32 +44680,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -ch -ch -ch -ch -ch -Nh -Nh -ch -ch -ch -ch -Nh -Nh -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh +TD +mI +mI +DE +kj +kj +kj +kj +kj +DE +DE +kj +kj +kj +kj +DE +DE +kj +kj +kj +kj +kj +DE +mI +mI +TD Nh Nh Nh @@ -44334,11 +44778,11 @@ Sd Sd Sd ID -uo -Yc -XG -RQ -uo +ch +ch +ch +ch +ch ch ch ch @@ -44353,15 +44797,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Wa +RB +Im +Im +Im +Wp Nh Nh Nh @@ -44494,32 +44938,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -Nh +TD +mI +mI +DE +kj +kj +kj +kj +DE +DE +DE +kj +kj +kj +kj +DE +DE +DE +kj +kj +kj +kj +DE +mI +mI +TD Nh Nh Nh @@ -44592,11 +45036,11 @@ Or bb Or Or -uo -uo -uo -uo -uo +ch +ch +ch +ch +ch ch ch ch @@ -44611,15 +45055,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +UE +RB +Im +Im +Im +Wp Nh Nh Nh @@ -44752,32 +45196,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -ch -ch -ch -Nh -Nh -ch -ch -ch -ch -ch -ch -Nh -Nh -ch -ch -ch -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +DE +kj +kj +kj +DE +DE +kj +kj +kj +kj +kj +kj +DE +DE +kj +kj +kj +DE +mI +mI +mI +TD Nh Nh Nh @@ -44869,15 +45313,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -oH -rt -Qh -Ae +Wp +Im +Im +Wa +zB +Im +Im +Im +Wp Nh Nh Nh @@ -45010,32 +45454,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +TD Nh Nh Nh @@ -45127,15 +45571,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +UT +Wp +Du +Im +Du +Wp Nh Nh Nh @@ -45268,32 +45712,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +DE +kj +kj +kj +kj +kj +DE +DE +DE +DE +kj +kj +kj +kj +kj +DE +mI +mI +mI +mI +TD Nh Nh Nh @@ -45385,15 +45829,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +TA +Wp +In +In +In +Wp Nh Nh Nh @@ -45526,32 +45970,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +DE +kj +kj +kj +kj +DE +DE +DE +DE +DE +DE +kj +kj +kj +kj +DE +mI +mI +mI +mI +TD Nh Nh Nh @@ -45599,7 +46043,7 @@ Sd Sd pF ID -bf +mS yE yE LO @@ -45643,15 +46087,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +UT +Wp +Im +Im +Im +Wp Nh Nh Nh @@ -45784,32 +46228,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -Nh -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +mI +DE +kj +kj +kj +kj +DE +DE +DE +DE +kj +kj +kj +kj +DE +mI +mI +mI +mI +mI +TD Nh Nh Nh @@ -45857,7 +46301,7 @@ Sd Sd cE ID -bf +mS yE yE LO @@ -45901,15 +46345,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Im +Tw +Im +Im +Im +Wp Nh Nh Nh @@ -46042,32 +46486,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +mI +mI +TD Nh Nh Nh @@ -46159,15 +46603,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -oH -rt -Qh -Ae +Wp +Im +Im +Im +RB +Im +Im +Im +Wp Nh Nh Nh @@ -46300,32 +46744,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +mI +mI +mI +TD Nh Nh Nh @@ -46417,15 +46861,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Im +zB +Im +Im +Im +Wp Nh Nh Nh @@ -46558,32 +47002,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +mI +mI +mI +TD Nh Nh Nh @@ -46675,15 +47119,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Im +Wp +Im +Im +Im +Wp Nh Nh Nh @@ -46816,32 +47260,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +mI +mI +mI +TD Nh Nh Nh @@ -46933,15 +47377,15 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Ae -rt -rt -rt -Ae +Wp +Wp +Wp +Wp +Wp +Wp +he +Wp +Wp Nh Nh Nh @@ -47074,32 +47518,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +mI +mI +mI +TD Nh Nh Nh @@ -47195,11 +47639,11 @@ Nh Nh Nh Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Im +Wp Nh Nh Nh @@ -47332,32 +47776,32 @@ Nh Nh Nh YJ -YJ -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -ch -ch -ch -ch -ch -ch -ch -ch -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh -Nh +TD +mI +mI +mI +mI +mI +mI +mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +DE +mI +mI +mI +mI +mI +mI +mI +TD Nh Nh Nh @@ -47453,11 +47897,11 @@ Nh Nh Nh Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Im +Wp Nh Nh Nh @@ -47598,17 +48042,16 @@ mI mI mI mI -mI -ZG -ZG -ZG -ZG -ZG -ZG -ZG -ZG -mI -mI +DE +kj +kj +kj +kj +kj +kj +kj +kj +DE mI mI mI @@ -47616,6 +48059,7 @@ mI mI mI mI +TD Nh Nh Nh @@ -47711,11 +48155,11 @@ Nh Nh Nh Nh -Ae -rt -rt -rt -Ae +Wp +Im +Im +Im +Wp Nh Nh Nh @@ -47855,7 +48299,7 @@ mI mI mI mI -mI +DE kj kj kj @@ -47866,14 +48310,14 @@ kj kj kj kj +DE mI mI mI mI mI mI -mI -mI +TD Nh Nh Nh @@ -48113,18 +48557,18 @@ mI mI mI mI +DE kj kj kj kj kj +Ta kj kj kj kj -kj -kj -kj +DE mI mI mI @@ -48370,6 +48814,7 @@ mI mI mI mI +DE kj kj kj @@ -48382,8 +48827,7 @@ kj kj kj kj -kj -kj +DE mI mI mI @@ -48627,6 +49071,8 @@ mI mI mI mI +mI +DE kj kj kj @@ -48639,10 +49085,8 @@ kj kj kj kj -kj -kj -kj -kj +DE +mI mI mI mI @@ -48884,9 +49328,9 @@ TD mI mI mI -kj -kj -kj +mI +mI +DE kj kj kj @@ -48899,9 +49343,9 @@ kj OM kj kj -kj -kj -kj +DE +mI +mI mI mI mI @@ -49141,6 +49585,11 @@ YJ TD mI mI +mI +mI +mI +mI +DE kj kj kj @@ -49151,16 +49600,11 @@ kj kj kj kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj +DE +mI +mI +mI +mI mI mI mI @@ -49398,6 +49842,12 @@ Nh YJ TD mI +mI +mI +mI +mI +mI +DE kj kj kj @@ -49408,18 +49858,12 @@ kj kj kj kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj +DE +mI +mI +mI +mI +mI mI mI Nh @@ -49655,6 +50099,14 @@ Nh Nh YJ TD +mI +mI +mI +mI +mI +mI +mI +DE kj kj kj @@ -49663,22 +50115,14 @@ kj kj kj kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj +DE +mI +mI +mI +mI +mI +mI +mI mI Nh Nh @@ -49913,30 +50357,30 @@ Nh Nh YJ TD +mI +mI +mI +mI +mI +mI +mI +mI +DE +DE kj kj kj kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj +DE +DE +mI +mI +mI +mI +mI +mI +mI +mI mI Nh Nh @@ -50171,30 +50615,30 @@ Nh Nh YJ TD -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +DE +DE +DE +DE +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI Nh Nh @@ -50302,7 +50746,7 @@ Xk Xk Xk Xk -tG +jz Nh Nh Nh @@ -50428,32 +50872,32 @@ Nh Nh Nh YJ -TD -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -50560,7 +51004,7 @@ Xk Xk Xk Xk -tG +jz Nh Nh Nh @@ -50686,32 +51130,32 @@ Nh Nh Nh YJ -TD -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -50818,7 +51262,7 @@ Xk Xk Xk Xk -tG +jz Nh Nh Nh @@ -50944,32 +51388,32 @@ Nh Nh Nh YJ -TD -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -Ta -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -51052,12 +51496,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +jz +jz +jz +jz +jz jz we we @@ -51076,13 +51520,13 @@ Xk Xk Xk Xk -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +jz +jz +jz +jz +jz +jz Nh Nh Nh @@ -51202,32 +51646,32 @@ Nh Nh Nh YJ -TD -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -51310,12 +51754,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +PG +PG +PG jz we we @@ -51334,13 +51778,13 @@ Xk Xk Xk Xk -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +oZ +PG +PG +PG +PG +jz Nh Nh Nh @@ -51460,32 +51904,32 @@ Nh Nh Nh YJ -TD -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -51568,12 +52012,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +bC +PG +PG +oZ +PG jz ov we @@ -51592,13 +52036,13 @@ Xk Xk Xk ZL -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +PG +bC +PG +jz Nh Nh Nh @@ -51718,32 +52162,32 @@ Nh Nh Nh YJ -TD -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -51826,13 +52270,13 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh jz +PG +oZ +PG +PG +PG +zx we we we @@ -51850,13 +52294,13 @@ Xk Xk Xk Xk -tG -Nh -Nh -Nh -Nh -Nh -Nh +zx +PG +PG +bC +YL +PG +jz Nh Nh Nh @@ -51976,32 +52420,32 @@ Nh Nh Nh YJ -TD -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -52084,12 +52528,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +PG +bC +YL jz we we @@ -52108,13 +52552,13 @@ Xk Xk Xk Xk -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +PG +PG +PG +jz Nh Nh Nh @@ -52234,32 +52678,32 @@ Nh Nh Nh YJ -TD -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -52342,13 +52786,13 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh jz +PG +YL +PG +PG +PG +zx gR gR gR @@ -52366,13 +52810,13 @@ nj nj nj nj -tG -Nh -Nh -Nh -Nh -Nh -Nh +zx +PG +PG +PG +oZ +PG +jz Nh Nh Nh @@ -52492,32 +52936,32 @@ Nh Nh Nh YJ -TD -mI -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -52600,12 +53044,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +bC +YL +PG jz il gR @@ -52624,13 +53068,13 @@ nj nj nj Ty -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +YL +bC +PG +PG +jz Nh Nh Nh @@ -52750,32 +53194,32 @@ Nh Nh Nh YJ -TD -mI -mI -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI -mI -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -52858,12 +53302,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +PG +PG +PG jz gR gR @@ -52882,13 +53326,13 @@ nj nj nj nj -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +PG +PG +YL +jz Nh Nh Nh @@ -53008,32 +53452,32 @@ Nh Nh Nh YJ -TD -mI -mI -mI -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI -mI -mI -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -53116,12 +53560,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +jz +jz +jz +jz +jz jz gR gR @@ -53131,7 +53575,7 @@ XK jz QI LW -jz +Gy ce QI jz @@ -53140,13 +53584,13 @@ nj nj nj nj -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +jz +jz +jz +jz +jz +jz Nh Nh Nh @@ -53266,32 +53710,32 @@ Nh Nh Nh YJ -TD -mI -mI -mI -mI -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI -mI -mI -mI -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -53398,7 +53842,7 @@ nj nj nj nj -tG +jz Nh Nh Nh @@ -53524,32 +53968,32 @@ Nh Nh Nh YJ -TD -mI -mI -mI -mI -mI -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI -mI -mI -mI -mI -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -53656,7 +54100,7 @@ nj nj nj nj -tG +jz Nh Nh Nh @@ -53782,32 +54226,32 @@ Nh Nh Nh YJ -TD -mI -mI -mI -mI -mI -mI -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI -mI -mI -mI -mI -mI -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -53914,7 +54358,7 @@ nj nj nj nj -tG +jz Nh Nh Nh @@ -54040,32 +54484,32 @@ Nh Nh Nh YJ -TD -mI -mI -mI -mI -mI -mI -mI -kj -kj -kj -kj -kj -kj -kj -kj -kj -kj -mI -mI -mI -mI -mI -mI -mI -mI +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh Nh Nh Nh @@ -54162,9 +54606,9 @@ gR gR im QI +jM QI -QI -QI +jM QI im nj @@ -54298,32 +54742,32 @@ Nh Nh Nh YJ -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD -TD +YJ +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh +Nh YJ YJ YJ @@ -56226,9 +56670,9 @@ gR gR HW QI +vr QI -QI -QI +vr QI HW nj @@ -56485,7 +56929,7 @@ XK jz jz jz -uN +nT jz jz jz @@ -56494,7 +56938,7 @@ nj nj nj nj -tG +jz Nh Nh Nh @@ -56752,7 +57196,7 @@ nj nj nj nj -tG +jz Nh Nh Nh @@ -57010,7 +57454,7 @@ nj nj nj nj -tG +jz Nh Nh Nh @@ -57244,12 +57688,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +jz +jz +jz +jz +jz jz gR gR @@ -57259,7 +57703,7 @@ XK jz QI LW -jz +Ab ce QI jz @@ -57268,13 +57712,13 @@ nj nj nj nj -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +jz +jz +jz +jz +jz +jz Nh Nh Nh @@ -57502,12 +57946,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +PG +PG +PG jz gR gR @@ -57526,13 +57970,13 @@ nj nj nj nj -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +PG +YL +PG +jz Nh Nh Nh @@ -57760,12 +58204,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +bC +PG +PG jz il gR @@ -57784,13 +58228,13 @@ nj nj nj Ty -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +bC +PG +PG +PG +jz Nh Nh Nh @@ -58018,13 +58462,13 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh jz +PG +oZ +PG +YL +PG +zx gR gR gR @@ -58042,13 +58486,13 @@ nj nj nj nj -tG -Nh -Nh -Nh -Nh -Nh -Nh +zx +PG +PG +PG +bC +PG +jz Nh Nh Nh @@ -58276,12 +58720,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +PG +PG +PG jz At At @@ -58300,13 +58744,13 @@ Hr Hr Hr Hr -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +YL +PG +oZ +PG +PG +jz Nh Nh Nh @@ -58534,13 +58978,13 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh jz +YL +bC +PG +PG +bC +zx At At At @@ -58558,13 +59002,13 @@ Hr Hr Hr Hr -tG -Nh -Nh -Nh -Nh -Nh -Nh +zx +PG +PG +PG +oZ +PG +jz Nh Nh Nh @@ -58792,12 +59236,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +oZ +YL +PG jz Bj At @@ -58816,13 +59260,13 @@ Hr Hr Hr rf -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +bC +PG +PG +PG +jz Nh Nh Nh @@ -59050,12 +59494,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +PG +PG +PG +PG +PG jz At At @@ -59074,13 +59518,13 @@ Hr Hr Hr Hr -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +oZ +PG +PG +YL +PG +jz Nh Nh Nh @@ -59308,12 +59752,12 @@ Nh Nh Nh Nh -Nh -Nh -Nh -Nh -Nh -Nh +jz +jz +jz +jz +jz +jz jz At At @@ -59332,13 +59776,13 @@ Hr Hr Hr Hr -tG -Nh -Nh -Nh -Nh -Nh -Nh +jz +jz +jz +jz +jz +jz +jz Nh Nh Nh @@ -59590,7 +60034,7 @@ Hr Hr Hr Hr -tG +jz Nh Nh Nh @@ -59848,7 +60292,7 @@ Hr Hr Hr Hr -tG +jz Nh Nh Nh @@ -60106,7 +60550,7 @@ Hr Hr Hr Hr -tG +jz Nh Nh Nh @@ -64999,7 +65443,7 @@ Nh jz hf cK -cK +ct cK ZN jz diff --git a/modular_chomp/code/modules/clothing/gateway/gateway.dm b/modular_chomp/code/modules/clothing/gateway/gateway.dm index ccc992e56a..d896959674 100644 --- a/modular_chomp/code/modules/clothing/gateway/gateway.dm +++ b/modular_chomp/code/modules/clothing/gateway/gateway.dm @@ -23,6 +23,7 @@ min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 3 * ONE_ATMOSPHERE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/backpack) //Candy section diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm index 439b5a8842..a1c23d2a0a 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm @@ -1,11 +1,18 @@ +//Trying to explain Jasper's attempt at a super boss +//Phase 1 Dark Gygax but diffrent +//Phase 2 All of it's attacks are meant to be some form of CC, with a single ion attack +//Phase 3 Orginally was meant to be a timed phase but couldn't get the debuff to work. Instead melee based phase? +//Phase 4 A mix of phases 1 through 3 +//Phase 5, it stands there with increased defense and shields. Bullet hell, highly rewarding if you can get melee in + /mob/living/simple_mob/mechanical/mecha/imperion name = "imperion" icon = 'icons/mecha/mecha.dmi' icon_state = "imperion" icon_living = "imperion" desc = "A strange precursor mecha" - maxHealth = 350 - health = 350 + maxHealth = 400 + health = 400 movement_cooldown = -1 unsuitable_atoms_damage = 0 projectiletype = /obj/item/projectile/energy/gaussrifle @@ -50,16 +57,6 @@ if(I_GRAB) // Micro-singulo launch_microsingularity(A) -/mob/living/simple_mob/mechanical/mecha/imperion/phase3/do_special_attack(atom/A) - . = TRUE // So we don't fire a bolt as well. - switch(a_intent) - if(I_DISARM) // Side gun - electric_defense(A) - if(I_HURT) // Rockets - launch_rockets(A) - if(I_GRAB) // Micro-singulo - launch_microsingularity(A) - /mob/living/simple_mob/mechanical/mecha/imperion/phase4/do_special_attack(atom/A) . = TRUE // So we don't fire a bolt as well. switch(a_intent) @@ -162,33 +159,73 @@ /mob/living/simple_mob/mechanical/mecha/imperion/phase3 //DPS check movement_cooldown = -1 - projectiletype = /obj/item/projectile/energy/gaussrifle - melee_attack_delay = 4 SECOND + projectiletype = null + melee_attack_delay = 2 SECOND - ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax + ai_holder_type = /datum/ai_holder/simple_mob/ranged/aggressive/meleeimperion wreckage = null pilot_type = /mob/living/simple_mob/mechanical/mecha/imperion/phase4 - special_attack_min_range = 1 - special_attack_max_range = 9 - special_attack_cooldown = 15 SECONDS + special_attack_min_range = 3 + special_attack_max_range = 14 //this thing will not let you recover during phase 3. It blitz you down, or you blitz it down. + special_attack_cooldown = 5 SECONDS -/mob/living/simple_mob/mechanical/mecha/imperion/phase3/proc/electric_defense(atom/target) +/mob/living/simple_mob/mechanical/mecha/imperion/phase3/do_special_attack(atom/A) + // Teleport attack. + if(!A) + to_chat(src, span("warning", "There's nothing to teleport to.")) + return FALSE + + var/list/nearby_things = range(1, A) + var/list/valid_turfs = list() + + // All this work to just go to a non-dense tile. + for(var/turf/potential_turf in nearby_things) + var/valid_turf = TRUE + if(potential_turf.density) + continue + for(var/atom/movable/AM in potential_turf) + if(AM.density) + valid_turf = FALSE + if(valid_turf) + valid_turfs.Add(potential_turf) + + if(!(valid_turfs.len)) + to_chat(src, span("warning", "There wasn't an unoccupied spot to teleport to.")) + return FALSE + + var/turf/target_turf = pick(valid_turfs) + var/turf/T = get_turf(src) + + var/datum/effect/effect/system/spark_spread/s1 = new /datum/effect/effect/system/spark_spread + s1.set_up(5, 1, T) + var/datum/effect/effect/system/spark_spread/s2 = new /datum/effect/effect/system/spark_spread + s2.set_up(5, 1, target_turf) + + + T.visible_message(span("notice", "\The [src] vanishes!")) + s1.start() + + forceMove(target_turf) + playsound(target_turf, 'sound/effects/phasein.ogg', 50, 1) + to_chat(src, span("notice", "You teleport to \the [target_turf].")) + + target_turf.visible_message(span("warning", "\The [src] appears!")) + s2.start() + +/datum/ai_holder/simple_mob/ranged/aggressive/meleeimperion + home_low_priority = TRUE + vision_range = 28 //cheesy Ai for absurdly aggressive phase + +/datum/ai_holder/simple_mob/ranged/aggressive/meleeimperion/react_to_attack() var/obj/item/projectile/P = new /obj/item/projectile/forcebolt(get_turf(src)) P.launch_projectile(target, BP_TORSO, src) -/mob/living/simple_mob/mechanical/mecha/imperion/phase3/proc/launch_rockets(atom/target) - var/obj/item/projectile/P = new /obj/item/projectile/energy/homing_bolt/wizard/lighting(get_turf(src)) - P.launch_projectile(target, BP_TORSO, src) - -/mob/living/simple_mob/mechanical/mecha/imperion/phase3/proc/launch_microsingularity(atom/target) - var/obj/item/projectile/P = new /obj/item/projectile/arc/radioactive(get_turf(src)) - P.launch_projectile(target, BP_TORSO, src) - +//Phase four, fusion time. /mob/living/simple_mob/mechanical/mecha/imperion/phase4 //Starts to slow down movement_cooldown = 0 - projectiletype = /obj/item/projectile/energy/plasma/vepr + projectiletype = /obj/item/projectile/energy/homing_bolt melee_attack_delay = 4 SECOND ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax @@ -198,7 +235,7 @@ special_attack_min_range = 1 special_attack_max_range = 9 - special_attack_cooldown = 15 SECONDS + special_attack_cooldown = 12 SECONDS /mob/living/simple_mob/mechanical/mecha/imperion/phase4/proc/electric_defense(atom/target) set waitfor = FALSE @@ -225,42 +262,83 @@ playsound(src, 'sound/effects/turret/move2.wav', 50, 1) /mob/living/simple_mob/mechanical/mecha/imperion/phase4/proc/launch_rockets(atom/target) - var/obj/item/projectile/P = new /obj/item/projectile/bullet/srmrocket(get_turf(src)) - P.launch_projectile(target, BP_TORSO, src) + if(!target) + to_chat(src, span("warning", "There's nothing to teleport to.")) + return FALSE + + var/list/nearby_things = range(1, target) + var/list/valid_turfs = list() + + // All this work to just go to a non-dense tile. + for(var/turf/potential_turf in nearby_things) + var/valid_turf = TRUE + if(potential_turf.density) + continue + for(var/atom/movable/AM in potential_turf) + if(AM.density) + valid_turf = FALSE + if(valid_turf) + valid_turfs.Add(potential_turf) + + if(!(valid_turfs.len)) + to_chat(src, span("warning", "There wasn't an unoccupied spot to teleport to.")) + return FALSE + + var/turf/target_turf = pick(valid_turfs) + var/turf/T = get_turf(src) + + var/datum/effect/effect/system/spark_spread/s1 = new /datum/effect/effect/system/spark_spread + s1.set_up(5, 1, T) + var/datum/effect/effect/system/spark_spread/s2 = new /datum/effect/effect/system/spark_spread + s2.set_up(5, 1, target_turf) + + + T.visible_message(span("notice", "\The [src] vanishes!")) + s1.start() + + forceMove(target_turf) + playsound(target_turf, 'sound/effects/phasein.ogg', 50, 1) + to_chat(src, span("notice", "You teleport to \the [target_turf].")) + + target_turf.visible_message(span("warning", "\The [src] appears!")) + s2.start() /mob/living/simple_mob/mechanical/mecha/imperion/phase4/proc/launch_microsingularity(atom/target) - var/obj/item/projectile/P = new /obj/item/projectile/bullet/pistol/medium/hp(get_turf(src)) - P.launch_projectile(target, BP_TORSO, src) + var/turf/T = get_turf(target) + visible_message(span("warning", "\The [src] fires an energetic sphere into the air!")) + playsound(src, 'sound/weapons/Laser.ogg', 50, 1) + face_atom(T) + var/obj/item/projectile/arc/microsingulo/sphere = new(loc) + sphere.old_style_target(T, src) + sphere.fire() + + /mob/living/simple_mob/mechanical/mecha/imperion/phase5 //Final stand icon_state = "imperion-phase" icon_living = "imperion-phase" icon_dead = "imperion-phase" desc = "A precursor mecha on it's last legs, sparking, seeming vunerable up close" - movement_cooldown = 45 - projectiletype = /obj/item/projectile/bullet/magnetic/fuelrod/tritium - melee_attack_delay = 4 SECOND - ranged_attack_delay = 1.5 SECONDS + movement_cooldown = 60 + projectiletype = /obj/item/projectile/energy/homing_bolt/missile + ranged_attack_delay = 0.5 SECONDS special_attack_min_range = 1 special_attack_max_range = 9 - special_attack_cooldown = 15 SECONDS + special_attack_cooldown = 5 SECONDS + melee_attack_delay = 1 SECOND ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax wreckage = null pilot_type = null - var/grenade_type = /obj/item/weapon/grenade/shooter/energy/tesla - var/grenade_timer = 10 - var/grenade_type2 = /obj/item/weapon/grenade/shooter/rubber - var/grenade_type3 = /obj/item/weapon/grenade/shooter/laserpellet var/obj/item/shield_projector/shields = null armor = list( - "melee" = -300, - "bullet" = 65, - "laser" = 65, - "energy" = 65, - "bomb" = 65, + "melee" = -500, + "bullet" = 75, + "laser" = 75, + "energy" = 75, + "bomb" = 75, "bio" = 100, "rad" = 100 ) @@ -308,44 +386,71 @@ /obj/item/clothing/head/psy_crown/candycrown = 60, /obj/item/clothing/gloves/stamina = 60, /obj/item/clothing/suit/armor/buffvest = 60, - /obj/item/weapon/melee/cullingcane = 60 + /obj/item/weapon/melee/cullingcane = 60, + /obj/item/weapon/bluespace_harpoon = 60, + /obj/item/weapon/flame/lighter/supermatter/syndismzippo = 60, + /obj/item/weapon/gun/energy/vepr/plasma = 60, + /obj/item/weapon/gun/energy/medigun = 60 ) /mob/living/simple_mob/mechanical/mecha/imperion/phase5/proc/electric_defense(atom/target) - set waitfor = FALSE - visible_message(span("warning", "\The [src] crackles with lighting!")) - - var/obj/item/weapon/grenade/G = new grenade_type(get_turf(src)) - if(istype(G)) - G.throw_at(G.throw_range, G.throw_speed, src) - G.det_time = grenade_timer - G.activate(src) - - set_AI_busy(FALSE) + var/turf/T = get_turf(target) + visible_message(span("warning", "\The [src] fires an energetic sphere into the air!")) + playsound(src, 'sound/weapons/Laser.ogg', 50, 1) + face_atom(T) + var/obj/item/projectile/arc/microsingulo/sphere = new(loc) + sphere.old_style_target(T, src) + sphere.fire() + var/obj/item/projectile/P = new /obj/item/projectile/bullet/imperionspear(get_turf(src)) + P.launch_projectile(target, BP_TORSO, src) + if(prob(50)) + var/obj/item/projectile/B = new /obj/item/projectile/bullet/imperionblaster(get_turf(src)) + B.launch_projectile(target, BP_TORSO, src) + else + var/obj/item/projectile/A = new /obj/item/projectile/bullet/imperiontesla(get_turf(src)) + A.launch_projectile(target, BP_TORSO, src) /mob/living/simple_mob/mechanical/mecha/imperion/phase5/proc/launch_rockets(atom/target) - set waitfor = FALSE - visible_message(span("warning", "\The [src] prepares lasers!")) - - var/obj/item/weapon/grenade/G = new grenade_type2(get_turf(src)) - if(istype(G)) - G.throw_at(G.throw_range, G.throw_speed, src) - G.det_time = grenade_timer - G.activate(src) - - set_AI_busy(FALSE) + var/obj/item/projectile/P = new /obj/item/projectile/bullet/imperionblaster(get_turf(src)) + P.launch_projectile(target, BP_TORSO, src) + if(prob(50)) + var/obj/item/projectile/B = new /obj/item/projectile/bullet/imperionspear(get_turf(src)) + B.launch_projectile(target, BP_TORSO, src) + else + var/obj/item/projectile/A = new /obj/item/projectile/bullet/imperiontesla(get_turf(src)) + A.launch_projectile(target, BP_TORSO, src) /mob/living/simple_mob/mechanical/mecha/imperion/phase5/proc/launch_microsingularity(atom/target) set waitfor = FALSE - visible_message(span("warning", "\The [src] prepares it's machine gun!")) - var/obj/item/weapon/grenade/G = new grenade_type3(get_turf(src)) - if(istype(G)) - G.throw_at(G.throw_range, G.throw_speed, src) - G.det_time = grenade_timer - G.activate(src) + // Telegraph our next move. + Beam(target, icon_state = "sat_beam", time = 3.5 SECONDS, maxdistance = INFINITY) + visible_message(span("warning", "\The [src] deploys a missile rack!")) + playsound(src, 'sound/effects/turret/move1.wav', 50, 1) + sleep(0.5 SECONDS) - set_AI_busy(FALSE) + for(var/i = 1 to 3) + if(target) // Might get deleted in the meantime. + var/turf/T = get_turf(target) + if(T) + visible_message(span("warning", "\The [src] fires a rocket into the air!")) + playsound(src, 'sound/weapons/rpg.ogg', 70, 1) + face_atom(T) + var/obj/item/projectile/arc/explosive_rocket/rocket = new(loc) + rocket.old_style_target(T, src) + rocket.fire() + sleep(1 SECOND) + + visible_message(span("warning", "\The [src] retracts the missile rack.")) + playsound(src, 'sound/effects/turret/move2.wav', 50, 1) + var/obj/item/projectile/P = new /obj/item/projectile/bullet/imperiontesla(get_turf(src)) + P.launch_projectile(target, BP_TORSO, src) + if(prob(50)) + var/obj/item/projectile/B = new /obj/item/projectile/bullet/imperionblaster(get_turf(src)) + B.launch_projectile(target, BP_TORSO, src) + else + var/obj/item/projectile/A = new /obj/item/projectile/bullet/imperionspear(get_turf(src)) + A.launch_projectile(target, BP_TORSO, src) /mob/living/simple_mob/mechanical/mecha/imperion/phase5/Initialize(mapload) shields = new /obj/item/shield_projector/rectangle/automatic/imperion(src) @@ -354,7 +459,7 @@ /obj/item/shield_projector/rectangle/automatic/imperion shield_health = 500 max_shield_health = 500 - shield_regen_delay = 30 SECONDS + shield_regen_delay = 60 SECONDS shield_regen_amount = 50 size_x = 2 size_y = 2 @@ -362,6 +467,91 @@ high_color = "#631644" low_color = "#631644" +//projectile time, mostly for phase five +/obj/item/projectile/bullet/imperionspear + use_submunitions = 1 + only_submunitions = 1 + range = 0 + embed_chance = 0 + submunition_spread_max = 700 + submunition_spread_min = 200 + submunitions = list(/obj/item/projectile/energy/imperionspear = 5) + +/obj/item/projectile/bullet/imperionspear/on_range() + qdel(src) + +/obj/item/projectile/energy/imperionspear + name = "energy spear" + icon_state = "arcane_barrage" + damage = 35 + armor_penetration = 35 + damage_type = BURN + check_armour = "laser" + speed = 4.4 + + flash_strength = 0 + +/obj/item/projectile/bullet/imperionblaster + use_submunitions = 1 + only_submunitions = 1 + range = 0 + embed_chance = 0 + submunition_spread_max = 1500 + submunition_spread_min = 300 + submunitions = list(/obj/item/projectile/energy/imperionblaster = 8) + +/obj/item/projectile/bullet/imperionblaster/on_range() + qdel(src) + +/obj/item/projectile/energy/imperionblaster + name = "energy pellet" + icon_state = "dark_pellet" + damage = 15 + armor_penetration = 100 + damage_type = BURN + check_armour = "laser" + speed = 4.4 + + flash_strength = 0 + +/obj/item/projectile/bullet/imperiontesla + use_submunitions = 1 + only_submunitions = 1 + range = 0 + embed_chance = 0 + submunition_spread_max = 400 + submunition_spread_min = 50 + submunitions = list(/obj/item/projectile/energy/imperiontesla = 2) + +/obj/item/projectile/bullet/imperiontesla/on_range() + qdel(src) + +/obj/item/projectile/energy/imperiontesla + name = "energy sphere" + icon_state = "tesla_projectile" + damage = 50 + armor_penetration = 50 + damage_type = BURN + check_armour = "energy" + agony = 50 + speed = 8.2 + + flash_strength = 0 + +/obj/item/projectile/energy/homing_bolt/missile + name = "homing rocket" + icon_state = "atrocket" + damage = 40 + damage_type = BURN + check_armour = "bullet" + +/obj/item/projectile/energy/homing_bolt/missile/on_hit(atom/target, blocked=0) + explosion(target, 0, 0, 2, 4)//No need to have a question. + return 1 + +/obj/item/projectile/energy/homing_bolt/missile/throw_impact(atom/target, var/speed) + explosion(target, 0, 0, 2, 4)//No need to have a question. + qdel(src) //Cool boss visuals, auras, and me saying no to stun. @@ -370,10 +560,9 @@ desc = "Unleashes not hit scan lasers." projectile_types = list(/obj/item/projectile/energy/mob/midlaser) - +//te,porarly removing mob_overlay_state = "red_electricity_constant" to try and fix the visual bug /datum/modifier/bossbuff name = "boss_buff" - mob_overlay_state = "red_electricity_constant" on_created_text = "You feel an intense and overwhelming rage overtake you as you go berserk!" on_expired_text = "The blaze of rage inside you has ran out." diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm index 3911ce8aae..b8745d2e5f 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm @@ -1,3 +1,10 @@ +/datum/category_item/catalogue/fauna/vrerror + name = "VR Creations" + desc = "Upon investigation of the strange creatures, they appear \ + to be constructed of hardlight technology, with connections to common \ + VR equipment. It is unknown what their purpose is at this time." + value = CATALOGUER_REWARD_MEDIUM + /mob/living/simple_mob/vr name = "vr creation" desc = "A digital creature" @@ -5,6 +12,7 @@ icon_state = "bookbat_purple" icon_living = "bookbat_purple" icon_dead = "bookbat_purple_dead" + catalogue_data = list(/datum/category_item/catalogue/fauna/vrerror) mob_class = MOB_CLASS_ABERRATION @@ -109,6 +117,7 @@ /obj/item/projectile/energy/homing_bolt/wizard/fire modifier_type_to_apply = /datum/modifier/wizfire modifier_duration = 6 SECONDS + icon_state = "fireball2" /obj/item/projectile/energy/homing_bolt/wizard/lighting modifier_type_to_apply = /datum/modifier/wizfire/lighting @@ -117,10 +126,12 @@ /obj/item/projectile/energy/homing_bolt/wizard/poison modifier_type_to_apply = /datum/modifier/wizpoison modifier_duration = 6 SECONDS + icon_state = "green_pellet" /obj/item/projectile/energy/homing_bolt/wizard/frost modifier_type_to_apply = /datum/modifier/wizpoison/frost modifier_duration = 6 SECONDS + icon_state = "ice_2" /datum/modifier/wizfire name = "wizfire" diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm index eab5f0b3fc..724c20f5fb 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm @@ -1,3 +1,13 @@ +//Cataloguer things +/datum/category_item/catalogue/fauna/livingcandy + name = "Living Candy" + desc = "Upon investigation of the strange creatures, a mix of \ + promethean biology alongside various candies can be found. The purpose \ + of such a creation is unknown but it seems to function at a middle ground \ + between slimes and prometheans. Lacking the full sentience of prometheans \ + but their presence bolstering others of their kind." + value = CATALOGUER_REWARD_MEDIUM + //Someone remind me to get someone to make actual sprites for this things. /mob/living/simple_mob/vore/candy name = "candy critter" @@ -6,6 +16,7 @@ icon_state = "drone0" icon_living = "drone0" icon_dead = "drone0" + catalogue_data = list(/datum/category_item/catalogue/fauna/livingcandy) mob_class = MOB_CLASS_ABERRATION ai_holder_type = /datum/ai_holder/simple_mob/melee @@ -32,7 +43,8 @@ can_be_drop_prey = TRUE //CHOMP Add -/mob/living/simple_mob/vore/candy/Login() +//bluenom +/mob/living/simple_mob/vore/candy/bluecabold/Login() . = ..() if(!riding_datum) riding_datum = new /datum/riding/simple_mob(src) @@ -40,19 +52,149 @@ verbs |= /mob/living/proc/toggle_rider_reins movement_cooldown = 1 -/mob/living/simple_mob/vore/candy/MouseDrop_T(mob/living/M, mob/living/user) +/mob/living/simple_mob/vore/candy/bluecabold/MouseDrop_T(mob/living/M, mob/living/user) return -/mob/living/simple_mob/vore/candy/init_vore() +/mob/living/simple_mob/vore/candy/bluecabold/init_vore() if(!voremob_loaded) return .=..() var/obj/belly/B = vore_selected B.name = "stomach" - B.desc = "The fearsome preadtor gets a firm grip upon you, before dunking you into it's maw, then with a powerful swift gulp you're sent tumbling into it's stomach.." + B.desc = "The fearsome predator gets a firm grip upon you, before dunking you into it's maw, then with a powerful swift gulp you're sent tumbling into it's stomach." B.emote_lists[DM_HOLD] = list( - "Your surroundings are momentarily filled with tour predator's pleased rumbling, its hands stroking over the taut swell you make in its belly.",) + "Your surroundings are momentarily filled with your predator's pleased rumbling, its hands stroking over the taut swell you make in its belly.",) + + B.emote_lists[DM_DIGEST] = list( + "Every clench of the predator's stomach grinds powerful digestive fluids into your body, forcibly churning away your strength!") + +//rednom +/mob/living/simple_mob/vore/candy/redcabold/Login() + . = ..() + if(!riding_datum) + riding_datum = new /datum/riding/simple_mob(src) + verbs |= /mob/living/simple_mob/proc/animal_mount + verbs |= /mob/living/proc/toggle_rider_reins + movement_cooldown = 1 + +/mob/living/simple_mob/vore/candy/redcabold/MouseDrop_T(mob/living/M, mob/living/user) + return + +/mob/living/simple_mob/vore/candy/redcabold/init_vore() + if(!voremob_loaded) + return + .=..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = "The fearsome predator gets a firm grip upon you, before dunking you into it's maw, then with a powerful swift gulp you're sent tumbling into it's stomach." + + B.emote_lists[DM_HOLD] = list( + "Your surroundings are momentarily filled with your predator's pleased rumbling, its hands stroking over the taut swell you make in its belly.",) + + B.emote_lists[DM_DIGEST] = list( + "Every clench of the predator's stomach grinds powerful digestive fluids into your body, forcibly churning away your strength!") + +//yellow +/mob/living/simple_mob/vore/candy/yellowcabold/Login() + . = ..() + if(!riding_datum) + riding_datum = new /datum/riding/simple_mob(src) + verbs |= /mob/living/simple_mob/proc/animal_mount + verbs |= /mob/living/proc/toggle_rider_reins + movement_cooldown = 1 + +/mob/living/simple_mob/vore/candy/yellowcabold/MouseDrop_T(mob/living/M, mob/living/user) + return + +/mob/living/simple_mob/vore/candy/yellowcabold/init_vore() + if(!voremob_loaded) + return + .=..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = "The fearsome predator gets a firm grip upon you, before dunking you into it's maw, then with a powerful swift gulp you're sent tumbling into it's stomach." + + B.emote_lists[DM_HOLD] = list( + "Your surroundings are momentarily filled with your predator's pleased rumbling, its hands stroking over the taut swell you make in its belly.",) + + B.emote_lists[DM_DIGEST] = list( + "Every clench of the predator's stomach grinds powerful digestive fluids into your body, forcibly churning away your strength!") + +//orange +/mob/living/simple_mob/vore/candy/orangecabold/Login() + . = ..() + if(!riding_datum) + riding_datum = new /datum/riding/simple_mob(src) + verbs |= /mob/living/simple_mob/proc/animal_mount + verbs |= /mob/living/proc/toggle_rider_reins + movement_cooldown = 1 + +/mob/living/simple_mob/vore/candy/orangecabold/MouseDrop_T(mob/living/M, mob/living/user) + return + +/mob/living/simple_mob/vore/candy/orangecabold/init_vore() + if(!voremob_loaded) + return + .=..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = "The fearsome predator gets a firm grip upon you, before dunking you into it's maw, then with a powerful swift gulp you're sent tumbling into it's stomach." + + B.emote_lists[DM_HOLD] = list( + "Your surroundings are momentarily filled with your predator's pleased rumbling, its hands stroking over the taut swell you make in its belly.",) + + B.emote_lists[DM_DIGEST] = list( + "Every clench of the predator's stomach grinds powerful digestive fluids into your body, forcibly churning away your strength!") + +//purplenom +/mob/living/simple_mob/vore/candy/purplecabold/Login() + . = ..() + if(!riding_datum) + riding_datum = new /datum/riding/simple_mob(src) + verbs |= /mob/living/simple_mob/proc/animal_mount + verbs |= /mob/living/proc/toggle_rider_reins + movement_cooldown = 1 + +/mob/living/simple_mob/vore/candy/purplecabold/MouseDrop_T(mob/living/M, mob/living/user) + return + +/mob/living/simple_mob/vore/candy/purplecabold/init_vore() + if(!voremob_loaded) + return + .=..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = "The fearsome predator gets a firm grip upon you, before dunking you into it's maw, then with a powerful swift gulp you're sent tumbling into it's stomach." + + B.emote_lists[DM_HOLD] = list( + "Your surroundings are momentarily filled with your predator's pleased rumbling, its hands stroking over the taut swell you make in its belly.",) + + B.emote_lists[DM_DIGEST] = list( + "Every clench of the predator's stomach grinds powerful digestive fluids into your body, forcibly churning away your strength!") + +//marshmellownom +/mob/living/simple_mob/vore/candy/marshmellowserpent/Login() + . = ..() + if(!riding_datum) + riding_datum = new /datum/riding/simple_mob(src) + verbs |= /mob/living/simple_mob/proc/animal_mount + verbs |= /mob/living/proc/toggle_rider_reins + movement_cooldown = 1 + +/mob/living/simple_mob/vore/candy/marshmellowserpent/MouseDrop_T(mob/living/M, mob/living/user) + return + +/mob/living/simple_mob/vore/candy/marshmellowserpent/init_vore() + if(!voremob_loaded) + return + .=..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = "The fearsome predator gets a firm grip upon you, before dunking you into it's maw, then with a powerful swift gulp you're sent tumbling into it's stomach." + + B.emote_lists[DM_HOLD] = list( + "Your surroundings are momentarily filled with your predator's pleased rumbling, its hands stroking over the taut swell you make in its belly.",) B.emote_lists[DM_DIGEST] = list( "Every clench of the predator's stomach grinds powerful digestive fluids into your body, forcibly churning away your strength!") @@ -62,7 +204,7 @@ desc = "A creature made of candy" icon_state = "blue" icon_living = "blue" - icon_dead = "blue" + icon_dead = "blue_dead" maxHealth = 50 health = 50 @@ -86,7 +228,7 @@ desc = "A creature made of candy" icon_state = "red" icon_living = "red" - icon_dead = "red" + icon_dead = "red_dead" maxHealth = 125 health = 125 @@ -115,7 +257,7 @@ desc = "A creature made of candy" icon_state = "yellow" icon_living = "yellow" - icon_dead = "yellow" + icon_dead = "yellow_dead" maxHealth = 50 health = 50 @@ -139,7 +281,7 @@ desc = "A creature made of candy" icon_state = "orange" icon_living = "orange" - icon_dead = "orange" + icon_dead = "orange_dead" maxHealth = 50 health = 50 @@ -163,7 +305,7 @@ desc = "A creature made of candy" icon_state = "purple" icon_living = "purple" - icon_dead = "purple" + icon_dead = "purple_dead" maxHealth = 50 health = 50 @@ -187,7 +329,7 @@ desc = "A creature made of candy" icon_state = "marshmellow" icon_living = "marshmellow" - icon_dead = "marshmellow" + icon_dead = "marshmellow_dead" ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting diff --git a/modular_chomp/icons/mob/candy.dmi b/modular_chomp/icons/mob/candy.dmi index 69fa03b377..1ec04c4692 100644 Binary files a/modular_chomp/icons/mob/candy.dmi and b/modular_chomp/icons/mob/candy.dmi differ