diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm index d3e6cdde33..f05b6c925a 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm @@ -196,7 +196,7 @@ strength = 15 ) -/mob/living/simple_mob/animal/tyr/mineral_ants/mhydro //secondary spawner +/mob/living/simple_mob/animal/tyr/mineral_ants/mhydro //smol name = "mhydro ant" icon_state = "mhydro_ant" icon_living = "mhydro_ant" @@ -208,9 +208,14 @@ /obj/item/stack/material/mhydrogen = 4 ) size_multiplier = 0.5 - movement_cooldown = -1 + mob_size = MOB_MINISCULE + pass_flags = PASSTABLE + layer = MOB_LAYER + density = 0 + melee_damage_lower = 6 + melee_damage_upper = 6 -/mob/living/simple_mob/animal/tyr/mineral_ants/painite +/mob/living/simple_mob/animal/tyr/mineral_ants/painite //flames name = "painite metal ant" ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive icon_state = "painite_ant" @@ -231,7 +236,7 @@ to_chat(L, span_danger("You've been burned by \the [src]!")) L.ignite_mob() -/mob/living/simple_mob/animal/tyr/mineral_ants/bronze +/mob/living/simple_mob/animal/tyr/mineral_ants/bronze //spawns a legion name = "bronze metal ant" icon_state = "bronze_ant" icon_living = "bronze_ant" @@ -307,7 +312,7 @@ new build_type(T) return TRUE -/mob/living/simple_mob/animal/tyr/mineral_ants/silver +/mob/living/simple_mob/animal/tyr/mineral_ants/silver //transparent name = "silver ant" icon_state = "silver_ant" icon_living = "silver_ant" @@ -319,29 +324,11 @@ /obj/item/stack/material/silver = 10 ) -/mob/living/simple_mob/animal/tyr/mineral_ants/silver/bullet_act(obj/item/projectile/P) - if(prob(45)) - visible_message(span_danger("The [P.name] gets reflected by [src]'s armor!"), \ - span_userdanger("The [P.name] gets reflected by [src]'s armor!")) - - // Find a turf near or on the original location to bounce to - if(P.starting) - var/new_x = P.starting.x + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3) - var/new_y = P.starting.y + pick(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3) - var/turf/curloc = get_turf(src) - - // redirect the projectile - P.redirect(new_x, new_y, curloc, src) - P.reflected = 1 - - return -1 // complete projectile permutation - - return (..(P)) - -/mob/living/simple_mob/animal/tyr/mineral_ants/gold +/mob/living/simple_mob/animal/tyr/mineral_ants/gold //emp on death name = "gold ant" icon_state = "gold_ant" icon_living = "gold_ant" + desc = "A large ant with a metallic golden rear end. Is crackling with lightning." meat_type = /obj/item/reagent_containers/food/snacks/tyrant_burn butchery_loot = list(\ /obj/item/stack/material/gold = 18\ @@ -349,20 +336,24 @@ harvest_results = list( /obj/item/stack/material/gold = 10 ) + var/exploded = FALSE + var/explosion_delay_lower = 5 SECOND // Lower bound for explosion delay. + var/explosion_delay_upper = 8 SECONDS // Upper bound. + +/mob/living/simple_mob/animal/tyr/mineral_ants/gold/proc/explode() + if(src && !exploded) + visible_message(span_danger("\The [src]'s body detonates!")) + exploded = TRUE + empulse(src, 1, 2, 0, 0) + +/mob/living/simple_mob/animal/tyr/mineral_ants/gold/death() + visible_message(span_critical("\The [src]'s body begins to rupture!")) + var/delay = rand(explosion_delay_lower, explosion_delay_upper) + animate(src, color = "#000000", time = 0.1 SECONDS, loop = ceil(delay/2)) + animate(color = "#FF0000", time = 0.1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(explode)), delay, TIMER_DELETE_ME) + return ..() -/mob/living/simple_mob/animal/tyr/mineral_ants/gold/apply_melee_effects(var/atom/A) - if(isliving(A)) - var/mob/living/L = A - if(prob(33)) - A.emp_act(4) //The weakest strength of EMP - playsound(src, 'sound/weapons/egloves.ogg', 75, 1) - L.Weaken(4) - L.Stun(4) - L.stuttering = max(L.stuttering, 4) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(5, 1, L) - s.start() - visible_message(span_danger("The grub releases a powerful shock!")) /mob/living/simple_mob/animal/tyr/mineral_ants/queen //the nurses of the ants name = "queen ant" diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/oddities.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/oddities.dm index 895462a4ee..790a8e8399 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/oddities.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/oddities.dm @@ -3,207 +3,41 @@ desc = "A strange insect." icon_state = "firefly" icon_dead = "firefly_dead" - maxHealth = 10 //Not sure why you're fighting this, but any agate weapon one shots it. Except bow. + maxHealth = 10 //One shotable by pratically anyweapon health = 10 pass_flags = PASSTABLE movement_cooldown = 1 - ai_holder_type = /datum/ai_holder/simple_mob/passive + ai_holder_type = /datum/ai_holder/simple_mob/ranged/guard_limit/pointblank + + mob_size = MOB_MINISCULE //need to click the tiny sprite + + projectiletype = /obj/item/projectile/energy/blob/rainbowfly + projectile_dispersion = 8 + projectile_accuracy = -15 + base_attack_cooldown = 5 glow_color = "#FF3300" light_color = "#FF3300" glow_range = 4 glow_intensity = 4 - melee_damage_lower = 5 //I guess it could theortically kill you dirrectly + melee_damage_lower = 5 melee_damage_upper = 5 hovering = TRUE +/obj/item/projectile/energy/blob/rainbowfly + damage = 10 + check_armour = "melee" + splatter = TRUE + my_chems = list(REAGENT_ID_CRYPTOBIOLIN) + /mob/living/simple_mob/animal/tyr/rainbow_fly/handle_special() if(stat != DEAD) painbow_aura() ..() /mob/living/simple_mob/animal/tyr/rainbow_fly/proc/painbow_aura() - for(var/mob/living/L in view(src, 5)) + for(var/mob/living/L in view(src, 7)) L.druggy = max(L.druggy, 10) - -/mob/living/simple_mob/animal/tyr/groundpitcher - name = "underground pitcher" - desc = "A large insect." - icon_state = "groundpitcher" - icon_dead = "groundpitcher" - maxHealth = 20 //two hits with sword and spear.. - health = 20 - pass_flags = PASSTABLE //This was from me copy and pasting but...it's an unmoving plant. Kind of want to keep it here. - movement_cooldown = 1 - - ai_holder_type = /datum/ai_holder/simple_mob/passive/pitcher - - melee_damage_lower = 0 //This cannot kill you unless you fall into it - melee_damage_upper = 0 - - meat_type = /obj/item/stack/material/fiber - - butchery_loot = list(\ - /obj/item/stack/material/cloth = 1\ - ) - - vore_bump_chance = 100 - vore_bump_emote = "slurps up" //Not really a good way to make the grammar work with a passive vore plant. - vore_active = 1 - vore_capacity = 1 - vore_pounce_chance = 100 - swallowTime = 3 - vore_ignores_undigestable = 0 - vore_default_mode = DM_DIGEST - -//This is legit pitcher plant bellies with slightly altered bits. -/mob/living/simple_mob/animal/tyr/groundpitcher/load_default_bellies() - . = ..() - var/obj/belly/B = vore_selected - B.desc = "You leaned a little too close to the pitcher plant, stumbling over the lip and splashing into a puddle of liquid filling the bottom of the cramped pitcher. You squirm madly, righting yourself and scrabbling at the walls in vain as the slick surface offers no purchase. The dim light grows dark as the pitcher's cap lowers, silently sealing the exit. With a sinking feeling you realize you won't be able to push the exit open even if you could somehow climb that high, leaving you helplessly trapped in the slick, tingling fluid." - B.digest_burn = 0.5 - B.digest_brute = 0 - B.vore_verb = "trip" - B.name = "pitcher" - B.mode_flags = DM_FLAG_THICKBELLY - B.wet_loop = 0 //As nice as the fancy internal sounds are this is a plant. - B.digestchance = 20 - B.escapechance = 20 - B.fancy_vore = 1 - B.vore_sound = "Squish2" - B.release_sound = "Pred Escape" - B.contamination_color = "purple" - B.contamination_flavor = "Wet" -//Why is it we have all these customizeable belly options which nobody ever alters for mobs? - - B.emote_lists[DM_HOLD] = list( - "Slick fluid trickles over you, carrying threads of sweetness.", - "Everything is still, dark, and quiet. Your breaths echo quietly.", - "The surrounding air feels thick and humid.") - - B.emote_lists[DM_DIGEST] = list( - "The slimy puddle stings faintly. It seems the plant has no need to quickly break down victims.", - "The humid air settles in your lungs, keeping each breath more labored than the last.", - "Fluid drips onto you, burning faintly as your body heat warms it." - ) - - B.emote_lists[DM_DRAIN] = list( - "Each bead of slick fluid running down your body leaves you feeling weaker.", - "It's cramped and dark, the air thick and heavy. Your limbs feel like lead.", - "Strength drains from your frame. The cramped chamber feels easier to settle into with each passing moment.") - -//Preadtory Things -/obj/structure/mob_spawner/beetle_hill - name = "beetle tunnel" - desc = "An entrance to the nest of metallic ants." - icon = 'modular_chomp/icons/obj/tribal_gear.dmi' - icon_state = "hole" - anchored = TRUE - - spawn_delay = 10 MINUTES - - spawn_types = list( - /mob/living/simple_mob/animal/tyr/electronic_beetle = 1, - /mob/living/simple_mob/animal/tyr/explode_beetle = 1, - /mob/living/simple_mob/animal/tyr/glowing_beetle = 1, - ) - - simultaneous_spawns = 2 - - destructible = 1 - health = 50 - -/mob/living/simple_mob/animal/tyr/electronic_beetle - name = "charged beetle" - desc = "A large insect." - icon_state = "lighting_beetle" - icon_dead = "beetle_dead" - maxHealth = 18 - health = 18 - pass_flags = PASSTABLE //flying bug - movement_cooldown = 1 - - meat_type = /obj/item/reagent_containers/food/snacks/meat/grubmeat - meat_amount = 2 - - butchery_loot = list(\ - /obj/item/stack/material/chitin = 1\ - ) - - ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive - - see_in_dark = 3 - melee_damage_lower = 12 //Kills you 8ish if unarmored, or 10ish if wearing the tribal armor - melee_damage_upper = 12 //Rng numbers are wierd - -/mob/living/simple_mob/animal/tyr/electronic_beetle/apply_melee_effects(var/atom/A) - if(isliving(A)) - var/mob/living/L = A - A.emp_act(4) //The weakest strength of EMP - playsound(src, 'sound/weapons/Egloves.ogg', 75, 1) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(5, 1, L) - s.start() - - -/mob/living/simple_mob/animal/tyr/explode_beetle - name = "fiery beetle" - desc = "A large insect." - icon_state = "fire_beetle" - icon_dead = "beetle_dead" - maxHealth = 18 - health = 18 - pass_flags = PASSTABLE //flying bug - movement_cooldown = 1 - - ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive - - meat_type = /obj/item/reagent_containers/food/snacks/carpmeat - meat_amount = 2 - - butchery_loot = list(\ - /obj/item/stack/material/chitin = 1\ - ) - - see_in_dark = 3 - melee_damage_lower = 6 //Kills you 8ish if unarmored, or 10ish if wearing the tribal armor - melee_damage_upper = 6 //Rng numbers are wierd - -/mob/living/simple_mob/animal/tyr/explode_beetle/apply_melee_effects(var/atom/A) - if(isliving(A)) - var/mob/living/L = A - L.adjust_fire_stacks(3) - L.ignite_mob() - -/mob/living/simple_mob/animal/tyr/glowing_beetle - name = "glowing beetle" - desc = "A large insect." - icon_state = "green_beetle" - icon_dead = "beetle_dead" - maxHealth = 18 - health = 18 - pass_flags = PASSTABLE - movement_cooldown = 1 - - needs_reload = TRUE - reload_max = 1 - reload_time = 2 SECONDS - - ai_holder_type = /datum/ai_holder/hostile/ranged/robust - projectiletype = /obj/item/projectile/arc/spore - - meat_type = /obj/item/reagent_containers/food/snacks/deathclawmeat - meat_amount = 2 - - butchery_loot = list(\ - /obj/item/stack/material/chitin = 1\ - ) - - see_in_dark = 3 - melee_damage_lower = 16 - melee_damage_upper = 16 - - ranged_cooldown = 30 diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/hivebot.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/hivebot.dm index 1efdcb70e9..3a725629b6 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/hivebot.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/hivebot.dm @@ -13,6 +13,7 @@ anchored = 1 armor = list(melee = 40, bullet = 40, laser = 40, energy = 40, bomb = 50, bio = 100, rad = 100) projectiletype = /obj/item/projectile/energy/eclipse_boss/tyrjavelin + specialattackprojectile = /obj/item/projectile/energy/eclipse_boss/tyrjavelin loot_list = list(/obj/item/tool/wirecutters/hybrid/alien = 10, /obj/item/tool/wrench/hybrid/alien = 10, /obj/item/tool/crowbar/hybrid/alien = 10, @@ -40,11 +41,9 @@ addtimer(CALLBACK(src, PROC_REF(bomb_lines), A, 2), 2 SECONDS, TIMER_DELETE_ME) attackcycle = 0 if(2) - specialattackprojectile = /obj/item/projectile/energy/spikeenergy_ball/boss addtimer(CALLBACK(src, PROC_REF(dual_spin), A, 3, 7), 1 SECOND, TIMER_DELETE_ME) attackcycle = 0 if(3) - specialattackprojectile = /obj/item/projectile/energy/eclipse_boss/tyrjavelin addtimer(CALLBACK(src, PROC_REF(quad_random_firing), A, 12, 1, 0.5 SECONDS), 1 SECOND, TIMER_DELETE_ME) attackcycle = 0 diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm index b76090cbaf..5b6ea3441c 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm @@ -51,8 +51,8 @@ icon_state = "poison_boss" icon_living = "poison_boss" wreckage = /obj/item/prop/tyrlore/acid_boss - specialattackprojectile = /obj/item/projectile/energy/neurotoxin/toxic/tyr_flora - projectiletype = /obj/item/projectile/energy/neurotoxin/toxic/tyr_flora + specialattackprojectile = /obj/item/projectile/energy/blob/tyrflora + projectiletype = /obj/item/projectile/energy/blob/tyrflora var/regeneration_strength = -20 /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/acid_boss/load_default_bellies() diff --git a/modular_chomp/code/modules/projectiles/precursor/tyr.dm b/modular_chomp/code/modules/projectiles/precursor/tyr.dm index 11693bdf81..b793a67b2c 100644 --- a/modular_chomp/code/modules/projectiles/precursor/tyr.dm +++ b/modular_chomp/code/modules/projectiles/precursor/tyr.dm @@ -13,17 +13,6 @@ //So if you miss, you're stuck with a middling melee weapon for a bit. //Whilst the shot gun has more shots, but you need to get up closih. //Chain gets AP whilst shotgun gets knockback -/obj/item/projectile/energy/spikeenergy_ball - name = "energy ball" - icon = 'modular_chomp/icons/obj/guns/precursor/tyr.dmi' - icon_state = "spikeenergyball" - 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 - penetrating = 2 - check_armour = "melee" - damage_type = BRUTE /obj/item/projectile/energy/tyr_rifle name = "laser blast" @@ -149,14 +138,13 @@ armor_penetration = 50 penetrating = 5 -/obj/item/projectile/arc/fragmentation/tyr_mortar - icon_state = "mortar" - fragment_amount = 10 - spread_range = 3 - fragment_types = list( - /obj/item/projectile/bullet/astral_blade/artillery, /obj/item/projectile/bullet/astral_blade/artillery, \ - /obj/item/projectile/bullet/astral_blade/artillery, /obj/item/projectile/bullet/astral_blade/artillery/secondary - ) +/obj/item/projectile/energy/blob/tyrflora + damage = 20 //10 with intended armor + speed = 12 + armor_penetration = 50 + check_armour = "bio" + damage_type = BURN + my_chems = list(REAGENT_ID_NEUROTOXIC_PROTEIN) /obj/item/projectile/energy/agate_lighting damage = 15 @@ -169,4 +157,4 @@ /obj/item/projectile/energy/agate_lighting/fast damage = 20 - speed = 3 + speed = 4 diff --git a/modular_chomp/icons/mob/tyr.dmi b/modular_chomp/icons/mob/tyr.dmi index 19cebd6201..b6b0953034 100644 Binary files a/modular_chomp/icons/mob/tyr.dmi and b/modular_chomp/icons/mob/tyr.dmi differ diff --git a/modular_chomp/icons/obj/guns/precursor/tyr.dmi b/modular_chomp/icons/obj/guns/precursor/tyr.dmi index 8db0225e4c..5e71119de4 100644 Binary files a/modular_chomp/icons/obj/guns/precursor/tyr.dmi and b/modular_chomp/icons/obj/guns/precursor/tyr.dmi differ 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 410ccb7b8f..a6d7cb8b30 100644 --- a/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dmm +++ b/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dmm @@ -123,6 +123,16 @@ /obj/structure/flora/tyr/flowers, /turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr, /area/planet/tyr/caverns) +"az" = ( +/obj/structure/fans/hardlight/colorable/abductor{ + color = "#FF3300" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/planet/tyr/ancient_ruins/two) +"aA" = ( +/obj/structure/boulder, +/turf/simulated/floor/outdoors/desert_planet/gravel/tyr, +/area/planet/tyr/caverns) "aB" = ( /turf/simulated/shuttle/floor/alien, /area/planet/tyr/ancient_ruins/one) @@ -354,10 +364,6 @@ /obj/item/bluespace_crystal/artificial, /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/shuttles/five) -"bx" = ( -/mob/living/simple_mob/vore/fossiltank, -/turf/simulated/shuttle/floor/voidcraft/tyr, -/area/planet/tyr/shuttles/five) "by" = ( /obj/structure/bed, /turf/simulated/shuttle/floor/voidcraft/tyr, @@ -910,6 +916,13 @@ }, /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/shuttles/seven) +"dr" = ( +/obj/structure/boulder, +/obj/structure/fans/hardlight/colorable/abductor{ + color = "#b6d9f3" + }, +/turf/simulated/floor/tiled/neutral, +/area/planet/tyr/ac_mainbase) "ds" = ( /turf/simulated/shuttle/floor/alien, /area/planet/tyr/precursorruins/engi_boss) @@ -932,6 +945,10 @@ }, /turf/simulated/shuttle/floor/alienplating, /area/planet/tyr/precursorruins/stairwell) +"dx" = ( +/obj/structure/boulder, +/turf/simulated/floor/tiled/red, +/area/planet/tyr/ac_mainbase) "dy" = ( /obj/structure/prop/tyr_elevator{ descendx = 177; @@ -1045,6 +1062,10 @@ }, /turf/simulated/shuttle/floor/alienplating, /area/planet/tyr/precursorruins/entryway) +"dP" = ( +/obj/structure/boulder, +/turf/simulated/floor/tiled/neutral, +/area/planet/tyr/ac_mainbase) "dQ" = ( /obj/structure/prop/tyr_elevator{ descendx = 181; @@ -1166,6 +1187,13 @@ }, /turf/simulated/shuttle/floor/black, /area/planet/tyr/precursorruins) +"el" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/boulder, +/turf/simulated/floor/tiled/red, +/area/planet/tyr/ac_mainbase) "em" = ( /obj/structure/prop/tyr_elevator{ descendx = 115; @@ -1334,6 +1362,10 @@ /obj/structure/barricade, /turf/simulated/tyracid, /area/planet/tyr/precursorruins/checkpoint) +"eL" = ( +/mob/living/simple_mob/humanoid/astral_collective/ranged/lizard, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/ac_mainbase) "eM" = ( /obj/machinery/light{ dir = 8 @@ -1689,6 +1721,10 @@ }, /turf/simulated/shuttle/floor/black, /area/planet/tyr/precursorruins) +"fT" = ( +/obj/structure/boulder, +/turf/simulated/floor/tiled, +/area/planet/tyr/ac_mainbase) "fU" = ( /obj/structure/prop/tyr_elevator{ descendx = 149; @@ -1799,6 +1835,13 @@ "gm" = ( /turf/simulated/mineral/crystal, /area/planet/tyr/shuttles/rock_one) +"gn" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/boulder, +/turf/simulated/floor/tiled/red, +/area/planet/tyr/ac_mainbase) "go" = ( /turf/simulated/mineral, /area/planet/tyr/shuttles/rock_two) @@ -1880,44 +1923,18 @@ "gH" = ( /turf/simulated/shuttle/floor/alienplating, /area/planet/tyr/ancient_ruins/two) -"gI" = ( -/obj/structure/prop/desert_rock/pebble, -/turf/simulated/shuttle/floor/alienplating, -/area/planet/tyr/ancient_ruins/two) "gJ" = ( /turf/simulated/shuttle/floor/alien, /area/planet/tyr/ancient_ruins/two) -"gK" = ( -/obj/structure/prop/desert_rock/pebble, -/turf/simulated/shuttle/floor/alien, -/area/planet/tyr/ancient_ruins/two) "gL" = ( /obj/structure/flora/tyr/flowers, /obj/structure/flora/tyr/flowers, /obj/random/tyroutcrop, /turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr, /area/planet/tyr/caverns) -"gM" = ( -/obj/structure/table/rack, -/obj/item/weldingtool/experimental/hybrid/alien, -/turf/simulated/shuttle/floor/alienplating, -/area/planet/tyr/ancient_ruins/two) -"gN" = ( -/obj/structure/table/rack, -/obj/item/gun/energy/tyr_rifle, -/turf/simulated/shuttle/floor/alienplating, -/area/planet/tyr/ancient_ruins/two) "gO" = ( /turf/simulated/shuttle/wall/alien/orange, /area/planet/tyr/ancient_ruins/four) -"gP" = ( -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "TyrBossGateE" - }, -/obj/structure/table/alien/blue, -/turf/simulated/shuttle/floor/alienplating, -/area/planet/tyr/ancient_ruins/two) "gQ" = ( /obj/structure/fans/hardlight/colorable/abductor{ color = "#FF3300" @@ -1938,17 +1955,6 @@ /obj/structure/table/alien/blue, /turf/simulated/shuttle/floor/alienplating, /area/planet/tyr/ancient_ruins/four) -"gT" = ( -/obj/structure/table/rack, -/obj/item/tool/wrench/hybrid/alien, -/turf/simulated/shuttle/floor/alienplating, -/area/planet/tyr/ancient_ruins/two) -"gU" = ( -/obj/structure/fans/hardlight/colorable/abductor{ - color = "#FF3300" - }, -/turf/simulated/shuttle/floor/alien, -/area/planet/tyr/ancient_ruins/two) "gV" = ( /turf/simulated/shuttle/floor/alien, /area/planet/tyr/ancient_ruins/four) @@ -1984,6 +1990,11 @@ }, /turf/simulated/tyracid/quantum, /area/planet/tyr/ancient_ruins/one) +"hd" = ( +/obj/structure/flora/tyr/flowers, +/mob/living/simple_mob/animal/tyr/rainbow_fly, +/turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr, +/area/planet/tyr/caverns) "he" = ( /obj/structure/fans/hardlight/colorable/abductor{ color = "#FF3300" @@ -2064,24 +2075,6 @@ /obj/machinery/porta_turret/alien, /turf/simulated/shuttle/floor/alien, /area/planet/tyr/ancient_ruins/three) -"hw" = ( -/mob/living/simple_mob/animal/tyr/mineral_ants/queen, -/turf/simulated/shuttle/floor/alienplating, -/area/planet/tyr/ancient_ruins/six) -"hx" = ( -/obj/structure/mob_spawner/ant_hill, -/obj/structure/flora/tyr/flowers, -/obj/structure/flora/tyr/flowers, -/turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr, -/area/planet/tyr/caverns) -"hy" = ( -/obj/structure/window/plastitanium, -/obj/structure/window/plastitanium{ - dir = 1 - }, -/obj/structure/grille, -/turf/simulated/shuttle/floor/alienplating, -/area/planet/tyr/ancient_ruins/six) "hz" = ( /obj/structure/fans/hardlight/colorable/abductor{ color = "#FF3300" @@ -2497,6 +2490,11 @@ }, /turf/simulated/shuttle/floor/alienplating, /area/planet/tyr/precursorruins/stairwell) +"jj" = ( +/obj/structure/table/rack, +/obj/item/melee/energy/tyr_sabre, +/turf/simulated/shuttle/floor/alienplating, +/area/planet/tyr/ancient_ruins/six) "jk" = ( /obj/item/melee/energy/tyr_katar, /obj/structure/table/rack, @@ -2644,17 +2642,6 @@ "jN" = ( /turf/simulated/shuttle/floor/alienplating, /area/planet/tyr/ancient_ruins/six) -"jO" = ( -/obj/machinery/door/blast/puzzle/tyrdoor/finale, -/turf/simulated/shuttle/floor/alienplating, -/area/planet/tyr/ancient_ruins/six) -"jP" = ( -/obj/structure/prop/tyr_elevator, -/turf/simulated/shuttle/floor/alienplating, -/area/planet/tyr/ancient_ruins/six) -"jQ" = ( -/turf/simulated/shuttle/wall/alien/orange, -/area/planet/tyr/caverns) "jR" = ( /obj/effect/shuttle_landmark{ base_area = /area/planet/tyr/ship_graveyard; @@ -3033,6 +3020,38 @@ /mob/living/simple_mob/humanoid/astral_collective/ranged/lizard, /turf/simulated/floor/outdoors/desert_planet/gravel/tyr, /area/planet/tyr/caverns) +"ld" = ( +/obj/structure/table/rack, +/obj/item/melee/energy/tyr_hammer, +/turf/simulated/shuttle/floor/alienplating, +/area/planet/tyr/ancient_ruins/six) +"le" = ( +/obj/structure/table/rack, +/obj/item/melee/energy/tyr_katar, +/turf/simulated/shuttle/floor/alienplating, +/area/planet/tyr/ancient_ruins/six) +"lf" = ( +/mob/living/simple_mob/mechanical/hivebot/tyr/meteor, +/turf/simulated/tyracid/quantum, +/area/planet/tyr/precursorruins) +"lg" = ( +/obj/structure/prop/tyr_elevator{ + descendx = 251; + descendy = 251 + }, +/turf/simulated/shuttle/floor/black, +/area/planet/tyr/precursorruins) +"lh" = ( +/obj/structure/prop/tyr_elevator{ + descendx = 132; + descendy = 194 + }, +/turf/simulated/shuttle/floor/black, +/area/planet/tyr/precursorruins) +"li" = ( +/mob/living/simple_mob/mechanical/mecha/eclipse/janus, +/turf/simulated/shuttle/floor/alien, +/area/planet/tyr/precursorruins) "tT" = ( /obj/structure/table/steel, /obj/item/slime_extract/silver, @@ -9609,7 +9628,7 @@ bS bQ bh bh -bx +bh bh bh bf @@ -16612,7 +16631,7 @@ fb iM iM iM -iM +lf iM eZ ik @@ -17380,7 +17399,7 @@ iM iM eZ ik -ir +iq iq iq iq @@ -18989,17 +19008,17 @@ gz gz gz gz +ei +ei +ei +ei +ei +ei gz gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +ei +ei +ei gz gz gz @@ -19246,19 +19265,19 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +ei +ei +ei +ei +ei +ei +ei +ei +ei +ei +ei +ei +ei gz gz gz @@ -19502,22 +19521,22 @@ gz gz gz gz +ei +ei +ei +ei +ei +ei +ei +hd +ei +ei +ei gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +ei +ei +ei +ei gz gz gz @@ -19759,24 +19778,24 @@ Mz gz gz gz +ei +ei +ei +ei +ei +ei +ei +ei +ei +ei +ei +ei gz gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +ei +ei +ei +ei gz gz gz @@ -20017,26 +20036,26 @@ Mz gz gz gz +ei +ei gz gz gz +ei +ei +gz +gz +ei +ei +ei gz gz gz +ei +ei +ei gz gz -jK -jK -jK -jK -jK -jK -jK -jK -jK -jK -jK -gz gz gz gz @@ -20225,7 +20244,7 @@ iM iM eZ ik -ir +iq ik ik fm @@ -20259,7 +20278,7 @@ in io iE ik -ir +iq iq iq iq @@ -20274,27 +20293,27 @@ Mz Mz gz gz +ei +ei +ei gz gz gz +ei +ei gz gz gz +ei +ei +ei +gz +gz +ei +ei +ei gz gz -jQ -jK -jO -jO -jN -jN -jN -jN -jN -jN -jN -jK -jK gz gz gz @@ -20532,28 +20551,28 @@ Mz Mz gz gz +ei +hd +ei +gz +gz +gz +ei gz gz gz gz gz +ei +ei +ei +ei +gz +ei +ei gz gz gz -jK -jP -jO -jO -jN -jN -jN -jN -jN -jN -jN -jN -jK -gz gz gz gz @@ -20790,27 +20809,27 @@ Mz Mz gz gz +ei +ei +ei +gz +gz +ei +ei gz gz gz gz gz gz +ei +ei +ei +ei +ei +ei gz gz -jK -jK -jO -jO -jN -jN -jN -jN -jN -jN -jN -jK -jK gz gz gz @@ -21004,7 +21023,7 @@ ik fb iM iM -iM +lf iM Mz Mz @@ -21049,25 +21068,25 @@ Mz gz gz gz +ei +ei +gz +gz +ei +ei gz gz gz gz gz gz -jK -jK -jK -jK -jK -jK -jK -jK -jK -jN -jK -jK -jK +ei +ei +ei +ei +ei +gz +gz gz gz gz @@ -21307,23 +21326,23 @@ Mz gz gz gz -gz -gz -gz -gz -gz +ei +ei +ei +ei +ei gz jK -jN -jN -jN -jN -hy -hw -jN -jN -hw jK +jK +jK +jK +gz +gz +ei +ei +ei +ei gz gz gz @@ -21565,26 +21584,26 @@ Mz gz gz gz -gz -gz -gz -gz -gz -gz +ei +ei +ei +ei +ei +ei jK -jN -jN -jN -jN -hy -jN -jN -jN -jN +ld +le +jj jK gz gz gz +ei +hd +ei +ei +gz +gz gz gz gz @@ -21824,24 +21843,24 @@ gz gz gz gz -gz -gz -gz -gz -gz -jK -jN -jN -jN -jN -hy -jN +ei +ei +hd +ei +ei +hz jN jN jN jK gz -gz +ei +ei +ei +ei +ei +ei +ei gz gz gz @@ -22083,23 +22102,23 @@ gz gz gz gz -gz -gz -gz -gz +ei +ei +ei +ei jK -jN -jN -jN -jN -hy -hw -jN -jN -hw +le +jj +ld jK -gz -gz +ei +ei +ei +ei +ei +ei +ei +ei gz gz gz @@ -22340,24 +22359,24 @@ gz gz gz gz -gz -gz -gz -gz +ei +ei +ei +ei gz jK -jN -jN -jN -jN jK jK jK jK -jK -jK -gz -gz +ei +ei +ei +ei +ei +ei +ei +ei gz gz gz @@ -22581,7 +22600,7 @@ ip ip iQ ik -iq +ir ik eW io @@ -22597,27 +22616,27 @@ Mz gz gz gz +ei +ei +ei +ei +ei +ei gz gz +ei +ei +ei +ay +ei gz -gz -gz -gz -jK -jN -jN -jN -jN -jK -vB -gz -gz -gz -gz -gz -gz -gz -gz +ei +ei +ei +ei +ei +ei +ei gz gz gz @@ -22855,28 +22874,28 @@ Mz gz gz gz -gz -gz -gz -gz -gz -gz -jK -jN -jN -jN -jN -hz ei -hx -gz -gz -gz -gz -gz -gz +ei +ei +ei +ei +ei +ei +ei +ei +ei +ei +ei gz gz +ei +ei +ei +ei +ei +ei +ei +ei gz gz gz @@ -23097,7 +23116,7 @@ in in iD ik -ir +iq iq iq iq @@ -23113,28 +23132,28 @@ Mz gz gz gz +ei +ei +ei +gz +ei +ei +ei +ei +ei gz gz gz -gz -gz -gz -jK -jN -jN -jN -jN -hz +ei +ei +ei ei ei ei gz gz -gz -gz -gz -gz -gz +ei +ei gz gz gz @@ -23370,19 +23389,12 @@ Mz Mz gz gz +ei +ei +ei gz gz gz -gz -gz -gz -gz -jK -jN -jN -jN -jN -jK ei ei ei @@ -23390,10 +23402,17 @@ ei ei gz gz +ei +ei +ei +gz +ei +ei gz gz -gz -gz +ei +ei +ei gz gz gz @@ -23628,30 +23647,30 @@ Mz Mz gz gz +ei +ei +ei gz gz gz gz -gz -gz -gz -jK -jK -jK -jK -jK -jK -vB ei ei ei ei +gz +ei +ei ei gz gz gz +ei gz gz +ei +ei +ei gz gz gz @@ -23887,13 +23906,8 @@ Mz gz gz gz -gz -gz -gz -gz -gz -gz -gz +ei +ei gz gz gz @@ -23903,13 +23917,18 @@ gz ei ei ei -gE ei ei gz gz gz gz +ei +gz +gz +gz +ei +ei gz gz gz @@ -24145,29 +24164,29 @@ Mz gz gz gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +ei +ei +ei gz gz gz gz ei -vB +ei +hd ei ei ei -vB +ei +gz +gz +ei +ei gz gz gz +ei +ei gz gz gz @@ -24403,29 +24422,29 @@ Mz gz gz gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +ei +ei +ei +ei +ei +ei ei ei ei ei ei gz +ei +ei +ei +ei +ei +ei +ei gz gz +ei +ei gz gz gz @@ -24662,29 +24681,29 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -vG ei -vB +ei +ei +ei +ei +ei ei ei gz gz gz gz +ei +ei +ei +hd +ei +ei +ei +ei +ei +ei +gz gz gz gz @@ -24921,12 +24940,10 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz +ei +ei +ei +ei gz gz gz @@ -24940,7 +24957,9 @@ ei ei ei ei -gz +ei +ei +ei gz gz gz @@ -25198,7 +25217,7 @@ ei ei ei ei -vG +ei gz gz gz @@ -27006,7 +27025,7 @@ gz gz gz gz -vG +ei ei ei ei @@ -53498,7 +53517,7 @@ Mz Mz Mz hK -hK +ik hK Mz Mz @@ -54272,7 +54291,7 @@ Mz Mz Mz hL -hL +ik hL Mz Mz @@ -55046,7 +55065,7 @@ Mz Mz Mz hM -hM +ik hM Mz Mz @@ -55820,7 +55839,7 @@ Mz Mz Mz hO -hO +ik hO Mz Mz @@ -57368,7 +57387,7 @@ Mz Mz Mz hQ -hQ +ik hQ Mz Mz @@ -58142,7 +58161,7 @@ Mz Mz Mz hR -hR +ik hR Mz Mz @@ -58916,7 +58935,7 @@ Mz Mz Mz hS -hS +ik hS Mz Mz @@ -59948,7 +59967,7 @@ Mz Mz Mz jZ -jZ +ik jZ Mz Mz @@ -60057,8 +60076,8 @@ Nc Nc Nc ei -gz -gz +ei +ei gz gz gz @@ -60312,13 +60331,13 @@ Nc Nc gz gz -ei -ei -ei -ei -gz gz gz +ei +ei +ei +ei +ei gz gz gz @@ -60464,7 +60483,7 @@ Mz Mz Mz Mz -Mz +lg Mz Mz Mz @@ -60571,13 +60590,13 @@ gz gz gz gz +gz +aW ei ei +aW +ei ei -gz -gz -gz -gz gz gz gz @@ -60829,14 +60848,14 @@ gz gz gz gz -ei -aW +gz +gz +ei +ei +ei +ei ei ei -gz -gz -gz -gz gz gz gz @@ -61087,15 +61106,15 @@ gz gz gz gz +gz +gz +gz +gz +ei +ei ei ei ei -aW -gz -gz -gz -gz -gz gz gz gz @@ -61346,15 +61365,15 @@ gz gz gz gz +gz +gz +gz +aW ei ei ei -gz -gz -gz -gz -gz -gz +ei +aW gz gz gz @@ -61604,15 +61623,15 @@ gz gz gz gz +gz +gz +gz +gz +ei +ei ei ei ei -gz -gz -gz -gz -gz -gz gz gz gz @@ -61862,17 +61881,17 @@ aL aL aL gz -aW +gz +gz +gz +gz +gz +ei +ei +ei +ei ei ei -aW -gz -gz -gz -gz -gz -gz -gz gz gz gz @@ -62117,21 +62136,21 @@ aL eT eO eO -eO +eL aL gz gz +gz +gz +gz +gz +gz ei ei ei -gz -gz -gz -gz -gz -gz -gz -gz +ei +ei +aW gz gz gz @@ -62380,17 +62399,17 @@ aL gz gz gz +gz +gz +gz +gz +gz +aW +ei +ei ei ei ei -gz -gz -gz -gz -gz -gz -gz -gz gz gz gz @@ -62638,18 +62657,18 @@ aL gz gz gz +gz +gz +gz +gz +gz +gz +ei +ei +ei ei ei ei -gC -gz -gz -gz -gz -gz -gz -gz -gz gz gz gz @@ -62897,18 +62916,18 @@ gz gz gz gz -ei -ei -ei -gz -gz -gz -gz -gz -gz -gz gz gz +gG +gG +gG +gG +az +az +gG +gG +gG +gG gz gz gz @@ -63155,18 +63174,18 @@ gz gz gz gz -ei -ei -ei -ei -gz -gz -gz -gz -gz -gz -gz -gz +aA +aA +gG +gJ +gJ +gJ +gH +gH +gJ +gJ +gJ +gG gz gz gz @@ -63412,12 +63431,30 @@ aL aL aL aL -gz -aW -ei -ei -ei -ei +aA +kD +kD +gG +gJ +gH +gH +gH +gH +gH +gH +gJ +gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -63426,24 +63463,6 @@ gz gz gz gz -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG gz gz gz @@ -63659,48 +63678,29 @@ aL aO aO aL -gp -aQ -aH -aH +dx +gn +dx +dx aL -aH +dx aH aQ aH -aH -aL -gz -gz -ei -ei -gE -ei -ei -gz -gz -gz -gz -gz -gz -gz +dx +dr +kD +kD +kD gG +gJ gH gH -gH -gI -gH -gI -gH -gI -gH -gH -gH -gI -gH -gH +gJ +gJ gH gH +gJ gG gz gz @@ -63713,6 +63713,25 @@ gz gz gz gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz aT aU aU @@ -63918,47 +63937,28 @@ aO aO aL gp -bV -bV -aH -gp -aH +fT +fT +dx +dx +dx bV bV bV aH -aL -gz -gz -ei -ei -ei -ei -ei -ei -gz -gz -gz -gz -gz -gz -gG +kV +kD +kD +kD +az +gH gH -gJ -gJ -gJ -gK -gJ -gK -gJ -gK -gJ -gK gJ gJ gJ gJ gH +gH gG gz gz @@ -63971,6 +63971,25 @@ gz gz gz gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz aT aU aU @@ -64177,45 +64196,26 @@ aO aL hZ bV -bV -hF -gs -aH +fT +fT +fT +dx bV aM bV aN -aL -gz -gz -ei -ei -aW -ei -ei -ei -gz -gz -gz -gz -gz -gz -gG -gH -gJ -gH -gH -gH -gI -gH -gH -gH -gI -gH +kV +kD +kD +kD +az gH gH gJ gJ +gJ +gJ +gH gH gG gz @@ -64229,6 +64229,25 @@ gz gz gz gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz aT aT aT @@ -64435,46 +64454,27 @@ aO aL cc bV -bV -aH -gp -aH +fT +dx +dx +dx bV bV bV aH -aL -gz -gz -gz -ei -ei -ei -ei -ei -aW -gz -gz -gz -gz -gz +dr +kD +kD +kD gG -gH gJ gH -gG -gG -gG -gG -gG -gG -gG -gG -gG -gI +gH gJ gJ -gI +gH +gH +gJ gG gz gz @@ -64496,6 +64496,25 @@ gz gz gz gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz dZ dZ dZ @@ -64592,7 +64611,7 @@ Mz Mz Mz Mz -Mz +lh Mz Mz Mz @@ -64694,46 +64713,46 @@ aL gp bV bV +dx +aL +dx +dx +el +dx aH aL -aH -aH -aR -aH -aH -aL -gz -gz -gz -gz -ei -ei -ei -ei -ei -gz -gz -gz -gz -gz +aA +kD +kD gG -gH gJ gH +gH +gH +gH +gH +gH +gJ gG -gH -gI -gH -gI -gH -gI -gH -gG -gH -gK -gK -gH -gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -64952,45 +64971,26 @@ aL hZ bV bV -aH +dx aL aL aL aL -aP +dP aO aL -gz -gz -gz -gz -gz -gC -ei -ei -ei -gz -gz -gz -gz -gz +aA +aA +kD gG -gH -gJ -gH -gG -gI -gK -gK gJ gJ -gK +gJ gH -gG gH gJ -gK -gI +gJ +gJ gG gz gz @@ -65013,6 +65013,25 @@ gz gz gz gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz dZ dZ dZ @@ -65212,44 +65231,44 @@ bV bV aH aQ -aH -aH +dx +dx aL -aO -aO +dP +dP aL gz gz -gz -gz -gz -gz -ei -ei -ei -ei -gz -gz -gz -gz +aA gG -gH -gJ -gH gG -gH -gJ -gK -gJ -gK -gJ -gI gG -gI -gK -gJ -gH gG +gG +gG +gG +gG +gG +gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -65473,8 +65492,8 @@ aH aH aH aL -aO -aO +dP +dP aL gz gz @@ -65482,32 +65501,32 @@ gz gz gz gz -aW -ei -ei -ei gz gz gz gz -gG -gH -gJ -gH -gG -gH -gK -gJ -gK -gJ -gK -gI -gG -gH -gK -gJ -gI -gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -65731,7 +65750,7 @@ aL aL eX aL -aO +dP aO aL gz @@ -65741,31 +65760,31 @@ gz gz gz gz -ei -ei -ei -ei gz gz gz -gG -gN -gJ -gM -gG -gI -gJ -gK -gJ -gK -gJ -gH -gG -gI -gJ -gK -gH -gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -66000,30 +66019,30 @@ gz gz gz gz -ei -ei -aW -ei gz gz -gG -gT -gP -gN -gG -gH -gK -gJ -gK -gJ -gK -gI -gG -gH -gK -gJ -gI -gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -66258,30 +66277,30 @@ gz gz gz gz -ei -ei -ei -ei -gC gz -gG -gG -gG -gG -gG -gH -gH -gI -gI -gH -gI -gH -gG -gI -gJ -gK -gH -gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -66398,7 +66417,7 @@ iM iM iM iM -iq +li iM iM iM @@ -66517,29 +66536,29 @@ gz gz gz gz -ei -ei -ei -ei -aW -gG -gH -gH -gH -gG -gH -gG -gG -gG -gG -gG -gH -gG -gH -gJ -gJ -gH -gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -66776,28 +66795,28 @@ gz gz gz gz -ei -ei -ei -ei -gU -gJ -gJ -gJ -gI -gH -gH -gG -gJ -gJ -gG -gH -gG -gH -gJ -gJ -gH -gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -67035,27 +67054,27 @@ gz gz gz gz -ei -ei -ei -gU -gJ -gJ -gJ -gI -gH -gH -gG -gJ -gJ -gG -gH -gK -gH -gJ -gJ -gH -gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -67294,26 +67313,26 @@ gz gz gz gz -aW -ei -gG -gH -gH -gH -gG -gG -gG -gG -gJ -gJ -gG -gH -gG -gH -gH -gH -gH -gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz @@ -67554,24 +67573,24 @@ gz gz gz gz -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG -gG +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz +gz gz gz gz