diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/astral_collective.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/astral_collective.dm index daa03087db..a6deb818d4 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/astral_collective.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/astral_collective.dm @@ -130,10 +130,11 @@ holder.adjustCloneLoss(-8) /datum/modifier/astralcollect_titan - max_health_percent = 1.8 + max_health_percent = 2 + slowdown = 2 /datum/modifier/astralcollect_armour - incoming_damage_percent = 0.65 + incoming_damage_percent = 0.7 /datum/modifier/astralcollect_mistake mob_overlay_state = "poisoned" @@ -241,7 +242,7 @@ name = "Astral Collective Unit" projectile_accuracy = 10 needs_reload = TRUE - special_attack_cooldown = 7 SECONDS + special_attack_cooldown = 10 SECONDS reload_max = 7 reload_time = 1.5 SECONDS ranged_cooldown = 65 @@ -267,6 +268,12 @@ health = 125 maxHealth = 125 + special_attack_cooldown = 20 SECONDS + reload_max = 15 + reload_time = 3.5 SECONDS + ranged_cooldown = 85 + movement_cooldown = 0 + /mob/living/simple_mob/humanoid/astral_collective/ranged/taur/do_special_attack(atom/A) expirmental = rand(1,5) switch(expirmental) @@ -287,8 +294,14 @@ icon_state = "tesh" icon_living = "tesh" projectiletype = /obj/item/projectile/energy/astral_collective/particle - health = 75 - maxHealth = 75 + health = 50 + maxHealth = 50 + + special_attack_cooldown = 5 SECONDS + reload_max = 2 + reload_time = 2 SECONDS + ranged_cooldown = 40 + movement_cooldown = -1 /mob/living/simple_mob/humanoid/astral_collective/ranged/tesh/do_special_attack(atom/A) if((health / maxHealth) <= 0.5) @@ -302,6 +315,10 @@ icon_state = "wolf" icon_living = "wolf" projectiletype = /obj/item/projectile/energy/astral_collective/green + special_attack_cooldown = 13 SECONDS + reload_max = 5 + reload_time = 0.5 SECONDS + ranged_cooldown = 70 /mob/living/simple_mob/humanoid/astral_collective/ranged/wolf/do_special_attack(atom/A) gravity_surge(A) @@ -315,6 +332,11 @@ health = 150 maxHealth = 150 + needs_reload = FALSE + special_attack_cooldown = 20 SECONDS + ranged_cooldown = 90 + movement_cooldown = 3 + /mob/living/simple_mob/humanoid/astral_collective/ranged/lizard/do_special_attack(atom/A) if((health / maxHealth) <= 0.5) repair_self(A) @@ -325,7 +347,9 @@ desc = "An armoured zaddat." icon_state = "zaddat" icon_living = "zaddat" - special_attack_cooldown = 1 SECOND + needs_reload = FALSE + special_attack_cooldown = 6 SECONDS + ranged_cooldown = 30 /mob/living/simple_mob/humanoid/astral_collective/ranged/zaddat/do_special_attack(atom/A) projectiletype = pick(/obj/item/projectile/energy/astral_collective/anti_mecha, /obj/item/projectile/energy/astral_collective/armour_breaker, /obj/item/projectile/energy/astral_collective/searing, /obj/item/projectile/energy/astral_collective/green, /obj/item/projectile/energy/astral_collective/particle) @@ -385,8 +409,10 @@ if(!target) return FALSE for(var/mob/living/L in orange(src, 14)) - if(L.stat != DEAD && !IIsAlly(L)) - L.add_modifier(/datum/modifier/mmo_drop/blade_boss_short, 3, src) + if(IIsAlly(L)) + Beam(L, icon_state = "purple_lightning", time = 2.5 SECONDS, maxdistance = INFINITY) + L.adjustBruteLoss(-30) + L.adjustFireLoss(-30) /mob/living/simple_mob/humanoid/astral_collective/proc/repair_self(atom/target) if(!target) diff --git a/modular_chomp/code/modules/projectiles/precursor/eclipse.dm b/modular_chomp/code/modules/projectiles/precursor/eclipse.dm index 497a5583ea..45f4516e2d 100644 --- a/modular_chomp/code/modules/projectiles/precursor/eclipse.dm +++ b/modular_chomp/code/modules/projectiles/precursor/eclipse.dm @@ -145,7 +145,7 @@ //projectiles /obj/item/projectile/energy/astral_collective name = "abnormal energy" - speed = 2 + speed = 3 damage = 28 //roughly 25 with intended armour damage_type = BURN //BRUTE, BURN, TOX, OXY, CLONE, HALLOSS, ELECTROCUTE, BIOACID, SEARING are the only things that should be in here check_armour = "laser" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb //Cael - bio and rad are also valid @@ -171,7 +171,8 @@ irradiate = 40 /obj/item/projectile/energy/astral_collective/particle + damage = 1 + armor_penetration = 100 icon_state = "particle" - damage_type = ELECTROMAG incendiary = 1 - flammability = 1 + flammability = 3 diff --git a/modular_chomp/maps/common_areas/planetary.dm b/modular_chomp/maps/common_areas/planetary.dm index b333ba9d2d..ab41d42020 100644 --- a/modular_chomp/maps/common_areas/planetary.dm +++ b/modular_chomp/maps/common_areas/planetary.dm @@ -172,8 +172,9 @@ icon_state = "explored" /area/surface/cave/explored/trader - name = "Trader Hideout" + name = "Astral Collective Refinery" icon_state = "hideaway" + requires_power = FALSE /area/surface/cave/unexplored/normal name = "Tunnels" 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 8e56183ff4..f284fdbd80 100644 --- a/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dmm +++ b/modular_chomp/maps/common_submaps/overmap/planets/tyr/tyr.dmm @@ -184,6 +184,9 @@ /obj/structure/table/steel, /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/shuttles/three) +"aL" = ( +/turf/simulated/wall/rshull, +/area/planet/tyr/eclipse_refinery) "aM" = ( /obj/machinery/hyperpad/centre{ map_pad_id = "tyr_1_station"; @@ -191,6 +194,29 @@ }, /turf/simulated/floor/tiled, /area/planet/tyr/eclipse_refinery) +"aN" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/red, +/area/planet/tyr/eclipse_refinery) +"aO" = ( +/turf/simulated/floor/tiled/neutral, +/area/planet/tyr/eclipse_refinery) +"aP" = ( +/mob/living/simple_mob/humanoid/astral_collective/purity, +/turf/simulated/floor/tiled/neutral, +/area/planet/tyr/eclipse_refinery) +"aQ" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/red, +/area/planet/tyr/eclipse_refinery) +"aR" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/red, +/area/planet/tyr/eclipse_refinery) "aS" = ( /obj/effect/anomaly/hallucination{ immortal = 1; @@ -198,17 +224,9 @@ }, /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/shuttles/nine) -"aT" = ( -/obj/structure/fans/hardlight/colorable/abductor{ - color = "#FF3300" - }, -/turf/simulated/floor/tiled, -/area/planet/tyr/eclipse_refinery) -"aU" = ( -/turf/simulated/wall/r_wall, -/area/planet/tyr/caverns) "aV" = ( -/turf/simulated/floor/lava/tyr, +/obj/machinery/suspension_gen, +/turf/simulated/floor/tiled/purple, /area/planet/tyr/eclipse_refinery) "aW" = ( /obj/structure/flora/tyr/flowers, @@ -313,7 +331,13 @@ /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/shuttles/eight) "bs" = ( -/turf/simulated/wall/r_wall, +/obj/structure/safe, +/obj/item/storage/belt/holding, +/obj/item/personal_shield_generator/belt/fossiltank, +/obj/item/ratvarian_spear, +/obj/item/rig/ch/clockwork, +/obj/item/gun/energy/clockwork, +/turf/simulated/floor/tiled, /area/planet/tyr/eclipse_refinery) "bt" = ( /turf/simulated/shuttle/floor/voidcraft/tyr, @@ -346,10 +370,6 @@ /obj/item/stack/medical/splint, /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/shuttles/eight) -"bA" = ( -/mob/living/simple_mob/humanoid/astral_collective/ranged/zaddat, -/turf/simulated/floor/tiled/red, -/area/planet/tyr/eclipse_refinery) "bB" = ( /obj/structure/sink/kitchen{ dir = 1 @@ -490,10 +510,6 @@ /obj/structure/frame, /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/shuttles/eleven) -"cc" = ( -/obj/machinery/door/airlock, -/turf/simulated/floor/tiled/red, -/area/planet/tyr/eclipse_refinery) "cd" = ( /obj/item/circuitboard/teleporter_station, /obj/structure/frame, @@ -693,8 +709,8 @@ /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/shuttles/six) "cM" = ( -/obj/random/tyroutcrop, -/turf/simulated/floor/outdoors/desert_planet/gravel/tyr, +/obj/machinery/reagent_refinery/pump, +/turf/simulated/floor/tiled, /area/planet/tyr/eclipse_refinery) "cN" = ( /obj/structure/prop/tyr_elevator{ @@ -798,29 +814,6 @@ /mob/living/simple_mob/mechanical/hivebot/tyr/swarm, /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/shuttles/three) -"db" = ( -/obj/structure/closet/crate, -/obj/random/material, -/obj/random/material/precious, -/obj/random/material/refined, -/obj/random/maintenance/medical, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/capacitor/hyper, -/obj/item/stock_parts/capacitor/hyper, -/obj/item/stock_parts/capacitor/hyper, -/turf/simulated/floor/tiled, -/area/planet/tyr/eclipse_refinery) "dc" = ( /obj/machinery/power/rtg/fake_reactor, /obj/structure/cable{ @@ -853,40 +846,12 @@ "dh" = ( /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/ship_graveyard) -"di" = ( -/mob/living/simple_mob/humanoid/astral_collective/ranged/taur, -/turf/simulated/floor/tiled, -/area/planet/tyr/eclipse_refinery) "dj" = ( /obj/structure/cable{ icon_state = "2-8" }, /turf/simulated/floor, /area/planet/tyr/shuttles/one) -"dk" = ( -/obj/structure/closet/crate, -/obj/random/material, -/obj/random/material/precious, -/obj/random/material/refined, -/obj/random/maintenance/medical, -/obj/item/pickaxe/jackhammer, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/capacitor/hyper, -/obj/item/stock_parts/capacitor/hyper, -/obj/item/stock_parts/capacitor/hyper, -/turf/simulated/floor/tiled/red, -/area/planet/tyr/eclipse_refinery) "dl" = ( /obj/structure/table/woodentable, /obj/random/contraband, @@ -901,28 +866,8 @@ /turf/simulated/floor, /area/planet/tyr/shuttles/one) "dn" = ( -/obj/structure/closet/crate, -/obj/random/material, -/obj/random/material/precious, -/obj/random/material/refined, -/obj/random/maintenance/medical, -/obj/item/pickaxe/jackhammer, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/capacitor/hyper, -/obj/item/stock_parts/capacitor/hyper, -/obj/item/stock_parts/capacitor/hyper, -/turf/simulated/floor/tiled, +/mob/living/simple_mob/humanoid/astral_collective/ranged/zaddat, +/turf/simulated/floor/tiled/purple, /area/planet/tyr/eclipse_refinery) "do" = ( /obj/structure/prop/tyr_elevator{ @@ -941,29 +886,6 @@ }, /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/shuttles/seven) -"dr" = ( -/obj/structure/closet/crate, -/obj/random/material, -/obj/random/material/precious, -/obj/random/material/refined, -/obj/random/maintenance/medical, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/manipulator/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/matter_bin/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/micro_laser/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/scanning_module/hyper, -/obj/item/stock_parts/capacitor/hyper, -/obj/item/stock_parts/capacitor/hyper, -/obj/item/stock_parts/capacitor/hyper, -/turf/simulated/floor/tiled/red, -/area/planet/tyr/eclipse_refinery) "ds" = ( /turf/simulated/shuttle/floor/alien, /area/planet/tyr/precursorruins/engi_boss) @@ -986,10 +908,6 @@ }, /turf/simulated/shuttle/floor/alienplating, /area/planet/tyr/precursorruins/stairwell) -"dx" = ( -/mob/living/simple_mob/humanoid/astral_collective/ranged/wolf, -/turf/simulated/floor/tiled/red, -/area/planet/tyr/eclipse_refinery) "dy" = ( /obj/structure/prop/tyr_elevator{ descendx = 177; @@ -1004,8 +922,13 @@ /turf/simulated/shuttle/floor/alien, /area/planet/tyr/precursorruins/stairwell) "dA" = ( -/mob/living/simple_mob/humanoid/astral_collective/ranged/tesh, -/turf/simulated/floor/tiled/red, +/obj/structure/table/standard, +/obj/random/tool/alien, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/obj/random/material/refined, +/turf/simulated/floor/tiled, /area/planet/tyr/eclipse_refinery) "dB" = ( /obj/effect/floor_decal/stairs/dark_stairs{ @@ -1223,10 +1146,6 @@ }, /turf/simulated/shuttle/floor/black, /area/planet/tyr/precursorruins) -"el" = ( -/mob/living/simple_mob/humanoid/astral_collective/ranged/lizard, -/turf/simulated/floor/tiled/red, -/area/planet/tyr/eclipse_refinery) "em" = ( /obj/structure/prop/tyr_elevator{ descendx = 115; @@ -1395,9 +1314,24 @@ /obj/structure/barricade, /turf/simulated/tyracid, /area/planet/tyr/precursorruins/checkpoint) -"eL" = ( -/mob/living/simple_mob/humanoid/astral_collective/ranged/noodle, -/turf/simulated/floor/tiled/red, +"eM" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/neutral, +/area/planet/tyr/eclipse_refinery) +"eN" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/neutral, +/area/planet/tyr/eclipse_refinery) +"eO" = ( +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) +"eP" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/yellow, /area/planet/tyr/eclipse_refinery) "eQ" = ( /obj/structure/prop/tyr_elevator{ @@ -1416,6 +1350,10 @@ }, /turf/simulated/tyracid/quantum, /area/planet/tyr/precursorruins) +"eT" = ( +/mob/living/simple_mob/humanoid/astral_collective/purity, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) "eU" = ( /obj/structure/prop/tyr_elevator{ descendx = 80; @@ -1441,6 +1379,10 @@ }, /turf/simulated/tyracid/supernova, /area/planet/tyr/precursorruins) +"eX" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) "eY" = ( /obj/structure/prop/tyr_elevator{ descendx = 69; @@ -1478,6 +1420,15 @@ }, /turf/simulated/shuttle/floor/black, /area/planet/tyr/precursorruins) +"fe" = ( +/obj/structure/closet, +/obj/random/contraband/nofail, +/obj/random/contraband/nofail, +/obj/random/contraband/nofail, +/obj/random/contraband/nofail, +/obj/random/contraband/nofail, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) "ff" = ( /turf/simulated/shuttle/wall/alien/orange, /area/planet/tyr/precursorruins/swarm_boss) @@ -1835,12 +1786,13 @@ "gm" = ( /turf/simulated/mineral/crystal, /area/planet/tyr/shuttles/rock_one) -"gn" = ( -/turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr, -/area/planet/tyr/eclipse_refinery) "go" = ( /turf/simulated/mineral, /area/planet/tyr/shuttles/rock_two) +"gp" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled/red, +/area/planet/tyr/eclipse_refinery) "gq" = ( /turf/simulated/floor/grass, /area/planet/tyr/shuttles/rock_two) @@ -1848,6 +1800,10 @@ /mob/living/simple_mob/vore/pakkun/snapdragon, /turf/simulated/floor/grass, /area/planet/tyr/shuttles/rock_two) +"gs" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) "gt" = ( /mob/living/simple_mob/mechanical/hivebot/tyr/swarm, /turf/simulated/shuttle/floor/voidcraft/tyr, @@ -1876,6 +1832,12 @@ "gz" = ( /turf/simulated/mineral/light/tyr, /area/planet/tyr/caverns) +"gA" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) "gB" = ( /obj/structure/flora/tyr/lilly, /turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr, @@ -2043,6 +2005,10 @@ /obj/item/gun/energy/tyr_rifle, /turf/simulated/shuttle/floor/alien, /area/planet/tyr/ancient_ruins/five) +"hl" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) "hm" = ( /obj/structure/table/rack, /obj/item/tool/crowbar/hybrid/alien, @@ -2144,6 +2110,10 @@ }, /turf/simulated/shuttle/floor/black, /area/planet/tyr/precursorruins/medical_boss) +"hF" = ( +/mob/living/simple_mob/humanoid/astral_collective/ranged/lizard, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) "hG" = ( /obj/machinery/button/remote/blast_door{ dir = 8; @@ -2252,6 +2222,17 @@ "hX" = ( /turf/simulated/wall/shull, /area/planet/tyr/shuttles/eleven) +"hY" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/neutral, +/area/planet/tyr/eclipse_refinery) +"hZ" = ( +/obj/structure/table/standard, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/red, +/area/planet/tyr/eclipse_refinery) "ia" = ( /obj/item/material/shard{ pixel_x = 5; @@ -2277,6 +2258,13 @@ }, /turf/simulated/shuttle/floor/alien, /area/planet/tyr/ancient_ruins/one) +"if" = ( +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"ig" = ( +/mob/living/simple_mob/humanoid/astral_collective/ranged/wolf, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) "ih" = ( /turf/simulated/shuttle/wall/alien/orange, /area/planet/tyr/precursorruins/checkpoint) @@ -2445,6 +2433,10 @@ "iU" = ( /turf/simulated/tyracid, /area/planet/tyr/precursorruins/stairwell) +"iV" = ( +/obj/random/multiple/corp_crate, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) "iW" = ( /obj/structure/prop/tyr_elevator{ descendx = 149; @@ -2566,6 +2558,11 @@ /obj/effect/floor_decal/stairs/dark_stairs, /turf/simulated/shuttle/floor/alien, /area/planet/tyr/precursorruins/entryway) +"jy" = ( +/obj/random/multiple/corp_crate, +/obj/machinery/light, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) "jz" = ( /obj/effect/floor_decal/stairs/dark_stairs{ dir = 4 @@ -2578,6 +2575,30 @@ }, /turf/simulated/shuttle/floor/alien, /area/planet/tyr/precursorruins) +"jB" = ( +/obj/machinery/reagent_refinery/waste_processor, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"jC" = ( +/obj/structure/closet, +/obj/random/material, +/obj/random/material, +/obj/random/mainttoyloot, +/obj/random/handgun, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"jD" = ( +/obj/structure/closet, +/obj/random/material/precious, +/obj/random/material, +/obj/random/material, +/obj/random/mainttoyloot, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"jE" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) "jF" = ( /obj/structure/closet, /obj/item/borg/upgrade/modkit/damage, @@ -2596,6 +2617,16 @@ }, /turf/simulated/shuttle/floor/alien, /area/planet/tyr/precursorruins) +"jI" = ( +/obj/machinery/reagent_refinery/filter/alt{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"jJ" = ( +/obj/machinery/reagent_refinery/vat, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) "jK" = ( /turf/simulated/shuttle/wall/alien/orange, /area/planet/tyr/ancient_ruins/six) @@ -2677,11 +2708,325 @@ /obj/structure/prop/blackbox/tyr_boxes/hint_c, /turf/simulated/shuttle/floor/alienplating, /area/planet/tyr/precursorruins) +"ke" = ( +/mob/living/simple_mob/humanoid/astral_collective/purity, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kf" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"kg" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) +"kh" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) +"ki" = ( +/mob/living/simple_mob/humanoid/astral_collective/ranged/zaddat, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kj" = ( +/mob/living/simple_mob/humanoid/astral_collective/ranged/wolf, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kk" = ( +/obj/structure/table/standard, +/obj/random/toolbox, +/obj/random/research_sample_type1, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kl" = ( +/obj/structure/table/standard, +/obj/random/tool/power, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/obj/random/material/precious, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"km" = ( +/obj/structure/table/standard, +/obj/random/tool, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kn" = ( +/obj/machinery/light{ + dir = 8; + layer = 3 + }, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"ko" = ( +/obj/structure/closet, +/obj/random/material/refined, +/obj/random/material, +/obj/random/material, +/obj/random/mainttoyloot, +/obj/random/mainttoyloot/nofail, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kp" = ( +/obj/structure/closet, +/obj/random/material, +/obj/random/material, +/obj/random/mainttoyloot, +/obj/random/mainttoyloot/nofail, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kq" = ( +/obj/random/multiple/corp_crate, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kr" = ( +/obj/structure/table/standard, +/obj/random/research_sample_type1, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"ks" = ( +/mob/living/simple_mob/humanoid/astral_collective/ranged/tesh, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) +"kt" = ( +/mob/living/simple_mob/humanoid/astral_collective/ranged/noodle, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"ku" = ( +/mob/living/simple_mob/humanoid/astral_collective/purity, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"kv" = ( +/obj/random/multiple/corp_crate, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) +"kw" = ( +/obj/random/multiple/corp_crate, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) +"kx" = ( +/obj/structure/table/standard, +/obj/random/tool/power, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"ky" = ( +/obj/structure/table/standard, +/obj/random/tool, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/obj/random/material/precious, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kz" = ( +/obj/structure/table/standard, +/obj/random/tool, +/obj/random/research_sample_type2, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kA" = ( +/obj/structure/table/standard, +/obj/random/translator, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/obj/random/material/refined, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kB" = ( +/obj/structure/table/standard, +/obj/random/slimecore, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kC" = ( +/obj/machinery/reagent_refinery/filter, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kD" = ( +/turf/simulated/floor/outdoors/desert_planet/gravel/tyr, +/area/planet/tyr/caverns) +"kE" = ( +/mob/living/simple_mob/humanoid/astral_collective/ranged/noodle, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) +"kF" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"kG" = ( +/obj/structure/table/standard, +/obj/random/research_sample_type3, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/obj/random/material/refined, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kH" = ( +/obj/random/tyroutcrop, +/turf/simulated/floor/outdoors/desert_planet/gravel/tyr, +/area/planet/tyr/caverns) +"kI" = ( +/obj/machinery/conveyor_switch{ + id = "tyr_refinery" + }, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kJ" = ( +/obj/structure/table/standard, +/obj/random/tool/alien, +/obj/random/research_sample_type3, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/obj/random/material/precious, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kK" = ( +/obj/machinery/reagent_refinery/grinder, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"kL" = ( +/obj/machinery/conveyor{ + id = "tyr_refinery"; + dir = 8 + }, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"kM" = ( +/obj/structure/closet, +/obj/random/material/precious, +/obj/random/material, +/obj/random/material, +/obj/random/mainttoyloot, +/obj/random/handgun, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kN" = ( +/obj/structure/closet, +/obj/random/material, +/obj/random/material, +/obj/random/mainttoyloot, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kO" = ( +/obj/random/multiple/corp_crate, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/yellow, +/area/planet/tyr/eclipse_refinery) "kP" = ( /obj/structure/table/steel, /obj/machinery/reagentgrinder, /turf/simulated/shuttle/floor/voidcraft/tyr, /area/planet/tyr/shuttles/seven) +"kQ" = ( +/mob/living/simple_mob/humanoid/astral_collective/ranged/wolf, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"kR" = ( +/obj/machinery/conveyor{ + id = "tyr_refinery" + }, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"kS" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/neutral, +/area/planet/tyr/eclipse_refinery) +"kT" = ( +/obj/structure/closet/excavation, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"kU" = ( +/obj/structure/fans/hardlight/colorable/abductor{ + color = "#b6d9f3" + }, +/turf/simulated/floor/tiled, +/area/planet/tyr/eclipse_refinery) +"kV" = ( +/obj/structure/fans/hardlight/colorable/abductor{ + color = "#b6d9f3" + }, +/turf/simulated/floor/tiled/neutral, +/area/planet/tyr/eclipse_refinery) +"kW" = ( +/obj/structure/fans/hardlight/colorable/abductor{ + color = "#b6d9f3" + }, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"kX" = ( +/obj/machinery/suspension_gen, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"kY" = ( +/obj/structure/closet/excavation, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"kZ" = ( +/mob/living/simple_mob/humanoid/astral_collective/ranged/zaddat, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/purple, +/area/planet/tyr/eclipse_refinery) +"la" = ( +/mob/living/simple_mob/humanoid/astral_collective/purity, +/turf/simulated/floor/outdoors/desert_planet/gravel/tyr, +/area/planet/tyr/caverns) +"lb" = ( +/turf/simulated/floor/lava/tyr, +/area/planet/tyr/caverns) +"lc" = ( +/mob/living/simple_mob/humanoid/astral_collective/ranged/lizard, +/turf/simulated/floor/outdoors/desert_planet/gravel/tyr, +/area/planet/tyr/caverns) "tT" = ( /obj/structure/table/steel, /obj/item/slime_extract/silver, @@ -2797,7 +3142,8 @@ /turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr, /area/planet/tyr/caverns) "vI" = ( -/turf/simulated/floor/outdoors/desert_planet/gravel/tyr, +/mob/living/simple_mob/humanoid/astral_collective/ranged/tesh, +/turf/simulated/floor/tiled, /area/planet/tyr/eclipse_refinery) "CU" = ( /obj/random/tyroutcrop, @@ -2814,7 +3160,12 @@ /turf/simulated/floor/outdoors/desert_planet/deep_grass/tyr, /area/planet/tyr/caverns) "OQ" = ( -/turf/simulated/mineral/light/tyr, +/obj/structure/table/standard, +/obj/random/research_sample_type2, +/obj/random/material, +/obj/random/material, +/obj/random/material, +/turf/simulated/floor/tiled, /area/planet/tyr/eclipse_refinery) "Uo" = ( /turf/simulated/floor/outdoors/desert_planet/sand/tyr, @@ -56321,7 +56672,7 @@ gz gz gz gz -gz +kD Nc Nc Nc @@ -56578,9 +56929,9 @@ gz gz gz gz -gz -gz -gz +kD +kD +kD Nc Nc Nc @@ -56835,10 +57186,10 @@ gz gz gz gz -gz -gz -gz -gz +kD +kD +kD +kD Nc CU Nc @@ -57093,9 +57444,9 @@ gz gz gz gz -gz -gz -gz +kH +kD +kD gz Nc Nc @@ -57350,10 +57701,10 @@ gz gz gz gz -gz -gz -gz -gz +kH +kH +kH +kD gz Nc Nc @@ -57607,10 +57958,10 @@ gz gz gz gz -gz -gz -gz -gz +kH +kH +kH +kH gz gz gz @@ -57865,9 +58216,9 @@ gz gz gz gz -gz -gz -gz +kH +kH +kH gz gz gz @@ -58122,10 +58473,10 @@ gz gz gz gz -gz -gz -gz -gz +kH +kH +kH +kH gz gz gz @@ -58379,10 +58730,10 @@ gz gz gz gz -gz -gz -gz -gz +kH +kH +kH +kH gz gz gz @@ -58636,11 +58987,11 @@ gz gz gz gz -gz -gz -gz -gz -gz +kH +kH +kH +kH +kH gz gz gz @@ -58891,19 +59242,19 @@ gz gz gz gz +kH +kH +kH +kH +kH +kH +kH gz gz gz gz gz gz -gz -gz -gz -gz -gz -OQ -vI Nc Nc Nc @@ -59148,6 +59499,13 @@ gz gz gz gz +kH +kH +kH +kH +kH +kH +kH gz gz gz @@ -59156,13 +59514,6 @@ gz gz gz gz -gz -gz -gz -gz -OQ -cM -vI Nc CU Nc @@ -59406,6 +59757,12 @@ gz gz gz gz +kH +kH +kH +kH +kH +kH gz gz gz @@ -59416,12 +59773,6 @@ gz gz gz gz -gz -OQ -vI -vI -vI -vI Nc Nc CU @@ -59663,6 +60014,13 @@ gz gz gz gz +kH +kH +kH +kH +kH +kH +gz gz gz gz @@ -59674,13 +60032,6 @@ gz gz gz gz -OQ -cM -vI -vI -vI -vI -vI Nc Nc Nc @@ -59920,6 +60271,15 @@ gz gz gz gz +kD +kD +kD +kH +kH +kH +gz +gz +gz gz gz gz @@ -59931,15 +60291,6 @@ gz gz gz gz -OQ -cM -cM -vI -vI -gn -cM -vI -vI gz gz gz @@ -60177,6 +60528,16 @@ gz gz gz gz +kD +kD +kD +kD +kD +kH +gz +gz +gz +gz gz gz gz @@ -60188,16 +60549,6 @@ gz gz gz gz -OQ -cM -cM -cM -cM -vI -vI -vI -vI -OQ gz gz gz @@ -60434,33 +60785,33 @@ gz gz gz gz +kD +kD +kD +kD +kD +kD gz gz gz gz gz gz -gz -gz -gz -gz -gz -OQ -cM -cM -cM -cM -cM -cM -cM -OQ -OQ -gz -gz -gz -gz -gz -gz +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL gz gz gz @@ -60691,34 +61042,34 @@ gz gz gz gz +kD +la +kD +la +kD +kD +kD gz gz gz gz gz gz -gz -gz -gz -gz -gz -OQ -cM -cM -cM -cM -cM -cM -OQ -OQ -gz -gz -gz -gz -gz -gz -gz -gz +aL +if +if +kn +if +if +kn +kn +if +if +kn +if +if +if +aL gz gz gz @@ -60949,6 +61300,12 @@ gz gz gz gz +kD +kD +lc +kD +kD +kD gz gz gz @@ -60956,27 +61313,21 @@ gz gz gz gz -gz -gz -gz -OQ +aL +kK cM -cM -cM -cM -cM -OQ -OQ -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +kC +kC +kC +jI +jI +jI +jI +jI +jI +jB +if +aL gz gz gz @@ -61207,6 +61558,12 @@ gz gz gz gz +kD +la +kD +la +kD +kD gz gz gz @@ -61214,27 +61571,21 @@ gz gz gz gz -gz -gz -gz -OQ -cM -cM -cM -OQ -OQ -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL +kL +kI +jJ +jJ +jJ +jJ +jJ +jJ +jJ +jJ +jJ +bV +if +aL gz gz gz @@ -61465,45 +61816,45 @@ gz gz gz gz +kD +kD +kD +kD +kD gz gz gz gz gz -gz -gz -gz -gz -OQ -vI -vI -cM -cM -OQ -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL +aL +aL +aL +kL +bV +ke +bV +bV +bV +bV +bV +bV +bV +ke +bV +if +aL gz gz gz gz gz +aL +aL +aL +aL +aL +aL gz aW ei @@ -61721,47 +62072,47 @@ gz gz gz gz +lb +lb +kD +kD +kD +kD +kD gz gz gz gz gz -gz -gz -OQ -OQ -OQ -OQ -vI -vI -vI -vI -OQ -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL +kR +kR +kR +kL +kf +if +if +ku +if +if +ku +if +if +kf +if +if +aL gz gz gz gz gz +aL +eT +eO +eO +eO +aL gz gz ei @@ -61978,48 +62329,48 @@ gz gz gz gz +lb +lb +lb +kD +kD +kD +kD gz gz gz gz gz gz -gz -OQ -aV -aV -aV -vI -vI -vI -vI -vI -OQ -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL +kL +aL +aL +aL +aL +aL +aL +aL +hY +hY +aL +aL +aL +aL +aL +aL +aL gz gz gz gz gz +aL +eO +fe +fe +eO +aL gz gz gz @@ -62235,49 +62586,49 @@ gz gz gz gz +lb +lb +lb +kD +kD +kD +kD +kD gz gz gz gz gz gz -gz -gz -OQ -aV -aV -aV -vI -vI -vI -vI -OQ -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 +aL +kL +aL +ks +eO +kg +eO +eO +hY +aO +aO +hY +eO +eO +kg +eO +ig +aL +aL +aL +aL +aL +aL +aL +gA +fe +fe +eP +aL gz gz gz @@ -62493,49 +62844,49 @@ gz gz gz gz +lb +lb +kD +kD +kD +kD +kD +kD gz gz gz gz gz gz -gz -OQ -aV -aV -aV -aV -vI -vI -vI -OQ -OQ -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 +aL +kL +aL +eO +jD +bV +kp +eO +hY +aO +aO +hY +eO +ko +bV +jC +eO +aL +aO +eM +aO +aO +aO +hY +eO +fe +fe +eO +aL gz gz gz @@ -62751,49 +63102,49 @@ gz gz gz gz +lb +lb +kD +kD +kD +kD +kD +kD +kD gz gz gz gz gz -gz -gz -OQ -aV -aV -aV -aV -vI -vI -vI -OQ -OQ -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 +aL +kL +aL +gA +kM +bV +ko +eO +aL +aO +aO +aL +eO +ko +bV +jD +eP +aL +aO +aO +aO +aO +aO +hY +eO +eO +eO +eT +aL gz gz gz @@ -63008,53 +63359,53 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -vI -vI -vI -vI -OQ -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 -gz -gz -gz +lb +lb +lb +kD +kD +kD +kD +kD +kD +kD +kD +aL +aL +aL +aL +aL +kL +aL +eO +kN +bV +ko +eO +aL +aO +aO +aL +eO +kp +bV +jD +eO +aL +aO +aO +aL +aL +aL +aL +hl +aL +aL +aL +aL +aL +aL +aL gz aW ei @@ -63266,53 +63617,53 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -OQ -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 -gz -gz +lb +lb +lb +kD +kD +kD +kD +kD +kD +kD +kD +kD +kW +kR +kR +kR +kL +aL +eO +eO +kh +eO +kE +aL +aO +aO +aL +ks +eO +kh +eO +eO +aL +aO +aO +aL +gp +aQ +aH +aH +aL +aH +aH +aQ +aH +aH +aL gz gz ei @@ -63524,53 +63875,53 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -vI -OQ -gz -gz -gz -gz -gz -gz -gz -bs -bs -bs -bs -bs -bs -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +lb +lb +lb +kD +kD +kD +kD +kD +kD +kD +kD +kD +kD +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aO +aO +aL +aL +aL +aL +aL +aL +aL +aO +aO +aL +gp +bV +bV +aH +gp +aH +bV +bV +bV +aH +aL gz gz ei @@ -63782,53 +64133,53 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -vI -OQ -gz -gz -gz -gz -gz -gz -bs -dx +lb +lb +lb +kD +kD +kD +kD +kD +kD +kD +kD +kD +kD +kU +aO +eM +aO +aO +aO +aO +aO +aO +aO +eM +aO +aO +eM +aO +aO +aO +aO +aO +aO +aO +aO +aL +hZ +bV +bV +hF +gs aH -aH -aH -aH -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +bV +aM +bV +aN +aL gz gz ei @@ -64040,53 +64391,53 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -vI -vI -OQ -gz -gz -gz -gz -gz -bs +lb +lb +lb +lb +kD +kD +kD +kD +kD +kD +kD +kD +kD +kU +aO +eN +aO +aP +eN +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +aO +eN +aP +aO +aL +gp +bV +bV +aH +gp aH bV bV bV aH -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL gz gz gz @@ -64298,53 +64649,53 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -vI -vI -OQ -gz -gz -gz -gz -bs -aH +lb +lb +lb +lb +kD +kD +kD +kD +kD +kD +kD +kD +kD +aL +aL +aL +kS +aO +aL +aL +aL +hY +aL +aL +aL +aL +aL +aL +aL +hY +aL +aL +aL +aO +aO +aL +gp bV -aM bV aH -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL +aH +aH +aR +aH +aH +aL gz gz gz @@ -64557,52 +64908,52 @@ gz gz gz gz +lb +lb +lb +lb +kD +kD +kD +kD +kD +kD +kD +kD gz gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -vI -vI -OQ -gz -gz -gz -gz -bs -aH -bV +aL +aO +aO +aL +iV +eO +eO +iV +iV +iV +kv +iV +iV +iV +eO +eO +iV +aL +aO +aO +aL +hZ bV bV aH -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL +aL +aL +aL +aP +aO +aL gz gz gz @@ -64815,52 +65166,52 @@ gz gz gz gz +lb +lb +lb +lb +kD +kD +kD +kD +kD +kD +kD +kD +kD gz -gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -vI -OQ -bs -gz -gz -gz -bs +aL +aO +aO +aL +kO +bV +kt +bV +bV +bV +bV +bV +bV +bV +ki +bV +jy +aL +aO +aO +aL +gp +bV +bV +aH +aQ aH aH -aH -aH -bA -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL +aO +aO +aL gz gz gz @@ -65073,52 +65424,52 @@ gz gz gz gz +lb +lb +lb +lb +lb +kD +kD +kD +kD +kD +kD +kD +kD gz -gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -vI -vI -bs -bs -bs -bs -bs -bs -bs +aL +aO +aO +aL +iV bV -bs -bs -bs -aU -aU -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +bV +kq +kq +kq +kq +kq +kq +kq +bV +bV +iV +aL +aO +aO +aL +gp +aH +aH +aH +aH +aH +aH +aL +aO +aO +aL gz gz gz @@ -65331,52 +65682,52 @@ gz gz gz gz +lb +lb +lb +lb +lb +kD +kD +kD +kD +kD +kD +kD +kD gz -gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -vI -bs -aH +aL +aO +aO +aL +iV bV -aH -bs -aH bV -aH +kq +kq +kq +kq +kq +kq +kq bV -aH -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +bV +iV +aL +aO +aO +aL +aL +aL +aL +aL +aL +aL +eX +aL +aO +aO +aL gz gz gz @@ -65589,52 +65940,52 @@ gz gz gz gz +lb +lb +lb +lb +lb +lb +kD +kD +kD +kD +kD +kD +kD gz -gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -vI -aT +aL +aO +aO +aL +kO bV -el +vI bV -bs bV -aH bV -aH bV -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +bV +bV +bV +kj +bV +jy +aL +aO +aO +aO +aO +eM +aO +aO +aO +aO +aO +eM +aO +aO +aL gz gz gz @@ -65848,51 +66199,51 @@ gz gz gz gz +lb +lb +lb +lb +lb +kD +kD +kD +kD +kD +kD gz gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -bs -aH -bV -aH -bV -aH -bV -aH -bV -aH -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL +aO +aO +aL +iV +eO +eO +iV +iV +iV +kw +iV +iV +iV +eO +eO +iV +aL +aO +aO +aO +aO +eN +aO +aO +aO +aO +aO +eN +aO +aO +aL gz gz gz @@ -66107,50 +66458,50 @@ gz gz gz gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -vI -bs -bs -bs -bV -aH -bV -aH -bV -aH -bV -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +lb +lb +lb +lb +lb +kD +kD +kD +kD +kD +aL +aL +aL +kS +aO +aL +aL +aL +hY +aL +aL +aL +aL +aL +aL +aL +hY +aL +aL +aL +aO +aO +aL +aL +aL +aL +aL +aL +aL +eX +aL +aO +aO +aL gz gz gz @@ -66365,50 +66716,50 @@ gz gz gz gz -gz -gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -bs +lb +lb +lb +lb +lb +kD +kD +kD +kD +kD +kV +aO +aO +aO +aO +eM +aO +aO +aO +aO +aO +aO +aO +eM +aO +aO +aO +aO +aO +aO +aP +aO +aL +gp aH -bV aH -bV aH -bV aH -bV aH -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aH +aL +aO +aO +aL gz gz gz @@ -66625,48 +66976,48 @@ gz gz gz gz -gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -aT -bV -eL -bV -bs -bV +lb +lb +lb +lb +kD +kD +kD +kD +kV +aO +aO +aO +aP +eN +aO +aO +aO +aO +aO +aO +aO +eN +aO +aO +aO +aO +aO +eN +aO +aO +aL +gp aH -bV aH -bV -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aH +aR +aH +aH +aL +aO +aO +aL gz gz gz @@ -66884,47 +67235,47 @@ gz gz gz gz -gz -OQ -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -vI -vI -bs -aH +lb +lb +lb +aL +kU +kU +aL +aL +aL +aL +aO +aO +aL +aL +aL +hY +aL +aL +aL +aL +aL +aL +hY +aL +aL +aL +aL +eX +aL +aL +hZ +bV bV aH -bs -aH -bV -aH -bV -aH -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL +aL +aL +aL +aP +aO +aL gz gz gz @@ -67144,45 +67495,45 @@ gz gz gz gz -OQ -OQ +lb +aL +if +if +kX aV aV -aV -aV -aV -aV -aV -aV -aV -aV -aV -vI -OQ -bs -bs -bs -bs -bs +aL +aO +aO +aL +if +if +if +kF +if +if +if +if +if +if +if +if +aL +eO +eO +eO +aL +gp +bV bV aH -bV +aL aH -bV -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aH +aQ +aH +aH +aL gz gz gz @@ -67403,44 +67754,44 @@ gz gz gz gz -gz -OQ -OQ -OQ -OQ -OQ -aV -aV -aV -OQ -OQ -OQ -OQ -OQ -OQ -OQ -OQ +aL +if +bV +bV +vI +if +aL +aO +aO +aL +if +kJ +kG +hF +bV +kz OQ +bV +kt +km +kk +if +aL +eO bs -cc -bs -bs -bs -cc -bs -aU -aU -aU -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +eO +aL +gp +bV +bV +aH +gp +aH +bV +bV +bV +aH +aL gz gz gz @@ -67661,44 +68012,44 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -OQ -OQ -OQ -gz -gz -gz -gz -gz -gz -gz -gz -gz -bs +aL +kZ bV -aH bV -aH bV -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +if +eM +aO +aO +aL +if +kB +kx +bV +bV +kA +kx +bV +bV +kr +kl +jE +aL +eT +bV +eT +aL +hZ +bV +bV +hF +gs +bV +bV +bV +bV +aN +aL gz gz gz @@ -67919,44 +68270,44 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -bs +aL +if +bV +hF +bV +if +eN +aO +aO +aL +if +km +km +bV +bV +kB +ky +bV +bV dA +km +if +aL +eO +bs +eO +hl +aH +bV bV aH -di +gp aH -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +bV +bV +bV +aH +aL gz gz gz @@ -68177,44 +68528,44 @@ gz gz gz gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -bs +aL +kT +kT +kY +kT +kT +aL +aL +aL +aL +kQ +if +if +kf +if +if +if +if +kf +if +if dn -dr -dn -dk -db -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL +eO +eO +eO +aL +aH +aR +aH +aH +aL +aH +aH +aR +aH +aH +aL gz gz gz @@ -68435,44 +68786,44 @@ gz gz gz gz +aL +aL +aL +aL +aL +aL +aL gz gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -bs -bs -bs -bs -bs -bs -bs -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz -gz +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL gz gz gz diff --git a/modular_chomp/maps/southern_cross/southern_cross-6.dmm b/modular_chomp/maps/southern_cross/southern_cross-6.dmm index f57aae5f58..b9e39f293a 100644 --- a/modular_chomp/maps/southern_cross/southern_cross-6.dmm +++ b/modular_chomp/maps/southern_cross/southern_cross-6.dmm @@ -1761,6 +1761,12 @@ }, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoarcheology/anomaly) +"dI" = ( +/obj/structure/fence/electric{ + dir = 4 + }, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/cave/explored/trader) "dJ" = ( /obj/structure/table/steel, /obj/effect/floor_decal/industrial/warning/dust{ @@ -3975,6 +3981,10 @@ }, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoarcheology/smes) +"iv" = ( +/obj/structure/fence/door/electric, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/cave/explored/trader) "iw" = ( /obj/machinery/power/apc{ name = "south bump"; @@ -4003,6 +4013,12 @@ temperature = 243.15 }, /area/surface/outpost/mining_main/cave) +"iy" = ( +/obj/structure/fence/electric_sign{ + dir = 4 + }, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/cave/explored/trader) "iz" = ( /obj/effect/floor_decal/industrial/warning/dust, /obj/structure/ore_box, @@ -4030,6 +4046,17 @@ }, /turf/simulated/floor/plating, /area/surface/outpost/research/xenoarcheology/smes) +"iD" = ( +/obj/structure/fence/corner/electric, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/cave/explored/trader) +"iE" = ( +/obj/structure/fence/electric, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/cave/explored/trader) +"iF" = ( +/turf/simulated/wall/rshull, +/area/surface/cave/explored/trader) "iG" = ( /turf/simulated/wall/r_wall, /area/surface/outpost/engineering/refinery/smes) @@ -4642,6 +4669,13 @@ }, /turf/simulated/floor/tiled, /area/surface/outpost/engineering/refinery/lobby) +"jU" = ( +/obj/structure/fans/hardlight/colorable/abductor{ + color = "#b6d9f3" + }, +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) "jV" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -4911,6 +4945,10 @@ }, /turf/simulated/floor/plating, /area/surface/outpost/engineering/refinery/smes) +"kx" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) "ky" = ( /turf/simulated/shuttle/floor/voidcraft/external, /area/surface/cave/explored/deep) @@ -5208,43 +5246,32 @@ }, /area/surface/outpost/engineering/refinery) "ll" = ( -/turf/simulated/wall/r_wall, +/obj/machinery/light{ + dir = 8; + layer = 3 + }, +/turf/simulated/floor/tiled, /area/surface/cave/explored/trader) "lm" = ( -/obj/structure/bed/pillowpile/teal, -/turf/simulated/floor/tiled, -/area/surface/cave/explored/trader) -"ln" = ( -/obj/structure/bed/pillowpile/teal, -/mob/living/simple_mob/humanoid/astral_collective/ranged/zaddat, -/turf/simulated/floor/tiled, -/area/surface/cave/explored/trader) -"lo" = ( -/obj/structure/bed/pillowpile/teal, -/mob/living/simple_mob/humanoid/astral_collective/purity, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/surface/cave/explored/trader) "lp" = ( /turf/simulated/floor/tiled, /area/surface/cave/explored/trader) -"lq" = ( -/obj/machinery/door/airlock, -/turf/simulated/floor/tiled, -/area/surface/cave/explored/trader) "lr" = ( /mob/living/simple_mob/humanoid/astral_collective/purity, /turf/simulated/floor/tiled, /area/surface/cave/explored/trader) -"ls" = ( -/obj/structure/fans/hardlight/colorable/abductor{ - color = "#FF3300" - }, -/obj/machinery/door/airlock, -/turf/simulated/floor/tiled, -/area/surface/cave/explored/trader) "lt" = ( -/obj/structure/table/reinforced, -/obj/random/maintenance/foodstuff, +/obj/machinery/reagent_refinery/pipe{ + dir = 1 + }, +/obj/structure/fans/hardlight/colorable/abductor{ + color = "#b6d9f3" + }, /turf/simulated/floor/tiled, /area/surface/cave/explored/trader) "lu" = ( @@ -5258,17 +5285,176 @@ /mob/living/simple_mob/humanoid/astral_collective/ranged/zaddat, /turf/simulated/floor/tiled, /area/surface/cave/explored/trader) +"lw" = ( +/obj/structure/table/standard, +/obj/random/material, +/obj/random/material, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lx" = ( +/obj/structure/table/standard, +/obj/machinery/light{ + dir = 4 + }, +/obj/random/material, +/obj/random/material, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"ly" = ( +/obj/structure/fence/corner/electric{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/cave/explored/trader) +"lz" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lA" = ( +/obj/structure/table/standard, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/pickaxe/jackhammer, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lB" = ( +/obj/structure/table/standard, +/obj/machinery/light{ + dir = 1 + }, +/obj/random/material, +/obj/random/material, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lC" = ( +/obj/machinery/light{ + dir = 8; + layer = 3 + }, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/cave/explored/trader) +"lD" = ( +/obj/machinery/light, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/cave/explored/trader) +"lE" = ( +/obj/structure/table/standard, +/obj/machinery/light, +/obj/random/material, +/obj/random/material, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lF" = ( +/obj/machinery/light{ + dir = 8; + layer = 3 + }, +/mob/living/simple_mob/humanoid/astral_collective/purity, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lG" = ( +/obj/structure/fans/hardlight/colorable/abductor{ + color = "#b6d9f3" + }, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lH" = ( +/obj/machinery/pump, +/turf/simulated/floor/water{ + outdoors = 0 + }, +/area/surface/cave/explored/trader) +"lI" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/cave/explored/trader) +"lJ" = ( +/obj/machinery/reagent_refinery/hub, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lK" = ( +/mob/living/simple_mob/humanoid/astral_collective/purity, +/turf/simulated/floor/water{ + outdoors = 0 + }, +/area/surface/cave/explored/trader) +"lL" = ( +/obj/machinery/reagent_refinery/pump, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lM" = ( +/obj/machinery/pump_relay, +/turf/simulated/floor/water{ + outdoors = 0 + }, +/area/surface/cave/explored/trader) +"lN" = ( +/obj/machinery/reagent_refinery/waste_processor, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lO" = ( +/obj/machinery/reagent_refinery/filter{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lP" = ( +/obj/machinery/reagent_refinery/pump{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lQ" = ( +/obj/machinery/reagent_refinery/pipe{ + dir = 8 + }, +/obj/structure/fans/hardlight/colorable/abductor{ + color = "#b6d9f3" + }, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lR" = ( +/mob/living/simple_mob/humanoid/astral_collective/purity, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/cave/explored/trader) +"lS" = ( +/obj/structure/table/standard, +/obj/item/pickaxe/diamonddrill, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lT" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/mineral/floor/ignore_mapgen/sif, +/area/surface/cave/explored/trader) +"lU" = ( +/obj/machinery/reagent_refinery/pump{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) "lV" = ( /obj/effect/zone_divider, /obj/effect/zone_divider, /turf/simulated/mineral/floor/ignore_mapgen/sif, /area/surface/cave/explored/normal) +"lW" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) +"lX" = ( +/obj/machinery/reagent_refinery/filter, +/turf/simulated/floor/tiled, +/area/surface/cave/explored/trader) "md" = ( /turf/simulated/wall/solidrock, /area/surface/cave/unexplored/normal) -"nr" = ( -/turf/simulated/mineral/sif, -/area/surface/cave/explored/trader) "nx" = ( /obj/machinery/light/small{ dir = 1 @@ -5829,30 +6015,30 @@ aa "} (2,1,1) = {" aa -ll -ll -ll -ll -ll -ll -ll -ll -ll -ll -ll -ll -ll -ll -ll -ll -ll -nr -nr -kD -kD -kD -kD -kD +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +kJ +dI +kJ +ab ab ab ab @@ -6087,30 +6273,30 @@ aa "} (3,1,1) = {" aa +iF +lp +lp ll -lp -lp +lr +iF lp ll lp lp lp lp +lF lp +iF lp ll lp -lm -lm -lm -ll +lp +jU kJ +dI kJ -kJ -kD -kD -kD -nr +ab ab ab ab @@ -6345,30 +6531,30 @@ aa "} (4,1,1) = {" aa -ll +iF lp lu lp -lq -lr +lp +lp +lp +lp +lN lp lp lp lp lp -lq lp -lm -ln -lm -ll +lp +lp +lp +lp +jU kJ +dI kJ -kJ -kD -kD -nr -nr +ab ab ab ab @@ -6603,30 +6789,30 @@ aa "} (5,1,1) = {" aa -ll -lp -lp -lp -ll -lp -lp -lp -lp -lp -lp -ll -lp +iF lm +lp +lv +kx +iF lm +lp +lO +lL +lL +lJ +lp +kx +iF lm -ll +lr +lp +kx +iF kJ +dI kJ -kJ -kD -kD -nr -nr +ab ab ab ab @@ -6861,30 +7047,30 @@ aa "} (6,1,1) = {" aa -ll -ll -ll -ll -ll -ll -ll -ll +iF +lr +lp +lW +lp +iF +lp +lp +lP lp lp lp -ll -ll -ll -ll -ll -ll +lp +lp +iF +lp +lp +lp +lp +iF kJ +dI kJ -kJ -kD -kD -kD -nr +ab ab ab ab @@ -7119,30 +7305,30 @@ aa "} (7,1,1) = {" aa -nr -ll +iF +iF lp +iF +iF +iF +iF +lG +lQ +lG +lG +lG +lG +iF +iF +iF +iF lp -lp -lp -lp -lq -lp -lp -lp -ll -lp -lm -lm -lm -ll +iF +iF kJ +dI kJ -kJ -kD -kD -kD -nr +ab ab ab ab @@ -7377,30 +7563,30 @@ aa "} (8,1,1) = {" aa -nr +iF +lp +lp ll lp -lt -lp -lt -lr -ll -lp -lp -lp -lq -lp -lm -lo -lm -ll -kJ +iF +lC kJ kJ kD kD kD -nr +kJ +lC +iF +lz +lp +lp +lw +iF +kJ +dI +kJ +ab ab ab ab @@ -7635,30 +7821,30 @@ aa "} (9,1,1) = {" aa -nr -ll -lv -lt -lp -lt -lp -ll +iF lp lp lp -ll lp -lm -lm -lm -ll -kJ -kJ -kJ +lG kJ +lR kD kD -nr +kD +kD +kD +lD +iF +lA +lp +lp +lw +iF +kJ +dI +kJ +ab ab ab ab @@ -7893,30 +8079,30 @@ aa "} (10,1,1) = {" aa -nr -ll -lp +iF +lm +lN +lX +lU lt -lp -lt -lp -ll -lr -lp -lr -ll -ll -ll -ll -ll -ll -kJ -kJ -kJ kJ kD kD -nr +kD +lM +kD +kD +kD +iF +lp +lp +lp +lw +iF +kJ +dI +kJ +ab ab ab ab @@ -8151,30 +8337,30 @@ aa "} (11,1,1) = {" aa -nr -ll +iF +lp +lp +lP +lp +lG +kD +kD +lM +kD +kD +kD +kD +kD +jU lp -lt lr -lt lp -ll -lp -lp -lp -ll -lp -lm -lm -lm -ll +lw +iF kJ +dI kJ -kJ -kD -kD -kD -nr +ab ab ab ab @@ -8409,30 +8595,30 @@ aa "} (12,1,1) = {" aa -nr -ll -lp -lt -lp -lt -lp -ll +iF lp lp +lP lp -lq -lp -lm -lo -lm -ll -kJ -kJ -kJ +lG kD kD kD -nr +kD +kD +kD +lH +kD +jU +lp +lp +lp +lw +iF +kJ +iv +kJ +ab ab ab ab @@ -8667,30 +8853,30 @@ aa "} (13,1,1) = {" aa -nr -ll -lp -lp -lp -lp -lp -lq -lp -lp -lp -ll -lp +iF lm -lm -lm -ll -kJ +lp +lJ +lp +lG kJ kD kD +lH +kD +lK kD kD -nr +iF +lp +lp +lp +lw +iF +kJ +dI +kJ +ab ab ab ab @@ -8925,30 +9111,30 @@ aa "} (14,1,1) = {" aa -nr -ll -ll -ll -ll -ll -ll -ll +iF +lr lp lp lp -ll -ll -ll -ll -ll -ll -kJ +lG kJ kD kD kD kD -nr +kD +kD +lD +iF +lB +lp +lp +lw +iF +kJ +dI +kJ +ab ab ab ab @@ -9183,30 +9369,30 @@ aa "} (15,1,1) = {" aa -nr -kJ -kJ -kJ -kJ -kJ -kJ -ll -ll -ls -ll -ll -kJ -kJ -kJ -kJ -kJ -kJ -kJ +iF +lp +lp +lW +lp +iF +lT +lI kD kD kD -kD -nr +kJ +lI +kJ +iF +lw +lx +lw +lw +iF +kJ +iy +kJ +ab ab ab ab @@ -9441,30 +9627,30 @@ aa "} (16,1,1) = {" aa -nr +iF +iF +lp +iF +iF +iF +iF +iF +iF +jU +jU +iF +iF +iF +iF +iF +iF +iF +iF +iF kJ +dI kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kD -kD -kD -kD -nr +ab ab ab ab @@ -9699,30 +9885,30 @@ aa "} (17,1,1) = {" aa -nr +iF +lp +lp +ll +lp +iF +lz +lS +lp +lp +lp +lp +lw +lw +iF kJ kJ kJ kJ kJ kJ +dI kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kD -kD -kD -kD -nr +ab ab ab ab @@ -9957,30 +10143,30 @@ aa "} (18,1,1) = {" aa -nr +iF +lm +lp +lr +lp +iF +lm +lp +lp +lp +lr +lp +lp +lE +iF kJ +ly +iE +iE +iE +iE +iD kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kD -kD -kD -kD -nr -nr +ab ab ab ab @@ -10215,30 +10401,30 @@ aa "} (19,1,1) = {" aa +iF +lp +lp +lp +lp +lp +lp +lp +lp +lp +lp +lp +lp +lw +iF +kJ +dI kJ kJ kJ kJ kJ kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kD -kD -kD -kD -kD -kD -nr -nr -nr +ab ab ab ab @@ -10473,30 +10659,30 @@ aa "} (20,1,1) = {" aa +iF +lp +lp +lW +lp +iF +lw +lx +lw +lw +lw +lw +lx +lw +iF kJ +iy kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kD -kD -kD -kD -kD -kD -kD -nr -nr -nr -nr +ab +ab +ab +ab +ab +ab ab ab ab @@ -10731,28 +10917,28 @@ aa "} (21,1,1) = {" aa -kD +iF +jU +jU +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF +iF kJ +dI kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kJ -kD -kD -kD -kD -kD -kD -kD -kD -nr -nr -nr +ab +ab +ab +ab ab ab ab @@ -10989,28 +11175,28 @@ aa "} (22,1,1) = {" aa -kD -kD kJ kJ kJ kJ kJ -kD -kD -kD -kD -kD -kD -kD -kD -nr -nr -nr -nr -nr -nr -nr +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +dI +kJ +ab +ab +ab +ab ab ab ab @@ -11247,24 +11433,24 @@ aa "} (23,1,1) = {" aa -kD -kD -kD -kD -kD -kD -kD -kD -kD -kD -kD -kD -kD -nr -nr -nr -ab -ab +iE +iE +iE +iE +iE +iE +iE +iE +iE +iE +iE +iE +iE +iE +iE +iE +iD +kJ ab ab ab @@ -11505,24 +11691,24 @@ aa "} (24,1,1) = {" aa -kD -kD -kD -kD -kD -kD -kD -kD -kD -kD -kD -nr -nr -nr -nr -nr -ab -ab +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ +kJ ab ab ab @@ -11763,22 +11949,22 @@ aa "} (25,1,1) = {" aa -kD -kD -kD -kD -kD -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr -nr +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab ab ab ab @@ -12021,12 +12207,12 @@ aa "} (26,1,1) = {" aa -kD -kD -nr -nr -nr -nr +ab +ab +ab +ab +ab +ab ab ab ab @@ -12279,12 +12465,12 @@ aa "} (27,1,1) = {" aa -nr -nr -nr -nr -nr -nr +ab +ab +ab +ab +ab +ab ab ab ab