diff --git a/aurorastation.dme b/aurorastation.dme index 87c1dc33779..afc6f214057 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1507,8 +1507,10 @@ #include "code\modules\ghostroles\spawner\human\merchant.dm" #include "code\modules\ghostroles\spawner\human\pra.dm" #include "code\modules\ghostroles\spawner\human\visitor.dm" +#include "code\modules\ghostroles\spawner\human\zenghu.dm" #include "code\modules\ghostroles\spawner\simplemob\maintdrone.dm" #include "code\modules\ghostroles\spawner\simplemob\rat.dm" +#include "code\modules\ghostroles\spawner\simplemob\spider.dm" #include "code\modules\ghostroles\spawnpoint\spawnpoint.dm" #include "code\modules\ghosttrap\trap.dm" #include "code\modules\global_listener\devices.dm" @@ -1952,6 +1954,7 @@ #include "code\modules\mob\living\simple_animal\hostile\pra.dm" #include "code\modules\mob\living\simple_animal\hostile\russian.dm" #include "code\modules\mob\living\simple_animal\hostile\sarlacc.dm" +#include "code\modules\mob\living\simple_animal\hostile\spider_queen.dm" #include "code\modules\mob\living\simple_animal\hostile\syndicate.dm" #include "code\modules\mob\living\simple_animal\hostile\tree.dm" #include "code\modules\mob\living\simple_animal\hostile\commanded\_command_defines.dm" diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index cb7ea19db1c..08e0c09c119 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -60,7 +60,7 @@ /obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if(air_group || (height==0)) return 1 - if(istype(mover, /mob/living/simple_animal/hostile/giant_spider)) + if(istype(mover, /mob/living/simple_animal/hostile/giant_spider) || istype(mover,/mob/living/simple_animal/hostile/spider_queen)) return 1 else if(istype(mover, /mob/living)) if(prob(50)) diff --git a/code/modules/ghostroles/spawner/base.dm b/code/modules/ghostroles/spawner/base.dm index 975e9809190..9ff5a517a79 100644 --- a/code/modules/ghostroles/spawner/base.dm +++ b/code/modules/ghostroles/spawner/base.dm @@ -27,6 +27,7 @@ var/mob_name_pick_message = "Pick a name." var/mob_name_prefix = null //The prefix that should be applied to the mob (i.e. CCIAA, Tpr., Cmdr.) var/mob_name_suffix = null //The suffix that should be applied to the mob name + var/away_site = FALSE /datum/ghostspawner/New() . = ..() @@ -152,3 +153,18 @@ for(var/i in SSghostroles.spawnpoints) SSghostroles.update_spawnpoint_status_by_identifier(i) return TRUE + +/datum/ghostspawner/simplemob/spawn_mob(mob/user) + //Select a spawnpoint (if available) + var/turf/T = select_spawnpoint() + var/mob/living/simple_animal/S + if (T) + S = new spawn_mob(T) + else + to_chat(user, "Unable to find any spawn point. ") + + if(S) + announce_ghost_joinleave(user, 0, "They are now a [name].") + S.ckey = user.ckey + + return S \ No newline at end of file diff --git a/code/modules/ghostroles/spawner/human/kataphract.dm b/code/modules/ghostroles/spawner/human/kataphract.dm index 2f3e7b4ed45..19a7782f2ce 100644 --- a/code/modules/ghostroles/spawner/human/kataphract.dm +++ b/code/modules/ghostroles/spawner/human/kataphract.dm @@ -4,7 +4,7 @@ desc = "Display honour in everything you do. Be an excellent person." tags = list("External") - enabled = TRUE + enabled = FALSE spawnpoints = list("kataphract") req_perms = null max_count = 2 @@ -22,6 +22,7 @@ special_role = "Kataphract-Hopeful" respawn_flag = null extra_languages = list(LANGUAGE_UNATHI, LANGUAGE_AZAZIBA) + away_site = TRUE /datum/ghostspawner/human/kataphract/klax short_name = "kataphract_hop_klax" diff --git a/code/modules/ghostroles/spawner/human/pra.dm b/code/modules/ghostroles/spawner/human/pra.dm index 7dc6415edec..38f56f55345 100644 --- a/code/modules/ghostroles/spawner/human/pra.dm +++ b/code/modules/ghostroles/spawner/human/pra.dm @@ -4,7 +4,7 @@ desc = "Protect the People's Republic of Adhomai's possessions on space." tags = list("External") - enabled = TRUE + enabled = FALSE spawnpoints = list("pra_cosmonaut") req_perms = null max_count = 3 @@ -20,6 +20,7 @@ respawn_flag = null extra_languages = list(LANGUAGE_SIIK_MAAS) uses_species_whitelist = FALSE + away_site = TRUE /datum/ghostspawner/human/pra_cosmonaut/commissar short_name = "pra_commissar" diff --git a/code/modules/ghostroles/spawner/human/zenghu.dm b/code/modules/ghostroles/spawner/human/zenghu.dm new file mode 100644 index 00000000000..f142bb6e963 --- /dev/null +++ b/code/modules/ghostroles/spawner/human/zenghu.dm @@ -0,0 +1,32 @@ +/datum/ghostspawner/human/zenghu_survivor + short_name = "zenghu" + name = "Zeng-Hu Survivor" + desc = "Survive whatever might lurk in the Zeng-Hu installation." + tags = list("External") + + enabled = FALSE + spawnpoints = list("zenghu") + req_perms = null + max_count = 3 + + away_site = TRUE + + outfit = /datum/outfit/admin/zenghu_survivor + possible_species = list("Human", "Off-Worlder Human", "Skrell", "Vaurca Worker", "Vaurca Warrior", "Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") + possible_genders = list(MALE,FEMALE) + allow_appearance_change = APPEARANCE_PLASTICSURGERY + + assigned_role = "Zeng-Hu Survivor" + special_role = "Zeng-Hu Survivor" + respawn_flag = null + uses_species_whitelist = TRUE + +/datum/outfit/admin/zenghu_survivor + name = "Zeng-Hu Employee" + + uniform = /obj/item/clothing/under/rank/zeng + shoes = /obj/item/clothing/shoes/white + belt = /obj/item/storage/belt/utility/full + id = /obj/item/card/id/zeng_hu + r_hand = /obj/item/device/flashlight + diff --git a/code/modules/ghostroles/spawner/simplemob/spider.dm b/code/modules/ghostroles/spawner/simplemob/spider.dm new file mode 100644 index 00000000000..fe2d6702780 --- /dev/null +++ b/code/modules/ghostroles/spawner/simplemob/spider.dm @@ -0,0 +1,15 @@ +/datum/ghostspawner/simplemob/spider_queen + short_name = "spiderqueen" + name = "Spider Queen" + desc = "Be a spooky giant spider." + tags = list("External") + spawnpoints = list("spiderqueen") + + max_count = 1 + enabled = FALSE + + away_site = TRUE + + respawn_flag = null + + spawn_mob = /mob/living/simple_animal/hostile/spider_queen \ No newline at end of file diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 6dfac6fe3dc..1b78fa8038b 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -6,6 +6,7 @@ blocks_air = 1 density = 1 gender = PLURAL + opacity = 1 // This is a global list so we can share the same list with all mineral turfs; it's the same for all of them anyways. var/list/mineral_can_smooth_with = list( @@ -429,7 +430,7 @@ var/list/mineral_can_smooth_with = list( //Add some rubble, you did just clear out a big chunk of rock. ChangeTurf(mined_turf) - + if(rand(1,500) == 1) visible_message("An old dusty crate was buried within!") new /obj/structure/closet/crate/secure/loot(src) diff --git a/code/modules/mob/living/simple_animal/hostile/spider_queen.dm b/code/modules/mob/living/simple_animal/hostile/spider_queen.dm new file mode 100644 index 00000000000..d3e6de9a148 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/spider_queen.dm @@ -0,0 +1,110 @@ +/mob/living/simple_animal/hostile/spider_queen + name = "colossal spider" + desc = "A monstrous eight-legged creature." + icon = 'icons/mob/npc/spider_queen.dmi' + icon_state = "spider_queen" + icon_living = "spider_queen" + icon_dead = "spider_queen_dead" + speak_emote = list("chitters") + emote_hear = list("chitters") + speak_chance = 5 + turns_per_move = 5 + see_in_dark = 10 + see_invisible = SEE_INVISIBLE_NOLIGHTING + meat_type = /obj/item/reagent_containers/food/snacks/xenomeat + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "pokes" + stop_automated_movement_when_pulled = 0 + maxHealth = 700 + health = 700 + melee_damage_lower = 25 + melee_damage_upper = 30 + heat_damage_per_tick = 20 + cold_damage_per_tick = 20 + faction = "spiders" + + mob_swap_flags = HUMAN|SIMPLE_ANIMAL|SLIME|MONKEY + mob_push_flags = ALLMOBS + + attacktext = "bit" + attack_sound = 'sound/weapons/bite.ogg' + + pass_flags = PASSTABLE + move_to_delay = 6 + speed = 1 + mob_size = 15 + environment_smash = 2 + + pixel_x = -16 + pixel_y = -16 + + attack_emote = "skitters toward" + emote_sounds = list('sound/effects/creatures/spider_critter.ogg') + + tameable = FALSE + density = FALSE + + var/hovering = FALSE + +/mob/living/simple_animal/hostile/spider_queen/Initialize() + . = ..() + add_spell(new /spell/targeted/ceiling_climb, "const_spell_ready") + +/mob/living/simple_animal/hostile/spider_queen/update_icon() + if(hovering) + icon_state = "spider_queen_shadow" + else + icon_state = initial(icon_state) + ..() + +/mob/living/simple_animal/hostile/spider_queen/UnarmedAttack(var/atom/A, var/proximity) + if(hovering) + return + ..() + +/spell/targeted/ceiling_climb + name = "Ceiling Climbing" + desc = "Allows the spider queen to walk on the ceiling, becoming untargetable." + feedback = "CEIB" + range = 0 + spell_flags = INCLUDEUSER + charge_max = 1200 //2 minute + max_targets = 1 + + invocation_type = SpI_EMOTE + invocation = "climbs on the ceiling." + + hud_state = "spider_climb" + +/spell/targeted/ceiling_climb/cast(mob/target,var/mob/living/user as mob) + ..() + if(istype(user, /mob/living/simple_animal/hostile/spider_queen)) + var/mob/living/simple_animal/hostile/spider_queen/M = user + if(M.hovering) + return FALSE + M.hovering = TRUE + M.mouse_opacity = FALSE + M.speed = -1 + M.update_icon() + M.pass_flags = PASSTABLE | PASSMOB + M.layer = BELOW_MOB_LAYER + addtimer(CALLBACK(src, .proc/do_landing, M), 1 MINUTE) + return TRUE + else + return FALSE + +/spell/targeted/ceiling_climb/proc/do_landing(var/mob/living/simple_animal/hostile/spider_queen/S) + S.hovering = FALSE + S.mouse_opacity = TRUE + S.speed = initial(S.speed) + S.update_icon() + S.pass_flags = PASSTABLE + S.layer = initial(S.layer) + var/turf/target_turf = get_turf(S) + if(target_turf) + S.visible_message("\The [S] lands on the [target_turf]!") + for(var/mob/living/M in target_turf) + M.apply_damage(50, BRUTE) + M.apply_effect(6, STUN, blocked) + return TRUE \ No newline at end of file diff --git a/code/modules/shuttles/departmental.dm b/code/modules/shuttles/departmental.dm index 4bdaf0f8e62..93372e2c977 100644 --- a/code/modules/shuttles/departmental.dm +++ b/code/modules/shuttles/departmental.dm @@ -16,6 +16,18 @@ req_access = list(access_research) circuit = /obj/item/circuitboard/research_shuttle +/datum/shuttle/ferry/research + var/triggered_away_sites = FALSE + +/datum/shuttle/ferry/research/launch() + . = ..() + if(!triggered_away_sites) + for(var/s in SSghostroles.spawners) + var/datum/ghostspawner/G = SSghostroles.spawners[s] + if(G.away_site) + G.enable() + triggered_away_sites = TRUE + /obj/machinery/computer/shuttle_control/merchant name = "merchant shuttle control console" req_access = list(access_merchant) diff --git a/html/changelogs/alberyk-spaceruinstuff.yml b/html/changelogs/alberyk-spaceruinstuff.yml new file mode 100644 index 00000000000..41cd4a028e5 --- /dev/null +++ b/html/changelogs/alberyk-spaceruinstuff.yml @@ -0,0 +1,7 @@ +author: Alberyk, Kyres1 + +delete-after: True + +changes: + - rscadd: "Added new space ruin." + - tweak: "Space ruin ghost roles will now only open when the research shuttle is launched from the station." \ No newline at end of file diff --git a/icons/mob/npc/spider_queen.dmi b/icons/mob/npc/spider_queen.dmi new file mode 100644 index 00000000000..711617582fb Binary files /dev/null and b/icons/mob/npc/spider_queen.dmi differ diff --git a/icons/mob/screen/spells.dmi b/icons/mob/screen/spells.dmi index 83c0c87d365..b13af31e2ea 100644 Binary files a/icons/mob/screen/spells.dmi and b/icons/mob/screen/spells.dmi differ diff --git a/maps/_common/areas/shuttles.dm b/maps/_common/areas/shuttles.dm index c0aee1acbd2..d4760c7694f 100644 --- a/maps/_common/areas/shuttles.dm +++ b/maps/_common/areas/shuttles.dm @@ -224,6 +224,11 @@ station_area = 0 base_turf = /turf/simulated/floor/reinforced +/area/shuttle/research/transit + name = "\improper Hyperspace" + icon_state = "shuttle" + base_turf = /turf/space/transit/north + /area/shuttle/legion name = "\improper Foreign Legion Shuttle" flags = RAD_SHIELDED | SPAWN_ROOF diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index d356d1c31a4..b2b9dac17a6 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -2817,9 +2817,6 @@ }, /turf/space/transit/north/shuttlespace_ns8, /area/template_noop) -"agZ" = ( -/turf/unsimulated/wall/riveted, -/area/prison/solitary) "aha" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2841,35 +2838,6 @@ }, /turf/space/transit/north/shuttlespace_ns6, /area/template_noop) -"ahc" = ( -/obj/structure/bed, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/prison/solitary) -"ahd" = ( -/turf/unsimulated/floor{ - name = "plating" - }, -/area/prison/solitary) -"ahe" = ( -/obj/effect/decal/cleanable/cobweb2, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/prison/solitary) -"ahf" = ( -/obj/structure/bed, -/turf/unsimulated/floor{ - icon_state = "floorscorched2" - }, -/area/prison/solitary) -"ahg" = ( -/obj/effect/decal/cleanable/blood, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/prison/solitary) "ahh" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2881,24 +2849,6 @@ }, /turf/space/transit/north/shuttlespace_ns4, /area/template_noop) -"ahi" = ( -/obj/effect/landmark{ - name = "prisonwarp" - }, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/prison/solitary) -"ahj" = ( -/turf/unsimulated/floor{ - icon_state = "panelscorched" - }, -/area/prison/solitary) -"ahk" = ( -/turf/unsimulated/floor{ - icon_state = "platingdmg3" - }, -/area/prison/solitary) "ahl" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2933,33 +2883,6 @@ }, /turf/template_noop, /area/template_noop) -"aho" = ( -/obj/structure/bed, -/turf/unsimulated/floor{ - icon_state = "panelscorched" - }, -/area/prison/solitary) -"ahp" = ( -/obj/structure/bed, -/obj/effect/decal/cleanable/cobweb, -/turf/unsimulated/floor{ - name = "plating" - }, -/area/prison/solitary) -"ahq" = ( -/obj/effect/decal/cleanable/blood, -/turf/unsimulated/wall/riveted, -/area/prison/solitary) -"ahr" = ( -/turf/unsimulated/floor{ - icon_state = "platingdmg1" - }, -/area/prison/solitary) -"ahs" = ( -/turf/unsimulated/floor{ - icon_state = "floorscorched2" - }, -/area/prison/solitary) "aht" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -21828,6 +21751,19 @@ /obj/item/storage/wallet/random, /turf/simulated/floor/carpet/blue, /area/shuttle/merchant/start) +"ckY" = ( +/obj/effect/step_trigger/teleporter/random{ + affect_ghosts = 1; + name = "escapeshuttle_leave"; + teleport_x = 25; + teleport_x_offset = 245; + teleport_y = 25; + teleport_y_offset = 245; + teleport_z = 6; + teleport_z_offset = 6 + }, +/turf/template_noop, +/area/space) "clq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning{ @@ -30887,6 +30823,19 @@ icon_state = "dark" }, /area/centcom/legion/hangar5) +"vpq" = ( +/obj/effect/step_trigger/teleporter/random{ + affect_ghosts = 1; + name = "escapeshuttle_leave"; + teleport_x = 25; + teleport_x_offset = 245; + teleport_y = 25; + teleport_y_offset = 245; + teleport_z = 6; + teleport_z_offset = 6 + }, +/turf/space/transit/north/shuttlespace_ns8, +/area/space) "vpD" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -31926,6 +31875,9 @@ icon_state = "floor" }, /area/centcom/legion/hangar5) +"xnL" = ( +/turf/space/transit/north/shuttlespace_ns13, +/area/shuttle/research/transit) "xqK" = ( /turf/simulated/floor/tiled, /area/merchant_station/warehouse) @@ -58409,36 +58361,36 @@ aaq aat aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ckY +ckY +ckY +ahn +ahn +ahn aaM aaM aaM @@ -58666,36 +58618,36 @@ aar aau aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -58923,36 +58875,36 @@ aas aav aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -59180,36 +59132,36 @@ aat aaw aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -59437,36 +59389,36 @@ aau abf aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -59694,36 +59646,36 @@ aav abg aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -59951,36 +59903,36 @@ aaw abh aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -60208,36 +60160,36 @@ abf abi aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -60465,36 +60417,36 @@ abg abm aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -60722,36 +60674,36 @@ abh abj aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -60979,36 +60931,36 @@ abi abk aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aaQ +aiy +aiy +aiy +aiy +vpq +vpq +vpq +vpq +vpq +vpq +vpq +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -61236,36 +61188,36 @@ abm abl aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aaQ +aiy +aiy +aiy +aiy +vpq +xnL +xnL +xnL +xnL +xnL +vpq +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -61493,36 +61445,36 @@ abj aaq aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aaQ +aiy +aiy +aiy +aiy +vpq +xnL +xnL +xnL +xnL +xnL +vpq +aiy +vpq +vpq +vpq +vpq +vpq +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -61750,36 +61702,36 @@ abk aar aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aaQ +aiy +aiy +aiy +vpq +vpq +xnL +xnL +xnL +xnL +xnL +xnL +vpq +vpq +xnL +xnL +xnL +vpq +vpq +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -62007,36 +61959,36 @@ abl aas aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aae +vpq +vpq +vpq +vpq +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +vpq +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -62264,36 +62216,36 @@ aaq aat aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aae +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +vpq +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -62521,36 +62473,36 @@ aar aau aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aae +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +vpq +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -62778,36 +62730,36 @@ aas aav aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aae +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +vpq +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -63035,36 +62987,36 @@ aat aaw aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aae +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +vpq +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -63292,36 +63244,36 @@ aau abf aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aae +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +vpq +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -63549,36 +63501,36 @@ aav abg aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aae +vpq +vpq +vpq +vpq +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +xnL +vpq +aiy +aiy +aaQ +aaQ +ahn aaM aaM aaM @@ -63806,51 +63758,51 @@ aaI aaI aaI aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aaQ +aiy +aiy +aiy +vpq +vpq +xnL +xnL +xnL +xnL +xnL +xnL +vpq +vpq +xnL +xnL +xnL +vpq +vpq +aiy +aiy +aaQ +aaQ +ahn aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -agZ -agZ -agZ -agZ -agZ -agZ -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ajH +jaZ +jaZ +jaZ +jaZ +jaZ +jaZ +jaZ +jaZ +jaZ +jaZ +jaZ +ajH aaM aaM aaM @@ -64063,51 +64015,51 @@ abh abj aaI aaM +ahn +aaQ +aaQ +aaQ +aaQ +aiy +aaQ +aiy +aiy +aiy +aiy +vpq +xnL +xnL +xnL +xnL +xnL +vpq +vpq +vpq +vpq +vpq +vpq +vpq +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -agZ -ahc -ahi -agZ -aho -ahi -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ajH +aVj +ake +ake +ake +ake +ake +ake +ake +ake +aVr +akw +ajH aaM aaM aaM @@ -64320,51 +64272,51 @@ abi abk aaI aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +vpq +xnL +xnL +xnL +xnL +xnL +vpq +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -agZ -ahd -ahg -agZ -ahk -ahd -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +jaZ +ajQ +akf +akl +akq +akq +akq +akr +akr +akT +ake +aVr +ajH aaM aaM aaM @@ -64577,51 +64529,51 @@ abm abl aaI aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +vpq +vpq +vpq +vpq +aae +aae +aae +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -agZ -agZ -agZ -agZ -agZ -ahq -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +jaZ +ajR +akf +akl +akr +akr +akr +akr +akr +akr +akZ +akw +ajH aaM aaM aaM @@ -64834,51 +64786,51 @@ abj aaq aaI aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aaQ +aaQ +ahn aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -agZ -ahc -ahi -agZ -ahc -ahi -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +jaZ +ajS +akf +akl +aks +aks +aks +akr +akr +akU +ake +aVs +ajH aaM aaM aaM @@ -65091,51 +65043,51 @@ abk aar aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -agZ -ahe -ahj -agZ -ahk -ahd -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +ckY +aWP +aWP +jaZ +aVk +ake +ake +ake +ake +ake +akJ +akJ +ake +aVs +akw ajH -jaZ -jaZ -jaZ -jaZ -jaZ -jaZ -jaZ -jaZ -jaZ -jaZ -jaZ -ajH -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -65348,51 +65300,51 @@ abl aas aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -agZ -agZ -agZ -agZ -agZ -agZ -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -ajH -aVj -ake -ake -ake -ake -ake -ake -ake -ake -aVr +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +ckY +aWP +aWP +ajJ +ajJ +ajJ +ajJ +ajJ akw -ajH -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +akH +akK +akK +akH +akw +akw +ajJ aaM aaM aaM @@ -65605,51 +65557,51 @@ aaq aat aaI aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +ckY +aWP +aWP aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -agZ -ahf -ahi -agZ -ahp -ahi -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -jaZ -ajQ -akf -akl -akq -akq -akq -akr -akr -akT -ake -aVr -ajH -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ajJ +akm +ajJ +akx +akx +akL +akL +ajJ +ajJ +ajJ +ajJ aaM aaM aaM @@ -65862,51 +65814,51 @@ aar aau aaI aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +ckY +aWP +aWP aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -agZ -ahg -ahd -agZ -ahd -ahr -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -jaZ -ajR -akf -akl -akr -akr -akr -akr -akr -akr -akZ -akw -ajH -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ajJ +akn +ajJ +aky +akB +akB +akB +akB +akB +akB +ajJ aaM aaM aaM @@ -66119,51 +66071,51 @@ aas aav aaI aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +ckY +aWP +aWP aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -agZ -agZ -agZ -agZ -agZ -agZ -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -jaZ -ajS -akf -akl -aks -aks -aks -akr -akr -akU -ake -aVs -ajH -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ajJ +ajJ +ajJ +akz +akB +akB +akB +akB +akB +akB +ajJ aaM aaM aaM @@ -66376,51 +66328,51 @@ aat aaw aaI aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +ckY +aWP +aWP aaM aaM aaM aaM -aaM -aaM -aaM -aaM -agZ -ahc -ahi -agZ -ahc -ahi -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -jaZ -aVk -ake -ake -ake -ake -ake -akJ -akJ -ake -aVs -akw -ajH -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ajJ +akA +akA +akA +akB +akA +akA +akA +ajJ aaM aaM aaM @@ -66633,51 +66585,51 @@ aau abf aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -agZ -ahd -ahk -agZ -ahg -ahs -agZ -aaM -aaM -aaM -aaM -aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +ckY +aWP +aWP aaM aaM aaM aaM ajJ +akB +akB +akB +akB +akB +akB +akB ajJ -ajJ -ajJ -ajJ -akw -akH -akK -akK -akH -akw -akw -ajJ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -66890,51 +66842,51 @@ aav abg aaI aaM +ahn +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +aiy +aiy +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aaQ +aiy +aiy +aiy +aiy +aiy +ckY +aWP +aWP aaM aaM aaM aaM -aaM -aaM -aaM -aaM -agZ -agZ -agZ -agZ -agZ -agZ -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -ajJ -akm ajJ akx akx -akL -akL +akx +akR +akx +akx +akx ajJ -ajJ -ajJ -ajJ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -67147,51 +67099,51 @@ aaw abh aaI aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ahn +ckY +ckY +ckY +ckY +ckY +ckY +aWP +aWP aaM aaM aaM aaM ajJ -akn +akC +akB +akC +akB +akC +akB +akC ajJ -aky -akB -akB -akB -akB -akB -akB -ajJ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -67428,27 +67380,27 @@ aaM aaM aaM aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aaM +aaM aaM aaM ajJ +akD +akB +akD +akB +akD +akB +akD ajJ -ajJ -akz -akB -akB -akB -akB -akB -akB -ajJ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -67685,18 +67637,26 @@ aaM aaM aaM aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM aaM ajJ -akA -akA -akA akB -akA -akA -akA +akB +akB +akB +akB +akB +akB ajJ aaM aaM @@ -67707,14 +67667,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM asM asM iAP @@ -67942,6 +67894,14 @@ aaM aaM aaM aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -67964,14 +67924,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM asM asM iAP @@ -68199,27 +68151,27 @@ aaM aaM aaM aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM aaM ajJ -akx -akx -akx -akR -akx -akx -akx ajJ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ajJ +ajJ +ajJ +ajJ +ajJ +ajJ +ajJ aaM aaM aaM @@ -68438,37 +68390,37 @@ aaM aaM aaM aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -ajJ -akC -akB -akC -akB -akC -akB -akC -ajJ +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -68695,37 +68647,37 @@ aaM aaM aaM aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -ajJ -akD -akB -akD -akB -akD -akB -akD -ajJ +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -68952,37 +68904,37 @@ aaM aaM aaM aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -ajJ -akB -akB -akB -akB -akB -akB -akB -ajJ +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -69209,37 +69161,37 @@ aaM aaM aaM aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -ajJ -akB -akB -akB -akB -akB -akB -akB -ajJ +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -69466,37 +69418,37 @@ aaM aaM aaM aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -ajJ -ajJ -ajJ -ajJ -ajJ -ajJ -ajJ -ajJ -ajJ +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -69723,23 +69675,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -69980,23 +69932,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -70237,23 +70189,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -70494,23 +70446,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -70751,23 +70703,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -71008,23 +70960,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -71265,23 +71217,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM @@ -71522,23 +71474,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP +aWP aaM aaM aaM diff --git a/maps/aurora/code/aurora_shuttles.dm b/maps/aurora/code/aurora_shuttles.dm index 332ba8d6e85..c4a6fd4cd71 100644 --- a/maps/aurora/code/aurora_shuttles.dm +++ b/maps/aurora/code/aurora_shuttles.dm @@ -168,16 +168,18 @@ START_PROCESSING(shuttle_controller, legion) //Away Site shuttle. - - shuttle = new() - shuttle.location = 0 - shuttle.warmup_time = 10 - shuttle.area_station = locate(/area/shuttle/research/station) - shuttle.area_offsite = locate(/area/shuttle/research/away) - shuttle.docking_controller_tag = "science_shuttle" - shuttle.dock_target_station = "science_bridge" - shuttles["Research"] = shuttle - START_PROCESSING(shuttle_controller, shuttle) + var/datum/shuttle/ferry/research/research = new() + research.location = 0 + research.warmup_time = 10 + research.area_station = locate(/area/shuttle/research/station) + research.area_offsite = locate(/area/shuttle/research/away) + research.area_transition = locate(/area/shuttle/research/transit) + research.transit_direction = NORTH + research.move_time = 85 + research.docking_controller_tag = "science_shuttle" + research.dock_target_station = "science_bridge" + shuttles["Research"] = research + START_PROCESSING(shuttle_controller, research) // Distress Team Shuttle