From 73f600a69863d74dc69234895989ff52d3728866 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 24 Jan 2020 19:36:30 -0300 Subject: [PATCH] Adds new space ruin content and changes how space ruin away roles works (#8058) This pr adds a new cool space ruin made by kyres, replacing the listening outpost and the sol corvette, that were lame. This space ruin has two ghost roles. This pr also makes so that space ruin sites only open if the research shuttle is launched to an away site, they will be closed otherwise. The research shuttle also has a transit time and area now. --- aurorastation.dme | 3 + code/game/objects/effects/spiders.dm | 2 +- code/modules/ghostroles/spawner/base.dm | 16 + .../ghostroles/spawner/human/kataphract.dm | 3 +- code/modules/ghostroles/spawner/human/pra.dm | 3 +- .../ghostroles/spawner/human/zenghu.dm | 32 + .../ghostroles/spawner/simplemob/spider.dm | 15 + code/modules/mining/mine_turfs.dm | 3 +- .../simple_animal/hostile/spider_queen.dm | 110 + code/modules/shuttles/departmental.dm | 12 + html/changelogs/alberyk-spaceruinstuff.yml | 7 + icons/mob/npc/spider_queen.dmi | Bin 0 -> 8018 bytes icons/mob/screen/spells.dmi | Bin 44165 -> 44496 bytes maps/_common/areas/shuttles.dm | 5 + maps/aurora/aurora-1_centcomm.dmm | 3222 ++++++++--------- maps/aurora/code/aurora_shuttles.dm | 22 +- 16 files changed, 1806 insertions(+), 1649 deletions(-) create mode 100644 code/modules/ghostroles/spawner/human/zenghu.dm create mode 100644 code/modules/ghostroles/spawner/simplemob/spider.dm create mode 100644 code/modules/mob/living/simple_animal/hostile/spider_queen.dm create mode 100644 html/changelogs/alberyk-spaceruinstuff.yml create mode 100644 icons/mob/npc/spider_queen.dmi 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 0000000000000000000000000000000000000000..711617582fbb55979d6ba1b63dfbf0e4d379c38c GIT binary patch literal 8018 zcmb`sXH-*76fT^EC{=n>I?}tmD82WNNPy6#2q;Pmz4zX$2m}EI>7w)!sx+kw(gcA> zZwWmi-1vR>&t3Q4e|N2OX4dREGi%PCJ+q%@?*tpouw5&B@!r%hdzs>iz}*@Gs06`%Ka&Myv5h`hq`nu_?ZHJ6GMJTopsY zonB4sV(DEr*y88mu~V`UfzFY7Qqior(sa7X<@wvmdqQuERkIToB^ z)j7OR3u7@+0YX|=`C$6kS?M+=QlZmpIW3P+i*AiuJ8E5=p}%ja^}bd>cRPd7_wMPO zkJS3MWrr4l1k*o^nn1fT;{X7whqjusiGSgN^+ejnw;Y_raiEa7SM>efd#O~0ZW8I0 z5w2`=$NEpMUlyM?dPBeWzD0w2uMLTU3z8z(i5j%Yzu5$jsmC#c^uI?%#CRV|F@9sR z<_V8mO7JaU`SjuQWc>ML=zfJU9h56c(V~XJMN6Mtgrk!-c@hV-6vqg2Y!4 zzn;EQ9dnSm#DiP_eM&5MxO&-hV!J7q|5bFN@|4im+E0H~v+SvEvvqV8%W5d3VGlJl zk`XO4G9zHm{mWHUJ)P$C+H)Rke?hsHkyZ+-rG=VNhRW_qnvyxSy zs0SASiOZQCTEOJd1<=Z>VF#8t;s^q4p9M}SJZA&}?nVKxZ$it7V9EHA^FH%FMv+|m zrP%V4S;P*EWCAV5NLCs;?YnyMVd-kiPV5(F)^4HFXGgJJpc;>CY7{$BX)i^;*n>+k zGAb~Td1&F++};@{cgcLWJ%Iib(b>l(+qq-vTdhl=dcP`1gaE7|LEk+ZXzHjbuZO z4k+9##;dgPy06Y&y|}4N(TXjfU?*z+`&c~l_(@c+-55=NraW4O(GL@>gx{?sds)EL zosB5b4zcAyOg9@p@Ma?BgZFgIuz)J7gmP#OiXyImJ1vWY*b%% zKfF%4SPeVE7q=HjxZk=D9e6;;y%!;h4|>XhPuq;Ilav0tlI|BvR*4eOnxwsgjEZL3 zG{Z0NZvh9-!3MDVQ}}I+?dMPcu_^?;M?VTr19s+Ue47PR60-H=>Tayf8PY3`HuFO1 zWo+rV#JIyK!N(zN%9OLFp}%?Su$(*mMS`P!is}@@yiKKU0;OYhBQTl4ckbN@Ok3W7 z9?hO1*E)3pP<+(Hj7?`*&x;pPG9*@fy{`=6>rEAgRAA-PB9X5yECVo31W|CN`CVeY z5z%&kW9HwfMjx&!Uyp~W z&nro(q_>_Lx|!z`84vc!wlxVI@+{S3Fw^7o>{$8c)s}p|wd%@-mxT;Ab53ms3s7U% zuDn}$dHpwz1hKU%-{9QD(NZqX5sq^c7dI)y1$*tUihDhn3A0AP%9LwSvVH(SMMZ`G z%}7>?0|JMwZwP{M{QTW$&eoKZ*3ta1D zYMk6`*aUj=P0K^-uS*Bpl7|c1t5rT^|Ik$1gM&XqLqpreSeoC` zvIGF3`M_~8?+4j}z_{-zAs$=g3c;sDVF5c3?3N7^1vv!}5O#Rx(b(cQb$m*Dd#!kz zG!MU}lad?wx1vUg(zAyqJ9nms>%S~dDC<1^fGwM<bYzUBB6cJZ2n78$G+4j6 zxv33_Vpr-|`7Oi1EAyd{0MP15pcsUtTfRQG#9nTKCv3LY%%2(5Qfkp*5_j6BTxK~X z4I;_nRD(l9Q{l^<0q>Vvk3o3l`K|TQU^oBjP|67FTUv z9>|Isjb*k7LlM{CMmgB%)+nVIVV$u|2Td(2x0?X z4qh>bO=t6G5gI`i?K(adMU&Lq4#@-jQD8XWatv<}h+@TFMAxZ+O&HE>nZSdhM{>TN zK<^iqpG^#dRwkU*$RxA~qW3#Bj<9OaC>w9)O9#yoQS)zFTIgE_TH)-YJ@s@RJKTIQ z&SQrp8-S8y`r?fOU+WuH_xEBMfT~|+&Wa+mfKzgE0N{dE@f+`I0D&>?%TXw4v{2L= zJxddzLiJEjyFvRpspECA(9ZIk#A4D<*$-Mxej&XQkY4=v;3gqZA^L5YjQ8PE-p)<)NgiMZ$}!Sz`aKgxupESCbl%Uhln3!AzZBb1$=kUDLslSz z)*4UEDl9Vd?i0kn+#1Wa{m`lX9zx%jGPE%_HI-rV$0_~C9hW*TYULryfpMV8=lW#N zU^W@)29^uzZkMJf3Xs=3Ql1R(YX=$nae-S8DK*4u8V;5NcRZGJcev$(CT7|WxJbNA z(I}g<|E$!qG-&@hzIh~DXyp1GD8|kcDoB_7o9bH*TofBmxk4k_POTiZ6JUcJbZ@6r zE&A$%Qi~Kwr)_6uVX3`1KleDdZl3}VlkVe9dVAYNo;9uMZ^*ipk}tti>TFgeIt=;U zsM=(3T>cY+@CCQn1vh%(({%OnjeueXr@%^KVy?P|#FFo%ip9i&`H;}v3p=rRTx0mr zgl>&GEq568U$nGIqRxCB*`DFryt0*bTGY8t!+0-1?V^+V#h3f|?!V}OucxBq^ge-7 z%o?u~z*QT651cKwndg009WEwcAId) zz`{Yp-F|xDK)W}2QNsNrwcnR%NA>+~pTpXHu9*WiD|)FgO1W}B;5Fr(JAno1Y{PY( zAGOOt6LKT*#W43fnjc>powSK`I?P5GR5)x9xZ`U9-<(-l)s z&48X43|t(!0B9fU8t3_uZ^v|dniyG&J!Zj;$LRpS?>-$XdfvblZ6oH!VNo7i5F46d6MmlAusTpn%hpDdh^e5#>TMFyJEPir4w z7rC2$1Z(CSFf&UU8inv2h~jK~v4)cwilkK2e0YD!KrE0r)_&Xc>iT8ZPcMlFO{iFk z?EW;%-r0x^sVNH;*7AVD65=bTAw5o&2ZM%5jjR>KaRl(*Ov{Q;Z>d5rG!RpH!^(jQa$R? z1p1k_+5Gj+g5ttIF!W&MkC$x2l%Rw+h*1eHqfn_y@Rjt=MuSDIKrOL2hhLpE072FE zeG9#}oNsftKqRbaatB6jR^b%S9llMC&Mhv8+z)Q_=ow&f)z4KVm!m5nG$C+YH;0xW zf$Phmbe|ifTGiuJ^)nS~X-i|3Z`Xj}O07&aidG|3cn=VoUf~(;RR2G@QwaJAK9+nN$x?3QH zBe&nu_vsZab5)J^nWVIzCmGG-nphQr&3)K}gao4QMF>5(rwd5Z=%?-}ooWC#xJU>A z|2L6MWjg_LKaiGUZ)p07i9IeJx*?D-7 zkEaKZiVSk#r*r4!2dA;Ly5J-(S`~nCaFO4B=AHSFFD=PnEaSSbE+|Qgu?RdvDiYiO z{M1F>*zISt7_u4MD^56@8#dCo&IwWm& z+Dgyp=~IdM$}wpPPzXI&+1f}8j|*-bQ%>ZMl@6DQt?=#tL#a$zo_ggvy@%<}cBH2l zccJOQ^D8{$1$b-(r%J8{Ka&~R95r-j;X-E1+ea-L%PxK_Aeiiki(>!vD^FZi4Fq6% zo*NTGW&ti?ydCUU#g2O($1zDx%1ih5E-b{x(B-iG3VmnK7|Rp}eyPb-a@$5|E|NEW z9KYyA9gndzA5IqlUwhZbA)1!{VNyIaz3fGAO}Uq%WK(JQ1sK&CgMW+uhbPmvwmxHGo-<~I$El1V zsqs($AF;+sE9fVdh-`Q_dXi9SzkDIHhm+g_d`T4^c7^y4dwI#Y8j2APJs%ak+_;hs z#q2}N?MlzKJcBw`Oa(aQ|EB8D2d}OkgRQQdFwsN69rFSZQt*w3 z00dO%7`;ID56VULD!mMW+-Fpny3?%7-ddVy6CPz5wxG7qr^1jh=+P+dWNZbIGoTcf zOxqzA-_uL$`55^mR4$b4tus5dP@e9wgSn_3N7Ol2zSn_c$cB(`j0El8%qre#3Dc9p zI;^caeD$xqHt@hSGv-k__Q2QjK79tt(tMlUmpeaCs`9rw_cz@7D|M$Kd0E;1URDcD<HQ#8}4L+YvBr0KV*1MMlncdZQ?S4E)7!Fdf$esKK%3d zKyD)G5WQAj;*dYO|8sXL-bY1;Tc@_1pF=jZrh;$!VZ1h_PD&DeVV~2Y#%O)}0&(jp zW3b}&c#7x>L9t}{PZXdEvevGzwL#xc5;zlNLE2S+Vm8~BqGS@v9_pE`IBjg=3srvD zpwBf$F#INbbeEW#SSj(@eEW4-S(#78%p+g9d7ssp2As@j9;9vNFz*+G{#$Ae-7uPg zMPUFF0u36SFIE`D6Io88$Zc7EMT&|`Tw|mzF8yl_*JLq)RY&d(mCD9Rs}J5H0&WYG z%}(@H@`ygDZ~@^CQ%CsQ15Xq2@dXk?|Dcdh^=d?`7kJM4#^CJ^b^B1BZ!I{8zIwvx1anW3`lwoLKbz zfwj_rpG!5S)hSu??{ifdWYntAqgBL?Iie%i=qI$_0C~`oiHQkM^xq%DD0p%4`spd{ z%#Or0xs`w9J4yF-G#Z@}_rU0KK)91%)X3riOpdiBH8pikwENN?S|P+llkHH%%U$@8 zUJW#LZBQ{&DMHrDt^_0adA8R|2rw*GJGi~i(6U5*2)z7z?Gp|SB8dv@Duw}t>ludS z3Hka-CnL4y8o2e@Xlfj%1zt~$zJ&!l-RfC}eZKda0gh6hlO+NbvM{ghuK@s@?n>}e zrY5>)H83m4X2ws_@^e7apuNLMna-qRV3URG;H@@Yb@Y_WDJGwIBQGBAmYG>_dRJyZ zybdewu{Tj)w$I@l-g)jE=n)>2#HiU$?vnfnN-8oyQJZc-{TAe8a*oKmlC-;Wf`iX;cC+V5VWAd1ydaX*5-~K}5 zY?#m&taS5{h(Bk|F8zh?jBXm%fHsD-)h_sxi=VjCAV~Sr+`+X_}E;oab zk|5q_Ayon^zDHDC`j4EJ73>QjZe=>Ym7Pl5-T=;wgoK7SB(t3N%dwrYaTOg`dldk; z0K#hnM3&EZrZ_`wP-fp)@jcz4l8s@l^h7}LW3xiS{JVpJp6`$Z7IYS^l|4CJe z`xpCeuDSo+fyqogHtaATz1V}vSVBq~yC?lVBg)|z3})JhFN<(3Q4kI64cxVx z5j_5$_MIAypQV_Wn>58g=<}w=$K&9bf(x2>vtSi`xRK799h0YbU76s%+3zN5eQJyVuB6Ffw?nJIKOB~WJ1HBMc5b0p?;s0 zrdHOHMwGqm;UmW#gGT`zb@v=Uk!JP|%P8fVFr@F_SwEj~b#}P5=LjS$3IH^;S?J!P zS2NecvK$JM0O}%2(7`SXqprP_Y zLa2v72wo@oU%sY(dF7&3-P#c);Q$?MWjX`U)0^G7tZx#ESmUG0tzoygg5T->bX&@JOyzTnyQ#g1 z{rMV8iU#1Xs+Bhkr9L$81EJy^L?Bql%Ch@MQ6}i-mMN-AmA-k_6HCew{?dMC@2vT* zc_&}@QQ7>S^$xKE>yB_h$j1v{mfz z(kF`e$`uo=pozcWw}51q1JXfxUWO?q;-pzOx)r4 zaPO`^KIrB4M3oZE)OU&rISuR@Zkz(wFCCQ5@4a6=(tPdODDmz`>3R3j{1aMne#G}{ z;ExP8K4&cHJMcxI{P!*IheLS4*VGcssW&Pbt84}|bHb)jg?};rYL&XdWpJ)GeE#Ql z{s&1xt|FN#KB{~Za*J7Y&&E2XAgDkCJ|Aax*oh)%$qvr~i6Ysb+&~z(`E+n{Tf#JE z0a$O*=&5yb<-*S6UnxqSHk9DY<9>>HK=}z9a$4O?K&0BN&B&x2Yoftk%8$x>gli)z zv0uaC6h6+lo+_q2m!C-Lo~dFFp^iVZ-|s*mL?Q82*(EMlBcM!>gg#FE8{+KvPrneR z_y5Z&4Zvhlq5&dr$HQnGr0qMl0y2(g@drMo*@Rc+0O(ejbZh#NI-6V3Ny%T?I%`uj z5c^*MfVx-}7E-(wu^4}1i&$N4pah5&8Aw{Oa}Y(|`{T3)5)tu-<~HbEMd*%cZna~0y=VIM2A^&4^z|s|LhLU)MT1OnE18Or2PUQ)BEE@Y4^k{ZZ0!KK|CCuup^7=(#v+)5v%$w4lDtU^+ngCOm!&@!TR#|V z6~e4$bnK9;`d82D!DGgdDhY<$nRk(lDDdBX%imFD>aI*p*&CuIFDY`BpY@AGQ*y*MFn zJNySLS+?&05@qzFk>L!2kG^9E;p7%aK< z<|-f@CCFKe?chdy_Hxm&e9CJ29qeJIIcOc6IUvgFmtY?t%n~I2)-7k$6iV)fL=>Q$ zZ3s)acm8-VLP5o7B)czKo4lb2L_ok-f?YbX;Rl4}P5bk`2-!bFW#X278uwdkZ9~ X9?`QR6wAXW$pPBx25NOGc9H)BrP8CU literal 0 HcmV?d00001 diff --git a/icons/mob/screen/spells.dmi b/icons/mob/screen/spells.dmi index 83c0c87d36551fdb3d8ab5d9acf0b71da16cecfe..b13af31e2eaad51dc487221f20f0e9d2047bdd86 100644 GIT binary patch delta 6804 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 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