Mecha Graveyard and Mech Wreckage Update (#37259)

* mecha graveyard initial

* not all basilisks lmao

* directional skullbot laughs
This commit is contained in:
jwhitak
2024-10-21 08:01:45 -05:00
committed by GitHub
parent e0f81a5e1e
commit 546d3f02b2
6 changed files with 311 additions and 98 deletions

View File

@@ -135,12 +135,16 @@
/obj/effect/decal/mecha_wreckage/gygax/New()
..()
var/list/parts = list(/obj/item/mecha_parts/part/gygax_torso,
var/list/parts = list( /obj/item/mecha_parts/chassis/gygax,
/obj/item/mecha_parts/part/gygax_torso,
/obj/item/mecha_parts/part/gygax_head,
/obj/item/mecha_parts/part/gygax_left_arm,
/obj/item/mecha_parts/part/gygax_right_arm,
/obj/item/mecha_parts/part/gygax_left_leg,
/obj/item/mecha_parts/part/gygax_right_leg)
/obj/item/mecha_parts/part/gygax_right_leg,
/obj/item/weapon/circuitboard/mecha/gygax/peripherals,
/obj/item/weapon/circuitboard/mecha/gygax/targeting,
/obj/item/weapon/circuitboard/mecha/gygax/main)
welder_salvage += pick_random_loot(parts)
/obj/effect/decal/mecha_wreckage/gygax/dark
@@ -154,13 +158,16 @@
/obj/effect/decal/mecha_wreckage/marauder/New()
..()
var/list/parts = list(
/obj/item/mecha_parts/chassis/marauder,
/obj/item/mecha_parts/part/marauder_torso,
/obj/item/mecha_parts/part/marauder_head,
/obj/item/mecha_parts/part/marauder_left_arm,
/obj/item/mecha_parts/part/marauder_right_arm,
/obj/item/mecha_parts/part/marauder_left_leg,
/obj/item/mecha_parts/part/marauder_right_leg,
)
/obj/item/weapon/circuitboard/mecha/marauder/peripherals,
/obj/item/weapon/circuitboard/mecha/marauder/targeting,
/obj/item/weapon/circuitboard/mecha/marauder/main)
welder_salvage += pick_random_loot(parts)
@@ -179,11 +186,14 @@
/obj/effect/decal/mecha_wreckage/ripley/New()
..()
var/list/parts = list(/obj/item/mecha_parts/part/ripley_torso,
var/list/parts = list( /obj/item/mecha_parts/chassis/ripley,
/obj/item/mecha_parts/part/ripley_torso,
/obj/item/mecha_parts/part/ripley_left_arm,
/obj/item/mecha_parts/part/ripley_right_arm,
/obj/item/mecha_parts/part/ripley_left_leg,
/obj/item/mecha_parts/part/ripley_right_leg)
/obj/item/mecha_parts/part/ripley_right_leg,
/obj/item/weapon/circuitboard/mecha/ripley/peripherals,
/obj/item/weapon/circuitboard/mecha/ripley/main)
welder_salvage += pick_random_loot(parts)
/obj/effect/decal/mecha_wreckage/ripley/mk2
@@ -211,7 +221,10 @@
/obj/item/mecha_parts/part/honker_left_arm,
/obj/item/mecha_parts/part/honker_right_arm,
/obj/item/mecha_parts/part/honker_left_leg,
/obj/item/mecha_parts/part/honker_right_leg)
/obj/item/mecha_parts/part/honker_right_leg,
/obj/item/weapon/circuitboard/mecha/honker/peripherals,
/obj/item/weapon/circuitboard/mecha/honker/targeting,
/obj/item/weapon/circuitboard/mecha/honker/main)
welder_salvage += pick_random_loot(parts)
/obj/effect/decal/mecha_wreckage/durand
@@ -220,13 +233,16 @@
/obj/effect/decal/mecha_wreckage/durand/New()
..()
var/list/parts = list(
var/list/parts = list( /obj/item/mecha_parts/chassis/durand,
/obj/item/mecha_parts/part/durand_torso,
/obj/item/mecha_parts/part/durand_head,
/obj/item/mecha_parts/part/durand_left_arm,
/obj/item/mecha_parts/part/durand_right_arm,
/obj/item/mecha_parts/part/durand_left_leg,
/obj/item/mecha_parts/part/durand_right_leg)
/obj/item/mecha_parts/part/durand_right_leg,
/obj/item/weapon/circuitboard/mecha/durand/peripherals,
/obj/item/weapon/circuitboard/mecha/durand/targeting,
/obj/item/weapon/circuitboard/mecha/durand/main)
welder_salvage += pick_random_loot(parts)
@@ -249,13 +265,15 @@
/obj/effect/decal/mecha_wreckage/odysseus/New()
..()
var/list/parts = list(
var/list/parts = list( /obj/item/mecha_parts/chassis/odysseus,
/obj/item/mecha_parts/part/odysseus_torso,
/obj/item/mecha_parts/part/odysseus_head,
/obj/item/mecha_parts/part/odysseus_left_arm,
/obj/item/mecha_parts/part/odysseus_right_arm,
/obj/item/mecha_parts/part/odysseus_left_leg,
/obj/item/mecha_parts/part/odysseus_right_leg)
/obj/item/mecha_parts/part/odysseus_right_leg,
/obj/item/weapon/circuitboard/mecha/odysseus/peripherals,
/obj/item/weapon/circuitboard/mecha/odysseus/main)
welder_salvage += pick_random_loot(parts)
/obj/effect/decal/mecha_wreckage/clarke
@@ -264,13 +282,15 @@
/obj/effect/decal/mecha_wreckage/clarke/New()
..()
var/list/parts = list(
var/list/parts = list( /obj/item/mecha_parts/chassis/clarke,
/obj/item/mecha_parts/part/clarke_torso,
/obj/item/mecha_parts/part/clarke_head,
/obj/item/mecha_parts/part/clarke_left_arm,
/obj/item/mecha_parts/part/clarke_right_arm,
/obj/item/mecha_parts/part/clarke_left_tread,
/obj/item/mecha_parts/part/clarke_right_tread)
/obj/item/mecha_parts/part/clarke_right_tread,
/obj/item/weapon/circuitboard/mecha/clarke/peripherals,
/obj/item/weapon/circuitboard/mecha/clarke/main)
welder_salvage += pick_random_loot(parts)
/obj/effect/decal/mecha_wreckage/vehicle
@@ -278,3 +298,7 @@
icon = 'icons/obj/vehicles.dmi'
icon_state = "pussywagon_destroyed"
desc = "Remains of some unfortunate vehicle. Completely unrepairable."
/obj/effect/decal/mecha_wreckage/skullbot
name = "Mysterious wreckage"
icon_state = "skullmech-broken"

View File

@@ -17,18 +17,21 @@
file_path = "maps/randomvaults/dungeons/mecha_graveyard.dmm"
unique = TRUE
//Ripley wreckage but with enough parts to rebuild
/obj/effect/decal/mecha_wreckage/graveyard_ripley
name = "Ripley wreckage"
desc = "Surprisingly well preserved."
icon_state = "ripley-broken"
/obj/effect/decal/mecha_wreckage/graveyard_ripley/New()
..()
var/list/parts = list(/obj/item/mecha_parts/part/ripley_torso,
var/list/parts = list( /obj/item/mecha_parts/chassis/ripley,
/obj/item/mecha_parts/part/ripley_torso,
/obj/item/mecha_parts/part/ripley_left_arm,
/obj/item/mecha_parts/part/ripley_right_arm,
/obj/item/mecha_parts/part/ripley_left_leg,
/obj/item/mecha_parts/part/ripley_right_leg)
/obj/item/mecha_parts/part/ripley_right_leg,
/obj/item/weapon/circuitboard/mecha/ripley/peripherals,
/obj/item/weapon/circuitboard/mecha/ripley/main)
welder_salvage += parts
if(prob(80))
@@ -36,27 +39,73 @@
else
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill,100)
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,100)
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/jetpack,100)
if(prob(50))
return
switch(rand(1,3))
if(1)
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/jetpack,100)
if(2)
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/passive/rack,100)
if(3)
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/passive/runningboard,100)
/obj/effect/decal/mecha_wreckage/graveyard_clarke
name = "Clarke wreckage"
desc = "Surprisingly well preserved."
icon_state = "clarke-broken"
/obj/effect/decal/mecha_wreckage/graveyard_clarke/New()
..()
var/list/parts = list(
var/list/parts = list( /obj/item/mecha_parts/chassis/clarke,
/obj/item/mecha_parts/part/clarke_torso,
/obj/item/mecha_parts/part/clarke_head,
/obj/item/mecha_parts/part/clarke_left_arm,
/obj/item/mecha_parts/part/clarke_right_arm,
/obj/item/mecha_parts/part/clarke_left_tread,
/obj/item/mecha_parts/part/clarke_right_tread)
/obj/item/mecha_parts/part/clarke_right_tread,
/obj/item/weapon/circuitboard/mecha/clarke/peripherals,
/obj/item/weapon/circuitboard/mecha/clarke/main)
welder_salvage += parts
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/tool/collector,100)
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/tool/tiler,100)
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/tool/switchtool,100)
if(prob(50))
return
switch(rand(1,4))
if(1)
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/jetpack,100)
if(2)
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/passive/rack,100)
if(3)
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/passive/runningboard,100)
if(4)
add_salvagable_equipment(new /obj/item/mecha_parts/mecha_equipment/tool/collector,100)
/mob/living/simple_animal/hostile/asteroid/basilisk/skullbot
name = "Mysterious skullbot"
desc = "A bizarre robot-like thing."
icon = 'icons/mecha/mecha.dmi'
icon_state = "skullmech"
icon_living = "skullmech"
icon_aggro = "skullmech-laugh"
icon_dead = "skullmech-broken"
icon_gib = null
move_to_delay = 5
projectiletype = /obj/item/projectile/temp/basilisk
projectilesound = 'sound/weapons/pierce.ogg'
ranged = 1
ranged_message = "laughs"
melee_damage_lower = 15
melee_damage_upper = 30
attacktext = "bites into"
attack_sound = 'sound/weapons/spiderlunge.ogg'
/mob/living/simple_animal/hostile/asteroid/basilisk/skullbot/death()
visible_message("<span class='danger'>\The [src] shatters before dying, leaving some bones.</span>")
drop_stack(/obj/item/stack/sheet/bone, loc, 5)
new /obj/effect/decal/mecha_wreckage/skullbot(loc)
..(TRUE)
qdel(src)
/obj/item/weapon/mech_expansion_kit
name = "exosuit expansion kit"

View File

@@ -60,7 +60,7 @@
to_spawn = list(
/obj/item/clothing/gloves/yellow
)
/obj/abstract/map/spawner/pick_spawner/yellowgloves/tcomms_storage
category = "yellowgloves_tcommsstorage"
name = "glubb pickspawner (tcomms_storage)"
@@ -72,3 +72,48 @@
/obj/abstract/map/spawner/pick_spawner/yellowgloves/technicalstorage
category = "yellowgloves_technicalstorage"
name = "glubb pickspawner (technicalstorage)"
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage
category = "mecha_graveyard_wreckage"
name = "Mecha Graveyard Wreckage Spawner"
spawners_to_pick = 14
icon_state = "robot_any"
to_spawn = list(
/obj/effect/decal/mecha_wreckage/ripley,
/obj/effect/decal/mecha_wreckage/ripley,
/obj/effect/decal/mecha_wreckage/clarke,
/obj/effect/decal/mecha_wreckage/clarke,
/obj/effect/decal/mecha_wreckage/odysseus,
/obj/effect/decal/mecha_wreckage/marauder,
/obj/effect/decal/mecha_wreckage/gygax,
/obj/effect/decal/mecha_wreckage/durand,
/obj/effect/decal/mecha_wreckage/honker,
)
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_good
category = "mecha_graveyard_wreckage_good"
name = "Mecha Graveyard Good Wreckage Spawner"
icon_state = "engi_materials"
to_spawn = list(
/obj/effect/decal/mecha_wreckage/graveyard_ripley,
/obj/effect/decal/mecha_wreckage/graveyard_clarke,
)
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_equip
category = "mecha_graveyard_wreckage_good"
name = "Mecha Graveyard Good Wreckage Spawner"
spawners_to_pick = 2
icon_state = "space_tools"
to_spawn = list(
/obj/item/mecha_parts/mecha_equipment/passive/runningboard,
/obj/item/mecha_parts/mecha_equipment/passive/rack,
/obj/item/mecha_parts/mecha_equipment/tool/jail,
/obj/item/mecha_parts/mecha_equipment/jetpack,
/obj/item/mecha_parts/mecha_equipment/tool/scythe,
/obj/item/mecha_parts/mecha_equipment/tool/extinguisher,
/obj/item/mecha_parts/mecha_equipment/tool/red,
/obj/item/mecha_parts/mecha_equipment/wormhole_generator,
/obj/item/mecha_parts/mecha_equipment/gravcatapult,
/obj/item/mecha_parts/mecha_equipment/repair_droid,
/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay,
)

View File

@@ -27,6 +27,12 @@ var/global/list/mineralSpawnChance[]
"Diamond" = 1,
"Ice Cave" = 1,
)
mineralSpawnChance["mecha_high"] = list(
"Nanotrasite" = 30,
"Electrum" = 20,
"Plasma" = 10,
"Diamond" = 2,
)
mineralSpawnChance["random_high"] = list(
"Uranium" = 10,
"Iron" = 30,
@@ -887,6 +893,11 @@ var/list/icon_state_to_appearance = list()
mined_type = /turf/unsimulated/floor/snow/permafrost
overlay_state = "snow_rock_overlay"
/turf/unsimulated/mineral/random/high_chance/mecha
icon_state = "rock(high)"
mineralChance = 40 //there's 46 turfs currently in the mecha graveyard...
mineralPool = "mecha_high"
/turf/unsimulated/mineral/uranium
name = "Uranium deposit"
icon_state = "rock_Uranium"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 518 KiB

After

Width:  |  Height:  |  Size: 518 KiB

View File

@@ -42,7 +42,7 @@
/turf/unsimulated/floor/asteroid,
/area/vault/mecha_graveyard)
"aj" = (
/turf/unsimulated/mineral/random,
/turf/unsimulated/mineral/random/high_chance/mecha,
/area/vault/mecha_graveyard)
"ak" = (
/turf/unsimulated/floor/airless{
@@ -76,6 +76,7 @@
/area/vault/mecha_graveyard)
"aq" = (
/obj/effect/decal/cleanable/blood/gibs/robot/limb,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_equip,
/turf/unsimulated/floor/asteroid,
/area/vault/mecha_graveyard)
"ar" = (
@@ -85,13 +86,14 @@
},
/area/vault/mecha_graveyard)
"as" = (
/obj/effect/decal/mecha_wreckage/graveyard_ripley,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/asteroid{
icon_state = "asteroid_dug"
},
/area/vault/mecha_graveyard)
"at" = (
/obj/effect/decal/cleanable/soot,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/asteroid{
icon_state = "asteroid_dug"
},
@@ -104,13 +106,16 @@
/area/vault/mecha_graveyard)
"av" = (
/obj/structure/hanging_lantern,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/airless{
icon_state = "asteroidfloor"
},
/area/vault/mecha_graveyard)
"aw" = (
/obj/effect/decal/mecha_wreckage/graveyard_ripley,
/turf/unsimulated/floor/asteroid,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/airless{
icon_state = "asteroidfloor"
},
/area/vault/mecha_graveyard)
"ax" = (
/obj/structure/girder,
@@ -145,6 +150,7 @@
/area/vault/mecha_graveyard)
"aD" = (
/obj/effect/decal/cleanable/blood/gibs/robot,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_good,
/turf/unsimulated/floor/asteroid{
icon_state = "asteroid_dug"
},
@@ -153,8 +159,7 @@
/obj/machinery/status_display{
pixel_y = 32
},
/obj/effect/decal/mecha_wreckage/durand,
/obj/effect/decal/cleanable/soot,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_good,
/turf/unsimulated/floor/airless{
icon_state = "asteroidfloor"
},
@@ -167,17 +172,16 @@
/area/vault/mecha_graveyard)
"aG" = (
/obj/item/stack/sheet/plasteel,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/asteroid,
/area/vault/mecha_graveyard)
"aH" = (
/obj/effect/decal/mecha_wreckage/marauder,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/asteroid,
/area/vault/mecha_graveyard)
"aI" = (
/obj/item/mecha_parts/mecha_equipment/repair_droid,
/turf/unsimulated/floor/airless{
icon_state = "asteroidfloor"
},
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_good,
/turf/unsimulated/floor/asteroid,
/area/vault/mecha_graveyard)
"aJ" = (
/obj/effect/decal/cleanable/blood/gibs/robot,
@@ -187,15 +191,20 @@
/area/vault/mecha_graveyard)
"aK" = (
/obj/item/stack/ore/slag,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/asteroid,
/area/vault/mecha_graveyard)
"aL" = (
/obj/effect/decal/cleanable/soot,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_good,
/turf/unsimulated/floor/asteroid,
/area/vault/mecha_graveyard)
"aM" = (
/obj/effect/decal/mecha_wreckage/durand,
/turf/unsimulated/floor/asteroid,
/obj/effect/decal/cleanable/dirt,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_equip,
/turf/unsimulated/floor/airless{
icon_state = "asteroidfloor"
},
/area/vault/mecha_graveyard)
"aN" = (
/turf/unsimulated/floor/airless{
@@ -210,8 +219,8 @@
},
/area/vault/mecha_graveyard)
"aP" = (
/obj/effect/decal/mecha_wreckage/gygax,
/obj/effect/decal/cleanable/soot,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/airless{
icon_state = "asteroidfloor"
},
@@ -299,12 +308,13 @@
/area/vault/mecha_graveyard)
"bc" = (
/obj/effect/decal/remains/human,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/simulated/floor/airless{
icon_state = "damaged5"
},
/area/vault/mecha_graveyard)
"bd" = (
/obj/effect/decal/mecha_wreckage/graveyard_clarke,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_equip,
/turf/unsimulated/floor/asteroid,
/area/vault/mecha_graveyard)
"be" = (
@@ -392,6 +402,7 @@
dir = 4;
id_tag = "mining_west"
},
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_equip,
/turf/unsimulated/floor/airless{
icon_state = "asteroidfloor"
},
@@ -451,6 +462,79 @@
"bA" = (
/turf/space/transit/south,
/area)
"bV" = (
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_equip,
/turf/unsimulated/floor/airless{
icon_state = "asteroidplating"
},
/area/vault/mecha_graveyard)
"hN" = (
/obj/item/stack/rods,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_good,
/turf/unsimulated/floor/asteroid,
/area/vault/mecha_graveyard)
"ll" = (
/obj/item/stack/rods,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/asteroid,
/area/vault/mecha_graveyard)
"ok" = (
/obj/item/stack/ore/iron,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/asteroid{
icon_state = "asteroid_dug"
},
/area/vault/mecha_graveyard)
"pd" = (
/obj/item/stack/ore/iron,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_equip,
/turf/unsimulated/floor/asteroid{
icon_state = "asteroid_dug"
},
/area/vault/mecha_graveyard)
"rc" = (
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/airless{
icon_state = "asteroidplating"
},
/area/vault/mecha_graveyard)
"LN" = (
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_equip,
/turf/unsimulated/floor/asteroid{
icon_state = "asteroid_dug"
},
/area/vault/mecha_graveyard)
"OU" = (
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_good,
/turf/unsimulated/floor/asteroid{
icon_state = "asteroid_dug"
},
/area/vault/mecha_graveyard)
"Tw" = (
/mob/living/simple_animal/hostile/asteroid/basilisk/skullbot,
/turf/unsimulated/floor/asteroid,
/area/vault/mecha_graveyard)
"Uj" = (
/obj/item/stack/ore/glass,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_good,
/turf/unsimulated/floor/asteroid{
icon_state = "asteroid_dug"
},
/area/vault/mecha_graveyard)
"Vg" = (
/obj/item/stack/ore/glass,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage_equip,
/turf/unsimulated/floor/asteroid{
icon_state = "asteroid_dug"
},
/area/vault/mecha_graveyard)
"ZZ" = (
/obj/item/stack/ore/glass,
/obj/abstract/map/spawner/pick_spawner/mecha_wreckage,
/turf/unsimulated/floor/asteroid{
icon_state = "asteroid_dug"
},
/area/vault/mecha_graveyard)
(1,1,1) = {"
aa
@@ -990,7 +1074,7 @@ ai
ax
ai
ai
aM
ai
ai
ae
ae
@@ -1032,11 +1116,11 @@ ae
ae
ae
ai
ai
aH
ai
ai
az
am
aM
aN
ai
ax
@@ -1083,7 +1167,7 @@ ai
ai
ay
ai
aI
ak
aO
aR
ai
@@ -1124,16 +1208,16 @@ ae
ae
ae
ae
ai
aH
ai
ak
ak
aw
ah
aE
ak
ak
aw
ah
al
ll
ai
ae
ae
@@ -1176,12 +1260,12 @@ ai
ai
av
ah
aw
ak
ak
ak
aw
ah
aG
ai
bd
ae
ae
ae
@@ -1221,9 +1305,9 @@ ai
aq
ai
ai
ai
aH
ah
ak
aw
aJ
aP
aS
@@ -1262,7 +1346,7 @@ ad
ae
ae
ah
ak
aw
ai
ai
ai
@@ -1275,7 +1359,7 @@ am
ak
aT
aZ
be
rc
be
be
ae
@@ -1309,8 +1393,8 @@ ad
ae
ae
ah
ak
am
aw
aM
ao
ai
ai
@@ -1402,15 +1486,15 @@ aa
ad
ae
ae
aH
aI
aH
ai
ai
ai
ai
ai
ai
ai
bd
aj
ai
aH
ai
ai
ai
@@ -1418,7 +1502,7 @@ ai
al
be
bl
be
bV
ai
ah
ae
@@ -1454,12 +1538,12 @@ ai
ai
ai
ai
ai
Tw
aj
aj
aj
aG
ak
aw
ai
aW
ai
@@ -1500,9 +1584,9 @@ ai
ai
ai
an
ar
an
ZZ
an
as
aj
aj
aj
@@ -1543,13 +1627,13 @@ aa
ad
ae
ae
ai
ai
aH
aH
as
an
an
ar
ar
au
Vg
Uj
ok
aj
aj
aj
@@ -1593,11 +1677,11 @@ ae
aj
aj
aj
as
an
an
an
au
aw
pd
ai
aj
aj
aK
@@ -1640,13 +1724,13 @@ ae
aj
aj
aj
an
as
an
at
an
au
au
an
ok
as
ai
ai
aY
@@ -1688,14 +1772,14 @@ aj
aj
aj
aj
an
OU
an
ar
ar
an
ai
ai
ai
aH
ah
bb
bh
@@ -1737,16 +1821,16 @@ aj
aj
as
au
ar
Vg
ar
aC
an
ai
ai
aH
ah
bc
aT
al
hN
bn
ae
bw
@@ -1783,13 +1867,13 @@ ae
aj
aj
aj
as
an
an
an
as
an
ar
aL
ai
aH
ah
bd
bi
@@ -1830,7 +1914,7 @@ ae
aj
aj
aj
an
as
an
au
aD
@@ -1877,10 +1961,10 @@ ae
aj
aj
aj
as
LN
an
an
an
an
as
an
ai
ai
@@ -1924,13 +2008,13 @@ ae
aj
aj
aj
an
as
au
ar
an
an
ai
LN
ai
aH
ai
ae
ae
@@ -1971,12 +2055,12 @@ ae
ae
ae
aj
an
OU
an
ao
as
an
an
an
as
aj
ae
ae
@@ -2018,7 +2102,7 @@ ae
ae
ae
aj
ai
aH
ai
ai
an
@@ -2065,11 +2149,11 @@ ae
ae
ae
aj
aH
bd
ai
ai
ai
an
an
as
LN
ae
ae
ae