diff --git a/code/__defines/research/techweb_nodes.dm b/code/__defines/research/techweb_nodes.dm
index 21a84804db..182ebc14e8 100644
--- a/code/__defines/research/techweb_nodes.dm
+++ b/code/__defines/research/techweb_nodes.dm
@@ -152,4 +152,5 @@
#define TECHWEB_NODE_METAMORPHOSIS_RAY "metamorphosis_ray" //CHOMPEDIT Add - Adds Caseless Rifle
#define TECHWEB_NODE_MOD_ANOMALY_SUIT "mod_anomaly_suit" //CHOMPEDIT Add - Adds Anomaly RIGs
#define TECHWEB_NODE_MECH_SHIELDS "mech_shields" //CHOMPEDIT Add - Adds Mech Shields
+#define TECHWEB_NODE_TYRGOODS "tyrian tech" //CHOMPEDIT Add - Adds Craftable Tyr Loot
//CHOMPEDIT End - Chomp Specific techwebs.
diff --git a/modular_chomp/code/datums/crafting/tyr_tribal.dm b/modular_chomp/code/datums/crafting/tyr_tribal.dm
index 5cc497e28b..3b4b2f03f4 100644
--- a/modular_chomp/code/datums/crafting/tyr_tribal.dm
+++ b/modular_chomp/code/datums/crafting/tyr_tribal.dm
@@ -45,51 +45,3 @@
time = 120
category = CAT_CLOTHING
-//Wierd guns
-/datum/crafting_recipe/prototype_hilt
- name = "prototype hilt"
- result = /obj/item/gun/energy/energyballchain
- reqs = list(list(/obj/item/stack/material/steel = 12),
- list(/obj/item/stack/material/plasteel = 6),
- list(/obj/item/stack/material/weathered_agate = 8),
- list(/obj/item/prop/alien/prototype = 1)
- )
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
-/datum/crafting_recipe/prototype_engine
- name = "prototype engine"
- result = /obj/item/gun/energy/curse_tyrshotgun
- reqs = list(list(/obj/item/stack/material/steel = 12),
- list(/obj/item/stack/material/plasteel = 6),
- list(/obj/item/stack/material/weathered_agate = 8),
- list(/obj/item/prop/alien/prototype = 1)
- )
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
-/datum/crafting_recipe/prototype_core
- name = "prototype core"
- result = /obj/item/gun/energy/curse_blaster
- reqs = list(list(/obj/item/stack/material/steel = 12),
- list(/obj/item/stack/material/plasteel = 6),
- list(/obj/item/stack/material/weathered_agate = 8),
- list(/obj/item/prop/alien/prototype = 1)
- )
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
-
-/datum/crafting_recipe/prototype_crystal
- name = "prototype crystal"
- result = /obj/item/gun/energy/curse_lasershooter
- reqs = list(list(/obj/item/stack/material/steel = 12),
- list(/obj/item/stack/material/plasteel = 6),
- list(/obj/item/stack/material/weathered_agate = 8),
- list(/obj/item/prop/alien/prototype = 1)
- )
- time = 40
- category = CAT_WEAPONRY
- subcategory = CAT_WEAPON
diff --git a/modular_chomp/code/game/objects/structures/tyr_project_props.dm b/modular_chomp/code/game/objects/structures/tyr_project_props.dm
index 9fd72ed4d6..2c410cd9f4 100644
--- a/modular_chomp/code/game/objects/structures/tyr_project_props.dm
+++ b/modular_chomp/code/game/objects/structures/tyr_project_props.dm
@@ -290,19 +290,10 @@
name = "alien disk"
desc = "A disc for storing data."
icon = 'modular_chomp/icons/obj/weather_ruins.dmi'
+ icon_state = "disc_alter"
w_class = ITEMSIZE_SMALL
-/obj/item/prop/tyrlore/reddisc
- catalogue_data = list(/datum/category_item/catalogue/anomalous/tyr_red)
- icon_state = "disc_red"
-
-/obj/item/prop/tyrlore/purpledisc
- catalogue_data = list(/datum/category_item/catalogue/anomalous/tyr_purple)
- icon_state = "disc_purple"
-
-/obj/item/prop/tyrlore/greendisc
- catalogue_data = list(/datum/category_item/catalogue/anomalous/tyr_green)
- icon_state = "disc_green"
+//The following are for Base Neon
/obj/item/prop/tyrlore/baseneon
name = "data disc"
@@ -339,43 +330,6 @@
catalogue_data = list(/datum/category_item/catalogue/technology/base_neon_planetary_report)
icon_state = "sci_disc"
-/datum/category_item/catalogue/anomalous/tyr_red
- name = "Precursor Object - Tyr Data Disc Red"
- desc = "The following data has been corrupted. \
-
\
- oslra yclce hietg hotfsaun ifev undhdre htiytr veesn.\
- No huftrer ritrdecisev cevredive. \
- notencnidoc tihw fof pantel posd lsot wot tuhanosd cslcey..\
- leif sgisn lbeow tslo gilans reorsr.\
- ireaneregnot dops wolakrbe.. \
- rsoescure gaklicn. \
- cenictomon To lawdorr.\
- tatepmt treeh hudnedr senevty tow."
- value = CATALOGUER_REWARD_HARD
-
-/datum/category_item/catalogue/anomalous/tyr_purple
- name = "Precursor Object - Tyr Data Disc Purple"
- desc = "The following data has been corrupted. \
-
\
- tapa'cnsi lgo, 1 ohur rebofe rcoy elpa.\
- I ma ont yerlal rues wtah yeht tawn ee to ptu ni tihs. \
- ts'i tjsu gipretena tginsh e'vi yarelad sida.\
- amirpexnlet irwnig is gongi yirwahe.\
- varesel crew memebers are filling ill. \
- But the elevators are holding strong. \
- And stable power is, well, stable.\
- I hope for a good dream."
- value = CATALOGUER_REWARD_HARD
-
-/datum/category_item/catalogue/anomalous/tyr_green
- name = "Precursor Object - Tyr Data Disc Green"
- desc = "Final mortality count before cryo leap.\
- 29,895 illness\
- 113,615 workplace injuries\
- 20,105 off planet\
- 300 to be determined."
- value = CATALOGUER_REWARD_HARD
-
/datum/category_item/catalogue/technology/base_neon
name = "Goal Manifest"
desc = "After we activation of the seal upon sif our foundation collapsed.\
@@ -521,20 +475,142 @@
anchored = 1
icon_state = "barbedwire-out"
-/obj/item/prop/tyrlore/expirmentvenom
- name = "data disc"
- desc = "An alien disc for storing data."
- catalogue_data = list(/datum/category_item/catalogue/technology/tyr_expirment_poison)
- icon_state = "old_sci_disc"
+/obj/item/prop/tyrlore/reddisc
+ catalogue_data = list(/datum/category_item/catalogue/anomalous/tyr_red)
+ color = "#FFFFFF"
-/datum/category_item/catalogue/technology/tyr_expirment_poison
- name = "Precursor Object - Tyr Data Disc Venom"
+/datum/category_item/catalogue/anomalous/tyr_red
+ name = "Precursor Object - Tyr Data Disc Red"
desc = "The following data has been corrupted. \
\
- Tseitgn rPeodi ahs ccnocuddle.\
- nUti vporse to eb xetayodrriarn nuop rocagni boantcamts. \
- Sirliam bio-erpeisxmnet fall to it's porses.\
- Hoverew reyverco tdsen to be wfits, and otseh muenim or tihw a ucer rovep to be sunursabspale.\
- Ntxe pets is to gntritea retfurh henenac the sosrpe, and deruce teh sethynict koovleor. \
- Recommendation for integration with the Astral Sea protocols."
+ oslra yclce hietg hotfsaun ifev undhdre htiytr veesn.\
+ No huftrer ritrdecisev cevredive. \
+ notencnidoc tihw fof pantel posd lsot wot tuhanosd cslcey..\
+ leif sgisn lbeow tslo gilans reorsr.\
+ ireaneregnot dops wolakrbe.. \
+ rsoescure gaklicn. \
+ cenictomon To lawdorr.\
+ tatepmt treeh hudnedr senevty tow."
+ value = CATALOGUER_REWARD_HARD
+
+/obj/item/prop/tyrlore/purpledisc
+ catalogue_data = list(/datum/category_item/catalogue/anomalous/tyr_purple)
+ color = "#530E31"
+
+/datum/category_item/catalogue/anomalous/tyr_purple
+ name = "Precursor Object - Tyr Data Disc Purple"
+ desc = "The following data has been corrupted. \
+
\
+ tapa'cnsi lgo, 1 ohur rebofe rcoy elpa.\
+ I ma ont yerlal rues wtah yeht tawn ee to ptu ni tihs. \
+ ts'i tjsu gipretena tginsh e'vi yarelad sida.\
+ amirpexnlet irwnig is gongi yirwahe.\
+ varesel crew memebers are filling ill. \
+ But the elevators are holding strong. \
+ And stable power is, well, stable.\
+ I hope for a good dream."
+ value = CATALOGUER_REWARD_HARD
+
+/obj/item/prop/tyrlore/greendisc
+ catalogue_data = list(/datum/category_item/catalogue/anomalous/tyr_green)
+ color = "#530E31"
+
+/datum/category_item/catalogue/anomalous/tyr_green
+ name = "Precursor Object - Tyr Data Disc Green"
+ desc = "Final mortality count before cryo leap.\
+ 29,895 illness\
+ 113,615 workplace injuries\
+ 20,105 off planet\
+ 300 to be determined."
+ value = CATALOGUER_REWARD_HARD
+
+/obj/item/prop/tyrlore/basicflora
+ color = "#FF66CC"
+ catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_basicflora)
+
+/datum/category_item/catalogue/anomalous/tyre_basicflora
+ name = "Tyr Data - Flora Expirments"
+ desc = "Energy Siphon Unit Attempt\
+ Damage is retained until enough energy is accured\
+ Subject grows with the acculmated energy\
+ Transfering flora program from offense division to sabatoge\
+ Utility to be determined."
+ value = CATALOGUER_REWARD_HARD
+
+/obj/item/prop/tyrlore/basicshield
+ color = "#530E31"
+ catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_basicshield)
+
+/datum/category_item/catalogue/anomalous/tyre_basicshield
+ name = "Tyr Data - Barrier Expirments"
+ desc = "Barrier Unit Attempt\
+ Barrier is capable of limiting damage\
+ However the barrier will break under repeated stress\
+ Rebuilding the barrier is swift but costly\
+ Attempts to be made to incoperate Astral Sea warping."
+ value = CATALOGUER_REWARD_HARD
+
+/obj/item/prop/tyrlore/advanceshield
+ color = "#FF0000"
+ catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_advanceshield)
+
+/datum/category_item/catalogue/anomalous/tyre_advanceshield
+ name = "Tyr Data - Astral Barrier Expirments"
+ desc = "barrier Unit Attempt\
+ Low class damage is vanished\
+ Higher speed and energized projectiles bypass the barrier\
+ Unbonded Astral Sea projects slightly damaged due to this expirment\
+ Swapping Astral Sea useage from defensive to offensive\
+ Gravity to be utlized for further defensive expirments."
+ value = CATALOGUER_REWARD_HARD
+
+/obj/item/prop/tyrlore/basicsonic
+ color = "#CCCCFF"
+ catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_basicsonic)
+
+/datum/category_item/catalogue/anomalous/tyre_basicsonic
+ name = "Tyr Data - Shockwave Expirments"
+ desc = "Enforcer Unit Attempt\
+ Success upon creating a shockwave capable of throwing indivuals\
+ Damage is limited\
+ Force spreads out, launching subjects\
+ Further energy to be added before hand held weaponery expirments."
+ value = CATALOGUER_REWARD_HARD
+
+/obj/item/prop/tyrlore/basicpower
+ color = "#530E31"
+ catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_basicpower)
+
+/datum/category_item/catalogue/anomalous/tyre_basicpower
+ name = "Tyr Data - Liquid Flame Generators"
+ desc = "Utilization of underground liquid flames is succesful\
+ Power is stable\
+ Capable of further growth\
+ Further expansion recomended\
+ Awaiting approval."
+ value = CATALOGUER_REWARD_HARD
+
+/obj/item/prop/tyrlore/ants
+ color = "#993300"
+ catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_ants)
+
+/datum/category_item/catalogue/anomalous/tyre_ants
+ name = "Tyr Data - Living Mines Expirments"
+ desc = "Success Living Mines\
+ Minerants\
+ Insect like creatures capable of reproducing metallic and gemstone structures\
+ Highly useful for gemstone production\
+ Altering for wartime useage approved."
+ value = CATALOGUER_REWARD_HARD
+
+/obj/item/prop/tyrlore/drones
+ catalogue_data = list(/datum/category_item/catalogue/anomalous/tyre_drones)
+
+/datum/category_item/catalogue/anomalous/tyre_drones
+ name = "Tyr Data - Drones"
+ desc = "Success\
+ Drone Data Aquired\
+ Allies none the wise\
+ Further data siphoning to contunie\
+ Remodel based off their blueprints."
value = CATALOGUER_REWARD_HARD
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm
index bc68b1e943..3be27b5220 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm
@@ -613,6 +613,7 @@
name = "experiment 20"
icon_state = "poison_boss"
icon_living = "poison_boss"
+ wreckage = /obj/item/prop/tyrlore/basicflora
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberc/bullet_act(obj/item/projectile/P)
if(istype(P,/obj/item/projectile/beam) || istype(P, /obj/item/projectile/energy))
@@ -655,6 +656,7 @@
icon_state = "sonic_boss"
icon_living = "sonic_boss"
projectiletype = /obj/item/projectile/knockback/slow
+ wreckage = /obj/item/prop/tyrlore/basicsonic
/obj/item/projectile/knockback/slow
speed = 10
@@ -688,6 +690,7 @@
icon_state = "UPshield_boss"
icon_living = "UPshield_boss"
projectiletype = /obj/item/projectile/energy/eclipse/tyrjavelin
+ wreckage = /obj/item/prop/tyrlore/basicshield
var/fullshield = 300
var/shieldrage = 3
@@ -737,6 +740,7 @@
specialattackprojectile = /obj/item/projectile/spawnball
icon_state = "spawn_boss"
icon_living = "spawn_boss"
+ wreckage = /obj/item/prop/tyrlore/drones
/obj/item/projectile/spawnball
name = "nano sphere"
@@ -748,7 +752,7 @@
muzzle_type = null
combustion = FALSE
-/obj/item/projectile/metalball/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/spawnball/on_hit(var/atom/target, var/blocked = 0)
if(isturf(target.loc))
visible_message(span_danger("\The [src] creates a hivebot!"))
new /mob/living/simple_mob/mechanical/hivebot/tyr(target.loc)
@@ -777,6 +781,8 @@
icon_living = "cyan"
size_multiplier = 3
projectiletype = /obj/item/projectile/arc/explosive_rocket
+ wreckage = /obj/item/prop/tyrlore/ants
+ specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin
loot_list = list(/obj/item/projectile/energy/wp_shotgun = 30,
/obj/item/gun/energy/energyballchain = 30,
/obj/item/tool/wirecutters/hybrid/alien = 30,
@@ -831,6 +837,7 @@
icon_state = "yellow"
icon_living = "yellow"
size_multiplier = 3
+ wreckage = /obj/item/prop/tyrlore/basicpower
specialattackprojectile = /obj/item/projectile/energy/lightingspark/nanoweave
projectiletype = /obj/item/projectile/energy/lightingspark/nanoweave
loot_list = list(/obj/item/projectile/energy/wp_shotgun = 30,
@@ -882,12 +889,13 @@
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberg //wierd shields
name = "expirement 28"
specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin
- resistance = 15
+ resistance = 10
health = 1000
maxHealth = 1000
icon_state = "UPshield_boss"
icon_living = "UPshield_boss"
color = "#FF0000"
+ wreckage = /obj/item/prop/tyrlore/advanceshield
projectiletype = /obj/item/projectile/energy/eclipse/tyrjavelin
/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberg/do_special_attack(atom/A)
@@ -928,3 +936,4 @@
projectiletype = /obj/item/projectile/energy/eclipse/tyrjavelin/speed
icon_state = "shield_boss"
icon_living = "shield_boss"
+ ..()
diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm
index a801eef220..2d4233f40a 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/eventsubtype.dm
@@ -164,7 +164,7 @@
. = TRUE // So we don't fire a bolt as well.
var/rng_cycle
if(attackcycle == 1)
- specialattackprojectile = /obj/item/projectile/beam/burstlaser
+ specialattackprojectile = /obj/item/projectile/beam/midlaser/shortrange
rng_cycle = rand(1,5)
say("PROTOCOL: LASER. BLADE.")
addtimer(CALLBACK(src, PROC_REF(giant_burst), A, rng_cycle), 2 SECONDS, TIMER_DELETE_ME)
diff --git a/modular_chomp/code/modules/projectiles/precursor/tyr.dm b/modular_chomp/code/modules/projectiles/precursor/tyr.dm
index 594bef42bd..ba4130ef12 100644
--- a/modular_chomp/code/modules/projectiles/precursor/tyr.dm
+++ b/modular_chomp/code/modules/projectiles/precursor/tyr.dm
@@ -17,7 +17,7 @@
name = "energy ball"
icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi'
icon_state = "spikeenergyball"
- damage = 60 //after remebering throwing things into walls deals bonus damage. Will that wall thwacking out damage this 5 bonus...yes. But shotgun likly wins most DPS tests anyway
+ damage = 45 //after remebering throwing things into walls deals bonus damage. Will that wall thwacking out damage this 5 bonus...yes. But shotgun likly wins most DPS tests anyway
armor_penetration = 60 //damage and AP matching makes brain happy for some reason. No real logic here, just brain saying yes, this is right
range = 8
speed = 5
@@ -28,7 +28,7 @@
name = "laser blast"
icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi'
icon_state = "shotgun_blast"
- damage = 50
+ damage = 25
range = 5
check_armour = "bullet"
damage_type = BRUTE
@@ -45,14 +45,14 @@
name = "laser blast"
icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi'
icon_state = "blaster_blast"
- damage = 60
+ damage = 35
range = 5
check_armour = "laser"
/obj/item/projectile/beam/precursor_tyr
name = "laser"
icon_state = "laser"
- damage = 10
+ damage = 8
armor_penetration = 30
penetrating = 20
damage_type = BURN
@@ -68,27 +68,27 @@
range = 0
embed_chance = 0
spread_submunition_damage = FALSE
- submunition_spread_max = 120
+ submunition_spread_max = 150
submunition_spread_min = 60
submunitions = list(/obj/item/projectile/beam/precursor_tyr = 5)
/obj/item/gun/energy/energyballchain
- name = "remade prototype weapon"
- desc = "A weapon created from strange alien junk and blueprints"
+ name = "tyrian energy club"
+ desc = "A strange alien weapon from tyr."
icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi'
icon_state = "violence"
item_state = "violence"
wielded_item_state = "placeholder"
origin_tech = list(TECH_COMBAT = 6, TECH_POWER = 5, TECH_PRECURSOR = 3)
- charge_cost = 2500 //Uses all it's charge in a single shot.
+ charge_cost = 625 //Uses all it's charge in a single shot.
battery_lock = 1 //No changing
accept_cell_type = /obj/item/cell/device
cell_type = /obj/item/cell/device/weapon/recharge/alien/tyr
projectile_type = /obj/item/projectile/energy/spikeenergy_ball
- force = 30 //functions as a melee weapon too! Ain't great, but still works.
+ force = 45 //functions as a melee weapon too! Ain't great, but still works.
recoil_mode = 0
charge_meter = 1
@@ -97,15 +97,15 @@
one_handed_penalty = 50
/obj/item/gun/energy/curse_tyrshotgun
- name = "remade prototype weapon"
- desc = "A weapon created from strange alien junk and blueprints"
+ name = "tyrian enforcer firearm"
+ desc = "A strange alien weapon from tyr."
icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi'
icon_state = "shotgun"
item_state = "shotgun"
wielded_item_state = "placeholder"
origin_tech = list(TECH_COMBAT = 6, TECH_POWER = 5, TECH_PRECURSOR = 3)
- charge_cost = 500 //Five shots
+ charge_cost = 625 //Four shots
battery_lock = 1 //No changing
accept_cell_type = /obj/item/cell/device
@@ -116,23 +116,23 @@
charge_meter = 1
firemodes = list(
- list(mode_name="explosive", projectile_type=/obj/item/projectile/energy/wp_shotgun, charge_cost = 500),
- list(mode_name="spray", projectile_type=/obj/item/projectile/bullet/tyrshotburst, charge_cost = 750),
+ list(mode_name="explosive", projectile_type=/obj/item/projectile/energy/wp_shotgun, charge_cost = 625),
+ list(mode_name="spray", projectile_type=/obj/item/projectile/bullet/tyrshotburst, charge_cost = 625),
)
move_delay = 0
one_handed_penalty = 50
/obj/item/gun/energy/curse_blaster
- name = "remade prototype weapon"
- desc = "A weapon created from strange alien junk and blueprints"
+ name = "tyrian infantry firearm"
+ desc = "A strange alien weapon from tyr."
icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi'
icon_state = "solider_blaster"
item_state = "solider_blaster"
wielded_item_state = "placeholder"
origin_tech = list(TECH_COMBAT = 6, TECH_POWER = 5, TECH_PRECURSOR = 3)
- charge_cost = 250
+ charge_cost = 625
battery_lock = 1 //No changing
accept_cell_type = /obj/item/cell/device
@@ -145,28 +145,6 @@
move_delay = 0
one_handed_penalty = 50
-/obj/item/gun/energy/curse_lasershooter
- name = "remade prototype weapon"
- desc = "A weapon created from strange alien junk and blueprints"
- icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi'
- icon_state = "crystal_blaster"
- item_state = "crystal_blaster"
- origin_tech = list(TECH_COMBAT = 6, TECH_POWER = 5, TECH_PRECURSOR = 3)
-
- charge_cost = 250 //10 shots
- battery_lock = 1 //No changing
-
- accept_cell_type = /obj/item/cell/device
- cell_type = /obj/item/cell/device/weapon/recharge/alien/tyr
- projectile_type = /obj/item/projectile/beam/precursor_tyr
-
- recoil_mode = 0
- charge_meter = 1
-
- move_delay = 0
- one_handed_penalty = 50
-
-
/obj/item/cell/device/weapon/recharge/alien/tyr
name = "odd cell"
icon = 'icons/obj/abductor.dmi'
@@ -175,38 +153,6 @@
charge_amount = 250 // 10%.
charge_delay = 50 // Every five seconds, bit faster than the default.
-/obj/item/gun/energy/weatherbombardment
- name = "prototype cannon - Weather Bombardment"
- desc = "A massive weapon torn of a precursor mech."
- icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi'
- icon_state = "ultima"
- item_state = "ultima"
- w_class = ITEMSIZE_HUGE // This thing is big.
- slot_flags = SLOT_BACK
- one_handed_penalty = 70
-
- accept_cell_type = /obj/item/cell/device
- cell_type = /obj/item/cell/device/weapon/recharge/alien/tyr
- battery_lock = 1
- recoil_mode = 0
- charge_meter = 1
- move_delay = 0
-
- firemodes = list(
- list(mode_name="lighting storm", burst=1, fire_delay=15, projectile_type=/obj/item/projectile/beam/chain_lightning, charge_cost = 500),
- list(mode_name="acid rain", burst=5, fire_delay=15, projectile_type=/obj/item/projectile/energy/neurotoxin/toxic, charge_cost = 50),
- list(mode_name="meteor shower", burst=1, fire_delay=15, projectile_type=/obj/item/projectile/arc/fragmentation/metoerstrike, charge_cost = 500),
- list(mode_name="starry night", burst=5, fire_delay=15, projectile_type=/obj/item/projectile/beam/medical_cell/omni, charge_cost = 50),
- )
-
-
-/obj/item/projectile/arc/fragmentation/metoerstrike
- name = "fragmentation shot"
- icon_state = "shell"
- fragment_types = list(/obj/item/projectile/energy/spikeenergy_ball/slow)
- fragment_amount = 10 // Same as a grenade.
- spread_range = 60
-
/obj/item/projectile/energy/spikeenergy_ball/slow
speed = 15
range = 20
diff --git a/modular_chomp/code/modules/research/tg/designs/expirsci/experiment/instances/misc.dm b/modular_chomp/code/modules/research/tg/designs/expirsci/experiment/instances/misc.dm
new file mode 100644
index 0000000000..a19e401bec
--- /dev/null
+++ b/modular_chomp/code/modules/research/tg/designs/expirsci/experiment/instances/misc.dm
@@ -0,0 +1,16 @@
+/datum/experiment/scanning/points/tyr_precursor_study
+ name = "Tyr Precursor Study"
+ description = "A scientist or explorer will need to obtain data discs from Tyr!"
+ required_points = 3
+ required_atoms = list(
+ /obj/item/prop/tyrlore/reddisc = 1,
+ /obj/item/prop/tyrlore/purpledisc = 1,
+ /obj/item/prop/tyrlore/greendisc = 1,
+ /obj/item/prop/tyrlore/basicflora = 1,
+ /obj/item/prop/tyrlore/basicshield = 1,
+ /obj/item/prop/tyrlore/advanceshield = 1,
+ /obj/item/prop/tyrlore/basicsonic = 1,
+ /obj/item/prop/tyrlore/basicpower = 1,
+ /obj/item/prop/tyrlore/ants = 1,
+ /obj/item/prop/tyrlore/drones = 1,
+ )
diff --git a/modular_chomp/code/modules/research/tg/designs/tyrstuff.dm b/modular_chomp/code/modules/research/tg/designs/tyrstuff.dm
new file mode 100644
index 0000000000..af6f99bfa4
--- /dev/null
+++ b/modular_chomp/code/modules/research/tg/designs/tyrstuff.dm
@@ -0,0 +1,32 @@
+/datum/design_techweb/tyrenergyballchain
+ name = "Tyrian Melee Weapon"
+ id = "tyr_meleegun"
+ build_type = PROTOLATHE
+ materials = list(MAT_STEEL = 12000,MAT_DIAMOND = 4000,MAT_URANIUM = 3000,MAT_COPPER = 3000,MAT_GOLD = 3000,MAT_MYDRO = 3000,MAT_QUARTZ = 3000,MAT_WEATHERED_AGATE = 3000)
+ build_path = /obj/item/gun/energy/energyballchain
+ category = list(
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
+
+/datum/design_techweb/tyrenergyshotgun
+ name = "Tyrian Enforcer Firearm"
+ id = "tyr_shotgun"
+ build_type = PROTOLATHE
+ materials = list(MAT_STEEL = 12000,MAT_DIAMOND = 4000,MAT_URANIUM = 3000,MAT_COPPER = 3000,MAT_GOLD = 3000,MAT_MYDRO = 3000,MAT_QUARTZ = 3000,MAT_WEATHERED_AGATE = 3000)
+ build_path = /obj/item/gun/energy/curse_tyrshotgun
+ category = list(
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
+
+/datum/design_techweb/tyrenergyrifle
+ name = "Tyrian Infantry Firearm"
+ id = "tyr_rifle"
+ build_type = PROTOLATHE
+ materials = list(MAT_STEEL = 12000,MAT_DIAMOND = 4000,MAT_URANIUM = 3000,MAT_COPPER = 3000,MAT_GOLD = 3000,MAT_MYDRO = 3000,MAT_QUARTZ = 3000,MAT_WEATHERED_AGATE = 3000)
+ build_path = /obj/item/gun/energy/curse_blaster
+ category = list(
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_RANGED
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
diff --git a/modular_chomp/code/modules/research/tg/techweb/nodes/exploration.dm b/modular_chomp/code/modules/research/tg/techweb/nodes/exploration.dm
new file mode 100644
index 0000000000..721f9ec9ce
--- /dev/null
+++ b/modular_chomp/code/modules/research/tg/techweb/nodes/exploration.dm
@@ -0,0 +1,13 @@
+/datum/techweb_node/tyr_loot
+ id = TECHWEB_NODE_TYRGOODS
+ display_name = "Explosives"
+ description = "For once, intentional explosions."
+ prereq_ids = list(TECHWEB_NODE_MOD_ANOMALY_SUIT)
+ design_ids = list(
+ "tyr_rifle",
+ "tyr_shotgun",
+ "tyr_meleegun",
+ )
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
+ required_experiments = list(/datum/experiment/scanning/points/tyr_precursor_study)
+ announce_channels = list(CHANNEL_SECURITY, CHANNEL_SCIENCE)
diff --git a/modular_chomp/icons/obj/weather_ruins.dmi b/modular_chomp/icons/obj/weather_ruins.dmi
index b3c2e2d16a..a99faf812f 100644
Binary files a/modular_chomp/icons/obj/weather_ruins.dmi and b/modular_chomp/icons/obj/weather_ruins.dmi differ
diff --git a/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dm b/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dm
index 393115827c..9d89e3e8fa 100644
--- a/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dm
+++ b/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dm
@@ -128,6 +128,11 @@
requires_power = FALSE
outdoors = OUTDOORS_NO
+/area/surface/tyr/eclipse_refinery
+ name = "Tyr refinery"
+ icon_state = "green"
+ outdoors = OUTDOORS_NO
+
/area/surface/tyr/ancient_ruins/puzzlea
/area/surface/tyr/ancient_ruins/puzzleb
@@ -224,6 +229,12 @@
temperature = TYR_AVG_TEMP
outdoors = OUTDOORS_AREA
+/turf/simulated/floor/lava/tyr
+ oxygen = TYR_MOL_O2
+ nitrogen = TYR_MOL_N2
+ temperature = TYR_AVG_TEMP
+ outdoors = OUTDOORS_AREA
+
/turf/simulated/floor/outdoors/desert_planet/sand/tyr
oxygen = TYR_MOL_O2
nitrogen = TYR_MOL_N2
diff --git a/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dmm b/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dmm
index 66c0f737de..54d3b2eaf8 100644
--- a/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dmm
+++ b/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dmm
@@ -32,8 +32,8 @@
"af" = (
/obj/effect/step_trigger/teleporter/poi{
pixel_x = -1;
- teleport_x = 122;
- teleport_y = 165
+ teleport_x = 113;
+ teleport_y = 161
},
/obj/structure/prop/tyr_elevator{
density = 0
@@ -66,7 +66,7 @@
"ak" = (
/obj/effect/step_trigger/teleporter/poi{
pixel_x = -1;
- teleport_x = 83;
+ teleport_x = 72;
teleport_y = 194
},
/obj/structure/prop/tyr_elevator{
@@ -78,7 +78,7 @@
/obj/effect/step_trigger/teleporter/poi{
pixel_x = -1;
teleport_x = 131;
- teleport_y = 202
+ teleport_y = 211
},
/obj/structure/prop/tyr_elevator{
density = 0
@@ -187,6 +187,9 @@
/obj/item/gun/energy/alien,
/turf/simulated/shuttle/floor/alien,
/area/surface/tyr/south_caverns)
+"aH" = (
+/turf/simulated/wall/iron,
+/area/surface/tyr/eclipse_refinery)
"aI" = (
/obj/structure/grille,
/obj/structure/window/plastitanium{
@@ -195,10 +198,128 @@
/obj/structure/window/plastitanium,
/turf/simulated/shuttle/floor/voidcraft/tyr,
/area/surface/tyr/northern_wilderness)
+"aJ" = (
+/turf/simulated/mineral/light/tyr,
+/area/surface/tyr/eclipse_refinery)
"aK" = (
/obj/structure/table/steel,
/turf/simulated/shuttle/floor/voidcraft/tyr,
/area/surface/tyr/northern_wilderness)
+"aL" = (
+/obj/machinery/power/rtg/advanced,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/simulated/floor,
+/area/surface/tyr/eclipse_refinery)
+"aM" = (
+/turf/simulated/floor,
+/area/surface/tyr/eclipse_refinery)
+"aN" = (
+/obj/machinery/power/rtg/advanced,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/simulated/floor,
+/area/surface/tyr/eclipse_refinery)
+"aO" = (
+/obj/item/circuitboard/industrial_reagent_waste_processor,
+/obj/item/circuitboard/industrial_reagent_vat,
+/obj/item/circuitboard/industrial_reagent_reactor,
+/obj/item/circuitboard/industrial_reagent_pump,
+/obj/item/circuitboard/industrial_reagent_pipe,
+/obj/item/circuitboard/industrial_reagent_pipe,
+/obj/item/circuitboard/industrial_reagent_pipe,
+/obj/item/circuitboard/industrial_reagent_pipe,
+/obj/item/circuitboard/industrial_reagent_pipe,
+/obj/item/circuitboard/industrial_reagent_mixer,
+/obj/item/circuitboard/industrial_reagent_hub,
+/obj/item/circuitboard/industrial_reagent_grinder,
+/obj/item/circuitboard/industrial_reagent_furnace,
+/obj/item/circuitboard/industrial_reagent_filter,
+/obj/structure/table/rack{
+ dir = 8;
+ layer = 2.6
+ },
+/turf/simulated/floor,
+/area/surface/tyr/eclipse_refinery)
+"aP" = (
+/obj/item/stock_parts/manipulator/pico,
+/obj/item/stock_parts/manipulator/pico,
+/obj/item/stock_parts/manipulator/pico,
+/obj/item/stock_parts/matter_bin/super,
+/obj/item/stock_parts/matter_bin/super,
+/obj/item/stock_parts/matter_bin/super,
+/obj/item/stock_parts/micro_laser/ultra,
+/obj/item/stock_parts/micro_laser/ultra,
+/obj/item/stock_parts/micro_laser/ultra,
+/obj/item/stock_parts/scanning_module/phasic,
+/obj/item/stock_parts/scanning_module/phasic,
+/obj/item/stock_parts/scanning_module/phasic,
+/obj/item/stack/cable_coil/silver,
+/obj/item/stack/cable_coil/silver,
+/obj/item/stack/cable_coil/silver,
+/obj/structure/table/rack{
+ dir = 8;
+ layer = 2.6
+ },
+/turf/simulated/floor,
+/area/surface/tyr/eclipse_refinery)
+"aQ" = (
+/mob/living/simple_mob/humanoid/eclipse/solar/clocksgun,
+/turf/simulated/floor,
+/area/surface/tyr/eclipse_refinery)
+"aR" = (
+/mob/living/simple_mob/humanoid/eclipse/lunar/cultfanatic,
+/turf/simulated/floor,
+/area/surface/tyr/eclipse_refinery)
+"aS" = (
+/obj/random/tyroutcrop,
+/turf/simulated/floor/outdoors/desert_planet/gravel/tyr,
+/area/surface/tyr/eclipse_refinery)
+"aT" = (
+/obj/structure/fans/hardlight/colorable/abductor{
+ color = "#FF3300"
+ },
+/turf/simulated/floor,
+/area/surface/tyr/eclipse_refinery)
+"aU" = (
+/turf/simulated/floor/outdoors/desert_planet/gravel/tyr,
+/area/surface/tyr/eclipse_refinery)
+"aV" = (
+/turf/simulated/floor/lava/tyr,
+/area/surface/tyr/eclipse_refinery)
+"aW" = (
+/obj/structure/flora/tyr/flowers,
+/obj/random/tyroutcrop,
+/turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr,
+/area/surface/tyr/south_caverns)
+"aX" = (
+/obj/random/tyroutcrop,
+/obj/random/tyroutcrop,
+/turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr,
+/area/surface/tyr/south_caverns)
+"aY" = (
+/obj/structure/flora/tyr/flowers,
+/obj/structure/mob_spawner/ant_hill,
+/turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr,
+/area/surface/tyr/south_caverns)
+"aZ" = (
+/obj/structure/flora/tyr/flowers,
+/mob/living/simple_mob/animal/tyr/mineral_ants/queen,
+/turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr,
+/area/surface/tyr/south_caverns)
+"ba" = (
+/obj/structure/prop/tyr_elevator{
+ density = 0
+ },
+/obj/effect/step_trigger/teleporter/poi{
+ pixel_x = -1;
+ teleport_x = 178;
+ teleport_y = 194
+ },
+/turf/simulated/shuttle/floor/alien,
+/area/surface/tyr/precursorruins/finale)
"bb" = (
/obj/effect/step_trigger/teleporter/poi{
pixel_x = -1;
@@ -210,6 +331,25 @@
},
/turf/simulated/shuttle/floor/alien,
/area/surface/tyr/precursorruins/finale)
+"bc" = (
+/obj/structure/prop/tyr_elevator{
+ density = 0
+ },
+/obj/effect/step_trigger/teleporter/poi{
+ pixel_x = -1;
+ teleport_x = 150;
+ teleport_y = 194
+ },
+/turf/simulated/shuttle/floor/alienplating,
+/area/surface/tyr/precursorruins/finale)
+"bd" = (
+/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberg,
+/turf/simulated/shuttle/floor/alienplating,
+/area/surface/tyr/precursorruins/finale)
+"be" = (
+/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberd,
+/turf/simulated/shuttle/floor/alienplating,
+/area/surface/tyr/precursorruins/finale)
"bj" = (
/turf/simulated/shuttle/floor/voidcraft/tyr,
/area/surface/tyr/northern_wilderness)
@@ -525,10 +665,6 @@
/obj/structure/curtain/medical,
/turf/simulated/shuttle/floor/voidcraft/tyr,
/area/surface/tyr/southern_wilderness)
-"fR" = (
-/mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberd,
-/turf/simulated/shuttle/floor/alien,
-/area/surface/tyr/precursorruins/finale)
"fZ" = (
/obj/machinery/optable,
/turf/simulated/shuttle/floor/voidcraft/tyr,
@@ -926,7 +1062,7 @@
},
/obj/effect/step_trigger/teleporter/poi{
pixel_x = -1;
- teleport_x = 101;
+ teleport_x = 92;
teleport_y = 210
},
/turf/simulated/shuttle/floor/alien,
@@ -945,7 +1081,7 @@
},
/obj/effect/step_trigger/teleporter/poi{
pixel_x = -1;
- teleport_x = 163;
+ teleport_x = 174;
teleport_y = 210
},
/turf/simulated/shuttle/floor/alien,
@@ -963,7 +1099,7 @@
/obj/effect/step_trigger/teleporter/poi{
pixel_x = -1;
teleport_x = 148;
- teleport_y = 172
+ teleport_y = 165
},
/turf/simulated/shuttle/floor/alien,
/area/surface/tyr/precursorruins/finale)
@@ -985,7 +1121,7 @@
},
/obj/effect/step_trigger/teleporter/poi{
pixel_x = -1;
- teleport_x = 103;
+ teleport_x = 96;
teleport_y = 180
},
/turf/simulated/shuttle/floor/alien,
@@ -9665,9 +9801,9 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
OQ
OQ
OQ
@@ -9922,11 +10058,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -10180,12 +10316,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -10438,13 +10574,13 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -10698,11 +10834,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -10959,7 +11095,7 @@ OQ
OQ
OQ
OQ
-OQ
+CU
OQ
OQ
OQ
@@ -12990,8 +13126,8 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
+CU
+CU
OQ
OQ
OQ
@@ -13246,11 +13382,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -13503,12 +13639,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -13761,11 +13897,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -14020,8 +14156,8 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
+CU
+CU
OQ
OQ
OQ
@@ -15047,7 +15183,7 @@ OQ
OQ
OQ
OQ
-OQ
+aW
Nc
Nc
Nc
@@ -15304,10 +15440,10 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-Nc
-Nc
+aW
+aW
+aW
+ei
Nc
Nc
OQ
@@ -15326,9 +15462,9 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
OQ
OQ
OQ
@@ -15561,11 +15697,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+aW
+aW
+aW
+aW
Nc
Nc
Nc
@@ -15583,10 +15719,10 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -15819,12 +15955,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+aW
+aW
+aW
+aW
+Nc
Nc
Nc
Nc
@@ -15841,11 +15977,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -16076,12 +16212,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+aW
+aW
+aW
+aW
+aW
OQ
OQ
Nc
@@ -16098,12 +16234,12 @@ Nc
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -16334,11 +16470,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+aW
+aW
+aW
+aW
OQ
OQ
OQ
@@ -16356,11 +16492,11 @@ Nc
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -16591,12 +16727,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+aW
+aW
+aW
OQ
OQ
OQ
@@ -16849,11 +16985,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+ei
+aW
OQ
OQ
OQ
@@ -17107,10 +17243,10 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
+ei
+aW
+ei
+ei
OQ
OQ
OQ
@@ -17364,11 +17500,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+ei
+aW
OQ
OQ
OQ
@@ -17622,11 +17758,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -17880,12 +18016,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aY
+aW
+ei
+ei
+ei
+aY
OQ
OQ
OQ
@@ -17911,9 +18047,9 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
OQ
OQ
OQ
@@ -18138,12 +18274,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+ei
+ei
+aW
OQ
OQ
OQ
@@ -18168,10 +18304,10 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -18396,12 +18532,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+aW
+ei
+ei
OQ
OQ
OQ
@@ -18425,12 +18561,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -18655,11 +18791,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -18683,11 +18819,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -18913,11 +19049,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+aW
+ei
+aW
+ei
OQ
OQ
OQ
@@ -18941,10 +19077,10 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -19172,10 +19308,10 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -19429,11 +19565,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -19686,11 +19822,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+ei
+aW
OQ
OQ
OQ
@@ -19943,12 +20079,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aY
+ei
+ei
+ei
+ei
+aW
OQ
OQ
OQ
@@ -20201,12 +20337,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+aW
+ei
+ei
OQ
OQ
OQ
@@ -20404,7 +20540,7 @@ ag
ag
ag
Th
-ah
+Th
Th
ag
ag
@@ -20459,11 +20595,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -20716,11 +20852,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+aW
+ei
+ei
OQ
OQ
OQ
@@ -20974,10 +21110,10 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -21230,12 +21366,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+aW
+ei
+ei
OQ
OQ
OQ
@@ -21488,11 +21624,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+aW
+ei
+ei
+ei
OQ
OQ
OQ
@@ -21694,7 +21830,7 @@ ag
Th
Th
Th
-Th
+ah
Th
Th
Th
@@ -21745,12 +21881,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+ei
+aW
+ei
OQ
OQ
OQ
@@ -22003,11 +22139,11 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -22260,12 +22396,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -22296,10 +22432,10 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -22516,13 +22652,13 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aY
+ei
+ei
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -22552,13 +22688,13 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -22774,13 +22910,13 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+aW
+ei
+ei
+ei
+ei
+aW
OQ
OQ
OQ
@@ -22809,14 +22945,14 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -23031,14 +23167,14 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+ei
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -23066,15 +23202,15 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -23289,6 +23425,14 @@ OQ
OQ
OQ
OQ
+ei
+ei
+ei
+aW
+ei
+ei
+aW
+aY
OQ
OQ
OQ
@@ -23298,16 +23442,8 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
OQ
OQ
OQ
@@ -23324,14 +23460,14 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -23547,6 +23683,13 @@ OQ
OQ
OQ
OQ
+ei
+ei
+ei
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -23555,19 +23698,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+aX
+CU
+CU
+CU
+CU
OQ
OQ
Nc
@@ -23583,13 +23719,13 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -23805,6 +23941,13 @@ OQ
OQ
OQ
OQ
+ei
+aW
+ei
+ei
+ei
+aW
+ei
OQ
OQ
OQ
@@ -23812,20 +23955,13 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -23842,12 +23978,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -24063,6 +24199,13 @@ OQ
OQ
OQ
OQ
+ei
+ei
+ei
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -24070,20 +24213,13 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -24253,8 +24389,8 @@ vI
vI
vI
vI
-vI
-vI
+Mz
+Mz
Mz
Th
Th
@@ -24262,8 +24398,8 @@ Th
Th
Th
Mz
-vI
-vI
+Mz
+Mz
vI
vI
vI
@@ -24321,6 +24457,13 @@ OQ
OQ
OQ
OQ
+ei
+ei
+ei
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -24328,19 +24471,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -24511,12 +24647,14 @@ vI
vI
vI
vI
-vI
-vI
Mz
Th
Th
-ai
+Th
+Th
+Th
+Th
+Th
Th
Th
Mz
@@ -24527,8 +24665,6 @@ vI
vI
vI
vI
-vI
-vI
Mz
Th
Th
@@ -24579,26 +24715,26 @@ OQ
OQ
OQ
OQ
+ei
+ei
+aW
+ei
+ei
+aW
+ei
+ei
OQ
OQ
OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -24770,15 +24906,15 @@ vI
vI
Mz
Mz
-Mz
-Mz
Th
Th
Th
Th
Th
-Mz
-Mz
+Th
+Th
+Th
+Th
Mz
Mz
vI
@@ -24837,26 +24973,26 @@ OQ
OQ
OQ
OQ
+ei
+ei
+ei
+ei
+ei
+ei
+aW
+ei
OQ
OQ
OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -25095,6 +25231,14 @@ OQ
OQ
OQ
OQ
+aY
+ei
+ei
+ei
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -25102,18 +25246,10 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+CU
+CU
+CU
+CU
OQ
OQ
OQ
@@ -25354,14 +25490,14 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+aW
+ei
+ei
+ei
+aW
OQ
OQ
OQ
@@ -25578,7 +25714,7 @@ Th
Th
Th
bF
-jn
+bF
bF
Th
Th
@@ -25613,13 +25749,13 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+ei
+ei
+ei
+ei
+ei
+ei
+aW
OQ
OQ
OQ
@@ -25872,12 +26008,12 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+aW
+ei
+aW
OQ
OQ
OQ
@@ -26130,14 +26266,14 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+aW
+ei
+ei
+ei
+aW
+aW
OQ
OQ
OQ
@@ -26318,15 +26454,15 @@ vI
vI
Mz
Mz
-Mz
-Mz
Th
Th
Th
Th
+ai
+Th
+Th
+Th
Th
-Mz
-Mz
Mz
Mz
vI
@@ -26388,15 +26524,15 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+aW
+ei
+ei
+ei
+ei
+aW
OQ
OQ
OQ
@@ -26575,14 +26711,16 @@ vI
vI
vI
vI
-vI
-vI
Mz
Th
Th
Th
Th
Th
+Th
+Th
+Th
+Th
Mz
vI
vI
@@ -26591,8 +26729,6 @@ vI
vI
vI
vI
-vI
-vI
Mz
dH
dH
@@ -26646,19 +26782,19 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+ei
+ei
+aW
+ei
+ei
+ei
+ei
+aW
+ei
+aW
OQ
OQ
OQ
@@ -26833,8 +26969,8 @@ vI
vI
vI
vI
-vI
-vI
+Mz
+Mz
Mz
Th
Th
@@ -26842,8 +26978,8 @@ Th
Th
Th
Mz
-vI
-vI
+Mz
+Mz
vI
vI
vI
@@ -26868,7 +27004,7 @@ Th
Th
Th
bF
-bF
+jn
bF
Th
Th
@@ -26904,19 +27040,19 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+aW
+ei
+ei
+ei
+aW
+ei
+ei
+aW
+ei
+ei
+ei
OQ
OQ
OQ
@@ -27162,20 +27298,20 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+ei
+ei
+ei
+ei
+aZ
+ei
+ei
+ei
+ei
+ei
+ei
OQ
OQ
OQ
@@ -27420,20 +27556,20 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+aW
+ei
+aW
+ei
+ei
+ei
+aW
+ei
+ei
+aW
+ei
+aW
OQ
OQ
OQ
@@ -27678,20 +27814,20 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+aZ
+ei
+ei
+ei
+aW
+ei
+ei
+aZ
+ei
+ei
+ei
OQ
OQ
OQ
@@ -27937,19 +28073,19 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+aW
+aW
+ei
+ei
+ei
+ei
+ei
+ei
+aW
+ei
OQ
OQ
OQ
@@ -28195,19 +28331,19 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+ei
+ei
+aW
+ei
+aW
+ei
+aW
+ei
+ei
+aW
OQ
OQ
OQ
@@ -28453,19 +28589,19 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+aW
+ei
+ei
+ei
+aZ
+ei
+ei
+ei
+ei
+aW
OQ
OQ
OQ
@@ -28712,17 +28848,17 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+ei
+ei
+ei
+ei
+ei
+aW
+ei
+ei
+ei
+aW
OQ
OQ
OQ
@@ -28971,15 +29107,15 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aW
+aW
+aW
+aW
+ei
+ei
+aW
+aW
+aW
OQ
OQ
OQ
@@ -29233,8 +29369,8 @@ OQ
OQ
OQ
OQ
-OQ
-OQ
+aW
+aW
OQ
OQ
OQ
@@ -29724,9 +29860,9 @@ Th
Th
Th
Th
-Th
dH
Th
+Th
Mz
vI
vI
@@ -29981,10 +30117,10 @@ Th
Th
Th
Th
-Th
dH
Th
-dH
+Th
+Th
Mz
vI
vI
@@ -30241,8 +30377,8 @@ Th
Th
dH
Th
-dH
Th
+dH
Mz
vI
vI
@@ -30497,9 +30633,9 @@ Th
Th
dH
dH
-ac
-dH
Th
+dH
+dH
Th
Mz
vI
@@ -31011,7 +31147,7 @@ Th
Th
dH
Th
-Th
+ac
Th
dH
Th
@@ -33060,11 +33196,11 @@ vI
vI
Mz
Mz
-Th
-Th
-Th
-Th
-Th
+dH
+dH
+dH
+dH
+dH
Mz
Mz
vI
@@ -33317,13 +33453,13 @@ vI
vI
Mz
Mz
+dH
Th
Th
Th
Th
Th
-Th
-Th
+dH
Mz
Mz
vI
@@ -33545,15 +33681,15 @@ vI
vI
vI
Mz
-dH
-dH
+bF
+bF
Th
Th
Th
Th
Th
-dH
-dH
+bF
+bF
Mz
vI
vI
@@ -33574,6 +33710,7 @@ vI
vI
Mz
Mz
+dH
Th
Th
Th
@@ -33581,8 +33718,7 @@ Th
Th
Th
Th
-Th
-Th
+dH
Mz
Mz
vI
@@ -33803,15 +33939,15 @@ vI
vI
vI
Mz
-dH
-dH
-dH
-dH
-dH
-dH
-dH
-dH
-dH
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
Mz
vI
vI
@@ -33831,6 +33967,7 @@ vI
vI
Mz
Mz
+dH
Th
Th
Th
@@ -33840,8 +33977,7 @@ Th
Th
Th
Th
-Th
-Th
+dH
Mz
Mz
vI
@@ -34062,13 +34198,13 @@ vI
Mz
Mz
Th
-dH
-dH
-dH
-dH
-dH
-dH
-dH
+bF
+Th
+Th
+bF
+Th
+Th
+bF
Th
Mz
Mz
@@ -34088,6 +34224,7 @@ vI
vI
vI
Mz
+dH
Th
Th
Th
@@ -34099,8 +34236,7 @@ Th
Th
Th
Th
-Th
-Th
+dH
Mz
vI
vI
@@ -34320,13 +34456,13 @@ vI
Mz
Th
Th
-dH
-dH
-dH
-dH
-dH
-dH
-dH
+bF
+Th
+Th
+bF
+Th
+Th
+bF
Th
Th
Mz
@@ -34346,7 +34482,7 @@ vI
vI
Mz
Mz
-Th
+dH
Th
Th
Th
@@ -34358,7 +34494,7 @@ Th
Th
Th
Th
-Th
+dH
Mz
Mz
vI
@@ -34577,14 +34713,14 @@ vI
vI
Mz
Th
-fR
-dH
-dH
-dH
-dH
-dH
-dH
-dH
+Th
+bF
+bF
+bF
+be
+bF
+bF
+bF
Th
Th
am
@@ -34604,7 +34740,7 @@ Mz
Mz
Mz
jq
-Th
+dH
Th
Th
Th
@@ -34616,7 +34752,7 @@ Th
Th
Th
Th
-Th
+dH
qa
Mz
Mz
@@ -34836,13 +34972,13 @@ vI
Mz
Th
Th
-dH
-dH
-dH
-dH
-dH
-dH
-dH
+bF
+Th
+Th
+bF
+Th
+Th
+bF
Th
Th
Mz
@@ -34862,7 +34998,7 @@ vI
vI
Mz
Mz
-Th
+dH
Th
Th
Th
@@ -34874,7 +35010,7 @@ Th
Th
Th
Th
-Th
+dH
Mz
Mz
vI
@@ -35094,13 +35230,13 @@ vI
Mz
Mz
Th
-dH
-dH
-dH
-dH
-dH
-dH
-dH
+bF
+Th
+Th
+bF
+Th
+Th
+bF
Th
Mz
Mz
@@ -35120,6 +35256,7 @@ vI
vI
vI
Mz
+dH
Th
Th
Th
@@ -35131,8 +35268,7 @@ Th
Th
Th
Th
-Th
-Th
+dH
Mz
vI
vI
@@ -35351,15 +35487,15 @@ vI
vI
vI
Mz
-dH
-dH
-dH
-dH
-dH
-dH
-dH
-dH
-dH
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
Mz
vI
vI
@@ -35379,6 +35515,7 @@ vI
vI
Mz
Mz
+dH
Th
Th
Th
@@ -35388,8 +35525,7 @@ Th
Th
Th
Th
-Th
-Th
+dH
Mz
Mz
vI
@@ -35609,15 +35745,15 @@ vI
vI
vI
Mz
-dH
-dH
+bF
+bF
Th
Th
Th
Th
Th
-dH
-dH
+bF
+bF
Mz
vI
vI
@@ -35638,6 +35774,7 @@ vI
vI
Mz
Mz
+dH
Th
Th
Th
@@ -35645,8 +35782,7 @@ Th
Th
Th
Th
-Th
-Th
+dH
Mz
Mz
vI
@@ -35897,13 +36033,13 @@ vI
vI
Mz
Mz
+dH
Th
Th
Th
Th
Th
-Th
-Th
+dH
Mz
Mz
vI
@@ -36156,11 +36292,11 @@ vI
vI
Mz
Mz
-Th
-Th
-Th
-Th
-Th
+dH
+dH
+dH
+dH
+dH
Mz
Mz
vI
@@ -39003,14 +39139,14 @@ Mz
Mz
wj
Th
-Th
-Th
-Th
-Th
-Th
iH
Th
Th
+Th
+Th
+Th
+Th
+Th
Mz
vI
vI
@@ -39754,7 +39890,7 @@ vI
Mz
Mz
Mz
-Mz
+ba
Mz
Mz
Mz
@@ -40011,9 +40147,9 @@ vI
vI
vI
vI
-vI
Mz
-vI
+Mz
+Mz
vI
vI
vI
@@ -44397,9 +44533,9 @@ vI
vI
vI
vI
-vI
Mz
-vI
+Mz
+Mz
vI
vI
vI
@@ -44651,17 +44787,17 @@ Mz
vI
vI
vI
-vI
-vI
-vI
-vI
-vI
Mz
-vI
-vI
-vI
-vI
-vI
+Mz
+Mz
+Mz
+Mz
+bc
+Mz
+Mz
+Mz
+Mz
+Mz
vI
vI
vI
@@ -44909,17 +45045,17 @@ Mz
vI
vI
vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
+Mz
+Th
+Th
+Th
+Th
+Th
+Th
+Th
+Th
+Th
+Mz
vI
vI
vI
@@ -45167,17 +45303,17 @@ Mz
vI
vI
vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
+Mz
+Th
+bF
+bF
+bF
+bd
+bF
+bF
+bF
+Th
+Mz
vI
vI
vI
@@ -45425,17 +45561,17 @@ vI
vI
vI
vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
+Mz
+Th
+bF
+Th
+Th
+Th
+Th
+Th
+bF
+Th
+Mz
vI
vI
vI
@@ -45683,17 +45819,17 @@ vI
vI
vI
vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
+Mz
+Th
+bF
+Th
+bF
+bF
+bF
+Th
+bF
+Th
+Mz
vI
vI
vI
@@ -45941,17 +46077,17 @@ vI
vI
vI
vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
+Mz
+Th
+bF
+Th
+bF
+bF
+bF
+Th
+bF
+Th
+Mz
vI
vI
vI
@@ -46199,17 +46335,17 @@ vI
vI
vI
vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
+Mz
+Th
+bF
+Th
+bF
+bF
+bF
+Th
+bF
+Th
+Mz
vI
vI
vI
@@ -46457,17 +46593,17 @@ vI
vI
vI
vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
+Mz
+Th
+bF
+Th
+Th
+Th
+Th
+Th
+bF
+Th
+Mz
vI
vI
vI
@@ -46715,17 +46851,17 @@ vI
vI
vI
vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
+Mz
+Th
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+Th
+Mz
vI
vI
vI
@@ -46973,17 +47109,17 @@ vI
vI
vI
vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
+Mz
+Th
+Th
+Th
+Th
+Th
+Th
+Th
+Th
+Th
+Mz
vI
vI
vI
@@ -47231,17 +47367,17 @@ vI
vI
vI
vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
-vI
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
+Mz
vI
vI
vI
@@ -57857,35 +57993,35 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aS
Nc
Nc
Nc
@@ -58115,40 +58251,40 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aS
+aS
+Nc
+Nc
+Nc
+Nc
Nc
-OQ
-OQ
Nc
OQ
Nc
@@ -58373,40 +58509,40 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aS
+aS
+aS
+aS
+Nc
+Nc
+Nc
+Nc
OQ
OQ
OQ
@@ -58631,38 +58767,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aS
+aS
+aS
+aS
+aS
+aS
+aS
OQ
OQ
OQ
@@ -58889,38 +59025,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aS
+aS
+aS
+aS
+aS
+aS
+aJ
+aJ
OQ
OQ
OQ
@@ -59147,38 +59283,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aS
+aS
+aS
+aS
+aS
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -59405,38 +59541,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aS
+aS
+aS
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -59663,38 +59799,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aU
+aU
+aS
+aS
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -59921,38 +60057,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aU
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -60179,38 +60315,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -60437,38 +60573,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -60695,38 +60831,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -60953,38 +61089,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -61211,38 +61347,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -61469,38 +61605,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -61727,38 +61863,38 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -61985,46 +62121,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aJ
+aJ
+aH
+aH
+aH
+aH
+aH
+aH
+aH
+aH
OQ
OQ
OQ
@@ -62243,46 +62379,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aJ
+aH
+aL
+aL
+aL
+aL
+aL
+aL
+aH
OQ
OQ
OQ
@@ -62501,46 +62637,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aH
+aM
+aM
+aM
+aM
+aM
+aM
+aH
OQ
OQ
OQ
@@ -62759,46 +62895,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aU
+aU
+aJ
+aJ
+aJ
+aH
+aM
+aN
+aN
+aN
+aN
+aM
+aH
OQ
OQ
OQ
@@ -63017,46 +63153,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aU
+aJ
+aH
+aH
+aH
+aM
+aH
+aH
+aH
+aH
+aM
+aH
OQ
OQ
OQ
@@ -63275,46 +63411,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aU
+aU
+aH
+aM
+aM
+aM
+aM
+aM
+aM
+aM
+aM
+aH
OQ
OQ
OQ
@@ -63533,46 +63669,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aU
+aT
+aM
+aM
+aM
+aO
+aM
+aM
+aO
+aM
+aH
OQ
OQ
OQ
@@ -63791,46 +63927,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aU
+aT
+aM
+aM
+aQ
+aP
+aM
+aM
+aP
+aM
+aH
OQ
OQ
OQ
@@ -64049,46 +64185,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aH
+aM
+aM
+aM
+aP
+aM
+aM
+aP
+aM
+aH
OQ
OQ
OQ
@@ -64307,46 +64443,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aU
+aH
+aM
+aM
+aM
+aM
+aM
+aM
+aM
+aM
+aH
OQ
OQ
OQ
@@ -64565,46 +64701,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aH
+aM
+aM
+aM
+aP
+aM
+aM
+aP
+aM
+aH
OQ
OQ
OQ
@@ -64823,46 +64959,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aT
+aM
+aM
+aR
+aP
+aM
+aM
+aP
+aM
+aH
OQ
OQ
OQ
@@ -65081,46 +65217,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aU
+aU
+aT
+aM
+aM
+aM
+aO
+aM
+aM
+aO
+aM
+aH
OQ
OQ
OQ
@@ -65339,46 +65475,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aV
+aU
+aJ
+aH
+aM
+aM
+aM
+aM
+aM
+aM
+aM
+aM
+aH
OQ
OQ
OQ
@@ -65597,46 +65733,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aV
+aV
+aV
+aJ
+aJ
+aJ
+aJ
+aJ
+aH
+aH
+aH
+aH
+aH
+aH
+aH
+aH
+aH
+aH
OQ
OQ
OQ
@@ -65855,46 +65991,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -66113,46 +66249,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -66371,46 +66507,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -66629,46 +66765,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
@@ -66887,46 +67023,46 @@ vI
vI
vI
Mz
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
-OQ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
+aJ
OQ
OQ
OQ
diff --git a/vorestation.dme b/vorestation.dme
index 6a1f84bbee..8e6f15fca4 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -5337,6 +5337,9 @@
#include "modular_chomp\code\modules\reagents\reagents\modapply.dm"
#include "modular_chomp\code\modules\reagents\reagents\toxin.dm"
#include "modular_chomp\code\modules\recycling\v_garbosystem.dm"
+#include "modular_chomp\code\modules\research\tg\designs\tyrstuff.dm"
+#include "modular_chomp\code\modules\research\tg\designs\expirsci\experiment\instances\misc.dm"
+#include "modular_chomp\code\modules\research\tg\techweb\nodes\exploration.dm"
#include "modular_chomp\code\modules\shieldgen\shield_capacitor.dm"
#include "modular_chomp\code\modules\shieldgen\shield_gen.dm"
#include "modular_chomp\code\modules\spells\spells.dm"