From 11359f0a3786ff2b95968906a469a2e0deca19d1 Mon Sep 17 00:00:00 2001
From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>
Date: Fri, 10 Jun 2022 06:51:30 -0400
Subject: [PATCH] Makes away ships no longer shuttle subtypes (#14224)

---
 code/modules/overmap/ships/computers/ship.dm  |   4 +-
 .../overmap/ships/computers/shuttle.dm        |   3 +-
 .../doxxmdearly-ships_not_shuttles.yml        |   9 +
 icons/turf/areas.dmi                          | Bin 35790 -> 35928 bytes
 maps/_common/areas/special.dm                 |   9 +
 maps/away/ships/biesel.dm                     |  53 +-
 maps/away/ships/corporate.dm                  | 106 +--
 maps/away/ships/ee_spy_ship.dmm               | 324 +++----
 maps/away/ships/fsf_patrol_ship.dmm           | 642 +++++++-------
 maps/away/ships/orion_express_ship.dmm        | 378 +++++----
 maps/away/ships/sfa_patrol_ship.dmm           | 678 +++++++--------
 maps/away/ships/sol.dm                        | 106 +--
 maps/away/ships/tcfl_peacekeeper_ship.dmm     | 796 +++++++++---------
 maps/away/ships/tramp_freighter.dmm           | 492 ++++++-----
 maps/away/ships/wildcard.dm                   |  53 +-
 maps/sccv_horizon/code/sccv_horizon.dm        |   6 -
 .../sccv_horizon/code/sccv_horizon_overmap.dm |   2 +-
 maps/sccv_horizon/sccv_horizon-3_deck_3.dmm   |  62 +-
 18 files changed, 1798 insertions(+), 1925 deletions(-)
 create mode 100644 html/changelogs/doxxmdearly-ships_not_shuttles.yml

diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm
index dd365ebce60..3b2dfa01067 100644
--- a/code/modules/overmap/ships/computers/ship.dm
+++ b/code/modules/overmap/ships/computers/ship.dm
@@ -128,7 +128,5 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
 	. = ..()
 	if(current_map.use_overmap && !linked)
 		var/my_sector = map_sectors["[z]"]
-		if (istype(my_sector, /obj/effect/overmap/visitable))
+		if(istype(my_sector, /obj/effect/overmap/visitable/ship))
 			attempt_hook_up(my_sector)
-	if(istype(linked, /obj/effect/overmap/visitable/ship))
-		connected = linked
diff --git a/code/modules/overmap/ships/computers/shuttle.dm b/code/modules/overmap/ships/computers/shuttle.dm
index 1755535ac15..7e787fb4a65 100644
--- a/code/modules/overmap/ships/computers/shuttle.dm
+++ b/code/modules/overmap/ships/computers/shuttle.dm
@@ -50,11 +50,10 @@
 	if(href_list["pick"])
 		var/list/possible_d = shuttle.get_possible_destinations()
 		var/D
-		if(possible_d.len)
+		if(length(possible_d))
 			D = input("Choose shuttle destination", "Shuttle Destination") as null|anything in possible_d
 		else
 			to_chat(usr,"<span class='warning'>No valid landing sites in range.</span>")
-		possible_d = shuttle.get_possible_destinations()
 		if(CanInteract(usr, physical_state) && (D in possible_d))
 			shuttle.set_destination(possible_d[D])
 		return TOPIC_REFRESH
diff --git a/html/changelogs/doxxmdearly-ships_not_shuttles.yml b/html/changelogs/doxxmdearly-ships_not_shuttles.yml
new file mode 100644
index 00000000000..3e263d6dedd
--- /dev/null
+++ b/html/changelogs/doxxmdearly-ships_not_shuttles.yml
@@ -0,0 +1,9 @@
+author: Doxxmedearly
+delete-after: True
+changes:
+  - tweak: "Away ships are no longer shuttle subtypes. The ships will spawn on the overmap, there is no need to 'launch to open space' first, and there will not be a 'faint ship activity' sector. Away ships still have their own shuttles."
+  - maptweak: "Replaced the no longer needed shuttle control consoles with engine control consoles in away ship helms, if the ship did not have one in the helm."
+  - maptweak: "Added a navpoint to all away ships at their external airlocks; if a shuttle can fit, it can dock right up against the ship!"
+  - bugfix: "Fixed the generic shuttle landing point for away ships not appearing as a valid destination, and renamed them to better describe the landing area."
+  - bugfix: "Fixed bugs relating to airlocks disappearing or not functioning once one leaves the 'faint ship activity' area, since this no longer happens."
+  
\ No newline at end of file
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 81b119a5cd2ca73523a7796579519df5987ebb18..9a690d4b36b609a20b4ec351dcd5a04e44d7a100 100755
GIT binary patch
delta 4319
zcmV<55Fqc)mjc+B0+1vDoUtW|1{*-FgfBH~zTW)w`<u<1cW*EM1s(+I!mXq=#k0l+
z$Z>z9G)OctMRwZ=(PW#D6j7SRl0}5yMoJnJ<PI$>cNW481@9RNA%Xt@NVAoND6`u@
z6^SNNuuG6gLz7A2-1XVB=iFa&XYQRh-;eb4=Kegh@2z&ed(OG{Zk^cC&^$su5hR6<
zmameKpsRU=d?H8+9q9p*?G~2MvGRF*{U(2>@n!NkaF38Y^1{ju;)kbNb-7`(j-EW*
zd%6%MniQG$GbH@wutHZc;V)n4%ZE?I#O48o`p1YQE^Hi@aFKmua)?sHU+&!(#?r!F
z+8E6S(fOohUeAR}uGdD6(S%Y6E3d~AIW3AGi*o`<6BN=rLo`l4P0aaSL))7~hQEKL
z$4Az2LhTWPM~0)M$4Az2LhZ4FhhvGKT(sr%2!UP17xoH?8M*2!B!qaq1{XLQwM35-
zHu7Dz=a3r4ifJp+KO|hZXGrrHIZ~3JH4&84*BayMcsVxLCwGi5Tow`|PP7bJ#g!|d
zoS5nRgTKWHo7TmT43|ZFfTRejMecuQinBxW{%G%|<`-z*AMHICIey4yhg>xIJVRzZ
z&g$~6@*0v8lrvTeoRA<Iisr>Rv+Y^!6)Ma5<O;GB!IYX1?b>5QW7g^|OSt&jOD037
zgt?>`N==-$LRoU9S8P&riO`rs6EB)~hhOvXm$fo1WS1v5b5D@F)>ec`kI^sKf++Ur
z42`o@U{(%|mXk9U(vGybh_F{KmOv^koD3|16eFBMg2xJR#f%NjdoYu=dPxG#9g=%F
z0cVpsdq)9^lY)CY59uyE8#cRr(gK<sAb`LblgxWA25bwflkRwud>a9_lN@|X0X~yw
zd^iENlc0PS19g9-lev5@0k@Ord`30(PXC*{+XeuDVLW`Q`$J9p@BWGYQPX~HI_h7j
zY5$wcFFdSi|Cjs!zEacv(mCy^>i2)<lVg1(1gD6e{F94)A^}X3u6-p4n+Xb_%}MvU
zliPhM2~Xbn_R96!FJ_Ysejp0TJKtt)XYdr!MUyvvCx7_SmDL;1J=~<s9~y&=5RHux
z-C@4kLB9pDHbT6*|J|C1=$re`AGm8*E@>YdA=ahDMu^h;lOlq!3Jd_y1Rp=TvikVZ
zl~pbK-2vT`W%uIk@?E?3m0Puc#zA*T>;5QspzlF<c=qCTq3Zxw_rF_zbN~4RE_O8G
zb9Mi_wSRl@y3jS)E~MZ|35P)d0RWmH)w?qV{hDt0+BMPAujz&y7n-M4`)61JMhc~o
zump@0N?@7filFSnP*ZXS<o5ZlZb(i6?3cA~jk9)W=Jz7)#LN-%^Gs<!m2La}Tea^(
zST#LEKKeD?i1qFa79q9mTV5cmtuU4s$Z7-2;(z+>7aykP1Z4@JoTCeP`_R=quwT}G
zj!2O0F?0CDPfh!&Y}@zWnte<3wCEwSkb+|j@iVD?mkT6?&IH1T=t(Y+6gm(-+ez-K
zE^Qv42+H;VacZv)f&H@fOUyS!eAKo-)YjB&ll>TP4{zt9$g1b<Ara-gDNZnGAtpJ7
zdw*dpk4&rwrnY?|I-mF~^MIrXlKo`TbcTnBCqBzOASr@mKbbTQ579i)L`$wH@`<1#
z0w|V}|AoT-H1=cm<Ow|hhlr2b_DeFy@4p56T(~%q<Ajp*7Fhx+CWIEsoAH%>-j-P5
zQQQ7GtOV##VzjS50V@GIlo;)+kKq>GI)5Z0x<hx4d}UWB+vOP9ANF-hd3=2HYa$3q
z(7?-TxBs1c#nfAK<UVj~+Xr><2^J@YEN_mi=i;d3J%a5-dvMDKJ%5<<_FHu8@DANM
zlI=0#1NNt9asgEPKXKR(+b<y&v_$2hUZ<(-kI5Xq|JwGsP_aT;{5=MU9}tUsh<{t<
z*g3Ro*w?v!`^AT$SBiaYeyzTU0IL09f&F3joj7o>Sdrvjv2$1=q_+K`%>Das(f%9H
zJ=|!X9xW6m+ca8TMV3SIzCIucp9ds&KG;v=lXt$oB44@oizh+L2Z>ziA?r&6`{nIh
zf<Y@=^QO$vn*9{E@%x{X{Zwxb&wm%n8Q&T_LAv<rGP&Q6wG*_qFVI9Q!p6qu@sOb&
zd98^BEl&pa{p5OlQg?-J<|vHSiC(|i9X?mi98<#YxAl7kpd=|rVU$3w1e^0w7$pSI
zg`+U|Dlc~}-$QK)SVv(@1&+d~ONpZ}963i~G?4`D1i-V;Tt4Qn5_9pomVfE4UCR1-
z!EkPz_UdPE)r0vmckd6;lMvXXdkZBTWdVk9i*6lqPm9c_(dy**A-3hUv>CED#C|Th
z=YgGtz*eWfQ2*F(cK)?D?AGFV_L<Aa-~aGq5nFt&lzCUH?%Zdv+4PhA>@9I{N}sQH
z=tAh?;FM&Z$EEcS?GX|E`5v_Ydr#eeiRcm${p31m^Jvum-2-4QOd@=I$6jnXlXHS5
ze{qX~XH4&v{H&e$u|$w1Xg=KOeoORN2z|KI<?Z+5`Q4KOiTAbIG*Q*U@3+Ol$?1jr
zUGMHpdcUjH=IkCen^m)))zaY!(4&YUEzc)5%#|4mYYA<Mx3%os*Ir7DlvtIOYA<vT
z68<w!DT0QGAEJaL=+)^jj^%?#K2Wqee^>9WLl2>`9{6+13*vOwE*<xu{<J5rd0D<&
zV_iM((=xu_v(WEgX~DxoV)u5sJznq1GHk~Cg_v6Ka8|3$F+@-MjPCu>Hae8=zP6c*
zAEI#5Zs-ADTA;*wfJ)jUy66py9XBQX{I8tE>0&!UTMs2m6iL4S;m19m_rpV2e<^iV
zxJ!;%oy<!Fr65I+Rmb68AD<U!sc?~_l{vBfVvwF8Cz5zQ7fxFJ!O7{d>=P@toL9(+
zBPo<znR|~Mvfi2lfL72R{#u`y_8dVF6GrpxzC4!qCA33yZE{zQofAN%!v?Y9XS4g*
zL&L=j&)w1Td91!Ze0f2eO~1!;e}H&6Ooqo?S?h1r$?LI0ZXv-#^!PJR5rHxfsH8yh
zg}J7fvxS6bOVmiQVhNfdLPvuO73<oO+Xg^O<ZK$~-b;xA8BWvQt^Q-$w(Nz<G3<8T
z+4*fJegElh*Ihg5`vW5S_5ZIw-R-(-vX3iYzug~*If7-Pgd8C5-SK&Of2`0%2>u|J
z;VNxKSjgj}5n5U16Fs3ZyuVgg3SYQO_OVu$xq3NPNpwEPm>!{A!Q&G-DRXLGnyE#R
zB~~n9lrpa+l5&BV0ozDOV1xw8RAH)Z!wD28Oo-?jD_<j`uTJ{@E7`{qHgaCWM%fTp
z_Sit)k0x?*R*aQeWyX;!f5)u4==loeKsgZ<)8<?G)p{5#HV<viXo4jr1m><wi60l*
z(!yREGK>ZQ0G$7P`Q?U)*1S%N8x1LFxY*%kizET$^X_OXb5guP(mN9pE8GLb^M|zZ
zx%(`f_oI1ud|n@4_)8NkJ`YbQ#Knb<6g_iEf(ANPsLQG^C4L-Mf8LMPmk3@X0D#WZ
zue_ojRTC0H(yOC+fP8jG%>i=bV^)D#f+yDdBkMwCiEj@eUw%+3miX}r5=#VWWvgCm
zn?n+~{QYrtF=I>S72VtE_N-N4lGuK+3=M(Bh#xIsnb&E;B}D{j;~<6r07OqbHPWM#
zJC8PpW}}&-FaQ9{e`D&SFeGz63Zn!Uj>4E29EGuLN*;xgLq|ka4~pp5^kGf=cb|K|
z>K}l&9=&zHrv0l=-+Qg5eXwkPe($r(HSPcL_wUy<Pk*`jt9Ps3000Z7iL<}}00000
zrUU{A00000i=!z4#Lu{~%KVkmX3YuC^Y#9l?|r@h=6kj8e`CqG??C$=@ZA6aKp8GB
zgYWwtwP)9zp0&GcIga=7%`pIX7LF!ld~F~N_n>|G{zq?rz5nKW?%lP&eE*}j>)qY<
z!asLkAKtE&-8H@^007X@_W|+=m99IzAVLTkF8}}qM@d9MRDxtVB$g`C9nihe4-+gz
zzv}<#uDeb5f08VxjE^1TupXLR3=xGzk~Rj|l>D6Vc>@4|pS+!*xd@tx$eE+~;iAQf
zAYLcSTAdrG^_7$guV~%~cqPhWi6w-{001D4rgDHBxgji{$m!Q~V`-r=CwNMDe|%^n
zN6zWy4bAV%f0>fdeZ<s{mBS-Fa8`RNDL<3-o%4G6e;Ky&-D-TWdHviA0I>b&0;unI
z&R!NHd4HUU$q_4|adQztPO!)@mWHp7^Zdlj<4Ao-@rNycFw5{5pFd_!Eu0p*uTp}8
z-}_K+RqD?kONx+`_mFZQR%lc9vF=fRh9y4J(tNOao&LJ|?A%L=Ac!IWwhvtZb=~RN
z%Yui%lk$f-f2n1h_>pKL2mr8MG!+7qqDL$9m(@3=ZLY-R^bn<alZf&Kgv|RXB}k+V
zpYYg*1maxpo18<t9+NqXAPY?x0RXm#yd-EI`f4x{dhTdqg$o|v3NZ~i&Js@6Lre>E
z@oTG{ms1~(@*ytg<)ImAe=1LmZ}pobrk@r<lx;Ehf8^%S>c;$BwowED0Jaxh0BK<@
z-_rIJ5d^X1#S$sLvL$G=F(I)u)&nwS-cT57tOsrGoWA?bxmVw3WeLofIa<rT(RlFS
z!66aRtFOL#WYs-*@ZeBhTXk*@J|D-0x=ML_O3noU7?+D7FrNRT<pNpaMXQgkYlxe#
z-8_uBe|9h4#@~JYeRP}drBG<g*FI!yE0hXn<p`QoyK@i~HPMo=Lu0sj;lhTOxwzqN
zavuI}Q8M2L;s=2F&{PhPJkBEJNQ>NKGBl)6x%t}7!@FPHJ#zJTzqotE-!*uDSN8R9
zmAQvBh9+KHtEp0LELAAQdaNYUtCKP&^&W|kfAkE%5@|{R5&09HW5=epNu+qm!HK3J
zb2wz!%9Z&tcU~77?;~fm)znG1QzrJ7S`}CFzLtU|etaS)MKDPqf&f?+%?Y4Zkm4m(
z5J?dgJKhp2R=o?EwHVqeDUzh{;tANHgz34^@<xFzF+}8q2#KK3W{FxoHdq9pP4ZTO
ze~pL?QAw}OkX@pO+}BXAP)Tplm|`d95YAXHQOSFfn=5MVT3c$^s`e2Rp%q)&&l&pJ
zr&<NJEm(=svMwg!IcE$2U>cedKrvz`_r&+P?Ej;k`86eDuCC$_;M9k4%*KSNW3>Lh
z-K1-ahuEzFroXf8LlZ$#xa6!LE4}Ire*lnAQvztNIPZ|p%Oex0W3l%C(b`MlJIr**
zMv2z(7?$l?g!V$JiQMN$iXKZC`P!|%eB(*&cOpb<Vlp+U8UV1}G$nwBhN(&%fx!ie
zT<xW`rH+ds)e9u|4w4%srr7r3d-(F*n1?=uYZ4L@v6TK9bLWc{o~}JqA6nI=e{GH#
znxA6{6uG3`dXK$!z#9X=a%oBcg~C*^$6ch(+af7DJX_;<dr46g`w%2*TkM3Wao<Bi
zkS%-FS|v8$rxXxe0JK9>0tj3rX2)mWn3QouY5&pZ%r|F2<Rf>#o7nlr9=Bw)m0u-A
z3ZEO|2Y_~f0BV>Pm$rjp#3pn5e{yAFMC7&#&9Mjx6RTZIj82^!08j_)0|X`m59N5Y
zLrtwcf?Pd5TL1uv2Oc0W8F)a4;X=l@zmX%g9smHqV<3P4XoM+FaECAg0D#9J1O@;A
z0D#2-0R#X50D#2-0R#X50D#2-0R#X5BY`FG0JIAP5C8xG02asp01@0p5dj8Pn2Z1b
N002ovPDHLkV1gEkV`~5a

delta 4217
zcmV-<5QgvAm;%n10+1vDnXx5_1{i#)mGJfEr{CXf-n@Hz`7ghI;BY{m{qM8M2FP)L
zBpM`|m}a+)5KXoTY0|AMSw#4~v?j<MT2}5X6t}!*B!oo#2SA#w45G|#163rNNWm^a
zA`ML@g>%<u&z^IC&7HY--h4mO)0_MA%)YnU`R+OA-n(;RM?>=n`9zQuI$FL;LV~X5
z5%P&3DRiU<NVZ#8LdVMI@%5XW#+S)|=fFKe^2iG-H;5meYSrb2$vS%WZ13q(lxR|9
z-p`Qmm%|EO#e~0np)Vgk5fhsS6zU%%lDM#OSi(j2jmaTO4S%_JUl>aZcWGlZ8$=hA
zmU%rFD!E=8IYtvoA*{R}OXRdDek?8sAWcw6?+np6`7|--cMWZC5*hxI9v@kM#|gDZ
z2p$=Zk{%yf#|gE^3LcInesa;4(<20S8DH2dBxdBQuaFSp^%`8@Xw(utPT0tI*`7mc
z7%Qf&ME{U*;hrJQW8_Fle%3@#PG4(`tK;R^T%X)AzHnJcj5yIUWEEGgfO2A{@7I5c
z5jL%h9~mx-_5eu{REylr6laHj=Kay$OU*CPyg%A|E^_>k%?`O}@_B~LdYskeUF9_-
zCn#sE6gVM4G!)H?b8g$S+ACC+^T`!tDS|0AA=<UahQ_SbTb6L~wU<nWP6=~KF_fA(
zZH2PrO0U?Y=n|nZhbCS$?+(A_;V)}tSja9<ZswjKcde}mlOCh71ySrP(HR=&tH7)r
z8Z9ShETkQ2a}i;$Tr7c9S~wY40x3o~g#?ck;))p?ns+^uyn0CjE*z5wdpQB;lR<k&
z0gID~dpi&9E<GEz`+d>^nj9d2z&VrCdoCjE3aiuZWD2pP0RaSvNI&8tW{l<$3fTbT
zqvaE&Vl7?YwUZ-!N&zvGZhSZzb~RK602qgmcgJcAd3Zu|LI43kWQ&$ff2@<hd@ccZ
zlka>+HO*fCyS&>50DxgUey;mtP5U4IiT+X3er-DHU#V&TyQ{A}u4(@_hyT7-)Be&q
z>#6GZf9{iNeIx|uh@SnEl6@ipN|UvHB?y-Z3ZU(2_l1+<eJKggKKTCH&AYE<lN5d+
z3fTwWXKiQj9MNTyK7J>E^vSi=J1;%nrpzB2gN+c4jS$^ozS=>*1+g|lyngt@hKT69
zhcB<)wJVpjkBt!PQeq=S>HSF&L0AO_0BC|wpIlpg`sCWGmi=x`4`kWBc)NVpu6^ZJ
z?Vq#mj%d>#2M_dJcSq+hUKhF!aQ*Oy&36x9UURXd37_kSKWyB8i`Rv&!EPZ1Pf9op
z0tf)m1gYMgDd;zJ%h#@nmVQIG<ham0t=d1w5-?IIjf5p&q)-COBv%AwABLKeGa$Fm
zcXdN@3ShsieQTVxLo>e@X(wimn4f1#`>E{O_us007s9IP8S>F@=vJ(EXRrvVZQt?&
zS#5=}yg*hPSQa;b@4ogpH76)b0OcHAz}tte=7IgP_H#snY>%14Cw^+$Pi5D>|JLkV
zqNha<k%bf-V~C$g?YmqcDRd?fK19!QfuzuZ@YzjrS9NLg_(V{)2Z&R9bqMU2wO?Ys
zA>yO9{h_v|W|!>8czbv|7e!V*Zx4wm=S^{fK?^a-G29D(V|ip^JutQH6Vb)QXPE~i
zMUd<#lcqB~L_G0X<^f3&B>TyvX?Td{i6&ZdMUhVg6%jzOl>9Fg_NTEQvnNmJ0XRf_
z)V5!eIez~w*yqB<i5w@Cq_@ZtP%$C2P~MEM?DMw73Xj_MFJL7=hZ3WG^$A!B(4oX=
zUwsUB=*|&;5z#%mckC;>I@vDA$o{aeQ_ADxn_m+_NP-4lR{Q-Q+$*Nunj`mtTiZUU
zgHNzHF=TmjWIY#0CGQdJCfb8rKIr+woVVYhJ4g5E-mz?t5g)KWJ(CNd+W(2ee%O8q
zv7jX?5A`}tWq(ZO@cq}e&xMK=%Hr=aK>UDM+(X=dD#y;DUBkZ4&AYEX4!u(BYx8UM
zMFddo2Mg>Ev+u-#d&P<*_lljv5+Swi4`uG(e~b3tdFk<1^Ymz;FxjTj>MF7vlK1ri
zN%%Y<x%0t(8lQde{WbZ@wO>35T0ThRN)K6I8rUyy-x3U3*_t<Hj@Im_u#4aSob0E1
zb9lagP|o<);0e;jSC`5Ceyp9KwS9pmS`jujK97eC^~h^YENFQ$u<s|=<CD58bTda`
ztWNd%?f&q&a^{#4e!s2XD*z=)ISQi$awXWDkHRP+fG!<{!B=^?Yxy2(OTan`V=8bI
zMqNrAh2h9K5~GPEXeR((eBtT|f0dYv*R@Q4cjHRd&kKfg>#SEld#fJIm$`d?h@OSO
zCf!>o;V26*j5~Dah<jROK8;o<#}BbBucgh9y&?8<$vqG3JOs8ndsY2ozuo)S!LVD4
z<HZ-Qp8WXJ&qZwUxl-m`t-1@J!FJnE^0T+Z`i#EV?9rvr#rlk7p2wBV9vu)7{rRjN
z|9el}e~IV{5&hyiX!B^){@nv$E=(ePe8*nwIFoyVCVxqbf@e(cmHe!o__0KgC1^h0
z>wZu4R0w^%*X8Z^<N4i_0*Uvv+B8ws!tb}m`t<D5{ciU6CcWR)YI}YU+wH2^&uZ!L
z1n5!3ke25Y8|KOkg|&pX#M@f-?Q1V3MoO&8O0^fd2MPa~rxZa$#1BzI67=fq)f4&P
zkq;ED&VSXr>(E1JtOx$w@`5<sjVmYp=f51tYhIS`)>v21`?QSj_bl`~SX%J#kl2I0
z?ts_3vJ9K?ej%n7Je<{PdjiqZKBIeow2cnsyRU8L;)f`lv>STBmli0o9-xx;h%S4>
zV#iGhKmRKyak|(}(AGoA5=D|9fBN}==l$>yR)0#J74DK_R;Tk4K`BTPWYuxF*T?4t
zS}I)RXk|`pzZj%v$cZFg&xMm#zdk)Xk$qytmh%cZaU_M3D|7FWL)Ke!0MH8B!(ZzY
z)1D&;V!~*?-IvGmzJzv&u1)T$u?qsIbl4zP{A~B1dT6+K;ki3nK9AMchc7Q^yX_Bn
z4u232hsp4mD{K9&I(a>I$Sovzh@O7tDI!qj0hJU;zA)DmbGDH1Y>65vRxCj?MCfR6
zp<-P-a@zoCiJVOX-Fqo9Aj4_eyVZY8+m^jhIfnhNJ3qhewC_LP@46eOeZMB6-~Rvl
z^Zl;7A^W)U&Aa_t%n>XTCFB5c?~c#QV}FGvLhuK%3|DC@!a^P&jnK+6pXdpV;r+F`
zQuxAMvX8a0%+<@WN}}@x#`Fl~3Lc-xNtsjg(o8LiEU{t<qm+3qk(3L>4A@0N0wW|y
zrV3N-8cv`%VM0VVSosDKeRJCP-^f0eu#xi`Hp+&;vd0GUel(Gjvtq2&Dl?8;Ie%u=
zMbB3#2g-?{m^R<auhzq0v3Y27MiVS4AuxAcO8mIcmKOHXkYO|c0O0)R>#w&&wBdD9
z+-OKa!^I9STO<h}pLa)FnUmrTlHQq+Sm7QZo<F3OFWhJ0ydTZO<MaCX!e5$T@p*Vc
zAucX-r0AJT5;V}ULS0sUDe>d5@_&A;zC`dE0RVKKfAdZCsG5)nl3pFn1LU(iY7USa
zAF~R~5<IcqA6XYFOMH6(`SOEOvBZy0kXRx}D_iwi+Z>X><?oNHiy2!oujs*EcVMjo
zlf?FmWoQU2M*L_A%e+n#E-4~N8wW8203dqisgWL?+<CM)G#kwvg#iFq9)D9Gg&~>q
zQ5Yq-bQH$K;3$k`Q}QT`96BPZdQe2ap^t0YzyH!-tNsCa@5y@)Yudm5{DZe^+6T+#
z*AM=7wWj^AzWVCJn)U$z^=RTOFaQ7m0Dvih00IC20KnpCN&xXQZmcqYrL<Xdf{T26
z`0hvF9=`ig?fY0V?mN)F2Y-Aw002;i%gf;VeoyV$b!X@8?pluHeSC8az@3Go2^n7-
zNW(p7-+1`R``;eE`;mKh?QcB%<o$Ygx4ZDq-Peb=Yh`zh?+E|^bo70Id_tw`&Mt`{
zSq_P%N_1;_F#2Icu6fe{00h8EL_t)7h3HrPKize=?OvDVl<~1+9DmkBlZzpuut?Iz
z0GpDZ6FzSM0PvHy6Eqh=GZ8s+6hB<FI1$9_WLc|o<Fvk#QsEWN8v(CGSuC-H5E%df
z#L-j^kRvyQ<r6vmhHfn_H0A_P3Ga^&P2|Wq-Mpdsefcj_61tC=`mu6&qzBGwPbKAN
zvc7X(FF(UpzFPnQAYZZsP~Y#Jzbr=b{x}hnBUVD=<|2ZeV3A=g4PPJU`H7jwk@}G0
z4_p3Vmf<lzf6Sa(I4yKvr344R_o3dZ)So?;6d@_^A>}@-(5CET-J|>rOMIpP08j#5
z0CnBj`I8ceJ%0%R09vG}5SSD_TA9DBzA0^UB_^kbD9xKhlrJD;-cKn(B5nAD$1Wrg
z=X&4d9NP7mKm-8*=0;u;G!K0>m<T<0G_k@3k8g#Th8$-JC+i`mg}L~()y~VQ4@dbB
zm-F(_jI=+MC&st>O%l^j3n9w3n0s<_Xmw+LE)YQgfPXom3m`45<y+dGB7z{6yjUW|
zSGEL=HYOyN#(F@e%o_?rjrE|-ozr)}Irr-OtSo^UGshfqZyr5*bVNk-)?05KTXl~f
zJvx%tR-K!J&j$biL|O=p=l^KAK$dvX>SOB~;`ZCOk7BOfi?{K2Uw<FnwtGDk+VZsz
z8QTh_!hcygf+p4O97IJ;v?T1%7%pD8u;FDcZg`uVhra^=0H>)OAbFfc%8?ei$7E<o
zp>q4}+ei1mynpQK?|*s!n7?cA{;urn-zswtX$(!gwpLT6+E}VkiuG7Yq*o_pOzJ%X
z0G3Hp0*J_;=o~vXwM`<$OAbyn4Vl9s!&a`$mw&nQy3lwZIjgOvPP&~kvA5K!xRUp^
z6fE)M6FKnq003fXP5`xn6fdcQNQ$V~@s?Pz>RrgJ#n4tsktBr|Prwc(OwR>u6c`6Y
z4gjD8d8@!iM24uO*Jj8r(L?TQs8^_@H)u?;6LSb>te2?dJ;}`#wRWv7HEdP;h>6gO
zEr0Fj4E^j=tpWo8fH~2W0E!VixhKBQW&a=T%&#dKb9EJe0H;2TV>TvC9i#R4?IvAY
zJj8AdF#VkY0KoicN&w9j=N<BSd1L~0EY|)%T6-ychnWu9DA76|!?InA&|XM2k^B5e
z(PIfCU%S<pZ#=2}PK0PpOr|DP0|0iLrhf#`&@ferBQUr?k*mG5w$yPkq<Vqm-a&Gs
z#1z{;d=Fo~8}rbIa7{vDB9_uWWA1#h!qc^f>O-r#w9PR?^K&eLBA2vV@3Gea0ML{G
z3Wcd+kGn{nw?$HRc(%sz_L8C~_8~~rw%7?#<GzQ4AY1mT0RTX2G$nw*Wny-G_J55@
z8Ap`%AAQbza~4ECa`(H5op0=M006KwAb=XC#ii|F7_rIRzFe6Y5xJ{E69528fqj6$
zWZ<D3k9Mf3wMUSv$7c%w0P(;B1SSIy=rCN!`1Ut)q}Brf0C)-n5CDxZ#R={ZMgRct
z6okM400026I3R!k00026I3R!k04e|gus9%q00000us9%q00000usHq)zC_R{<UaD8
P00000NkvXXu0mjff+H6J

diff --git a/maps/_common/areas/special.dm b/maps/_common/areas/special.dm
index 123784e29aa..7df25312c4e 100644
--- a/maps/_common/areas/special.dm
+++ b/maps/_common/areas/special.dm
@@ -297,4 +297,13 @@
 /area/dungeon/bluespace_outpost
 	name = "Bluespace Outpost"
 	icon_state = "purple"
+	flags = RAD_SHIELDED | SPAWN_ROOF
+
+//Away ships, third party ships, etc. Mostly for the ships that are expected to move on the overmap and/or have ghost roles.
+/area/ship
+	name = "Ship"
+	icon_state = "ship"
+	requires_power = 0
+	sound_env = STANDARD_STATION
+	no_light_control = 1
 	flags = RAD_SHIELDED | SPAWN_ROOF
\ No newline at end of file
diff --git a/maps/away/ships/biesel.dm b/maps/away/ships/biesel.dm
index 5b48ef5e6b5..44d337fa063 100644
--- a/maps/away/ships/biesel.dm
+++ b/maps/away/ships/biesel.dm
@@ -6,22 +6,15 @@
 	spawn_weight = 1
 	spawn_cost = 1
 	id = "tcfl_peacekeeper_ship"
-	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/tcfl_peacekeeper_ship, /datum/shuttle/autodock/overmap/tcfl_shuttle)
-
-/obj/effect/overmap/visitable/sector/tcfl_peacekeeper_ship
-	name = "faint ship activity"
-	desc = "A sector with faint hints of previous ship presence."
-	in_space = 1
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/tcfl_shuttle)
 
 /decl/submap_archetype/tcfl_peacekeeper_ship
 	map = "TCFL Peacekeeper Ship"
 	descriptor = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus. This one’s transponder identifies it as a Tau Ceti Foreign Legion patrol vessel."
 
 //areas
-
-/area/shuttle/tcfl_peacekeeper_ship
+/area/ship/tcfl_peacekeeper_ship
 	name = "TCFL Peacekeeper Ship"
-	icon_state = "shuttle"
 
 /area/shuttle/tcfl_shuttle
 	name = "TCFL Shuttle"
@@ -29,59 +22,46 @@
 
 //ship stuff
 
-/obj/effect/overmap/visitable/ship/landable/tcfl_peacekeeper_ship
+/obj/effect/overmap/visitable/ship/tcfl_peacekeeper_ship
 	name = "TCFL Peacekeeper Ship"
 	desc = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus. This one’s transponder identifies it as a Tau Ceti Foreign Legion patrol vessel."
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"	
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
 	fore_dir = SOUTH
 	vessel_size = SHIP_SIZE_SMALL
-	shuttle = "TCFL Peacekeeper Ship"
 	initial_restricted_waypoints = list(
 		"TCFL Shuttle" = list("nav_hangar_tcfl")
 	)
 
 	initial_generic_waypoints = list(
-		"nav_tcfl_peacekeeper_ship_1"
+		"nav_tcfl_peacekeeper_ship_1",
+		"nav_tcfl_peacekeeper_ship_2"
 	)
 
-/obj/effect/overmap/visitable/ship/landable/tcfl_peacekeeper_ship/New()
+/obj/effect/overmap/visitable/ship/tcfl_peacekeeper_ship/New()
 	name = "BLV [pick("Castle", "Rook", "Gin Rummy", "Pawn", "Bishop", "Knight", "Blackjack", "Torch", "Liberty", "President Dorn")]"
 	..()
 
 /obj/effect/shuttle_landmark/tcfl_peacekeeper_ship/nav1
-	name = "TCFL Peacekeeper Ship #1"
+	name = "TCFL Peacekeeper Ship - Port Side"
 	landmark_tag = "nav_tcfl_peacekeeper_ship_1"
 	base_turf = /turf/space/dynamic
-	base_area = /area/template_noop
+	base_area = /area/space
 
-/datum/shuttle/autodock/overmap/tcfl_peacekeeper_ship
-	name = "TCFL Peacekeeper Ship"
-	warmup_time = 5
-	range = 1
-	current_location = "nav_tcfl_peacekeeper_ship_start"
-	shuttle_area = list(/area/shuttle/tcfl_peacekeeper_ship)
-	knockdown = FALSE
-
-	fuel_consumption = 4
-	logging_home_tag = "nav_tcfl_peacekeeper_ship_start"
-	defer_initialisation = TRUE
-
-/obj/effect/shuttle_landmark/tcfl_peacekeeper_ship/start
-	name = "Uncharted Space"
-	landmark_tag = "nav_tcfl_peacekeeper_ship_start"
+/obj/effect/shuttle_landmark/tcfl_peacekeeper_ship/nav2
+	name = "TCFL Peacekeeper Ship - Port Airlock"
+	landmark_tag = "nav_tcfl_peacekeeper_ship_2"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
 
 /obj/effect/shuttle_landmark/tcfl_peacekeeper_ship/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_tcfl_peacekeeper_ship"
 	base_turf = /turf/space/transit/south
 
-/obj/machinery/computer/shuttle_control/explore/tcfl_peacekeeper_ship
-	name = "ship control console"
-	shuttle_tag = "TCFL Peacekeeper Ship"
-	req_access = list(access_tcfl_peacekeeper_ship)
-
 //shuttle stuff
 /obj/effect/overmap/visitable/ship/landable/tcfl_shuttle
 	name = "TCFL Shuttle"
@@ -108,13 +88,12 @@
 	fuel_consumption = 2
 	logging_home_tag = "nav_hangar_tcfl"
 	defer_initialisation = TRUE
-	mothershuttle = "TCFL Peacekeeper Ship"
 
 /obj/effect/shuttle_landmark/tcfl_shuttle/hangar
 	name = "TCFL Shuttle Hangar"
 	landmark_tag = "nav_hangar_tcfl"
 	docking_controller = "tcfl_shuttle_dock"
-	base_area = /area/shuttle/tcfl_peacekeeper_ship
+	base_area = /area/ship/tcfl_peacekeeper_ship
 	base_turf = /turf/simulated/floor/plating
 	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
diff --git a/maps/away/ships/corporate.dm b/maps/away/ships/corporate.dm
index 4134a21646e..77ca560b172 100644
--- a/maps/away/ships/corporate.dm
+++ b/maps/away/ships/corporate.dm
@@ -6,22 +6,15 @@
 	spawn_weight = 1
 	spawn_cost = 1
 	id = "orion_express_ship"
-	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/orion_express_ship, /datum/shuttle/autodock/overmap/orion_express_shuttle)
-
-/obj/effect/overmap/visitable/sector/orion_express_ship
-	name = "faint ship activity"
-	desc = "A sector with faint hints of previous ship presence."
-	in_space = 1
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/orion_express_shuttle)
 
 /decl/submap_archetype/orion_express_ship
 	map = "Orion Express ship"
 	descriptor = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus. This one’s transponder identifies it as an Orion Express courier vessel."
 
 //areas
-
-/area/shuttle/orion_express_ship
+/area/ship/orion_express_ship
 	name = "Orion Express Ship"
-	icon_state = "shuttle"
 
 /area/shuttle/orion_express_shuttle
 	name = "Orion Express Shuttle"
@@ -29,59 +22,46 @@
 
 //ship stuff
 
-/obj/effect/overmap/visitable/ship/landable/orion_express_ship
+/obj/effect/overmap/visitable/ship/orion_express_ship
 	name = "Orion Express Ship"
 	desc = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus. This one’s transponder identifies it as an Orion Express courier vessel."
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"	
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
 	vessel_size = SHIP_SIZE_SMALL
 	fore_dir = SOUTH
-	shuttle = "Orion Express Ship"
 	initial_restricted_waypoints = list(
 		"Orion Express Shuttle" = list("nav_hangar_orion_express")
 	)
 
 	initial_generic_waypoints = list(
-		"nav_orion_express_ship_1"
+		"nav_orion_express_ship_1",
+		"nav_orion_express_ship_2"
 	)
 
-/obj/effect/overmap/visitable/ship/landable/orion_express_ship/New()
+/obj/effect/overmap/visitable/ship/orion_express_ship/New()
 	name = "OEV [pick("Messenger", "Traveler", "Highspeed", "Punctual", "Unstoppable", "Pony Express", "Courier", "Telegram", "Carrier Pigeon")]"
 	..()
 
 /obj/effect/shuttle_landmark/orion_express_ship/nav1
-	name = "Orion Express Ship #1"
+	name = "Orion Express Ship - Port Side"
 	landmark_tag = "nav_orion_express_ship_1"
 	base_turf = /turf/space/dynamic
-	base_area = /area/template_noop
+	base_area = /area/space
 
-/datum/shuttle/autodock/overmap/orion_express_ship
-	name = "Orion Express Ship"
-	warmup_time = 5
-	range = 1
-	current_location = "nav_orion_express_ship_start"
-	shuttle_area = list(/area/shuttle/orion_express_ship)
-	knockdown = FALSE
-
-	fuel_consumption = 4
-	logging_home_tag = "nav_orion_express_ship_start"
-	defer_initialisation = TRUE
-
-/obj/effect/shuttle_landmark/orion_express_ship/start
-	name = "Uncharted Space"
-	landmark_tag = "nav_orion_express_ship_start"
+/obj/effect/shuttle_landmark/orion_express_ship/nav2
+	name = "Orion Express Ship - Port Airlock"
+	landmark_tag = "nav_orion_express_ship_2"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
 
 /obj/effect/shuttle_landmark/orion_express_ship/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_orion_express_ship"
 	base_turf = /turf/space/transit/south
 
-/obj/machinery/computer/shuttle_control/explore/orion_express_ship
-	name = "ship control console"
-	shuttle_tag = "Orion Express Ship"
-	req_access = list(access_orion_express_ship)
-
 //shuttle stuff
 /obj/effect/overmap/visitable/ship/landable/orion_express_shuttle
 	name = "Orion Express Shuttle"
@@ -108,13 +88,12 @@
 	fuel_consumption = 2
 	logging_home_tag = "nav_hangar_orion_express"
 	defer_initialisation = TRUE
-	mothershuttle = "Orion Express Ship"
 
 /obj/effect/shuttle_landmark/orion_express_shuttle/hangar
 	name = "Orion Express Shuttle Hangar"
 	landmark_tag = "nav_hangar_orion_express"
 	docking_controller = "orion_express_shuttle_dock"
-	base_area = /area/shuttle/orion_express_ship
+	base_area = /area/ship/orion_express_ship
 	base_turf = /turf/simulated/floor/plating
 	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
@@ -133,22 +112,15 @@
 	spawn_weight = 1
 	spawn_cost = 1
 	id = "ee_spy_ship"
-	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/ee_spy_ship, /datum/shuttle/autodock/overmap/ee_shuttle)
-
-/obj/effect/overmap/visitable/sector/ee_spy_ship
-	name = "faint ship activity"
-	desc = "A sector with faint hints of previous civilian ship presence."
-	in_space = 1
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/ee_shuttle)
 
 /decl/submap_archetype/ee_spy_ship
 	map = "Einstein Engines Research Ship"
 	descriptor = "A research ship belonging to Einstein Engines, the Stellar Corporate Conglomerate's main competitor."
 
 //areas
-
-/area/shuttle/ee_spy_ship
+/area/ship/ee_spy_ship
 	name = "Einstein Engines Research Ship"
-	icon_state = "shuttle"
 
 /area/shuttle/ee_shuttle
 	name = "Einstein Engines Shuttle"
@@ -156,59 +128,46 @@
 
 //ship stuff
 
-/obj/effect/overmap/visitable/ship/landable/ee_spy_ship
+/obj/effect/overmap/visitable/ship/ee_spy_ship
 	name = "Einstein Engines Research Ship"
 	desc = "A research ship belonging to Einstein Engines, the Stellar Corporate Conglomerate's main competitor."
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"	
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
 	fore_dir = SOUTH
 	vessel_size = SHIP_SIZE_SMALL
-	shuttle = "Einstein Engines Research Ship"
 	initial_restricted_waypoints = list(
 		"Einstein Engines Shuttle" = list("nav_hangar_ee")
 	)
 
 	initial_generic_waypoints = list(
-		"nav_ee_spy_ship_1"
+		"nav_ee_spy_ship_1",
+		"nav_ee_spy_ship_2"
 	)
 
-/obj/effect/overmap/visitable/ship/landable/ee_spy_ship/New()
+/obj/effect/overmap/visitable/ship/ee_spy_ship/New()
 	name = "EERV [pick("Brilliance", "Oppenheimer", "Fermi", "Slingshot", "Shanghai", "Bern", "Hadron", "Positron", "Invention", "Nikola Tesla", "Quark")]"
 	..()
 
 /obj/effect/shuttle_landmark/ee_spy_ship/nav1
-	name = "Einstein Engines Research Ship #1"
+	name = "Einstein Engines Research Ship - Port Side"
 	landmark_tag = "nav_ee_spy_ship_1"
 	base_turf = /turf/space/dynamic
-	base_area = /area/template_noop
+	base_area = /area/space
 
-/datum/shuttle/autodock/overmap/ee_spy_ship
-	name = "Einstein Engines Research Ship"
-	warmup_time = 5
-	range = 1
-	current_location = "nav_ee_spy_ship_start"
-	shuttle_area = list(/area/shuttle/ee_spy_ship)
-	knockdown = FALSE
-
-	fuel_consumption = 4
-	logging_home_tag = "nav_ee_spy_ship_start"
-	defer_initialisation = TRUE
-
-/obj/effect/shuttle_landmark/ee_spy_ship/start
-	name = "Uncharted Space"
-	landmark_tag = "nav_ee_spy_ship_start"
+/obj/effect/shuttle_landmark/ee_spy_ship/nav2
+	name = "Einstein Engines Research Ship - Port Airlock"
+	landmark_tag = "nav_ee_spy_ship_2"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
 
 /obj/effect/shuttle_landmark/ee_spy_ship/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_ee_spy_ship"
 	base_turf = /turf/space/transit/south
 
-/obj/machinery/computer/shuttle_control/explore/ee_spy_ship
-	name = "ship control console"
-	shuttle_tag = "Einstein Engines Research Ship"
-	req_access = list(access_ee_spy_ship)
-
 //shuttle stuff
 /obj/effect/overmap/visitable/ship/landable/ee_shuttle
 	name = "Einstein Engines Shuttle"
@@ -235,13 +194,12 @@
 	fuel_consumption = 2
 	logging_home_tag = "nav_hangar_ee"
 	defer_initialisation = TRUE
-	mothershuttle = "Einstein Engines Research Ship"
 
 /obj/effect/shuttle_landmark/ee_shuttle/hangar
 	name = "Einstein Engines Shuttle Hangar"
 	landmark_tag = "nav_hangar_ee"
 	docking_controller = "ee_shuttle_dock"
-	base_area = /area/shuttle/ee_spy_ship
+	base_area = /area/ship/ee_spy_ship
 	base_turf = /turf/simulated/floor/plating
 	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
diff --git a/maps/away/ships/ee_spy_ship.dmm b/maps/away/ships/ee_spy_ship.dmm
index 4b64641160e..28fc6bb9135 100644
--- a/maps/away/ships/ee_spy_ship.dmm
+++ b/maps/away/ships/ee_spy_ship.dmm
@@ -1,8 +1,4 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aaa" = (
-/obj/effect/overmap/visitable/sector/ee_spy_ship,
-/turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
 "aab" = (
 /obj/machinery/computer/shuttle_control/explore/ee_shuttle{
 	dir = 4;
@@ -10,25 +6,18 @@
 	},
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/ee_shuttle)
-"aac" = (
-/obj/machinery/computer/shuttle_control/explore/ee_spy_ship{
-	dir = 1;
-	req_access = list(205)
-	},
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
 "aaI" = (
 /obj/machinery/atmospherics/unary/engine,
 /obj/structure/window/reinforced,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aaJ" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Telecomms"
 	},
 /obj/structure/plasticflaps/airtight,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "ajL" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /turf/simulated/wall/shuttle/space_ship,
@@ -38,15 +27,15 @@
 	dir = 5
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aow" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "atj" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "awG" = (
 /obj/structure/table/rack,
 /obj/item/tank/jetpack,
@@ -54,7 +43,7 @@
 /obj/item/tank/jetpack,
 /obj/item/tank/jetpack,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aBD" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -62,13 +51,13 @@
 	id_tag = "ee_spy_ship_out"
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aCd" = (
 /obj/machinery/computer/ship/sensors{
 	dir = 1
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aEq" = (
 /obj/structure/table/rack,
 /obj/machinery/light{
@@ -79,7 +68,7 @@
 /obj/item/clothing/shoes/magboots,
 /obj/item/clothing/shoes/magboots,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aEB" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -89,99 +78,99 @@
 /obj/item/clothing/suit/space/void/einstein,
 /obj/item/clothing/head/helmet/space/void/einstein,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aHs" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aHt" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden,
 /obj/machinery/meter,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aHv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aHw" = (
 /obj/machinery/computer/ship/engines{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aJd" = (
 /obj/machinery/atmospherics/binary/pump/high_power{
 	dir = 1;
 	layer = 2.8
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aMB" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /obj/machinery/papershredder,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aOU" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aSi" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aSm" = (
 /obj/machinery/door/airlock/silver{
 	name = "Toilet"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aSJ" = (
 /obj/machinery/computer/ship/engines{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "aSN" = (
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "bcf" = (
 /obj/machinery/washing_machine,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "bci" = (
 /obj/machinery/computer/ship/helm{
 	dir = 1;
 	req_access = list(205)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "bgV" = (
 /turf/simulated/wall/shuttle/space_ship/cardinal,
 /area/shuttle/ee_shuttle)
 "bkQ" = (
 /obj/structure/dispenser/oxygen,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "buA" = (
 /obj/structure/table/standard,
 /obj/item/stack/medical/bruise_pack/full,
 /obj/item/stack/medical/ointment/full,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "buK" = (
 /obj/machinery/computer/ship/navigation,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "buM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 6
@@ -192,7 +181,7 @@
 	id_tag = "ee_spy_ship_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "cLC" = (
 /obj/structure/table/steel,
 /obj/item/paper_bin,
@@ -200,11 +189,11 @@
 /obj/item/pen,
 /obj/item/pen,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "cMo" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "cQs" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 1
@@ -214,31 +203,31 @@
 "cTq" = (
 /obj/structure/bookcase/manuals,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "cVA" = (
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "cYw" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "dfe" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "dqJ" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "dHA" = (
 /obj/structure/bed/stool/chair/office/dark,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "dQZ" = (
 /obj/machinery/telecomms/allinone/ship,
 /obj/machinery/light/small,
@@ -246,13 +235,13 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "dTw" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Hangar"
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "eiL" = (
 /obj/machinery/light{
 	icon_state = "tube1"
@@ -261,17 +250,17 @@
 /obj/item/storage/firstaid/fire,
 /obj/item/storage/firstaid/o2,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "eiR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "epw" = (
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "etL" = (
 /turf/space/transit/south,
 /area/space)
@@ -279,13 +268,13 @@
 /obj/machinery/atmospherics/portables_connector,
 /obj/machinery/portable_atmospherics/canister/air/airlock,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "ewW" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "exg" = (
 /obj/machinery/light{
 	dir = 1;
@@ -297,53 +286,53 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "eBK" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
 /obj/effect/shuttle_landmark/ee_shuttle/hangar,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "eCV" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 4
 	},
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "eIb" = (
 /obj/machinery/vending/engivend{
 	req_access = list(205)
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "eMT" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "eTH" = (
 /obj/structure/table/steel,
 /obj/item/storage/toolbox/electrical,
 /obj/item/storage/toolbox/mechanical,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "eYX" = (
 /obj/machinery/light{
 	dir = 1;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "fnE" = (
 /obj/structure/bed/stool/chair/office/bridge/generic,
-/obj/effect/overmap/visitable/ship/landable/ee_spy_ship,
+/obj/effect/overmap/visitable/ship/ee_spy_ship,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "fnY" = (
 /obj/structure/closet/crate/loot,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "frC" = (
 /obj/machinery/vending/wallmed1{
 	name = "Medical Supplies";
@@ -355,7 +344,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "fws" = (
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
 	frequency = 1380;
@@ -368,33 +357,33 @@
 	tag_interior_door = "ee_spy_ship_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "fBb" = (
 /obj/structure/table/steel,
 /obj/item/storage/box/gloves,
 /obj/item/storage/box/masks,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "fNZ" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /obj/structure/closet/crate/freezer/rations,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "fQq" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Head";
 	req_access = list(205)
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "fRD" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 25
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "fVv" = (
 /obj/structure/closet{
 	name = "disguise equipment"
@@ -417,14 +406,14 @@
 /obj/item/clothing/head/softcap/idris,
 /obj/item/storage/secure/briefcase,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "fZq" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Horizon Refuse Sorting";
 	req_access = list(205)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "gcq" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(205)
@@ -436,7 +425,7 @@
 /obj/item/gun/energy/pistol,
 /obj/item/gun/energy/pistol,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "goI" = (
 /obj/structure/closet/walllocker/emerglocker/west,
 /turf/simulated/floor/shuttle/black,
@@ -447,23 +436,23 @@
 	},
 /obj/structure/closet/crate/loot,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "gyl" = (
 /obj/machinery/vending/tool,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "gHC" = (
 /obj/structure/fuel_port{
 	pixel_x = -32
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "gLO" = (
 /obj/structure/table/steel,
 /obj/item/folder/yellow,
 /obj/item/folder/red,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "hdb" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 8;
@@ -471,7 +460,7 @@
 	},
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "heP" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -485,22 +474,22 @@
 /obj/item/mop,
 /obj/item/reagent_containers/glass/bucket,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "hiw" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Maintenance"
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "huE" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "hBd" = (
 /obj/structure/table/standard,
 /obj/item/soap,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "hBs" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -25
@@ -522,21 +511,21 @@
 	name = "igs - ee_crewman"
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "hZq" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Dock";
 	req_access = list(205)
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "iaK" = (
 /obj/structure/toilet,
 /obj/machinery/light/small{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "iiZ" = (
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
 	frequency = 1380;
@@ -557,7 +546,7 @@
 "irX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "ive" = (
 /obj/structure/bed/stool/chair/shuttle{
 	dir = 1
@@ -576,27 +565,33 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
+"iOV" = (
+/obj/machinery/computer/ship/engines{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/ship/ee_spy_ship)
 "jEu" = (
 /obj/structure/bed/stool/chair/office/bridge/pilot{
 	dir = 1
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "kaR" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -25
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "kfX" = (
 /obj/structure/closet/crate/freezer/rations,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "kpR" = (
 /obj/machinery/light/small,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "kqx" = (
 /obj/structure/table/steel,
 /obj/structure/window/reinforced{
@@ -604,28 +599,28 @@
 	},
 /obj/structure/window/reinforced,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "krH" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Research Officer's Quarters";
 	req_access = list(205)
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "kwe" = (
 /turf/simulated/wall/shuttle/space_ship/cardinal,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "kzm" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "kAt" = (
 /obj/structure/table/wood,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "kPs" = (
 /obj/structure/closet/cabinet,
 /obj/item/spacecash/c1000,
@@ -645,14 +640,14 @@
 /obj/item/spacecash/c1,
 /obj/item/spacecash/c1000,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "lhC" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Operations";
 	req_access = list(205)
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "lpe" = (
 /obj/machinery/hologram/holopad/long_range,
 /obj/effect/overmap/visitable/ship/landable/ee_shuttle,
@@ -665,26 +660,26 @@
 	dir = 4
 	},
 /turf/simulated/floor/airless,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "lwj" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp/lava/blue,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "lFg" = (
 /obj/structure/table/standard,
 /obj/item/reagent_containers/toothbrush/green,
 /obj/item/reagent_containers/toothpaste,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "mkb" = (
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "mwP" = (
 /obj/structure/table/standard,
 /obj/item/device/flashlight/lamp,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "mEc" = (
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
 	frequency = 1380;
@@ -692,7 +687,7 @@
 	pixel_y = 24
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "mET" = (
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -702,26 +697,35 @@
 	name = "trashbin"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "mJE" = (
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "mLa" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "mPM" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 9
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
+"ncB" = (
+/obj/machinery/door/airlock/external{
+	frequency = 1380;
+	icon_state = "door_locked";
+	id_tag = "ee_spy_ship_out"
+	},
+/obj/effect/shuttle_landmark/ee_spy_ship/nav2,
+/turf/simulated/floor,
+/area/ship/ee_spy_ship)
 "ntt" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -731,17 +735,17 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "nty" = (
 /obj/structure/table/steel,
 /obj/item/device/camera,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "nDn" = (
 /obj/item/device/flashlight/lamp,
 /obj/structure/table/steel,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "nVi" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/machinery/light{
@@ -749,7 +753,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "ofY" = (
 /obj/machinery/atmospherics/portables_connector{
 	layer = 2.8
@@ -765,7 +769,7 @@
 	pixel_y = 31
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "opS" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -773,14 +777,14 @@
 	id_tag = "ee_spy_ship_pump"
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "oNi" = (
 /obj/machinery/light{
 	dir = 4;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "pfE" = (
 /obj/structure/fuel_port{
 	pixel_x = -32
@@ -790,7 +794,7 @@
 "piw" = (
 /obj/item/modular_computer/console/preset/civilian,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "pwR" = (
 /obj/machinery/light{
 	dir = 1;
@@ -800,17 +804,17 @@
 	pixel_y = 24
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "pAh" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle,
 /turf/simulated/floor/plating,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "pBl" = (
 /obj/structure/table/steel,
 /obj/item/storage/briefcase/crimekit,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "pCa" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -823,7 +827,7 @@
 	pixel_y = 26
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "pDZ" = (
 /obj/machinery/vending/wallmed1{
 	name = "Medical Supplies";
@@ -842,7 +846,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "pRf" = (
 /obj/effect/step_trigger/teleporter,
 /turf/template_noop,
@@ -855,18 +859,18 @@
 	id_tag = "ee_spy_ship_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "pXP" = (
 /obj/structure/table/steel,
 /obj/item/device/flashlight/lamp/lava/green,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "pYB" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "que" = (
 /obj/effect/step_trigger/teleporter,
 /turf/space/transit/south,
@@ -876,7 +880,7 @@
 	dir = 10
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "qHO" = (
 /obj/effect/shuttle_landmark/ee_spy_ship/transit,
 /turf/space/transit/south,
@@ -886,13 +890,13 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "rtf" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "rNp" = (
 /obj/structure/bed/stool/chair/shuttle{
 	dir = 8
@@ -910,7 +914,7 @@
 	pixel_y = -8
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "szY" = (
 /obj/machinery/shipsensors/weak,
 /obj/structure/railing/mapped{
@@ -930,30 +934,26 @@
 "sBA" = (
 /obj/structure/trash_pile,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "sGi" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Cockpit";
 	req_access = list(205)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "sOb" = (
 /obj/effect/step_trigger/teleporter,
 /obj/effect/step_trigger/teleporter,
 /turf/space/transit/south,
 /area/space)
-"ths" = (
-/obj/effect/shuttle_landmark/ee_spy_ship/start,
-/turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
 "tpL" = (
 /obj/machinery/light{
 	dir = 1;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "tra" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(205)
@@ -963,29 +963,29 @@
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "tCH" = (
 /obj/structure/table/standard,
 /obj/item/paper_bin,
 /obj/item/pen/multi,
 /obj/item/device/binoculars,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "uaE" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 1
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "ufp" = (
 /obj/machinery/light/small,
 /obj/structure/trash_pile,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "upC" = (
 /obj/machinery/hologram/holopad/long_range,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "uwT" = (
 /obj/machinery/access_button{
 	command = "cycle_exterior";
@@ -996,12 +996,12 @@
 	pixel_y = -10
 	},
 /turf/template_noop,
-/area/shuttle/ee_spy_ship)
+/area/space)
 "uxz" = (
 /obj/structure/table/steel,
 /obj/item/storage/box/cups,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "uCl" = (
 /obj/machinery/cryopod{
 	dir = 2
@@ -1010,7 +1010,7 @@
 	pixel_y = 30
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "uNN" = (
 /obj/structure/bed/padded,
 /obj/effect/ghostspawpoint{
@@ -1019,13 +1019,13 @@
 	},
 /obj/item/bedsheet/black,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "uWn" = (
 /obj/structure/table/rack,
 /obj/item/storage/firstaid,
 /obj/item/storage/firstaid/adv,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "uYP" = (
 /obj/machinery/light/small/emergency{
 	dir = 4
@@ -1040,14 +1040,14 @@
 	dir = 5
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "vdX" = (
 /obj/effect/shuttle_landmark/ee_spy_ship/nav1,
 /turf/template_noop,
 /area/space)
 "vwF" = (
 /turf/unsimulated/wall/fakepdoor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "vxN" = (
 /obj/structure/closet/crate,
 /obj/item/stack/material/phoron{
@@ -1060,7 +1060,7 @@
 /obj/item/clothing/gloves/yellow,
 /obj/item/clothing/gloves/yellow,
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "vMq" = (
 /obj/structure/bed/padded,
 /obj/effect/ghostspawpoint{
@@ -1069,20 +1069,20 @@
 	},
 /obj/item/bedsheet/black,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "vTv" = (
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "vUu" = (
 /obj/machinery/light/small{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "wfy" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/manifold/visible{
@@ -1096,7 +1096,7 @@
 	req_access = list(205)
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "wrJ" = (
 /obj/effect/shuttle_landmark/ee_shuttle/transit,
 /turf/space/transit/south,
@@ -1106,7 +1106,7 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "wCo" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/manifold/visible{
@@ -1119,10 +1119,10 @@
 "wLs" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "wUJ" = (
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "wXi" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/window/reinforced{
@@ -1132,7 +1132,7 @@
 /obj/item/clothing/suit/space/void/einstein,
 /obj/item/clothing/head/helmet/space/void/einstein,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "wZf" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle,
@@ -1140,7 +1140,7 @@
 /area/shuttle/ee_shuttle)
 "xbK" = (
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "xoc" = (
 /turf/simulated/wall/shuttle/space_ship,
 /area/shuttle/ee_shuttle)
@@ -1152,13 +1152,13 @@
 /area/shuttle/ee_shuttle)
 "xQS" = (
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 "xRX" = (
 /turf/template_noop,
 /area/space)
 "yjk" = (
 /turf/simulated/wall/shuttle/space_ship,
-/area/shuttle/ee_spy_ship)
+/area/ship/ee_spy_ship)
 
 (1,1,1) = {"
 xRX
@@ -33388,9 +33388,9 @@ wUJ
 wUJ
 wUJ
 wUJ
-ths
 wUJ
-aaa
+wUJ
+wUJ
 wUJ
 wUJ
 wUJ
@@ -33656,7 +33656,7 @@ dfe
 yjk
 pwR
 xQS
-aac
+iOV
 pAh
 xRX
 xRX
@@ -36727,7 +36727,7 @@ xRX
 xRX
 xRX
 pAh
-aBD
+ncB
 aBD
 pAh
 xRX
diff --git a/maps/away/ships/fsf_patrol_ship.dmm b/maps/away/ships/fsf_patrol_ship.dmm
index b2add027c0b..3a77bab1a84 100644
--- a/maps/away/ships/fsf_patrol_ship.dmm
+++ b/maps/away/ships/fsf_patrol_ship.dmm
@@ -5,25 +5,25 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aab" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/light/small/emergency{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aac" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aaI" = (
 /obj/machinery/atmospherics/unary/engine,
 /obj/structure/window/reinforced,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aaJ" = (
 /obj/machinery/bodyscanner{
 	dir = 8
@@ -32,19 +32,19 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "acx" = (
 /obj/structure/closet/firecloset/full,
 /obj/effect/floor_decal/industrial/outline/red,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aej" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 4
 	},
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "agg" = (
 /obj/item/modular_computer/console/preset/civilian{
 	dir = 1
@@ -55,12 +55,12 @@
 	},
 /obj/effect/floor_decal/corner/red/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ahU" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ajL" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 5
@@ -70,30 +70,30 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "akP" = (
 /obj/machinery/light{
 	dir = 1;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "anK" = (
 /obj/structure/bed/padded,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aou" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "atj" = (
 /obj/structure/table/standard,
 /obj/item/reagent_containers/toothpaste,
 /obj/item/reagent_containers/toothbrush/green,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "auY" = (
 /obj/structure/table/steel,
 /obj/item/device/binoculars,
@@ -101,7 +101,7 @@
 	pixel_y = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "axe" = (
 /obj/structure/table/rack,
 /obj/item/clothing/head/welding{
@@ -109,7 +109,7 @@
 	},
 /obj/item/clothing/head/welding,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "axB" = (
 /obj/effect/shuttle_landmark/fsf_patrol_ship/nav1,
 /turf/template_noop,
@@ -122,7 +122,7 @@
 /obj/item/stack/material/steel/full,
 /obj/item/stack/material/glass/reinforced/full,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aBb" = (
 /obj/machinery/access_button{
 	command = "cycle_exterior";
@@ -133,11 +133,11 @@
 	pixel_y = -10
 	},
 /turf/template_noop,
-/area/shuttle/fsf_patrol_ship)
+/area/space)
 "aCd" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aCu" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/machinery/light{
@@ -145,7 +145,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aEq" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -158,31 +158,31 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/vending/coffee/free,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aHt" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden,
 /obj/machinery/meter,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aHv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aHw" = (
 /obj/machinery/light/small/emergency{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aJd" = (
 /obj/machinery/atmospherics/binary/pump/high_power{
 	dir = 1;
 	layer = 2.8
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aLo" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -25
@@ -192,7 +192,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aMB" = (
 /obj/structure/table/steel,
 /obj/item/storage/slide_projector,
@@ -200,7 +200,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aOU" = (
 /obj/machinery/light/small/emergency{
 	dir = 4
@@ -211,25 +211,25 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aSi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/emergency{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aSm" = (
 /obj/structure/weightlifter,
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aSJ" = (
 /obj/machinery/computer/ship/engines{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aUn" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 1
@@ -248,14 +248,14 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aVu" = (
 /obj/machinery/door/airlock/security{
 	name = "Weapons Systems";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aXh" = (
 /obj/structure/table/steel,
 /obj/item/laser_components/modifier/stock,
@@ -264,23 +264,23 @@
 	pixel_y = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "aZQ" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/sign/nosmoking_1{
 	pixel_x = -32
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "bcf" = (
 /obj/structure/table/rack,
 /obj/item/storage/toolbox/mechanical,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "bci" = (
 /obj/machinery/vending/tool,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "bfg" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
@@ -294,7 +294,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/holofloor/tiled/ramp,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "bgD" = (
 /obj/structure/railing/mapped,
 /obj/effect/floor_decal/corner/blue/full,
@@ -307,7 +307,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "blv" = (
 /obj/structure/table/standard,
 /obj/structure/bedsheetbin,
@@ -317,27 +317,27 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "buK" = (
 /obj/structure/sign/vacuum{
 	pixel_y = -32
 	},
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "bxR" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "bzW" = (
 /obj/structure/sign/fire{
 	pixel_x = -32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "bFk" = (
 /obj/item/modular_computer/console/preset/civilian{
 	dir = 1
@@ -347,14 +347,14 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "bGz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "bNj" = (
 /obj/effect/shuttle_landmark/fsf_patrol_ship/transit,
 /turf/space/transit/south,
@@ -368,7 +368,7 @@
 	name = "cannon breechs"
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ccm" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
@@ -379,7 +379,7 @@
 /obj/item/tape_roll,
 /obj/item/tape_roll,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "cdD" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -392,7 +392,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "cwd" = (
 /obj/structure/sign/nosmoking_1{
 	pixel_x = -32
@@ -402,7 +402,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "cCV" = (
 /obj/structure/toilet{
 	pixel_y = 10
@@ -411,7 +411,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "cTN" = (
 /obj/structure/bed/roller,
 /obj/structure/curtain/open/medical,
@@ -419,25 +419,25 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "dhp" = (
 /obj/machinery/door/airlock/security{
 	name = "Checkpoint";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "dHE" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "dLJ" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Telecomms"
 	},
 /obj/structure/plasticflaps/airtight,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "dPp" = (
 /obj/structure/table/steel,
 /obj/machinery/door/window/northleft{
@@ -453,7 +453,7 @@
 /obj/item/paper_bin,
 /obj/item/pen,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "dQZ" = (
 /obj/machinery/shower{
 	dir = 8
@@ -464,12 +464,12 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "dSA" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "dTw" = (
 /obj/machinery/atmospherics/portables_connector{
 	layer = 2.8
@@ -487,7 +487,7 @@
 	pixel_x = -10
 	},
 /turf/simulated/floor/carpet/blue,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "dYq" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10
@@ -498,14 +498,14 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "edg" = (
 /obj/machinery/iv_drip,
 /obj/effect/floor_decal/corner_wide/green/full{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "eeP" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/black,
@@ -524,7 +524,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/carpet/blue,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "eiX" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/machinery/light{
@@ -532,7 +532,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "etL" = (
 /turf/space/transit/south,
 /area/space)
@@ -541,17 +541,17 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "eMT" = (
 /obj/machinery/appliance/cooker/grill,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "eMY" = (
 /obj/machinery/appliance/cooker/oven,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "eOK" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -560,73 +560,73 @@
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "eTq" = (
 /obj/machinery/appliance/cooker/stove,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "eTH" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/sign/flag/sol/left{
 	pixel_y = 30
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "eYk" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/sign/flag/sol/right{
 	pixel_y = 30
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "eYX" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "far" = (
 /obj/structure/bed/stool,
 /obj/effect/floor_decal/spline/plain{
 	dir = 10
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fhJ" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fji" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fjy" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fkj" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/freezer/rations,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fnE" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fnY" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/light/small/emergency{
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fqb" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 4
@@ -635,32 +635,32 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "frC" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ftq" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/computer/ship/sensors{
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fva" = (
 /obj/machinery/light/small/emergency{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fAN" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fCq" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/structure/sign/nosmoking_2{
@@ -674,7 +674,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fDM" = (
 /obj/structure/closet/cabinet,
 /obj/item/spacecash/c1000,
@@ -715,7 +715,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/carpet/blue,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fFu" = (
 /obj/structure/table/steel,
 /obj/item/storage/firstaid/adv,
@@ -724,7 +724,7 @@
 	},
 /obj/effect/floor_decal/corner_wide/green/full,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fFU" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
@@ -732,7 +732,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fQq" = (
 /obj/machinery/vending/wallmed1{
 	name = "Medical Supplies";
@@ -753,23 +753,23 @@
 	dir = 4
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fUw" = (
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fVv" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fXG" = (
 /obj/structure/table/steel,
 /obj/item/toy/desk/newtoncradle,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fYt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -777,7 +777,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "fZq" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 5
@@ -794,14 +794,14 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "gkM" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "glO" = (
 /obj/machinery/body_scanconsole{
 	dir = 4
@@ -810,7 +810,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "gnr" = (
 /obj/effect/floor_decal/corner_wide/green/full{
 	dir = 4
@@ -818,7 +818,7 @@
 /obj/structure/table/steel,
 /obj/item/storage/firstaid/surgery,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "goI" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -828,14 +828,14 @@
 	},
 /obj/machinery/floodlight,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "gqw" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
 /obj/effect/shuttle_landmark/fsf_shuttle/hangar,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "gqO" = (
 /obj/machinery/shipsensors/weak,
 /obj/structure/railing/mapped{
@@ -861,17 +861,17 @@
 	},
 /obj/machinery/floodlight,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "gyl" = (
 /obj/structure/punching_bag,
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "gyL" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/vending/dinnerware,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "gAg" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet,
@@ -880,7 +880,7 @@
 /obj/item/storage/belt/security,
 /obj/item/storage/belt/security,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "gAS" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10
@@ -889,7 +889,7 @@
 	pixel_y = 25
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "gXx" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/light{
@@ -898,12 +898,12 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "gXD" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "gYw" = (
 /obj/effect/floor_decal/carpet/blue{
 	dir = 4
@@ -913,7 +913,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/carpet/blue,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hdb" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 8;
@@ -922,19 +922,19 @@
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "heP" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/bed/stool,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hiw" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Maintenance";
 	req_access = list(203)
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hjH" = (
 /obj/structure/sign/securearea{
 	pixel_y = -32
@@ -945,7 +945,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hjW" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor,
 /turf/simulated/floor/plating,
@@ -1001,44 +1001,44 @@
 	pixel_y = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "huE" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/machinery/door/airlock/security{
 	name = "Infirmary"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hxl" = (
 /obj/machinery/door/airlock/security{
 	name = "Small Arms Locker";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hzg" = (
 /obj/structure/closet/toolcloset,
 /obj/item/clothing/gloves/yellow,
 /obj/item/clothing/gloves/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hBs" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hQA" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hVU" = (
 /obj/machinery/light{
 	dir = 4;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hXZ" = (
 /obj/effect/floor_decal/carpet/blue{
 	dir = 1
@@ -1047,7 +1047,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/carpet/blue,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hZe" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(203)
@@ -1056,7 +1056,7 @@
 /obj/item/gun/energy/taser,
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "hZq" = (
 /obj/machinery/computer/ship/helm{
 	req_access = list(203)
@@ -1075,7 +1075,7 @@
 	pixel_y = 26
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ikP" = (
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
 	frequency = 1380;
@@ -1088,7 +1088,7 @@
 	tag_interior_door = "sfa_patrol_ship_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ilo" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -1096,13 +1096,13 @@
 	id_tag = "sfa_patrol_ship_out"
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "inf" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 5
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "irz" = (
 /obj/machinery/appliance/cooker/fryer,
 /obj/effect/floor_decal/corner/black/diagonal,
@@ -1111,7 +1111,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "iwP" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/sink{
@@ -1119,7 +1119,7 @@
 	pixel_x = 11
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "iBZ" = (
 /obj/item/clothing/suit/storage/hazardvest,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -1130,7 +1130,7 @@
 /obj/item/clothing/head/hardhat,
 /obj/item/clothing/head/hardhat,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "iGK" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/door/window/northleft{
@@ -1139,7 +1139,7 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "iIT" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
@@ -1151,7 +1151,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/holofloor/tiled/ramp/bottom,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "iJB" = (
 /obj/machinery/computer/shuttle_control/explore/fsf_shuttle{
 	dir = 4
@@ -1176,7 +1176,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/generic,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "iQt" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/table/rack,
@@ -1189,7 +1189,7 @@
 	},
 /obj/item/tank/jetpack/carbondioxide,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "iQy" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 10
@@ -1203,13 +1203,13 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "iRD" = (
 /obj/structure/table/rack,
 /obj/item/device/assembly/infra,
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "iWa" = (
 /obj/structure/toilet{
 	dir = 8
@@ -1218,14 +1218,14 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "jdD" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "jeR" = (
 /obj/structure/filingcabinet{
 	desc = "A large cabinet with drawers. Those are some fancy cabinets, High-Speed.";
@@ -1239,7 +1239,7 @@
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "jmA" = (
 /obj/structure/table/rack,
 /obj/item/gun/energy/plasmacutter{
@@ -1251,7 +1251,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "jxF" = (
 /obj/structure/bed/roller,
 /obj/structure/curtain/open/medical,
@@ -1259,14 +1259,14 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "jEu" = (
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "jFZ" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -1274,11 +1274,11 @@
 	id_tag = "sfa_patrol_ship_pump"
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "jGx" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "jHa" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/door/airlock/security{
@@ -1286,7 +1286,7 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "jIq" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -25
@@ -1308,7 +1308,7 @@
 	},
 /obj/item/clothing/head/cone,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kaR" = (
 /obj/structure/table/steel,
 /obj/item/storage/firstaid/fire{
@@ -1328,17 +1328,17 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kcJ" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/smartfridge/foodheater,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "keV" = (
 /obj/structure/table/steel,
 /obj/item/clothing/head/hardhat/orange,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kjN" = (
 /obj/machinery/sleeper{
 	dir = 8
@@ -1347,7 +1347,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kmF" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/computer/ship/helm{
@@ -1355,16 +1355,16 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "krH" = (
 /obj/structure/bed/stool,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ktI" = (
 /obj/machinery/door/airlock/security,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ktN" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -1379,7 +1379,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kzm" = (
 /obj/machinery/hologram/holopad/long_range,
 /obj/effect/overmap/visitable/ship/landable/fsf_shuttle,
@@ -1405,31 +1405,31 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kFw" = (
 /obj/structure/dispenser/oxygen,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kIx" = (
 /obj/structure/curtain/open/shower,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kJp" = (
 /obj/item/screwdriver,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kMV" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kSt" = (
 /obj/structure/bed/padded,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kTD" = (
 /obj/structure/table/steel,
 /obj/item/folder/white,
@@ -1437,7 +1437,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kWZ" = (
 /obj/structure/table/steel,
 /obj/item/storage/box/gloves,
@@ -1446,10 +1446,10 @@
 	},
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "kYY" = (
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lcg" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/light{
@@ -1457,7 +1457,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ldz" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 6
@@ -1466,17 +1466,17 @@
 	dir = 4
 	},
 /turf/simulated/floor/holofloor/tiled/ramp/bottom,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lfq" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lit" = (
 /obj/structure/bed/stool,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "llg" = (
 /obj/structure/closet/walllocker/emerglocker/west,
 /turf/simulated/floor/shuttle/black,
@@ -1488,7 +1488,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "loX" = (
 /obj/structure/table/rack,
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -1499,7 +1499,7 @@
 	},
 /obj/item/grenade/chem_grenade,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lwj" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/table/rack,
@@ -1508,13 +1508,13 @@
 /obj/item/clothing/shoes/magboots,
 /obj/item/tank/jetpack/carbondioxide,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lFg" = (
 /obj/structure/weightlifter,
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/item/towel,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lGR" = (
 /obj/structure/fuel_port{
 	pixel_x = -32
@@ -1533,18 +1533,18 @@
 	pixel_y = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lOH" = (
 /obj/structure/table/wood,
 /obj/item/modular_computer/laptop/preset/civilian,
 /turf/simulated/floor/carpet/blue,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lOJ" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin,
 /obj/item/pen,
 /turf/simulated/floor/wood,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lRa" = (
 /obj/machinery/atmospherics/binary/pump/high_power,
 /turf/simulated/floor/shuttle/black,
@@ -1553,7 +1553,7 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/table/steel,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lUc" = (
 /obj/structure/table/steel,
 /obj/machinery/light{
@@ -1570,23 +1570,23 @@
 	pickup_sound = 'sound/items/pickup/gun.ogg'
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lUH" = (
 /obj/machinery/light{
 	icon_state = "tube1";
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "lXE" = (
 /obj/structure/table/steel,
 /obj/item/pen/drafting/blue,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "mdc" = (
 /obj/structure/bed/stool/chair/office/dark,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "mfR" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 6
@@ -1598,7 +1598,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "mgi" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/black,
@@ -1610,7 +1610,7 @@
 	name = "igs - fsf_navy_crewman"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "msC" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/black,
@@ -1623,7 +1623,7 @@
 	name = "igs - fsf_navy_crewman"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "mwV" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/light{
@@ -1632,7 +1632,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "mEc" = (
 /obj/structure/table/steel,
 /obj/item/paper_bin,
@@ -1646,7 +1646,7 @@
 	pixel_y = -3
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "mET" = (
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/fsf_shuttle)
@@ -1661,20 +1661,20 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "mGs" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "mWk" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
 /obj/item/clothing/head/cone,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ncb" = (
 /obj/structure/noticeboard{
 	pixel_y = 28
@@ -1682,7 +1682,7 @@
 /obj/structure/table/steel,
 /obj/item/tape_roll,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "nic" = (
 /turf/simulated/wall/shuttle/raider,
 /area/shuttle/fsf_shuttle)
@@ -1690,13 +1690,13 @@
 /obj/structure/table/steel,
 /obj/item/device/flashlight/lamp,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "nsN" = (
 /obj/structure/bed/stool/chair{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ntt" = (
 /obj/structure/table/steel,
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sol{
@@ -1708,21 +1708,20 @@
 	pixel_y = -1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "nty" = (
 /obj/machinery/door/airlock/security{
 	name = "Head";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "nvz" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	icon_state = "bridge"
 	},
-/obj/effect/overmap/visitable/sector/fsf_patrol_ship,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "nBN" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/manifold/visible{
@@ -1735,7 +1734,7 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/vending/cigarette/hacked,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "nSb" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/manifold/visible{
@@ -1751,7 +1750,7 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "nVi" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/black,
@@ -1760,14 +1759,14 @@
 	name = "igs - fsf_navy_crewman"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "obG" = (
 /obj/machinery/hologram/holopad/long_range,
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ofG" = (
 /obj/item/storage/belt/medical/first_responder,
 /obj/item/roller,
@@ -1786,7 +1785,7 @@
 /obj/item/clothing/head/hardhat/white,
 /obj/item/clothing/head/hardhat/white,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "oie" = (
 /obj/structure/table/steel,
 /obj/item/book/manual/wiki/engineering_construction{
@@ -1798,19 +1797,19 @@
 	name = "ship blueprints"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "oqH" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	dir = 8
 	},
 /turf/simulated/floor/carpet/blue,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "oqN" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "oFb" = (
 /obj/structure/table/rack,
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -1819,14 +1818,14 @@
 	},
 /obj/item/trash/uselessplastic,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "oJN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "oKX" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /turf/simulated/wall/shuttle/raider,
@@ -1841,7 +1840,7 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "oRr" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(203)
@@ -1856,21 +1855,21 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "oSU" = (
 /obj/machinery/door/airlock/security{
 	name = "Crew Quarters";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "pfE" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/sign/nosmoking_1{
 	pixel_x = 32
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "phC" = (
 /obj/structure/table/steel,
 /obj/item/paper_bin,
@@ -1883,13 +1882,12 @@
 	icon_state = "tube1";
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
-/obj/effect/shuttle_landmark/fsf_patrol_ship/start,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "phQ" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "pPS" = (
 /obj/machinery/vending/wallmed1{
 	name = "Medical Supplies";
@@ -1898,7 +1896,7 @@
 	req_access = null
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "pRf" = (
 /obj/effect/step_trigger/teleporter,
 /turf/template_noop,
@@ -1929,24 +1927,24 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "pXP" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/light/small/emergency{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "qbP" = (
 /obj/structure/table/steel,
 /obj/item/storage/toolbox/electrical,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "qcp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/device/flashlight/heavy,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "qcz" = (
 /obj/structure/table/steel,
 /obj/item/storage/box/cups,
@@ -1955,20 +1953,20 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "qgw" = (
 /obj/machinery/door/airlock/security{
 	name = "Lieutenant's Quarters";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "qil" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "qjY" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 1
@@ -1980,10 +1978,10 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "quc" = (
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "que" = (
 /obj/effect/step_trigger/teleporter,
 /turf/space/transit/south,
@@ -1999,43 +1997,43 @@
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "qyG" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "qBC" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 4
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "qHm" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "rdB" = (
 /obj/structure/janitorialcart/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "rrx" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "rtf" = (
 /obj/machinery/vending/engivend{
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ryb" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "rzy" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -2046,7 +2044,7 @@
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "rAo" = (
 /obj/machinery/light{
 	dir = 1;
@@ -2054,7 +2052,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "rCw" = (
 /obj/machinery/computer/ship/navigation{
 	dir = 1
@@ -2067,7 +2065,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "rNp" = (
 /obj/structure/bed/stool/chair/office/dark,
 /obj/effect/floor_decal/corner_wide/green/full{
@@ -2080,31 +2078,31 @@
 	req_access = null
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "sfM" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/bed/stool/chair/office/bridge/pilot,
-/obj/effect/overmap/visitable/ship/landable/fsf_patrol_ship,
+/obj/effect/overmap/visitable/ship/fsf_patrol_ship,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "srj" = (
 /obj/machinery/door/airlock/security{
 	name = "Bridge";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "sKE" = (
 /obj/machinery/door/airlock/security{
 	name = "Briefing Room";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "sLj" = (
 /obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "sOb" = (
 /obj/effect/step_trigger/teleporter,
 /obj/effect/step_trigger/teleporter,
@@ -2112,7 +2110,7 @@
 /area/space)
 "sSs" = (
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "sVY" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -2121,12 +2119,12 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "taa" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/loot,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "taq" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -2137,20 +2135,20 @@
 	dir = 5
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "tnP" = (
 /obj/structure/sign/securearea{
 	pixel_y = -32
 	},
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "tra" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "trv" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
@@ -2161,7 +2159,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ttw" = (
 /obj/machinery/shipsensors/weak,
 /obj/structure/railing/mapped,
@@ -2169,7 +2167,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/airless,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ttC" = (
 /obj/structure/sink{
 	dir = 8;
@@ -2183,19 +2181,19 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ttG" = (
 /obj/structure/bed/stool,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ttH" = (
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "tvp" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "txi" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -2207,53 +2205,53 @@
 	pixel_y = -30
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "tHO" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
 /obj/item/storage/toolbox/mechanical,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "tKM" = (
 /obj/machinery/light{
 	icon_state = "tube1";
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "tWo" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "tWH" = (
 /obj/machinery/constructable_frame/temp_deco,
 /obj/effect/decal/remains/robot,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "tYU" = (
 /obj/effect/floor_decal/spline/plain,
 /obj/structure/noticeboard{
 	pixel_x = -32
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "uaE" = (
 /turf/unsimulated/wall/fakepdoor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "udB" = (
 /obj/machinery/door/airlock/glass_security{
 	name = "Cell";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "uBC" = (
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "uCl" = (
 /obj/structure/table/wood,
 /obj/item/flame/lighter/zippo/sol{
@@ -2269,7 +2267,7 @@
 	pixel_y = -4
 	},
 /turf/simulated/floor/carpet/blue,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "uHi" = (
 /obj/machinery/door/airlock/security{
 	name = "Gym";
@@ -2277,21 +2275,21 @@
 	},
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "uHV" = (
 /obj/effect/floor_decal/carpet/blue{
 	dir = 4
 	},
 /turf/simulated/floor/carpet/blue,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "uWQ" = (
 /obj/machinery/washing_machine,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "uYP" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vfY" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/table/rack,
@@ -2304,7 +2302,7 @@
 	},
 /obj/item/tank/jetpack/carbondioxide,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vgc" = (
 /obj/machinery/light{
 	dir = 1;
@@ -2314,7 +2312,7 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vmq" = (
 /obj/machinery/constructable_frame/temp_deco,
 /obj/item/material/wirerod,
@@ -2326,7 +2324,7 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vns" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light{
@@ -2335,7 +2333,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vtl" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
@@ -2350,7 +2348,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/holofloor/tiled/ramp,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vwF" = (
 /obj/machinery/telecomms/allinone/ship,
 /obj/effect/floor_decal/industrial/outline,
@@ -2358,13 +2356,13 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vxN" = (
 /obj/structure/table/steel,
 /obj/item/clipboard,
 /obj/item/folder/blue,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vAi" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(203)
@@ -2375,12 +2373,12 @@
 /obj/item/ammo_magazine/a10mm,
 /obj/item/ammo_magazine/a10mm,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vCD" = (
 /obj/structure/table/steel,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vCZ" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
@@ -2391,7 +2389,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vGx" = (
 /obj/structure/table/steel,
 /obj/machinery/door/window/northleft{
@@ -2399,35 +2397,35 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vJj" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/light/small/emergency{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vLp" = (
 /turf/simulated/floor/carpet/blue,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vMq" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vMF" = (
 /obj/item/trash/spitwad,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vOB" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vPt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vPL" = (
 /obj/structure/fuel_port{
 	pixel_x = 10;
@@ -2441,44 +2439,44 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vQR" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/wall/shuttle/raider,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "vTv" = (
 /obj/machinery/door/airlock/security{
 	name = "Engineering";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "waK" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 6
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "wfy" = (
 /obj/machinery/door/airlock/security{
 	name = "Weapons Control";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "wha" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden,
 /obj/machinery/meter,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "wmd" = (
 /obj/structure/sign/nosmoking_1{
 	pixel_x = 32
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "woR" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
@@ -2488,7 +2486,7 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "wrJ" = (
 /obj/effect/shuttle_landmark/fsf_shuttle/transit,
 /turf/space/transit/south,
@@ -2500,12 +2498,12 @@
 	pixel_y = 7
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "wBq" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "wCo" = (
 /obj/structure/table/steel,
 /obj/machinery/door/window/eastright{
@@ -2514,7 +2512,7 @@
 	},
 /obj/item/folder/blue,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "wMs" = (
 /obj/structure/bed/stool{
 	pixel_y = 16
@@ -2526,7 +2524,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "wTJ" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(203)
@@ -2543,7 +2541,7 @@
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "wUJ" = (
 /obj/structure/sink{
 	dir = 8;
@@ -2553,7 +2551,7 @@
 	pixel_x = -28
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "wUQ" = (
 /obj/structure/bed/stool,
 /obj/structure/sign/flag/sol{
@@ -2561,7 +2559,16 @@
 	},
 /obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
+"wZc" = (
+/obj/machinery/door/airlock/external{
+	frequency = 1380;
+	icon_state = "door_locked";
+	id_tag = "sfa_patrol_ship_out"
+	},
+/obj/effect/shuttle_landmark/fsf_patrol_ship/nav2,
+/turf/simulated/floor,
+/area/ship/fsf_patrol_ship)
 "wZf" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -2570,7 +2577,7 @@
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xbK" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	icon_state = "bridge_legion"
@@ -2580,7 +2587,7 @@
 	name = "gunner's mate vest"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xdk" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
@@ -2591,15 +2598,15 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xdn" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xeO" = (
 /obj/machinery/papershredder,
 /turf/simulated/floor/wood,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xgf" = (
 /obj/machinery/conveyor{
 	name = "running machine"
@@ -2614,26 +2621,26 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xgG" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xmZ" = (
 /obj/structure/sign/greencross,
 /turf/simulated/wall/shuttle/raider,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xoc" = (
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xto" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xzu" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -2643,7 +2650,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xCV" = (
 /obj/item/clothing/accessory/storage/webbingharness,
 /obj/item/clothing/head/helmet/pilot,
@@ -2656,18 +2663,18 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xKJ" = (
 /obj/machinery/door/airlock/security{
 	name = "Brig";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xOE" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xPF" = (
 /obj/structure/table/steel,
 /obj/item/toy/comic{
@@ -2676,7 +2683,7 @@
 	name = "New Hai Phong Bustle Issue #84"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "xRX" = (
 /turf/template_noop,
 /area/space)
@@ -2685,29 +2692,22 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/fsf_patrol_ship)
-"ygO" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/computer/shuttle_control/explore/fsf_patrol_ship{
-	dir = 8
-	},
-/turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "yin" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "yjk" = (
 /turf/simulated/wall/shuttle/raider,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "yjW" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "ylV" = (
 /turf/simulated/floor/wood,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 "yme" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot{
@@ -2723,7 +2723,7 @@
 	pixel_y = 17
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/fsf_patrol_ship)
+/area/ship/fsf_patrol_ship)
 
 (1,1,1) = {"
 xRX
@@ -31368,7 +31368,7 @@ hBs
 sSs
 cdD
 kMV
-ygO
+hBs
 qyG
 qyG
 xRX
@@ -39579,7 +39579,7 @@ xRX
 xRX
 xRX
 qyG
-ilo
+wZc
 ilo
 qyG
 xRX
diff --git a/maps/away/ships/orion_express_ship.dmm b/maps/away/ships/orion_express_ship.dmm
index e34a45c3aef..09835525c3e 100644
--- a/maps/away/ships/orion_express_ship.dmm
+++ b/maps/away/ships/orion_express_ship.dmm
@@ -1,20 +1,16 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aaa" = (
-/obj/effect/overmap/visitable/sector/orion_express_ship,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
 "aaI" = (
 /obj/machinery/atmospherics/unary/engine,
 /obj/structure/window/reinforced,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aaJ" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Telecomms"
 	},
 /obj/structure/plasticflaps/airtight,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "ajL" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /turf/simulated/wall/shuttle/scc,
@@ -24,24 +20,24 @@
 	dir = 5
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aow" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "atj" = (
 /obj/structure/table/standard,
 /obj/item/device/flashlight/heavy,
 /obj/item/device/flashlight/heavy,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "awG" = (
 /obj/structure/table/rack,
 /obj/item/tank/jetpack/oxygen,
 /obj/item/tank/jetpack/oxygen,
 /obj/item/tank/jetpack/oxygen,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aEq" = (
 /obj/structure/table/rack,
 /obj/item/clothing/shoes/magboots,
@@ -51,84 +47,84 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aEB" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aHs" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aHt" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden,
 /obj/machinery/meter,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aHv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aHw" = (
 /obj/machinery/computer/ship/engines{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aJd" = (
 /obj/machinery/atmospherics/binary/pump/high_power{
 	dir = 1;
 	layer = 2.8
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aMB" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /obj/structure/table/wood,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aOU" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aSi" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aSm" = (
 /obj/machinery/door/airlock/silver{
 	name = "Toilet"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aSJ" = (
 /obj/machinery/computer/ship/engines{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aSN" = (
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aSO" = (
 /obj/effect/floor_decal/corner_wide/beige/full{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "aUD" = (
 /obj/machinery/light{
 	icon_state = "tube1"
@@ -137,11 +133,11 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "bcf" = (
 /obj/machinery/washing_machine,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "bci" = (
 /obj/machinery/computer/ship/helm{
 	dir = 1;
@@ -151,22 +147,22 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "bkQ" = (
 /obj/structure/dispenser/oxygen,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "ble" = (
 /obj/effect/floor_decal/corner_wide/beige{
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "buA" = (
 /obj/structure/table/standard,
 /obj/item/stack/medical/bruise_pack/full,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "buK" = (
 /obj/machinery/appliance/cooker/fryer,
 /obj/machinery/light{
@@ -175,28 +171,28 @@
 	},
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "bGI" = (
 /obj/effect/floor_decal/corner_wide/beige/full{
 	dir = 1
 	},
 /obj/structure/closet/crate/bin,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "ccm" = (
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "ctQ" = (
 /obj/structure/bed/stool/bar/padded/beige,
 /turf/simulated/floor/carpet,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "cuQ" = (
 /obj/effect/floor_decal/corner_wide/beige{
 	dir = 5
 	},
 /obj/machinery/vending/cola,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "cLC" = (
 /obj/machinery/light{
 	dir = 1;
@@ -207,11 +203,11 @@
 	},
 /obj/machinery/vending/zora,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "cMo" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "cQs" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 1
@@ -221,17 +217,17 @@
 "cTq" = (
 /obj/structure/bookcase/manuals,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "cVA" = (
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "dqJ" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "drY" = (
 /obj/machinery/light{
 	dir = 1;
@@ -241,16 +237,16 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "dHA" = (
 /obj/structure/table/wood,
 /obj/item/pizzabox/meat,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "dKJ" = (
 /obj/machinery/cryopod,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "dQZ" = (
 /obj/machinery/telecomms/allinone/ship,
 /obj/machinery/light/small,
@@ -258,19 +254,19 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "dTw" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Hangar"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "eiR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "etL" = (
 /turf/space/transit/south,
 /area/space)
@@ -281,13 +277,13 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "ewW" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "exg" = (
 /obj/structure/table/wood,
 /obj/machinery/light{
@@ -296,50 +292,50 @@
 	},
 /obj/item/material/ashtray,
 /turf/simulated/floor/carpet,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "eCV" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 4
 	},
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "eIb" = (
 /obj/machinery/vending/engivend{
 	req_access = list(201)
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "eMT" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "eTH" = (
 /obj/structure/table/steel,
 /obj/item/storage/toolbox/electrical,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "eYX" = (
 /obj/machinery/light{
 	dir = 1;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "fnE" = (
 /obj/structure/bed/stool/chair/office/bridge/generic,
-/obj/effect/overmap/visitable/ship/landable/orion_express_ship,
 /obj/effect/ghostspawpoint{
 	identifier = "orion_express_captain";
 	name = "igs - orion_express_captain"
 	},
+/obj/effect/overmap/visitable/ship/orion_express_ship,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "fnY" = (
 /obj/structure/table/steel,
 /obj/item/storage/toolbox/mechanical,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "frn" = (
 /obj/machinery/light{
 	dir = 4;
@@ -349,17 +345,17 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "frC" = (
 /turf/simulated/floor/carpet,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "fAJ" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /obj/effect/floor_decal/corner_wide/beige/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "fNZ" = (
 /obj/structure/bed/stool/bar/padded/beige,
 /obj/effect/ghostspawpoint{
@@ -367,13 +363,13 @@
 	name = "igs - orion_express_courier"
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "fQq" = (
 /obj/machinery/door/airlock/mining{
 	name = "Restroom"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "fRD" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 25
@@ -382,7 +378,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "fSX" = (
 /obj/effect/floor_decal/corner_wide/beige{
 	dir = 6
@@ -397,7 +393,7 @@
 	pixel_y = -8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "fXG" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden,
 /obj/machinery/door/airlock/external{
@@ -406,14 +402,14 @@
 	id_tag = "orion_traveler_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "fZq" = (
 /obj/machinery/door/airlock/mining{
 	name = "Warehouse";
 	req_access = list(201)
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "gcq" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(201)
@@ -428,7 +424,7 @@
 /obj/item/gun/energy/stunrevolver,
 /obj/item/gun/energy/blaster/carbine,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "goI" = (
 /obj/structure/closet/walllocker/emerglocker/west,
 /turf/simulated/floor/shuttle/black,
@@ -438,17 +434,17 @@
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "gyl" = (
 /obj/machinery/vending/tool,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "gHC" = (
 /obj/structure/fuel_port{
 	pixel_x = -32
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "gNV" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -456,17 +452,17 @@
 	id_tag = "orion_traveler_pump"
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "gNW" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
 /turf/simulated/floor/plating,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "gOy" = (
 /obj/machinery/vending/dinnerware,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "gZw" = (
 /obj/effect/floor_decal/corner_wide/beige{
 	dir = 9
@@ -476,7 +472,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "hdb" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 8;
@@ -484,7 +480,7 @@
 	},
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "heP" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -498,7 +494,7 @@
 	name = "Maintenance"
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "hjH" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
@@ -508,18 +504,18 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "hrA" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
 /obj/effect/shuttle_landmark/orion_express_shuttle/hangar,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "huE" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "hzn" = (
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
 	frequency = 1380;
@@ -532,12 +528,12 @@
 	tag_interior_door = "orion_traveler_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "hBd" = (
 /obj/structure/table/standard,
 /obj/item/stack/medical/ointment/full,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "hBs" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -25
@@ -551,35 +547,26 @@
 /obj/machinery/atmospherics/binary/pump/high_power,
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/orion_express_shuttle)
-"hJi" = (
-/obj/effect/floor_decal/corner_wide/beige/full{
-	dir = 4
-	},
-/obj/machinery/computer/shuttle_control/explore/orion_express_ship{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
 "hME" = (
 /obj/effect/floor_decal/corner_wide/beige{
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "hZq" = (
 /obj/machinery/door/airlock/mining{
 	name = "Dock";
 	req_access = null
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "iaK" = (
 /obj/structure/toilet,
 /obj/machinery/light/small{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "iiZ" = (
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
 	frequency = 1380;
@@ -600,7 +587,7 @@
 "irX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "ive" = (
 /obj/structure/bed/stool/chair/shuttle{
 	dir = 1
@@ -612,19 +599,19 @@
 /obj/machinery/chemical_dispenser/bar_soft/full,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "juh" = (
 /obj/machinery/computer/cryopod{
 	pixel_y = -33
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "jEu" = (
 /obj/structure/bed/stool/chair/wood{
 	dir = 1
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "kaR" = (
 /obj/effect/floor_decal/corner_wide/beige{
 	dir = 9
@@ -633,63 +620,63 @@
 	pixel_x = -25
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "kpR" = (
 /obj/machinery/light/small,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "krH" = (
 /obj/machinery/door/airlock/mining{
 	name = "Captain's Quarters";
 	req_access = list(201)
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "ktN" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/largecrate/animal/cow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "kzm" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "kAt" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp/lava/red,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "kJp" = (
 /obj/machinery/light/small{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "kPs" = (
 /obj/structure/closet/cabinet,
 /obj/item/coin/phoron,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "kYf" = (
 /obj/structure/closet/crate/bin,
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "lev" = (
 /obj/structure/table/standard,
 /obj/item/device/hand_labeler,
 /obj/item/stack/packageWrap,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "lhC" = (
 /obj/machinery/door/airlock/silver{
 	name = "Kitchen";
 	req_access = list(201)
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "lpe" = (
 /obj/effect/overmap/visitable/ship/landable/orion_express_shuttle,
 /obj/machinery/hologram/holopad/long_range,
@@ -702,7 +689,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/airless,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "lsi" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -710,27 +697,27 @@
 	id_tag = "orion_traveler_out"
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "lvc" = (
 /obj/machinery/vending/snack,
 /obj/effect/floor_decal/corner_wide/beige{
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "lwj" = (
 /obj/structure/table/wood,
 /obj/item/material/ashtray,
 /obj/item/storage/box/fancy/cigarettes,
 /obj/item/flame/lighter/zippo,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "lFg" = (
 /obj/structure/table/standard,
 /obj/item/reagent_containers/toothbrush/green,
 /obj/item/reagent_containers/toothpaste,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "mfi" = (
 /obj/structure/closet,
 /obj/item/clothing/suit/storage/toggle/leather_jacket/flight,
@@ -747,10 +734,10 @@
 /obj/item/clothing/accessory/bandanna,
 /obj/item/clothing/accessory/bandanna/black,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "mkb" = (
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "mwP" = (
 /obj/structure/table/standard,
 /obj/item/device/flashlight/lamp,
@@ -758,12 +745,12 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "mxc" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "mCc" = (
 /obj/machinery/computer/shuttle_control/explore/orion_express_shuttle{
 	dir = 4
@@ -777,19 +764,19 @@
 	pixel_y = 24
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "mLa" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "mPM" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 9
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "ntt" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -799,7 +786,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "nty" = (
 /obj/structure/table/stone/marble,
 /obj/item/reagent_containers/cooking_container/plate/bowl,
@@ -824,7 +811,7 @@
 	},
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "nBz" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -835,7 +822,7 @@
 	dir = 6
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "nJz" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -848,37 +835,37 @@
 	pixel_y = 26
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "nMV" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille/diagonal{
 	dir = 4
 	},
 /turf/simulated/floor/plating,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "nSQ" = (
 /obj/effect/floor_decal/corner_wide/beige{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "nTM" = (
 /obj/structure/bed/stool/bar/padded/beige,
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "nVi" = (
 /obj/machinery/appliance/cooker/stove,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "ofl" = (
 /obj/machinery/appliance/cooker/oven,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "ofY" = (
 /obj/machinery/atmospherics/portables_connector{
 	layer = 2.8
@@ -894,7 +881,7 @@
 	pixel_y = 31
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "oEN" = (
 /obj/machinery/access_button{
 	command = "cycle_exterior";
@@ -905,13 +892,13 @@
 	pixel_y = -10
 	},
 /turf/template_noop,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/space)
 "pbp" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "pfE" = (
 /obj/structure/fuel_port{
 	pixel_x = -32
@@ -941,18 +928,18 @@
 /obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "pjp" = (
 /obj/effect/floor_decal/corner_wide/beige,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "pre" = (
 /obj/machinery/vending/cigarette,
 /obj/effect/floor_decal/corner_wide/beige/full{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "pwR" = (
 /obj/machinery/light{
 	dir = 1;
@@ -965,17 +952,17 @@
 	pixel_y = 24
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "pxS" = (
 /obj/effect/floor_decal/corner_wide/beige/full,
 /obj/structure/closet/crate/bin,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "pAh" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille/diagonal,
 /turf/simulated/floor/plating,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "pDZ" = (
 /obj/machinery/vending/wallmed1{
 	name = "Medical Supplies";
@@ -994,7 +981,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "pJZ" = (
 /obj/machinery/light{
 	icon_state = "tube1"
@@ -1003,7 +990,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "pRf" = (
 /obj/effect/step_trigger/teleporter,
 /turf/template_noop,
@@ -1012,7 +999,7 @@
 /obj/structure/table/stone/marble,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "qil" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/window/reinforced{
@@ -1020,7 +1007,7 @@
 	},
 /obj/machinery/suit_storage_unit,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "que" = (
 /obj/effect/step_trigger/teleporter,
 /turf/space/transit/south,
@@ -1030,7 +1017,7 @@
 	dir = 10
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "qHO" = (
 /obj/effect/shuttle_landmark/orion_express_ship/transit,
 /turf/space/transit/south,
@@ -1041,22 +1028,27 @@
 	},
 /obj/effect/floor_decal/corner_wide/beige/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "riA" = (
 /turf/simulated/wall/shuttle/scc_space_ship,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "rtf" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "ruQ" = (
 /obj/effect/floor_decal/corner_wide/beige/full{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
+"rAR" = (
+/obj/effect/floor_decal/corner_wide/beige,
+/obj/structure/bed/stool/chair/office/bridge/generic,
+/turf/simulated/floor/tiled/dark,
+/area/ship/orion_express_ship)
 "rNp" = (
 /obj/structure/bed/stool/chair/shuttle{
 	dir = 8
@@ -1068,7 +1060,7 @@
 /obj/random/voidsuit/no_nanotrasen,
 /obj/random/voidsuit/no_nanotrasen,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "szY" = (
 /obj/machinery/shipsensors/weak,
 /obj/structure/railing/mapped{
@@ -1090,14 +1082,14 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "sGi" = (
 /obj/machinery/door/airlock/mining{
 	name = "Cockpit";
 	req_access = list(201)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "sOb" = (
 /obj/effect/step_trigger/teleporter,
 /obj/effect/step_trigger/teleporter,
@@ -1110,15 +1102,11 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
-"ths" = (
-/obj/effect/shuttle_landmark/orion_express_ship/start,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "tjM" = (
 /obj/machinery/hologram/holopad/long_range,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "tra" = (
 /obj/effect/floor_decal/corner_wide/beige/full{
 	dir = 4
@@ -1127,33 +1115,42 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
+"tzT" = (
+/obj/effect/floor_decal/corner_wide/beige/full{
+	dir = 4
+	},
+/obj/machinery/computer/ship/navigation{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/ship/orion_express_ship)
 "tCH" = (
 /obj/structure/table/standard,
 /obj/item/paper_bin,
 /obj/item/pen/multi,
 /obj/effect/floor_decal/corner_wide/beige/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "uaE" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "uwT" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle/scc_space_ship,
 /turf/simulated/floor/plating,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "uCl" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "uNN" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/brown,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "uYP" = (
 /obj/machinery/light/small/emergency{
 	dir = 4
@@ -1168,21 +1165,21 @@
 	dir = 5
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "vdX" = (
 /obj/effect/shuttle_landmark/orion_express_ship/nav1,
 /turf/template_noop,
 /area/space)
 "vwF" = (
 /turf/unsimulated/wall/fakepdoor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "vxN" = (
 /obj/machinery/door/blast/shutters{
 	dir = 8;
 	id = "orion_warehouse"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "vCD" = (
 /obj/machinery/door/window/northleft{
 	dir = 2;
@@ -1191,30 +1188,39 @@
 	},
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "vLp" = (
 /obj/effect/floor_decal/industrial/loading/yellow{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "vMq" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/captain,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
+"vRM" = (
+/obj/machinery/door/airlock/external{
+	frequency = 1380;
+	icon_state = "door_locked";
+	id_tag = "orion_traveler_out"
+	},
+/obj/effect/shuttle_landmark/orion_express_ship/nav2,
+/turf/simulated/floor,
+/area/ship/orion_express_ship)
 "vTv" = (
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "vUu" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/loot,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "wfy" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/manifold/visible{
@@ -1228,10 +1234,10 @@
 	req_access = list(201)
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "wmd" = (
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "wrJ" = (
 /obj/effect/shuttle_landmark/orion_express_shuttle/transit,
 /turf/space/transit/south,
@@ -1241,7 +1247,7 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "wCo" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/manifold/visible{
@@ -1253,7 +1259,7 @@
 "wLs" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "wNk" = (
 /turf/simulated/wall/shuttle/scc,
 /area/shuttle/orion_express_shuttle)
@@ -1265,7 +1271,7 @@
 /obj/structure/bed/stool/bar/padded/beige,
 /obj/structure/bed/stool/bar/padded/beige,
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "xoc" = (
 /turf/simulated/wall/shuttle/scc/cardinal,
 /area/shuttle/orion_express_shuttle)
@@ -1279,19 +1285,19 @@
 	amount = 20
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "xwj" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
 /obj/item/stack/material/plasteel,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "xzv" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
 /obj/random/voidsuit,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "xPN" = (
 /obj/machinery/computer/ship/helm{
 	req_access = list(201)
@@ -1306,7 +1312,7 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "xRX" = (
 /turf/template_noop,
 /area/space)
@@ -1315,10 +1321,10 @@
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 "yjk" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/shuttle/orion_express_ship)
+/area/ship/orion_express_ship)
 
 (1,1,1) = {"
 xRX
@@ -33548,9 +33554,9 @@ ccm
 ccm
 ccm
 ccm
-ths
 ccm
-aaa
+ccm
+ccm
 ccm
 ccm
 ccm
@@ -33815,8 +33821,8 @@ ccm
 aUD
 riA
 pwR
-pjp
-hJi
+rAR
+tzT
 gNW
 xRX
 xRX
@@ -36887,7 +36893,7 @@ xRX
 xRX
 xRX
 gNW
-lsi
+vRM
 lsi
 gNW
 xRX
diff --git a/maps/away/ships/sfa_patrol_ship.dmm b/maps/away/ships/sfa_patrol_ship.dmm
index 05c04d200a5..c146054066c 100644
--- a/maps/away/ships/sfa_patrol_ship.dmm
+++ b/maps/away/ships/sfa_patrol_ship.dmm
@@ -5,25 +5,25 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aab" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/light/small/emergency{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aac" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aaI" = (
 /obj/machinery/atmospherics/unary/engine,
 /obj/structure/window/reinforced,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aaJ" = (
 /obj/machinery/bodyscanner{
 	dir = 8
@@ -32,23 +32,23 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "acx" = (
 /obj/structure/closet/firecloset/full,
 /obj/effect/floor_decal/industrial/outline/red,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aej" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 4
 	},
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "afz" = (
 /obj/item/trash/spitwad,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "agg" = (
 /obj/item/modular_computer/console/preset/civilian{
 	dir = 1
@@ -59,12 +59,12 @@
 	},
 /obj/effect/floor_decal/corner/red/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ahU" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ajL" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 5
@@ -74,37 +74,37 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "akP" = (
 /obj/machinery/light{
 	dir = 1;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "anK" = (
 /obj/structure/bed/padded,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aou" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "atj" = (
 /obj/structure/table/standard,
 /obj/item/reagent_containers/toothpaste,
 /obj/item/reagent_containers/toothbrush/green,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "atB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/corner/red{
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "auY" = (
 /obj/structure/table/steel,
 /obj/item/device/binoculars,
@@ -112,7 +112,7 @@
 	pixel_y = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "axe" = (
 /obj/structure/table/rack,
 /obj/item/clothing/head/welding{
@@ -120,7 +120,7 @@
 	},
 /obj/item/clothing/head/welding,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "axB" = (
 /obj/effect/shuttle_landmark/sfa_patrol_ship/nav1,
 /turf/template_noop,
@@ -133,7 +133,7 @@
 /obj/item/stack/material/steel/full,
 /obj/item/stack/material/glass/reinforced/full,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aBb" = (
 /obj/machinery/access_button{
 	command = "cycle_exterior";
@@ -144,11 +144,11 @@
 	pixel_y = -10
 	},
 /turf/template_noop,
-/area/shuttle/sfa_patrol_ship)
+/area/space)
 "aCd" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aCu" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/machinery/light{
@@ -156,7 +156,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aEq" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -169,31 +169,31 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/vending/coffee/free,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aHt" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden,
 /obj/machinery/meter,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aHv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aHw" = (
 /obj/machinery/light/small/emergency{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aJd" = (
 /obj/machinery/atmospherics/binary/pump/high_power{
 	dir = 1;
 	layer = 2.8
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aLo" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -25
@@ -203,7 +203,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aMB" = (
 /obj/structure/table/steel,
 /obj/item/storage/slide_projector,
@@ -211,7 +211,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aOU" = (
 /obj/machinery/light/small/emergency{
 	dir = 4
@@ -222,25 +222,25 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aSi" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/emergency{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aSm" = (
 /obj/structure/weightlifter,
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aSJ" = (
 /obj/machinery/computer/ship/engines{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aUn" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 1
@@ -259,14 +259,14 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aVu" = (
 /obj/machinery/door/airlock/security{
 	name = "Weapons Systems";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aXh" = (
 /obj/structure/table/steel,
 /obj/item/laser_components/modifier/stock,
@@ -275,23 +275,23 @@
 	pixel_y = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "aZQ" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/sign/nosmoking_1{
 	pixel_x = -32
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "bcf" = (
 /obj/structure/table/rack,
 /obj/item/storage/toolbox/mechanical,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "bci" = (
 /obj/machinery/vending/tool,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "bfg" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
@@ -305,14 +305,14 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/holofloor/tiled/ramp,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "bfG" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "bgD" = (
 /obj/structure/railing/mapped,
 /obj/effect/floor_decal/corner/blue/full,
@@ -325,7 +325,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "blv" = (
 /obj/structure/table/standard,
 /obj/structure/bedsheetbin,
@@ -335,31 +335,31 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "buK" = (
 /obj/structure/sign/vacuum{
 	pixel_y = -32
 	},
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "buM" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "bxR" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "bzW" = (
 /obj/structure/sign/fire{
 	pixel_x = -32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "bFk" = (
 /obj/item/modular_computer/console/preset/civilian{
 	dir = 1
@@ -369,14 +369,14 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "bGz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "bNj" = (
 /obj/effect/shuttle_landmark/sfa_patrol_ship/transit,
 /turf/space/transit/south,
@@ -390,7 +390,7 @@
 	name = "cannon breechs"
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ccm" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
@@ -399,13 +399,13 @@
 /obj/item/storage/bag/inflatable,
 /obj/item/storage/box/lights/mixed,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ccO" = (
 /obj/machinery/light/small/emergency{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "cdD" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -418,7 +418,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "cwd" = (
 /obj/structure/sign/nosmoking_1{
 	pixel_x = -32
@@ -429,7 +429,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "cCV" = (
 /obj/structure/toilet{
 	pixel_y = 10
@@ -439,7 +439,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "cTN" = (
 /obj/structure/bed/roller,
 /obj/structure/curtain/open/medical,
@@ -447,25 +447,25 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "dhp" = (
 /obj/machinery/door/airlock/security{
 	name = "Checkpoint";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "dHE" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "dLJ" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Telecomms"
 	},
 /obj/structure/plasticflaps/airtight,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "dPp" = (
 /obj/structure/table/steel,
 /obj/machinery/door/window/northleft{
@@ -480,7 +480,7 @@
 	},
 /obj/item/trash/candy,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "dQZ" = (
 /obj/machinery/shower{
 	dir = 8
@@ -491,12 +491,12 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "dSA" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "dTw" = (
 /obj/machinery/atmospherics/portables_connector{
 	layer = 2.8
@@ -514,7 +514,7 @@
 	pixel_x = -10
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "dYq" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10
@@ -525,14 +525,14 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "edg" = (
 /obj/machinery/iv_drip,
 /obj/effect/floor_decal/corner_wide/green/full{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "eeP" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/black,
@@ -551,7 +551,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ehK" = (
 /obj/effect/floor_decal/carpet{
 	dir = 1
@@ -560,7 +560,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "eiX" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/machinery/light{
@@ -568,11 +568,11 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "elQ" = (
 /obj/effect/decal/cleanable/blood/drip/oil,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "etL" = (
 /turf/space/transit/south,
 /area/space)
@@ -581,7 +581,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "eDr" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10
@@ -591,17 +591,17 @@
 	pixel_y = 25
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "eMT" = (
 /obj/machinery/appliance/cooker/grill,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "eMY" = (
 /obj/machinery/appliance/cooker/oven,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "eOK" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -610,74 +610,74 @@
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "eTq" = (
 /obj/machinery/appliance/cooker/stove,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "eTH" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/sign/flag/sol/left{
 	pixel_y = 30
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "eYk" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/sign/flag/sol/right{
 	pixel_y = 30
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "eYX" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "far" = (
 /obj/structure/bed/stool,
 /obj/effect/floor_decal/spline/plain{
 	dir = 10
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fhJ" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fji" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fjy" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/blood/oil,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fkj" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/freezer/rations,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fnE" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fnY" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/light/small/emergency{
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fqb" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 4
@@ -687,33 +687,33 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "frC" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ftq" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/computer/ship/sensors{
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fva" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/emergency{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fAN" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fCq" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/structure/sign/nosmoking_2{
@@ -727,7 +727,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fDM" = (
 /obj/structure/closet/cabinet,
 /obj/item/spacecash/c1000,
@@ -768,7 +768,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fFu" = (
 /obj/structure/table/steel,
 /obj/item/storage/firstaid/adv,
@@ -777,7 +777,7 @@
 	},
 /obj/effect/floor_decal/corner_wide/green/full,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fFU" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
@@ -785,7 +785,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fQq" = (
 /obj/machinery/vending/wallmed1{
 	name = "Medical Supplies";
@@ -806,25 +806,25 @@
 	dir = 4
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fUw" = (
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fVv" = (
 /obj/effect/floor_decal/carpet{
 	dir = 4
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fXG" = (
 /obj/structure/table/steel,
 /obj/item/toy/desk/newtoncradle,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fYt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -832,7 +832,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "fZq" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 5
@@ -849,14 +849,14 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "gkM" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "glO" = (
 /obj/machinery/body_scanconsole{
 	dir = 4
@@ -865,7 +865,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "gnr" = (
 /obj/effect/floor_decal/corner_wide/green/full{
 	dir = 4
@@ -873,7 +873,7 @@
 /obj/structure/table/steel,
 /obj/item/storage/firstaid/surgery,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "goI" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -883,14 +883,14 @@
 	},
 /obj/machinery/floodlight,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "gqw" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /obj/effect/shuttle_landmark/sfa_shuttle/hangar,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "gqO" = (
 /obj/machinery/shipsensors/weak,
 /obj/structure/railing/mapped{
@@ -916,17 +916,17 @@
 	},
 /obj/machinery/floodlight,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "gyl" = (
 /obj/structure/punching_bag,
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "gyL" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/vending/dinnerware,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "gAg" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet,
@@ -935,7 +935,7 @@
 /obj/item/storage/belt/security,
 /obj/item/storage/belt/security,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "gAS" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10
@@ -944,7 +944,16 @@
 	pixel_y = 25
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
+"gXv" = (
+/obj/machinery/door/airlock/external{
+	frequency = 1380;
+	icon_state = "door_locked";
+	id_tag = "sfa_patrol_ship_out"
+	},
+/obj/effect/shuttle_landmark/sfa_patrol_ship/nav2,
+/turf/simulated/floor,
+/area/ship/sfa_patrol_ship)
 "gXx" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/light{
@@ -953,12 +962,12 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "gXD" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "hdb" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 8;
@@ -967,19 +976,19 @@
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "heP" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/bed/stool,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "hiw" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Maintenance";
 	req_access = list(203)
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "hjH" = (
 /obj/structure/sign/securearea{
 	pixel_y = -32
@@ -991,7 +1000,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "hjW" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor,
 /turf/simulated/floor/plating,
@@ -1043,44 +1052,44 @@
 	pixel_y = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "huE" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/machinery/door/airlock/security{
 	name = "Infirmary"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "hxl" = (
 /obj/machinery/door/airlock/security{
 	name = "Small Arms Locker";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "hzg" = (
 /obj/structure/closet/toolcloset,
 /obj/item/clothing/gloves/yellow,
 /obj/item/clothing/gloves/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "hBs" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "hQA" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "hVU" = (
 /obj/machinery/light{
 	dir = 4;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "hZe" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(203)
@@ -1089,7 +1098,7 @@
 /obj/item/gun/energy/taser,
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "hZq" = (
 /obj/machinery/computer/ship/helm{
 	req_access = list(203)
@@ -1108,7 +1117,7 @@
 	pixel_y = 26
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ikP" = (
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
 	frequency = 1380;
@@ -1121,7 +1130,7 @@
 	tag_interior_door = "sfa_patrol_ship_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ilo" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -1129,13 +1138,13 @@
 	id_tag = "sfa_patrol_ship_out"
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "inf" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 5
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "irz" = (
 /obj/machinery/appliance/cooker/fryer,
 /obj/effect/floor_decal/corner/black/diagonal,
@@ -1144,7 +1153,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ive" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light{
@@ -1152,7 +1161,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "iwP" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/sink{
@@ -1160,7 +1169,7 @@
 	pixel_x = 11
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "iBZ" = (
 /obj/item/clothing/suit/storage/hazardvest,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -1171,7 +1180,7 @@
 /obj/item/taperoll/engineering,
 /obj/item/clothing/head/hardhat,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "iGK" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/door/window/northleft{
@@ -1180,7 +1189,7 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "iIT" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
@@ -1192,7 +1201,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/holofloor/tiled/ramp/bottom,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "iJB" = (
 /obj/machinery/computer/shuttle_control/explore/sfa_shuttle{
 	dir = 4
@@ -1217,7 +1226,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/generic,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "iQt" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/table/rack,
@@ -1230,7 +1239,7 @@
 	},
 /obj/item/tank/jetpack/carbondioxide,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "iQy" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 10
@@ -1244,13 +1253,13 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "iRD" = (
 /obj/structure/table/rack,
 /obj/item/device/assembly/infra,
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "iWa" = (
 /obj/structure/toilet{
 	dir = 8
@@ -1263,14 +1272,14 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "jdD" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "jeR" = (
 /obj/structure/filingcabinet{
 	desc = "A large cabinet with drawers. Those are some fancy cabinets, High-Speed.";
@@ -1284,7 +1293,7 @@
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "jmA" = (
 /obj/structure/table/rack,
 /obj/item/gun/energy/plasmacutter{
@@ -1296,7 +1305,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "jxF" = (
 /obj/structure/bed/roller,
 /obj/structure/curtain/open/medical,
@@ -1304,14 +1313,14 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "jEu" = (
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "jFZ" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -1319,11 +1328,11 @@
 	id_tag = "sfa_patrol_ship_pump"
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "jGx" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "jHa" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/door/airlock/security{
@@ -1331,7 +1340,7 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "jIq" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -25
@@ -1353,7 +1362,7 @@
 	},
 /obj/item/clothing/head/cone,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kaR" = (
 /obj/structure/table/steel,
 /obj/item/storage/firstaid/fire{
@@ -1373,24 +1382,24 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kcJ" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/smartfridge/foodheater,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "keV" = (
 /obj/structure/table/steel,
 /obj/item/clothing/head/hardhat/orange,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kgs" = (
 /obj/structure/table/steel,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/item/trash/ramen,
 /obj/structure/table/steel,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kjN" = (
 /obj/machinery/sleeper{
 	dir = 8
@@ -1399,7 +1408,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kmF" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/computer/ship/helm{
@@ -1407,23 +1416,23 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kpn" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10
 	},
 /obj/effect/decal/cleanable/blood/drip/oil,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "krH" = (
 /obj/structure/bed/stool,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ktI" = (
 /obj/machinery/door/airlock/security,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ktN" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -1438,7 +1447,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kzm" = (
 /obj/effect/overmap/visitable/ship/landable/sfa_shuttle,
 /obj/machinery/hologram/holopad/long_range,
@@ -1464,36 +1473,36 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kFw" = (
 /obj/structure/dispenser/oxygen,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kIx" = (
 /obj/structure/curtain/open/shower,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kJp" = (
 /obj/item/screwdriver,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kMV" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kNX" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/drip/oil,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kSt" = (
 /obj/structure/bed/padded,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kTD" = (
 /obj/structure/table/steel,
 /obj/item/folder/white,
@@ -1501,7 +1510,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kWZ" = (
 /obj/structure/table/steel,
 /obj/item/storage/box/gloves,
@@ -1510,10 +1519,10 @@
 	},
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "kYY" = (
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lcg" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/light{
@@ -1521,7 +1530,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ldz" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 6
@@ -1530,18 +1539,18 @@
 	dir = 4
 	},
 /turf/simulated/floor/holofloor/tiled/ramp/bottom,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lfq" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lit" = (
 /obj/structure/bed/stool,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "llg" = (
 /obj/structure/closet/walllocker/emerglocker/west,
 /turf/simulated/floor/shuttle/black,
@@ -1553,7 +1562,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "loX" = (
 /obj/structure/table/rack,
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -1564,7 +1573,7 @@
 	},
 /obj/item/grenade/chem_grenade,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lwj" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/table/rack,
@@ -1573,13 +1582,13 @@
 /obj/item/clothing/shoes/magboots,
 /obj/item/tank/jetpack/carbondioxide,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lFg" = (
 /obj/structure/weightlifter,
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/item/towel,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lGR" = (
 /obj/structure/fuel_port{
 	pixel_x = -32
@@ -1598,22 +1607,22 @@
 	pixel_y = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lNz" = (
 /obj/structure/window/full,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lOH" = (
 /obj/structure/table/wood,
 /obj/item/modular_computer/laptop/preset/civilian,
 /turf/simulated/floor/carpet,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lOJ" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin,
 /obj/item/pen,
 /turf/simulated/floor/wood,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lRa" = (
 /obj/machinery/atmospherics/binary/pump/high_power,
 /turf/simulated/floor/shuttle/black,
@@ -1623,7 +1632,7 @@
 /obj/structure/table/steel,
 /obj/item/trash/plate,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lUc" = (
 /obj/structure/table/steel,
 /obj/machinery/light{
@@ -1640,23 +1649,23 @@
 	pickup_sound = 'sound/items/pickup/gun.ogg'
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lUH" = (
 /obj/machinery/light{
 	icon_state = "tube1";
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "lXE" = (
 /obj/structure/table/steel,
 /obj/item/pen/drafting/blue,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "mdc" = (
 /obj/structure/bed/stool/chair/office/dark,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "mfR" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 6
@@ -1668,7 +1677,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "mgi" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/black,
@@ -1680,10 +1689,10 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "mkb" = (
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "msC" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/black,
@@ -1696,7 +1705,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "mwV" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/light{
@@ -1705,7 +1714,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "mEc" = (
 /obj/structure/table/steel,
 /obj/item/paper_bin,
@@ -1719,7 +1728,7 @@
 	pixel_y = -3
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "mET" = (
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/sfa_shuttle)
@@ -1734,13 +1743,13 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "mGs" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "mLa" = (
 /turf/simulated/wall/shuttle/raider,
 /area/shuttle/sfa_shuttle)
@@ -1750,7 +1759,7 @@
 	},
 /obj/item/clothing/head/cone,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ncb" = (
 /obj/structure/noticeboard{
 	pixel_y = 28
@@ -1758,18 +1767,18 @@
 /obj/structure/table/steel,
 /obj/item/tape_roll,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "nny" = (
 /obj/structure/table/steel,
 /obj/item/device/flashlight/lamp,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "nsN" = (
 /obj/structure/bed/stool/chair{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ntt" = (
 /obj/structure/table/steel,
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sol{
@@ -1781,21 +1790,20 @@
 	pixel_y = -1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "nty" = (
 /obj/machinery/door/airlock/security{
 	name = "Head";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "nvz" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	icon_state = "bridge"
 	},
-/obj/effect/overmap/visitable/sector/sfa_patrol_ship,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "nBN" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/manifold/visible{
@@ -1808,7 +1816,7 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/machinery/vending/cigarette/hacked,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "nSb" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/manifold/visible{
@@ -1824,7 +1832,7 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "nVi" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/black,
@@ -1833,14 +1841,14 @@
 	name = "igs - sfa_navy_crewman"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "obG" = (
 /obj/machinery/hologram/holopad/long_range,
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ofG" = (
 /obj/item/storage/belt/medical/first_responder,
 /obj/item/roller,
@@ -1859,7 +1867,7 @@
 /obj/item/clothing/head/hardhat/white,
 /obj/item/clothing/head/hardhat/white,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "oie" = (
 /obj/structure/table/steel,
 /obj/item/book/manual/wiki/engineering_construction{
@@ -1871,19 +1879,19 @@
 	name = "ship blueprints"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "oqH" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	dir = 8
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "oqN" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "oFb" = (
 /obj/structure/table/rack,
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -1892,14 +1900,14 @@
 	},
 /obj/item/trash/uselessplastic,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "oJN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "oKX" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /turf/simulated/wall/shuttle/raider,
@@ -1909,7 +1917,7 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/table/steel,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "oPL" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -1920,7 +1928,7 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "oRr" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(203)
@@ -1935,21 +1943,21 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "oSU" = (
 /obj/machinery/door/airlock/security{
 	name = "Crew Quarters";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "pfE" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/sign/nosmoking_1{
 	pixel_x = 32
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "phC" = (
 /obj/structure/table/steel,
 /obj/item/paper_bin,
@@ -1957,23 +1965,22 @@
 /obj/item/folder/blue{
 	pixel_x = -16
 	},
-/obj/effect/shuttle_landmark/sfa_patrol_ship/start,
 /obj/machinery/light{
 	dir = 1;
 	icon_state = "tube1";
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "phQ" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "pBY" = (
 /obj/structure/window/full,
 /obj/structure/window/full,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "pPS" = (
 /obj/machinery/vending/wallmed1{
 	name = "Medical Supplies";
@@ -1982,7 +1989,7 @@
 	req_access = null
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "pRf" = (
 /obj/effect/step_trigger/teleporter,
 /turf/template_noop,
@@ -2013,7 +2020,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "pXP" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/item/target{
@@ -2023,17 +2030,17 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "qbP" = (
 /obj/structure/table/steel,
 /obj/item/storage/toolbox/electrical,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "qcp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/device/flashlight/heavy,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "qcz" = (
 /obj/structure/table/steel,
 /obj/item/storage/box/cups,
@@ -2042,27 +2049,27 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "qgw" = (
 /obj/machinery/door/airlock/security{
 	name = "Lieutenant's Quarters";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "qil" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "qjR" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/mopbucket,
 /obj/item/reagent_containers/glass/bucket,
 /obj/item/mop,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "qjY" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 1
@@ -2075,14 +2082,14 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "quc" = (
 /obj/effect/decal/remains/rat{
 	desc = "Looks like the charred remains of a small rodent. This one was a sort of beloved ship pet. He always did love to ride in the shuttle.";
 	name = "Barry"
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "que" = (
 /obj/effect/step_trigger/teleporter,
 /turf/space/transit/south,
@@ -2098,50 +2105,50 @@
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "qyG" = (
 /obj/structure/window/full,
 /turf/simulated/floor/plating,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "qBC" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 4
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "qHm" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "rdB" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/vending/sovietsoda{
 	name = "Soda Water Machine"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "rgA" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "rrx" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "rtf" = (
 /obj/machinery/vending/engivend{
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ryb" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "rzy" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -2152,7 +2159,7 @@
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "rAo" = (
 /obj/machinery/light{
 	dir = 1;
@@ -2160,7 +2167,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "rCw" = (
 /obj/machinery/computer/ship/navigation{
 	dir = 1
@@ -2173,7 +2180,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "rNp" = (
 /obj/structure/bed/stool/chair/office/dark,
 /obj/effect/floor_decal/corner_wide/green/full{
@@ -2186,24 +2193,24 @@
 	req_access = null
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "sfM" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/bed/stool/chair/office/bridge/pilot,
-/obj/effect/overmap/visitable/ship/landable/sfa_patrol_ship,
+/obj/effect/overmap/visitable/ship/sfa_patrol_ship,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "shH" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "srj" = (
 /obj/machinery/door/airlock/security{
 	name = "Bridge";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "sAC" = (
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -2211,21 +2218,21 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "sBA" = (
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "sKE" = (
 /obj/machinery/door/airlock/security{
 	name = "Briefing Room";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "sLj" = (
 /obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "sOb" = (
 /obj/effect/step_trigger/teleporter,
 /obj/effect/step_trigger/teleporter,
@@ -2235,7 +2242,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "sVY" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -2244,12 +2251,12 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "taa" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/loot,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "taq" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -2260,20 +2267,20 @@
 	dir = 5
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "tnP" = (
 /obj/structure/sign/securearea{
 	pixel_y = -32
 	},
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "tra" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "trv" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
@@ -2284,7 +2291,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ttw" = (
 /obj/machinery/shipsensors/weak,
 /obj/structure/railing/mapped,
@@ -2292,7 +2299,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/airless,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ttC" = (
 /obj/structure/sink{
 	dir = 8;
@@ -2306,19 +2313,19 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ttG" = (
 /obj/structure/bed/stool,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ttH" = (
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "tvp" = (
 /obj/structure/window/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "txi" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -2330,53 +2337,53 @@
 	pixel_y = -30
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "tHO" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
 	},
 /obj/item/storage/toolbox/mechanical,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "tKM" = (
 /obj/machinery/light{
 	icon_state = "tube1";
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "tWo" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "tWH" = (
 /obj/machinery/constructable_frame/temp_deco,
 /obj/item/stack/cable_coil,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "tYU" = (
 /obj/effect/floor_decal/spline/plain,
 /obj/structure/noticeboard{
 	pixel_x = -32
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "uaE" = (
 /turf/unsimulated/wall/fakepdoor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "udB" = (
 /obj/machinery/door/airlock/glass_security{
 	name = "Cell";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "uBC" = (
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "uCl" = (
 /obj/structure/table/wood,
 /obj/item/flame/lighter/zippo/sol{
@@ -2392,7 +2399,7 @@
 	pixel_y = -4
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "uHi" = (
 /obj/machinery/door/airlock/security{
 	name = "Gym";
@@ -2400,7 +2407,7 @@
 	},
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "uHV" = (
 /obj/effect/floor_decal/carpet{
 	dir = 4
@@ -2410,15 +2417,15 @@
 	dir = 6
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "uWQ" = (
 /obj/machinery/washing_machine,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "uYP" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vfY" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/table/rack,
@@ -2432,7 +2439,7 @@
 	},
 /obj/item/tank/jetpack/carbondioxide,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vgc" = (
 /obj/machinery/light{
 	dir = 1;
@@ -2442,7 +2449,7 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vmq" = (
 /obj/machinery/constructable_frame/temp_deco,
 /obj/item/material/wirerod,
@@ -2454,7 +2461,7 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vns" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light{
@@ -2463,7 +2470,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vtl" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
@@ -2478,7 +2485,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/holofloor/tiled/ramp,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vwF" = (
 /obj/machinery/telecomms/allinone/ship,
 /obj/effect/floor_decal/industrial/outline,
@@ -2487,13 +2494,13 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vxN" = (
 /obj/structure/table/steel,
 /obj/item/clipboard,
 /obj/item/folder/blue,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vAi" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(203)
@@ -2504,13 +2511,13 @@
 /obj/item/ammo_magazine/a10mm,
 /obj/item/ammo_magazine/a10mm,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vCD" = (
 /obj/structure/table/steel,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/item/trash/plate,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vCZ" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
@@ -2521,7 +2528,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vGx" = (
 /obj/structure/table/steel,
 /obj/machinery/door/window/northleft{
@@ -2529,36 +2536,36 @@
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vJj" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/light/small/emergency{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vLp" = (
 /turf/simulated/floor/carpet,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vMq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/generic,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vMF" = (
 /obj/item/trash/spitwad,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vOB" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vPt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vPL" = (
 /obj/structure/fuel_port{
 	pixel_x = 10;
@@ -2572,44 +2579,44 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vQR" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/wall/shuttle/raider,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "vTv" = (
 /obj/machinery/door/airlock/security{
 	name = "Engineering";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "waK" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 6
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "wfy" = (
 /obj/machinery/door/airlock/security{
 	name = "Weapons Control";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "wha" = (
 /obj/machinery/atmospherics/pipe/manifold4w/hidden,
 /obj/machinery/meter,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "wmd" = (
 /obj/structure/sign/nosmoking_1{
 	pixel_x = 32
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "woR" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
@@ -2619,7 +2626,7 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "wrJ" = (
 /obj/effect/shuttle_landmark/sfa_shuttle/transit,
 /turf/space/transit/south,
@@ -2631,12 +2638,12 @@
 	pixel_y = 7
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "wBq" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "wCo" = (
 /obj/structure/table/steel,
 /obj/machinery/door/window/eastright{
@@ -2645,7 +2652,7 @@
 	},
 /obj/item/folder/blue,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "wMs" = (
 /obj/structure/bed/stool{
 	pixel_y = 16
@@ -2657,7 +2664,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "wTJ" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(203)
@@ -2674,7 +2681,7 @@
 /obj/item/ammo_magazine/mc9mm,
 /obj/item/ammo_magazine/mc9mm,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "wUJ" = (
 /obj/structure/sink{
 	dir = 8;
@@ -2685,7 +2692,7 @@
 	},
 /obj/effect/decal/cleanable/mucus,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "wUQ" = (
 /obj/structure/bed/stool,
 /obj/structure/sign/flag/sol{
@@ -2693,7 +2700,7 @@
 	},
 /obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "wZf" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -2702,7 +2709,7 @@
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xbK" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	icon_state = "bridge_legion"
@@ -2712,7 +2719,7 @@
 	name = "gunner's mate vest"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xdk" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
@@ -2723,15 +2730,15 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xdn" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xeO" = (
 /obj/machinery/papershredder,
 /turf/simulated/floor/wood,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xgf" = (
 /obj/machinery/conveyor{
 	name = "running machine"
@@ -2746,22 +2753,22 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xmZ" = (
 /obj/structure/sign/greencross,
 /turf/simulated/wall/shuttle/raider,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xoc" = (
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xto" = (
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /obj/effect/floor_decal/corner_wide/green/diagonal,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xzu" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -2771,7 +2778,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xCV" = (
 /obj/item/clothing/accessory/storage/webbingharness,
 /obj/item/clothing/head/helmet/pilot,
@@ -2784,18 +2791,18 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xKJ" = (
 /obj/machinery/door/airlock/security{
 	name = "Brig";
 	req_access = list(203)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xOE" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xPF" = (
 /obj/structure/table/steel,
 /obj/item/toy/comic{
@@ -2804,7 +2811,7 @@
 	name = "New Hai Phong Bustle Issue #42"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "xRX" = (
 /turf/template_noop,
 /area/space)
@@ -2813,29 +2820,22 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/sfa_patrol_ship)
-"ygO" = (
-/obj/machinery/computer/shuttle_control/explore/sfa_patrol_ship{
-	dir = 8
-	},
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "yin" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "yjk" = (
 /turf/simulated/wall/shuttle/raider,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "yjW" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "ylV" = (
 /turf/simulated/floor/wood,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 "yme" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/item/reagent_containers/food/drinks/bottle/whiskey{
@@ -2851,7 +2851,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/sfa_patrol_ship)
+/area/ship/sfa_patrol_ship)
 
 (1,1,1) = {"
 xRX
@@ -31496,7 +31496,7 @@ hBs
 sBA
 cdD
 kMV
-ygO
+hBs
 lNz
 lNz
 xRX
@@ -39707,7 +39707,7 @@ xRX
 xRX
 xRX
 qyG
-ilo
+gXv
 ilo
 qyG
 xRX
diff --git a/maps/away/ships/sol.dm b/maps/away/ships/sol.dm
index e04cbce7b31..a7f306e2be1 100644
--- a/maps/away/ships/sol.dm
+++ b/maps/away/ships/sol.dm
@@ -6,22 +6,15 @@
 	spawn_weight = 1
 	spawn_cost = 1
 	id = "sfa_patrol_ship"
-	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/sfa_patrol_ship, /datum/shuttle/autodock/overmap/sfa_shuttle)
-
-/obj/effect/overmap/visitable/sector/sfa_patrol_ship
-	name = "faint ship activity"
-	desc = "A sector with faint hints of previous ship presence."
-	in_space = 1
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/sfa_shuttle)
 
 /decl/submap_archetype/sfa_patrol_ship
 	map = "SFA Patrol Ship"
 	descriptor = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship’s lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew. This one's transponder identifies it as belonging to the Southern Fleet Administration, an all-but-defunct Solarian warlord state."
 
 //areas
-
-/area/shuttle/sfa_patrol_ship
+/area/ship/sfa_patrol_ship
 	name = "SFA Patrol Ship"
-	icon_state = "shuttle"
 
 /area/shuttle/sfa_shuttle
 	name = "SFA Shuttle"
@@ -29,59 +22,46 @@
 
 //ship stuff
 
-/obj/effect/overmap/visitable/ship/landable/sfa_patrol_ship
+/obj/effect/overmap/visitable/ship/sfa_patrol_ship
 	name = "SFA Patrol Ship"
 	desc = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship’s lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew. This one's transponder identifies it as belonging to the Southern Fleet Administration, an all-but-defunct Solarian warlord state."
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"	
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
 	fore_dir = SOUTH
 	vessel_size = SHIP_SIZE_SMALL
-	shuttle = "SFA Patrol Ship"
 	initial_restricted_waypoints = list(
 		"SFA Shuttle" = list("nav_hangar_sfa")
 	)
 
 	initial_generic_waypoints = list(
-		"nav_sfa_patrol_ship_1"
+		"nav_sfa_patrol_ship_1",
+		"nav_sfa_patrol_ship_2"
 	)
 
-/obj/effect/overmap/visitable/ship/landable/sfa_patrol_ship/New()
+/obj/effect/overmap/visitable/ship/sfa_patrol_ship/New()
 	name = "SFAV [pick("Brigand", "Zheng Yi Sao", "Watchman", "Edward Teach", "Beauchamp's Revenge", "Blackguard", "Viking", "Despoiler", "Wayward Son", "Black Sheep")]"
 	..()
 
 /obj/effect/shuttle_landmark/sfa_patrol_ship/nav1
-	name = "SFA Patrol Ship #1"
+	name = "SFA Patrol Ship - Port Side"
 	landmark_tag = "nav_sfa_patrol_ship_1"
 	base_turf = /turf/space/dynamic
-	base_area = /area/template_noop
+	base_area = /area/space
 
-/datum/shuttle/autodock/overmap/sfa_patrol_ship
-	name = "SFA Patrol Ship"
-	warmup_time = 5
-	range = 1
-	current_location = "nav_sfa_patrol_ship_start"
-	shuttle_area = list(/area/shuttle/sfa_patrol_ship)
-	knockdown = FALSE
-
-	fuel_consumption = 4
-	logging_home_tag = "nav_sfa_patrol_ship_start"
-	defer_initialisation = TRUE
-
-/obj/effect/shuttle_landmark/sfa_patrol_ship/start
-	name = "Uncharted Space"
-	landmark_tag = "nav_sfa_patrol_ship_start"
+/obj/effect/shuttle_landmark/sfa_patrol_ship/nav2
+	name = "SFA Patrol Ship - Port Airlock"
+	landmark_tag = "nav_sfa_patrol_ship_2"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
 
 /obj/effect/shuttle_landmark/sfa_patrol_ship/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_sfa_patrol_ship"
 	base_turf = /turf/space/transit/south
 
-/obj/machinery/computer/shuttle_control/explore/sfa_patrol_ship
-	name = "ship control console"
-	shuttle_tag = "SFA Patrol Ship"
-	req_access = list(access_sol_ships)
-
 //shuttle stuff
 /obj/effect/overmap/visitable/ship/landable/sfa_shuttle
 	name = "SFA Shuttle"
@@ -108,13 +88,12 @@
 	fuel_consumption = 2
 	logging_home_tag = "nav_hangar_sfa"
 	defer_initialisation = TRUE
-	mothershuttle = "SFA Patrol Ship"
 
 /obj/effect/shuttle_landmark/sfa_shuttle/hangar
 	name = "SFA Shuttle Hangar"
 	landmark_tag = "nav_hangar_sfa"
 	docking_controller = "sfa_shuttle_dock"
-	base_area = /area/shuttle/sfa_patrol_ship
+	base_area = /area/ship/sfa_patrol_ship
 	base_turf = /turf/simulated/floor/plating
 	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
@@ -133,22 +112,15 @@
 	spawn_weight = 1
 	spawn_cost = 1
 	id = "fsf_patrol_ship"
-	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/fsf_patrol_ship, /datum/shuttle/autodock/overmap/fsf_shuttle)
-
-/obj/effect/overmap/visitable/sector/fsf_patrol_ship
-	name = "faint ship activity"
-	desc = "A sector with faint hints of previous ship presence."
-	in_space = 1
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/fsf_shuttle)
 
 /decl/submap_archetype/fsf_patrol_ship
 	map = "FSF Patrol Ship"
 	descriptor = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship’s lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew. This one's transponder identifies it as belonging to the Free Solarian Fleets, a Solarian warlord's mercenary fleet."
 
 //areas
-
-/area/shuttle/fsf_patrol_ship
+/area/ship/fsf_patrol_ship
 	name = "FSF Patrol Ship"
-	icon_state = "shuttle"
 
 /area/shuttle/fsf_shuttle
 	name = "FSF Shuttle"
@@ -156,59 +128,46 @@
 
 //ship stuff
 
-/obj/effect/overmap/visitable/ship/landable/fsf_patrol_ship
+/obj/effect/overmap/visitable/ship/fsf_patrol_ship
 	name = "FSF Patrol Ship"
 	desc = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship’s lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew. This one's transponder identifies it as belonging to the Free Solarian Fleets, a Solarian warlord's mercenary fleet."
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
 	fore_dir = SOUTH
 	vessel_size = SHIP_SIZE_SMALL
-	shuttle = "FSF Patrol Ship"
 	initial_restricted_waypoints = list(
 		"FSF Shuttle" = list("nav_hangar_fsf")
 	)
 
 	initial_generic_waypoints = list(
-		"nav_fsf_patrol_ship_1"
+		"nav_fsf_patrol_ship_1",
+		"nav_fsf_patrol_ship_2"
 	)
 
-/obj/effect/overmap/visitable/ship/landable/fsf_patrol_ship/New()
+/obj/effect/overmap/visitable/ship/fsf_patrol_ship/New()
 	name = "FSFV [pick("Varangian", "Swiss Guard", "Free Company", "Praetorian", "Gurkha", "Roland", "Whispering Death", "Gordon Ingram", "Jungle Work", "Habiru", "Francs-Tireurs", "Catalan", "Navarrese", "Breton", "Corsair")]"
 	..()
 
 /obj/effect/shuttle_landmark/fsf_patrol_ship/nav1
-	name = "FSF Patrol Ship #1"
+	name = "FSF Patrol Ship - Port Side"
 	landmark_tag = "nav_fsf_patrol_ship_1"
 	base_turf = /turf/space/dynamic
-	base_area = /area/template_noop
+	base_area = /area/space
 
-/datum/shuttle/autodock/overmap/fsf_patrol_ship
-	name = "FSF Patrol Ship"
-	warmup_time = 5
-	range = 1
-	current_location = "nav_fsf_patrol_ship_start"
-	shuttle_area = list(/area/shuttle/fsf_patrol_ship)
-	knockdown = FALSE
-
-	fuel_consumption = 4
-	logging_home_tag = "nav_fsf_patrol_ship_start"
-	defer_initialisation = TRUE
-
-/obj/effect/shuttle_landmark/fsf_patrol_ship/start
-	name = "Uncharted Space"
-	landmark_tag = "nav_fsf_patrol_ship_start"
+/obj/effect/shuttle_landmark/fsf_patrol_ship/nav2
+	name = "FSF Patrol Ship - Port Side"
+	landmark_tag = "nav_fsf_patrol_ship_2"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
 
 /obj/effect/shuttle_landmark/fsf_patrol_ship/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_fsf_patrol_ship"
 	base_turf = /turf/space/transit/south
 
-/obj/machinery/computer/shuttle_control/explore/fsf_patrol_ship
-	name = "ship control console"
-	shuttle_tag = "FSF Patrol Ship"
-	req_access = list(access_sol_ships)
-
 //shuttle stuff
 /obj/effect/overmap/visitable/ship/landable/fsf_shuttle
 	name = "FSF Shuttle"
@@ -235,13 +194,12 @@
 	fuel_consumption = 2
 	logging_home_tag = "nav_hangar_fsf"
 	defer_initialisation = TRUE
-	mothershuttle = "FSF Patrol Ship"
 
 /obj/effect/shuttle_landmark/fsf_shuttle/hangar
 	name = "FSF Shuttle Hangar"
 	landmark_tag = "nav_hangar_fsf"
 	docking_controller = "fsf_shuttle_dock"
-	base_area = /area/shuttle/fsf_patrol_ship
+	base_area = /area/ship/fsf_patrol_ship
 	base_turf = /turf/simulated/floor/plating
 	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
diff --git a/maps/away/ships/tcfl_peacekeeper_ship.dmm b/maps/away/ships/tcfl_peacekeeper_ship.dmm
index c30699deb42..e27e66202b0 100644
--- a/maps/away/ships/tcfl_peacekeeper_ship.dmm
+++ b/maps/away/ships/tcfl_peacekeeper_ship.dmm
@@ -4,20 +4,20 @@
 	dir = 1
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "aac" = (
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "aaI" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 9
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "abb" = (
 /obj/structure/window/shuttle/legion,
 /obj/structure/grille,
@@ -28,14 +28,14 @@
 	dir = 5
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "agx" = (
 /obj/machinery/light{
 	dir = 4;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "aiG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -43,13 +43,13 @@
 /obj/structure/lattice/catwalk/indoor,
 /obj/machinery/meter,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "aow" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "arp" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -59,7 +59,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "arF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
@@ -67,12 +67,12 @@
 /obj/machinery/meter,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "atj" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "auP" = (
 /obj/machinery/shipsensors/weak,
 /obj/structure/railing/mapped{
@@ -91,7 +91,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "azW" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -101,7 +101,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "aAS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 8
@@ -109,13 +109,13 @@
 /obj/structure/lattice/catwalk/indoor,
 /obj/structure/railing/mapped,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "aBD" = (
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "aLZ" = (
 /obj/structure/table/steel,
 /obj/structure/window/reinforced{
@@ -137,7 +137,7 @@
 /obj/structure/closet/crate/loot,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "aUf" = (
 /obj/structure/closet/crate/medical,
 /obj/item/storage/firstaid/regular,
@@ -146,7 +146,7 @@
 /area/shuttle/tcfl_shuttle)
 "bdV" = (
 /turf/simulated/floor/wood,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "beE" = (
 /obj/machinery/computer/ship/helm{
 	req_access = list(204)
@@ -164,7 +164,7 @@
 	pixel_y = 6
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "bkQ" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/machinery/light{
@@ -173,7 +173,7 @@
 	},
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "bty" = (
 /obj/machinery/atmospherics/portables_connector,
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
@@ -200,11 +200,11 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "bYX" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "cdt" = (
 /turf/simulated/wall/shuttle/legion/cardinal,
 /area/shuttle/tcfl_shuttle)
@@ -213,13 +213,13 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "coZ" = (
 /obj/structure/window/reinforced{
 	dir = 4
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "cpH" = (
 /obj/structure/closet/walllocker/emerglocker/west,
 /obj/structure/bed/roller,
@@ -234,7 +234,7 @@
 "cFC" = (
 /obj/machinery/recharge_station,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "cIZ" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -251,11 +251,11 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "cNY" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "cPz" = (
 /obj/machinery/computer/shuttle_control/explore/tcfl_shuttle,
 /obj/machinery/light/small{
@@ -274,12 +274,12 @@
 	pixel_x = -27
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "cTq" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/structure/reagent_dispensers/extinguisher,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "cYw" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/vehicle/bike/speeder{
@@ -290,7 +290,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "cZd" = (
 /obj/structure/bed/stool/chair/office/bridge/pilot{
 	dir = 1
@@ -319,7 +319,7 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "dcm" = (
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/tcfl_shuttle)
@@ -335,15 +335,15 @@
 	dir = 10
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "dfd" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "dkk" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "dkC" = (
 /obj/machinery/atmospherics/pipe/manifold/visible{
 	dir = 4
@@ -356,7 +356,7 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "dtv" = (
 /obj/item/cell/high,
 /obj/item/cell/high,
@@ -376,18 +376,18 @@
 	name = "defense shutters"
 	},
 /turf/simulated/floor/plating,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "dCR" = (
 /obj/machinery/vending/engivend{
 	req_access = list(204)
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "dPD" = (
 /obj/effect/floor_decal/industrial/warning/corner,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "dQZ" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -396,17 +396,17 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "dTd" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/ramp,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "dTw" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "dXB" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/machinery/light{
@@ -415,14 +415,14 @@
 	},
 /obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eaJ" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/vehicle/bike/speeder{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "edR" = (
 /obj/structure/bed/roller,
 /obj/structure/window/reinforced{
@@ -448,7 +448,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ehg" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -457,7 +457,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ehA" = (
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 4;
@@ -468,7 +468,7 @@
 	pixel_y = 33
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eib" = (
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 4;
@@ -483,7 +483,7 @@
 	},
 /obj/item/storage/toolbox/mechanical,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eiL" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/window/reinforced{
@@ -498,7 +498,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eiR" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -517,7 +517,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "epw" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 25
@@ -527,7 +527,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "erL" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -537,7 +537,7 @@
 	},
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "erS" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -569,26 +569,26 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ewn" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ewW" = (
 /obj/structure/closet/crate/loot,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ewZ" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "exg" = (
 /obj/structure/closet/crate/loot,
 /obj/effect/floor_decal/industrial/warning{
@@ -598,7 +598,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eyj" = (
 /obj/machinery/computer/ship/engines{
 	dir = 8
@@ -616,19 +616,19 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eCV" = (
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eDP" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eGO" = (
 /obj/machinery/atmospherics/binary/pump/high_power,
 /obj/effect/floor_decal/industrial/outline/blue,
@@ -639,7 +639,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eKc" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 6
@@ -649,13 +649,13 @@
 /area/shuttle/tcfl_shuttle)
 "eKS" = (
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eMT" = (
 /obj/effect/floor_decal/industrial/loading/yellow{
 	dir = 8
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eOz" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/machinery/door/blast/shutters{
@@ -665,7 +665,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eOJ" = (
 /obj/machinery/atmospherics/pipe/manifold/visible{
 	dir = 1
@@ -677,13 +677,13 @@
 "eQn" = (
 /obj/structure/closet/crate/loot,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eTH" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eUC" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -691,12 +691,12 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "eYX" = (
 /obj/structure/dispenser/oxygen,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fhi" = (
 /obj/machinery/atmospherics/pipe/manifold/visible{
 	dir = 1
@@ -710,11 +710,11 @@
 /obj/item/cell/high,
 /obj/item/cell/high,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fnY" = (
 /obj/structure/trash_pile,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fpQ" = (
 /obj/structure/table/rack,
 /obj/item/clothing/head/helmet/tank/legion,
@@ -725,14 +725,14 @@
 /obj/item/shield/riot/tact/legion,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "frn" = (
 /obj/structure/closet/crate/loot,
 /obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "frB" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
@@ -755,7 +755,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fws" = (
 /obj/machinery/light{
 	dir = 4;
@@ -763,7 +763,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fBo" = (
 /obj/machinery/atmospherics/pipe/manifold4w/visible,
 /obj/machinery/meter,
@@ -778,7 +778,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fFu" = (
 /obj/machinery/light{
 	dir = 8;
@@ -788,7 +788,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fFA" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
@@ -798,11 +798,11 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fHl" = (
 /obj/machinery/optable,
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fLz" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
@@ -813,7 +813,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fNN" = (
 /obj/machinery/light{
 	dir = 4;
@@ -823,14 +823,14 @@
 	dir = 8
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fNZ" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fQo" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 10
@@ -846,37 +846,37 @@
 /obj/item/device/suit_cooling_unit,
 /obj/item/device/suit_cooling_unit,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fQL" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fRD" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /obj/machinery/mech_recharger,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fTp" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fVv" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "fZq" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gaB" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /turf/simulated/wall/shuttle/legion,
@@ -887,7 +887,7 @@
 	},
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gec" = (
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/floor,
@@ -906,13 +906,13 @@
 "ghV" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gkc" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/light/small,
 /obj/structure/reagent_dispensers/fueltank,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gmy" = (
 /obj/machinery/computer/ship/navigation,
 /obj/structure/window/reinforced{
@@ -941,14 +941,14 @@
 "goI" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "grI" = (
 /obj/structure/closet/crate/loot,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gvM" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 1
@@ -962,7 +962,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gyl" = (
 /obj/machinery/door/airlock/multi_tile/glass{
 	name = "Gear Room";
@@ -970,7 +970,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gAJ" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 1
@@ -984,11 +984,11 @@
 "gGC" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gHC" = (
 /obj/structure/sign/flag/biesel,
 /turf/simulated/wall/shuttle/legion,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gIX" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -996,7 +996,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gJE" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Hangar";
@@ -1004,7 +1004,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gMA" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/machinery/door/airlock/hatch{
@@ -1013,7 +1013,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gNW" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Cargo Bay";
@@ -1021,17 +1021,17 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gRK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 6
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gXh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "gZm" = (
 /obj/machinery/door/window/southright,
 /obj/machinery/light/small{
@@ -1046,7 +1046,7 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hdd" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -1068,12 +1068,12 @@
 	},
 /obj/structure/closet/crate/loot,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hiw" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hjH" = (
 /obj/structure/closet/crate/freezer,
 /obj/item/reagent_containers/blood/OMinus,
@@ -1086,17 +1086,17 @@
 	req_access = null
 	},
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hsz" = (
 /obj/machinery/bodyscanner,
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hsG" = (
 /obj/structure/table/steel,
 /obj/item/clothing/glasses/hud/health,
 /obj/item/storage/belt/medical/first_responder/combat,
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hud" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -1108,7 +1108,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hwy" = (
 /obj/structure/closet/crate/medical,
 /obj/item/roller,
@@ -1116,7 +1116,7 @@
 /obj/item/storage/firstaid/adv,
 /obj/item/storage/firstaid/regular,
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hxm" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -1137,21 +1137,21 @@
 /obj/structure/table/steel,
 /obj/item/storage/firstaid/surgery,
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hzX" = (
 /obj/structure/sign/flag/biesel/left{
 	pixel_y = 31
 	},
 /obj/machinery/recharge_station,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hBS" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
 	},
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hCh" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -25
@@ -1167,7 +1167,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hFC" = (
 /obj/structure/table/steel,
 /obj/item/material/ashtray/glass,
@@ -1175,19 +1175,19 @@
 	pixel_y = -11
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hFK" = (
 /obj/structure/bed/stool,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hFX" = (
 /obj/machinery/washing_machine,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hGt" = (
 /obj/structure/bed/stool/chair/sofa/right/red,
 /turf/simulated/floor/carpet,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hJC" = (
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 32
@@ -1207,14 +1207,14 @@
 "hNy" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hNH" = (
 /obj/machinery/light/small{
 	dir = 1
 	},
 /obj/structure/bed/stool/chair/sofa/corner/red,
 /turf/simulated/floor/carpet,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hQA" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -1225,7 +1225,7 @@
 	},
 /obj/structure/closet/firecloset/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hRJ" = (
 /obj/structure/mopbucket,
 /obj/item/reagent_containers/glass/bucket,
@@ -1237,41 +1237,41 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hRT" = (
 /obj/machinery/vending/tool,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hUJ" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hWh" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hXr" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "hZq" = (
 /obj/structure/table/rack,
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/cell/high,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "iaK" = (
 /obj/machinery/door/window/westleft,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "iaO" = (
 /obj/machinery/body_scanconsole{
 	dir = 1;
@@ -1279,11 +1279,11 @@
 	pixel_y = 6
 	},
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ibU" = (
 /obj/machinery/iv_drip,
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ijB" = (
 /obj/machinery/mech_recharger,
 /turf/simulated/floor/shuttle/black,
@@ -1296,25 +1296,25 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ilM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "imC" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ina" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/vending/tool,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "iqy" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -1324,17 +1324,17 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "irX" = (
 /obj/structure/closet/crate/freezer/rations,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ive" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "iyR" = (
 /obj/structure/closet/cabinet,
 /obj/item/flag/biesel/l,
@@ -1359,18 +1359,18 @@
 	req_one_access = null
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "iCG" = (
 /obj/structure/table/steel,
 /obj/item/storage/box/cups,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "iDc" = (
 /obj/structure/bed/stool/chair/sofa/red{
 	dir = 8
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "iNo" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -1378,7 +1378,7 @@
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/blue/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "iOJ" = (
 /obj/effect/floor_decal/industrial/loading/yellow{
 	dir = 1
@@ -1390,7 +1390,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "iQd" = (
 /obj/structure/bed/stool/chair/shuttle{
 	dir = 8
@@ -1406,27 +1406,27 @@
 "iVq" = (
 /obj/machinery/mech_recharger,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "iWp" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jbc" = (
 /obj/structure/fuel_port{
 	pixel_x = -32
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jbQ" = (
 /obj/structure/railing/mapped,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/floodlight,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jcg" = (
 /obj/structure/bed/stool/chair/shuttle{
 	dir = 4
@@ -1451,7 +1451,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jdB" = (
 /obj/effect/floor_decal/industrial/loading/yellow,
 /turf/simulated/floor/shuttle/black,
@@ -1514,14 +1514,14 @@
 	dir = 4
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jvL" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jyv" = (
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor/shuttle/black,
@@ -1535,11 +1535,11 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jEu" = (
 /obj/structure/railing/mapped,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jGx" = (
 /obj/machinery/recharge_station,
 /obj/machinery/light/small{
@@ -1556,7 +1556,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jMm" = (
 /obj/structure/bookcase/manuals,
 /obj/machinery/light{
@@ -1564,7 +1564,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jNr" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -1573,7 +1573,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jOw" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 25
@@ -1583,7 +1583,7 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "jQV" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/shuttle/black,
@@ -1603,7 +1603,7 @@
 "jWO" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kaR" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Maintenance";
@@ -1614,7 +1614,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kdK" = (
 /obj/machinery/door/blast/shutters{
 	dir = 2;
@@ -1629,14 +1629,14 @@
 /turf/simulated/floor/tiled/ramp{
 	dir = 8
 	},
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kgv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kgR" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/blue{
@@ -1644,43 +1644,42 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kiO" = (
 /obj/structure/table/wood,
 /obj/item/clothing/suit/storage/legion,
 /turf/simulated/floor/wood,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kkV" = (
 /obj/structure/window/reinforced,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kpn" = (
 /obj/machinery/door/window/southright,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kpR" = (
-/obj/effect/shuttle_landmark/tcfl_peacekeeper_ship/start,
 /obj/effect/floor_decal/corner/blue{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kqx" = (
 /obj/machinery/door/firedoor,
 /obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/ramp{
 	dir = 8
 	},
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kqK" = (
 /obj/structure/table/rack,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/item/storage/belt/utility,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "krH" = (
 /obj/structure/railing/mapped,
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -1688,7 +1687,7 @@
 	},
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ksI" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 1
@@ -1697,11 +1696,11 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ktN" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kwe" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
@@ -1711,7 +1710,7 @@
 	},
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kwV" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -1720,14 +1719,14 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kye" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
 	},
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kzm" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/blue{
@@ -1735,21 +1734,14 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kAt" = (
 /obj/machinery/light/small,
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
-"kDQ" = (
-/obj/effect/overmap/visitable/sector/tcfl_peacekeeper_ship,
-/obj/effect/floor_decal/corner/blue{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kJI" = (
 /obj/machinery/door/blast/shutters{
 	dir = 2;
@@ -1773,17 +1765,17 @@
 	req_access = list(204)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kPs" = (
 /obj/structure/railing/mapped{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kQl" = (
 /obj/effect/shuttle_landmark/tcfl_shuttle/hangar,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "kSQ" = (
 /obj/structure/table/steel,
 /obj/item/storage/toolbox/electrical,
@@ -1793,7 +1785,7 @@
 /obj/item/storage/belt/utility,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lak" = (
 /obj/structure/closet/crate,
 /obj/item/stack/material/phoron{
@@ -1811,7 +1803,7 @@
 /obj/item/clothing/glasses/welding,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lej" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -1828,7 +1820,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lhC" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
@@ -1845,29 +1837,29 @@
 	pixel_y = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lmc" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lmS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lnU" = (
 /obj/structure/bed/stool/chair/office/light{
 	dir = 4
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lri" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
 /obj/item/reagent_containers/cooking_container/plate/bowl,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ltf" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/blue{
@@ -1878,7 +1870,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lva" = (
 /obj/machinery/door/airlock/multi_tile/glass{
 	dir = 2;
@@ -1886,11 +1878,11 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lwj" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lAV" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/structure/table/rack,
@@ -1899,17 +1891,17 @@
 	pixel_y = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lCc" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lEL" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/tank/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lKK" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/sink/kitchen{
@@ -1917,7 +1909,7 @@
 	pixel_y = 26
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lLn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -1926,7 +1918,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lMI" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
@@ -1938,14 +1930,14 @@
 	pixel_y = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lXl" = (
 /obj/structure/railing/mapped,
 /obj/structure/railing/mapped{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "lYs" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -1954,7 +1946,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mar" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -1963,7 +1955,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mmq" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -1971,7 +1963,7 @@
 /obj/structure/closet/crate/loot,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mnC" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/machinery/door/blast/shutters{
@@ -1987,7 +1979,7 @@
 	req_access = list(204)
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mqy" = (
 /obj/effect/shuttle_landmark/tcfl_shuttle/transit,
 /turf/space/transit/south,
@@ -1996,12 +1988,12 @@
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mwP" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/extinguisher_cartridges,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mxc" = (
 /obj/structure/closet/crate/secure/legion{
 	req_access = list(204)
@@ -2012,11 +2004,11 @@
 /obj/item/stack/material/glass/reinforced/full,
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mEc" = (
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mET" = (
 /obj/structure/curtain/open/shower,
 /obj/structure/window/reinforced{
@@ -2026,7 +2018,7 @@
 	pixel_y = 20
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mLa" = (
 /obj/structure/table/standard,
 /obj/item/reagent_containers/toothpaste,
@@ -2034,7 +2026,7 @@
 /obj/item/stack/medical/bruise_pack/full,
 /obj/item/soap,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mNF" = (
 /obj/structure/mirror{
 	pixel_y = 31
@@ -2043,7 +2035,7 @@
 	pixel_y = 26
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mPM" = (
 /obj/structure/table/steel,
 /obj/item/device/flashlight/maglight,
@@ -2052,7 +2044,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mSl" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/black,
@@ -2062,13 +2054,13 @@
 	},
 /obj/item/clothing/suit/storage/legion,
 /turf/simulated/floor/carpet,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mTR" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "mZb" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
@@ -2076,7 +2068,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nap" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
@@ -2086,13 +2078,13 @@
 	pixel_y = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "naU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nbG" = (
 /obj/effect/shuttle_landmark/tcfl_peacekeeper_ship/transit,
 /turf/space/transit/south,
@@ -2107,23 +2099,23 @@
 	pixel_x = -25
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ngE" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nhU" = (
 /obj/machinery/door/airlock/multi_tile/glass{
 	req_access = list(204)
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "npn" = (
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "npq" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Restroom";
@@ -2131,11 +2123,11 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nsw" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ntt" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
@@ -2144,7 +2136,7 @@
 	pixel_y = 6
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nty" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
@@ -2153,28 +2145,28 @@
 	},
 /obj/item/reagent_containers/glass/beaker/large,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nBU" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/structure/table/rack,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nDn" = (
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nFw" = (
 /obj/structure/table/steel,
 /obj/item/device/flashlight/lamp,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nJs" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nKm" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/structure/table/stone/marble,
@@ -2182,7 +2174,7 @@
 	pixel_x = 25
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nTM" = (
 /obj/structure/plasticflaps/airtight,
 /obj/machinery/door/airlock/hatch{
@@ -2190,7 +2182,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "nVi" = (
 /obj/machinery/cryopod{
 	dir = 4
@@ -2199,19 +2191,19 @@
 	pixel_x = -28
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ofl" = (
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "oge" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "opS" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp/lava/blue,
@@ -2220,35 +2212,44 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "orP" = (
 /obj/structure/bed/stool/chair/office/light{
 	dir = 8
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "oyy" = (
 /obj/machinery/light{
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "oAp" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "oAV" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/blue/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "oAY" = (
 /turf/simulated/wall/shuttle/legion/cardinal,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
+"oJg" = (
+/obj/machinery/door/airlock/external{
+	frequency = 1380;
+	icon_state = "door_locked";
+	id_tag = "tcfl_peacekeeper_ship_out"
+	},
+/obj/effect/shuttle_landmark/tcfl_peacekeeper_ship/nav2,
+/turf/simulated/floor,
+/area/ship/tcfl_peacekeeper_ship)
 "oLC" = (
 /obj/machinery/light/small,
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -2256,7 +2257,7 @@
 	},
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "oMU" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 25
@@ -2265,17 +2266,17 @@
 	dir = 4
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "oNi" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/appliance/cooker/oven,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "oYH" = (
 /obj/machinery/floodlight,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "oYU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/structure/railing/mapped{
@@ -2283,7 +2284,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pfE" = (
 /obj/machinery/appliance/cooker/fryer,
 /obj/machinery/light{
@@ -2292,28 +2293,28 @@
 	},
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pim" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "piw" = (
 /obj/machinery/appliance/cooker/stove,
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pke" = (
 /obj/machinery/computer/ship/navigation,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ppZ" = (
 /obj/machinery/vending/dinnerware,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pqU" = (
 /obj/structure/closet/secure_closet/freezer/kitchen{
 	req_access = list(204)
@@ -2337,27 +2338,27 @@
 /obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pse" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pwR" = (
 /obj/machinery/telecomms/allinone/ship,
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pxn" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "plant-04"
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pAh" = (
 /obj/structure/table/rack,
 /obj/item/shield/energy/legion{
@@ -2369,7 +2370,7 @@
 	pixel_y = 5
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pCa" = (
 /obj/structure/sign/poster{
 	icon_state = "tcflposter2";
@@ -2390,7 +2391,7 @@
 	pixel_y = 6
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pIz" = (
 /obj/structure/table/standard,
 /obj/item/device/flashlight/lamp,
@@ -2398,7 +2399,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pJZ" = (
 /obj/structure/bed,
 /obj/effect/decal/cleanable/dirt,
@@ -2406,11 +2407,11 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pKl" = (
 /obj/structure/bed,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pLb" = (
 /obj/structure/closet/crate/loot,
 /obj/machinery/light/small{
@@ -2418,20 +2419,20 @@
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pNl" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pPl" = (
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pPW" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pRf" = (
 /obj/effect/step_trigger/teleporter,
 /turf/template_noop,
@@ -2450,7 +2451,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pUq" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(204)
@@ -2462,7 +2463,7 @@
 /obj/item/device/flash,
 /obj/item/reagent_containers/spray/pepper,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pVN" = (
 /obj/machinery/atmospherics/portables_connector,
 /obj/machinery/portable_atmospherics/canister/air/airlock,
@@ -2470,7 +2471,7 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "pXP" = (
 /obj/structure/table/standard,
 /obj/item/flame/lighter/zippo{
@@ -2483,14 +2484,14 @@
 	pixel_y = 6
 	},
 /turf/simulated/floor/wood,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qds" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qfE" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Prefect's Quarters";
@@ -2498,7 +2499,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/wood,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qhu" = (
 /obj/effect/overmap/visitable/ship/landable/tcfl_shuttle,
 /turf/simulated/floor/shuttle/black,
@@ -2508,7 +2509,7 @@
 /obj/machinery/meter,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qlz" = (
 /obj/structure/table/standard,
 /obj/item/paper_bin,
@@ -2517,7 +2518,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qtP" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	dir = 8
@@ -2529,12 +2530,12 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qtX" = (
 /obj/structure/window/shuttle/legion,
 /obj/structure/grille,
 /turf/simulated/floor/plating,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "que" = (
 /obj/effect/step_trigger/teleporter,
 /turf/space/transit/south,
@@ -2546,31 +2547,31 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qBg" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qFi" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/ramp,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qHm" = (
 /obj/structure/closet/crate/freezer/rations,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qHO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qMx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/bed/stool,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qPL" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -2579,20 +2580,20 @@
 	req_access = list(204)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qUf" = (
 /obj/structure/sign/flag/biesel{
 	pixel_x = -32;
 	pixel_y = 32
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qUg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qXw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /obj/machinery/access_button{
@@ -2607,12 +2608,12 @@
 	icon_state = "plant-33"
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "qYw" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle/legion,
 /turf/simulated/floor/plating,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "rdB" = (
 /obj/machinery/access_button{
 	command = "cycle_exterior";
@@ -2623,14 +2624,14 @@
 	pixel_y = -10
 	},
 /turf/template_noop,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/space)
 "rgX" = (
 /obj/structure/bed/stool/chair/office/bridge/generic,
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "rhz" = (
 /obj/structure/toilet{
 	dir = 4
@@ -2638,13 +2639,13 @@
 /obj/structure/curtain/open/privacy,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "rrF" = (
 /obj/structure/bed/stool,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "rtf" = (
 /obj/structure/table/steel,
 /obj/item/paper_bin,
@@ -2652,23 +2653,23 @@
 /obj/item/deck/cards,
 /obj/item/board,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "rxc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ryh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "rCW" = (
 /obj/structure/trash_pile,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "rWf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 6
@@ -2679,7 +2680,7 @@
 	id_tag = "tcfl_peacekeeper_ship_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "rXT" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -2688,7 +2689,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "rYF" = (
 /obj/machinery/atmospherics/binary/pump/high_power{
 	dir = 1;
@@ -2697,7 +2698,7 @@
 	},
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sbb" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/black,
@@ -2707,11 +2708,11 @@
 	name = "igs - tcfl_peacekeeper_pilot"
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sfQ" = (
 /obj/machinery/light/small,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "siz" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -2724,7 +2725,7 @@
 	pixel_y = 26
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "smb" = (
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
 	frequency = 1380;
@@ -2737,7 +2738,7 @@
 	tag_interior_door = "tcfl_peacekeeper_ship_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "soZ" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -2745,19 +2746,19 @@
 	id_tag = "tcfl_peacekeeper_ship_out"
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "spX" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/blue/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sqr" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/blue/full{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "stc" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -2766,7 +2767,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "stK" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -2776,7 +2777,7 @@
 	},
 /obj/structure/closet/firecloset/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sxG" = (
 /obj/machinery/cryopod{
 	dir = 4
@@ -2785,7 +2786,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "szY" = (
 /obj/machinery/door/airlock/glass_security{
 	name = "Cell";
@@ -2793,30 +2794,30 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sBp" = (
 /obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/ramp{
 	dir = 4
 	},
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sBA" = (
 /obj/machinery/atmospherics/unary/engine,
 /obj/structure/window/reinforced,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sEq" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	dir = 4
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sFI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sGi" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden,
 /obj/machinery/door/airlock/external{
@@ -2825,13 +2826,13 @@
 	id_tag = "tcfl_peacekeeper_ship_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sKP" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sOb" = (
 /obj/effect/step_trigger/teleporter,
 /obj/effect/step_trigger/teleporter,
@@ -2846,7 +2847,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sRH" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -2854,10 +2855,10 @@
 	id_tag = "tcfl_peacekeeper_ship_pump"
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "sWY" = (
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "taa" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -2865,14 +2866,14 @@
 /obj/structure/table/standard,
 /obj/item/clothing/suit/storage/legion,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ths" = (
 /obj/structure/sign/flag/biesel{
 	pixel_x = -32;
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tis" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Maintenance";
@@ -2883,25 +2884,25 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tkU" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tmI" = (
 /obj/machinery/light/small,
 /obj/structure/table/steel,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tnP" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
 /obj/structure/closet/crate/trashcart,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tpL" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -2910,7 +2911,7 @@
 /obj/item/device/magnetic_lock/security/legion,
 /obj/item/device/magnetic_lock/security/legion,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tra" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Cockpit";
@@ -2918,29 +2919,29 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "trs" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "plant-29"
 	},
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tuA" = (
 /obj/machinery/vending/cigarette,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "twq" = (
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tCH" = (
 /obj/structure/closet/firecloset/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tJH" = (
 /obj/structure/table/standard,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tNm" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 30
@@ -2951,46 +2952,46 @@
 /obj/structure/table/standard,
 /obj/item/clothing/suit/storage/legion,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tOF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
 	},
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tQp" = (
 /obj/effect/floor_decal/industrial/outline/blue,
 /obj/machinery/door/firedoor,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tUb" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tVn" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
 	},
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "tYP" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "uaE" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(204)
 	},
 /obj/item/gun/energy/blaster,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ucw" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -3003,7 +3004,7 @@
 	},
 /obj/structure/bed/stool/chair/office/bridge/generic,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ulV" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Maintenance";
@@ -3012,7 +3013,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "upC" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -3020,14 +3021,14 @@
 /obj/structure/table/standard,
 /obj/item/device/flashlight/lamp,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "urq" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 4
 	},
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "urZ" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -3038,7 +3039,7 @@
 /obj/structure/table/standard,
 /obj/item/gun/energy/blaster/pilot_special,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "usV" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -3050,10 +3051,10 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "uwT" = (
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "uCl" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -3063,7 +3064,7 @@
 	},
 /obj/structure/bed/stool/chair/office/bridge/generic,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "uIP" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -3072,11 +3073,11 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "uNk" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "uNN" = (
 /obj/structure/sign/flag/biesel{
 	pixel_x = -32;
@@ -3086,16 +3087,16 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "uWn" = (
 /obj/machinery/hologram/holopad/long_range,
 /obj/effect/floor_decal/industrial/warning/full,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "uZC" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vdz" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = list(204)
@@ -3107,7 +3108,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vdX" = (
 /obj/effect/shuttle_landmark/tcfl_peacekeeper_ship/nav1,
 /turf/template_noop,
@@ -3120,7 +3121,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vgx" = (
 /obj/structure/table/standard,
 /obj/machinery/button/remote/blast_door{
@@ -3128,51 +3129,42 @@
 	name = "Cockpit Defense Shutters"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vnW" = (
 /obj/structure/railing/mapped{
 	dir = 8
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vqr" = (
 /obj/structure/bed/stool/chair/office/bridge/generic,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vrU" = (
 /obj/machinery/door/window/southleft,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/shuttle/dark_blue,
-/area/shuttle/tcfl_peacekeeper_ship)
-"vsE" = (
-/obj/effect/floor_decal/corner/blue{
-	dir = 9
-	},
-/obj/machinery/computer/ship/engines{
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vwF" = (
 /obj/structure/bed/stool/chair/office/bridge/generic,
-/obj/effect/overmap/visitable/ship/landable/tcfl_peacekeeper_ship,
+/obj/effect/overmap/visitable/ship/tcfl_peacekeeper_ship,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vxE" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vxN" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vAg" = (
 /obj/structure/table/standard,
 /obj/item/clothing/head/helmet/tank/legion,
@@ -3184,21 +3176,21 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vCD" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
 /obj/structure/table/standard,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vEx" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vLp" = (
 /obj/structure/table/standard,
 /obj/item/paper_bin,
@@ -3209,7 +3201,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vLQ" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 4
@@ -3218,66 +3210,64 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vMq" = (
 /obj/machinery/computer/ship/sensors{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vMw" = (
 /obj/machinery/computer/ship/helm{
 	dir = 1;
 	req_access = list(204)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vRm" = (
 /obj/structure/bed/roller,
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vTv" = (
-/obj/machinery/computer/shuttle_control/explore/tcfl_peacekeeper_ship{
-	dir = 1
-	},
+/obj/machinery/computer/ship/engines,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vUm" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vUu" = (
 /obj/machinery/light/small,
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "vWV" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "wdh" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden,
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "whf" = (
 /obj/structure/railing/mapped,
 /obj/structure/reagent_dispensers/water_cooler,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "wji" = (
 /obj/machinery/shipsensors/weak,
 /obj/structure/railing/mapped,
 /turf/simulated/floor/airless,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "wuK" = (
 /obj/structure/railing/mapped,
 /obj/structure/railing/mapped{
@@ -3288,43 +3278,43 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "wJV" = (
 /turf/simulated/wall/shuttle/legion,
 /area/shuttle/tcfl_shuttle)
 "xcE" = (
 /obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "xdz" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/shuttle/white,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "xfS" = (
 /turf/simulated/floor/carpet,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "xji" = (
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "xjG" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "xoc" = (
 /turf/unsimulated/wall/fakepdoor{
 	dir = 4
 	},
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "xsR" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "xyB" = (
 /turf/simulated/floor/carpet/rubber,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "xAs" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -3333,19 +3323,19 @@
 /obj/structure/table/rack,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "xFD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "xMF" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/machinery/atmospherics/portables_connector,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "xRX" = (
 /turf/template_noop,
 /area/space)
@@ -3370,17 +3360,17 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "yjk" = (
 /turf/simulated/wall/shuttle/legion,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 "ykM" = (
 /obj/structure/bedsheetbin{
 	pixel_y = 4
 	},
 /obj/structure/table/steel,
 /turf/simulated/floor/shuttle/tan,
-/area/shuttle/tcfl_peacekeeper_ship)
+/area/ship/tcfl_peacekeeper_ship)
 
 (1,1,1) = {"
 xRX
@@ -28428,7 +28418,7 @@ yjk
 oAY
 ucw
 sKP
-vsE
+sKP
 vLp
 dze
 xRX
@@ -29695,7 +29685,7 @@ ilG
 imC
 kpR
 oge
-kDQ
+oAp
 yjk
 hBS
 xji
@@ -32532,7 +32522,7 @@ pwR
 yjk
 xRX
 qYw
-soZ
+oJg
 soZ
 qYw
 xRX
diff --git a/maps/away/ships/tramp_freighter.dmm b/maps/away/ships/tramp_freighter.dmm
index 1a5ac580254..a238d5b8ba6 100644
--- a/maps/away/ships/tramp_freighter.dmm
+++ b/maps/away/ships/tramp_freighter.dmm
@@ -5,67 +5,67 @@
 	},
 /obj/structure/trash_pile,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aab" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
 /obj/structure/trash_pile,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aac" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aap" = (
 /obj/machinery/shipsensors/weak,
 /turf/simulated/floor/airless,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aaI" = (
 /obj/machinery/light/small{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "acx" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /obj/structure/trash_pile,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aej" = (
 /obj/machinery/computer/ship/engines{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "afz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ahU" = (
 /obj/structure/sign/vacuum{
 	pixel_y = 31
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/wall/shuttle/space_ship,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ajL" = (
 /obj/structure/fuel_port{
 	pixel_x = -32
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "akP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "anK" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 8;
@@ -73,14 +73,14 @@
 	},
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aou" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/machinery/light/small/emergency{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aoJ" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/table/steel,
@@ -90,7 +90,7 @@
 	pixel_y = 5
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "atj" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -98,14 +98,14 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/floodlight,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "auY" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
 /obj/effect/shuttle_landmark/freighter_shuttle/hangar,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "axB" = (
 /obj/machinery/shipsensors/weak,
 /obj/structure/railing/mapped{
@@ -133,17 +133,17 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aCu" = (
 /obj/structure/railing/mapped,
 /obj/structure/lattice/catwalk/indoor/grate/old,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aFo" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/vending/zora,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aGW" = (
 /obj/machinery/computer/ship/helm{
 	req_access = null
@@ -153,7 +153,7 @@
 "aHt" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/wall/shuttle/space_ship,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aHv" = (
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 1
@@ -164,7 +164,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aHw" = (
 /obj/machinery/computer/shuttle_control/explore/freighter_shuttle{
 	dir = 4
@@ -201,7 +201,7 @@
 /obj/item/reagent_containers/inhaler/space_drugs,
 /obj/structure/closet/crate/medical,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aSi" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/loot,
@@ -210,7 +210,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aSJ" = (
 /obj/effect/decal/fake_object{
 	desc = "A lightweight support lattice.";
@@ -220,7 +220,7 @@
 	name = "lattice"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aUn" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -25
@@ -236,7 +236,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aWL" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/railing/mapped{
@@ -246,7 +246,7 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "aXh" = (
 /obj/machinery/hologram/holopad/long_range,
 /obj/effect/overmap/visitable/ship/landable/freighter_shuttle,
@@ -256,7 +256,7 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden,
 /obj/machinery/meter,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "bcf" = (
 /obj/machinery/light/small/emergency{
 	dir = 4
@@ -270,7 +270,7 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/railing/mapped,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "bfg" = (
 /obj/machinery/light{
 	dir = 4;
@@ -285,7 +285,7 @@
 	name = "lattice"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "bfG" = (
 /obj/item/gun/energy/plasmacutter,
 /obj/item/gun/energy/plasmacutter{
@@ -300,7 +300,7 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "bgD" = (
 /obj/machinery/recharger/wallcharger{
 	pixel_y = 24
@@ -310,7 +310,7 @@
 "biS" = (
 /obj/structure/ore_box,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "bFk" = (
 /obj/machinery/atmospherics/portables_connector{
 	layer = 2.8
@@ -330,7 +330,7 @@
 /obj/item/pickaxe/drill/weak,
 /obj/item/mecha_equipment/mounted_system/plasmacutter,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "bNj" = (
 /obj/machinery/atmospherics/binary/pump/high_power,
 /turf/simulated/floor/shuttle/black,
@@ -338,17 +338,17 @@
 "bQB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "bSo" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /obj/item/clothing/head/cone,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "bTf" = (
 /turf/simulated/floor/carpet,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "bWO" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/manifold/visible{
@@ -366,7 +366,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/carpet/art,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ckN" = (
 /obj/structure/table/steel,
 /obj/item/device/flashlight/lamp/green,
@@ -374,7 +374,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/carpet/art,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "clm" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/manifold/visible{
@@ -394,7 +394,7 @@
 	pixel_y = -10
 	},
 /turf/template_noop,
-/area/shuttle/tramp_freighter)
+/area/space)
 "ctQ" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/sink{
@@ -402,7 +402,7 @@
 	pixel_x = -12
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ctX" = (
 /obj/machinery/atmospherics/pipe/simple/visible,
 /turf/simulated/wall/shuttle/space_ship,
@@ -417,7 +417,7 @@
 	id_tag = "sfa_patrol_ship_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "cwD" = (
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
 	frequency = 1380;
@@ -430,7 +430,7 @@
 	tag_interior_door = "freight_ship_in"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "cBb" = (
 /obj/structure/railing/mapped,
 /obj/structure/railing/mapped{
@@ -438,7 +438,7 @@
 	},
 /obj/structure/lattice/catwalk/indoor/grate/old,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "cJv" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -447,7 +447,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "cMo" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -455,7 +455,7 @@
 	id_tag = "freight_ship_pump"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "cTq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -463,14 +463,14 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/railing/mapped,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "cVA" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/railing/mapped{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "cWy" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
@@ -479,7 +479,7 @@
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dbx" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/railing/mapped{
@@ -489,12 +489,12 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ddV" = (
 /obj/structure/lattice/catwalk/indoor/grate/old,
 /obj/structure/closet/crate,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dex" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -510,7 +510,7 @@
 /obj/item/clothing/head/helmet/space/void/mining/fluff,
 /obj/item/device/suit_cooling_unit,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dmm" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/light{
@@ -518,7 +518,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dqq" = (
 /obj/structure/closet/secure_closet/freezer/kitchen{
 	req_access = list(203)
@@ -542,27 +542,27 @@
 /obj/item/reagent_containers/food/drinks/milk,
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dqJ" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /obj/machinery/floodlight,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dsq" = (
 /obj/structure/bed/stool/chair/sofa/right/brown{
 	dir = 4
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dxh" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/door/airlock/hatch{
 	name = "Cargo Compartment"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dzR" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/table/rack,
@@ -581,11 +581,11 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dGM" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dHA" = (
 /obj/structure/closet/crate,
 /obj/item/stack/material/phoron{
@@ -598,13 +598,13 @@
 /obj/item/clothing/gloves/yellow,
 /obj/item/clothing/gloves/yellow,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dSf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/vehicle/bike/monowheel,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "dTw" = (
 /obj/machinery/atmospherics/unary/engine{
 	dir = 1
@@ -616,7 +616,7 @@
 	dir = 6
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ebN" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/light{
@@ -625,7 +625,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ecW" = (
 /obj/structure/lattice,
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -636,11 +636,11 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "efg" = (
 /obj/structure/closet/firecloset/full,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ehI" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	req_access = null
@@ -653,7 +653,7 @@
 /obj/item/storage/box/flashshells,
 /obj/item/storage/box/shotgunshells,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eiL" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/railing/mapped{
@@ -661,28 +661,28 @@
 	},
 /obj/structure/railing/mapped,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "elQ" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/table/stone/marble,
 /obj/item/reagent_containers/cooking_container/plate,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "emn" = (
 /obj/machinery/vending/dinnerware,
 /turf/simulated/wall/shuttle/space_ship,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "enr" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/door/airlock/glass{
 	name = "Kitchen"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eoK" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/wall/shuttle/space_ship/cardinal,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "etL" = (
 /turf/space/transit/south,
 /area/space)
@@ -690,7 +690,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ewW" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 8;
@@ -703,37 +703,37 @@
 	pixel_y = 26
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "exg" = (
 /obj/structure/bed/stool/chair{
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eyx" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eBV" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/mining/brace{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eCb" = (
 /obj/structure/bed/stool/chair,
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eCV" = (
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eEk" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eIb" = (
 /obj/structure/table/steel,
 /obj/effect/floor_decal/corner/red/diagonal,
@@ -743,38 +743,34 @@
 	},
 /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eIk" = (
 /obj/structure/sign/vacuum{
 	pixel_y = 31
 	},
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eMT" = (
 /obj/machinery/door/airlock/multi_tile/glass{
 	name = "EVA Prep"
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
-"eMY" = (
-/obj/effect/overmap/visitable/sector/tramp_freighter,
-/turf/simulated/wall/shuttle/space_ship/cardinal,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eTq" = (
 /obj/structure/lattice/catwalk/indoor/grate/damaged,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "eVk" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/structure/dispenser/oxygen,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fgT" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/appliance/cooker/grill,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fhJ" = (
 /obj/structure/bed,
 /obj/item/bedsheet/brown,
@@ -788,29 +784,29 @@
 	name = "igs - freight crew"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fji" = (
 /obj/structure/railing/mapped,
 /obj/structure/lattice/catwalk/indoor/grate/damaged,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fjY" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/mining/drill,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fkv" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/emergency{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fkL" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/vending/coffee/free,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ftq" = (
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -824,25 +820,25 @@
 	name = "lattice"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fty" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/bed,
 /obj/item/device/flashlight,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fva" = (
 /obj/structure/janitorialcart/full,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fCq" = (
 /obj/structure/reagent_dispensers/watertank,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fFU" = (
 /obj/structure/bed/stool/chair/office/bridge/generic,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fMy" = (
 /obj/structure/toilet{
 	dir = 8
@@ -854,21 +850,21 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fQf" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
 /obj/item/clothing/head/cone,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fQG" = (
 /obj/effect/floor_decal/corner/black{
 	dir = 5
 	},
 /obj/machinery/recharge_station,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fRD" = (
 /obj/effect/floor_decal/corner/black{
 	dir = 5
@@ -877,7 +873,7 @@
 	dir = 2
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fTv" = (
 /obj/machinery/conveyor{
 	dir = 1;
@@ -890,13 +886,13 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fUw" = (
 /obj/structure/sign/poster{
 	pixel_x = 32
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fUQ" = (
 /obj/item/spacecash/c500,
 /obj/item/spacecash/c500,
@@ -922,29 +918,29 @@
 /obj/structure/closet,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fXG" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Anti-Piracy Armory"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "fZq" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/vending/battlemonsters,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "gab" = (
 /obj/structure/lattice/catwalk/indoor/grate/old,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "gcq" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "gdg" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
@@ -956,18 +952,18 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "gdk" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "gjD" = (
 /obj/machinery/computer/ship/engines{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "gqO" = (
 /turf/simulated/floor/shuttle/black,
 /area/shuttle/freighter_shuttle)
@@ -991,18 +987,18 @@
 	pixel_y = 16
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "gAS" = (
 /obj/structure/bed/stool/chair/sofa/left/brown{
 	dir = 4
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "gHC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/hologram/holopad/long_range,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "gIU" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -1010,14 +1006,14 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "gMq" = (
 /obj/structure/railing/mapped{
 	dir = 8
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "gMG" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/vending/boozeomat,
@@ -1026,20 +1022,20 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hdb" = (
 /obj/structure/closet/crate/bin{
 	name = "trashbin"
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hei" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/mining{
 	name = "Bridge"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hlD" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/vending/hydronutrients/xenobotany,
@@ -1048,7 +1044,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hqX" = (
 /obj/structure/table/steel,
 /obj/effect/floor_decal/corner/red/diagonal,
@@ -1063,20 +1059,20 @@
 	pixel_y = -3
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hsz" = (
 /obj/machinery/computer/ship/navigation{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hvh" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/emergency{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hxl" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 1
@@ -1093,12 +1089,12 @@
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hCv" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/vending/snack,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hDn" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -1112,7 +1108,7 @@
 /obj/structure/curtain/open/shower,
 /obj/item/soap,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hEw" = (
 /obj/structure/table/wood,
 /obj/item/device/electronic_assembly/simple{
@@ -1124,7 +1120,7 @@
 /obj/item/flame/lighter/zippo/royal,
 /obj/item/storage/box/fancy/cigarettes/nka,
 /turf/simulated/floor/carpet,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hGK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/corner/red/diagonal,
@@ -1132,7 +1128,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hLk" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/machinery/chemical_dispenser/coffee/full{
@@ -1140,18 +1136,18 @@
 	pixel_y = 35
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hNm" = (
 /obj/structure/table/standard,
 /obj/item/device/flashlight/lamp,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hOr" = (
 /obj/structure/table/standard,
 /obj/item/paper_bin,
 /obj/item/pen/multi,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hQi" = (
 /obj/effect/floor_decal/corner/black{
 	dir = 5
@@ -1159,7 +1155,7 @@
 /obj/structure/table/steel,
 /obj/item/storage/box/fancy/gum,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hQA" = (
 /obj/effect/decal/fake_object{
 	density = 1;
@@ -1173,14 +1169,14 @@
 	pixel_y = 16
 	},
 /turf/simulated/floor/carpet,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hQL" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/railing/mapped{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hWh" = (
 /obj/structure/table/standard,
 /obj/machinery/light{
@@ -1190,12 +1186,7 @@
 	},
 /obj/item/toy/desk/fan,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
-"hZl" = (
-/obj/structure/bed/stool/chair/office/bridge/generic,
-/obj/effect/overmap/visitable/ship/landable/tramp_freighter,
-/turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "hZq" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -1208,37 +1199,36 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/closet/crate,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "iaS" = (
 /obj/machinery/computer/ship/sensors{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ibU" = (
 /obj/machinery/computer/ship/helm{
 	dir = 1;
 	req_access = null
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "idS" = (
 /obj/machinery/suit_cycler/mining{
 	req_access = null
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ifO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/vehicle/train/cargo/trolley,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "iiZ" = (
-/obj/machinery/computer/shuttle_control/explore/tramp_freighter{
-	dir = 1
-	},
+/obj/structure/bed/stool/chair/office/bridge/generic,
+/obj/effect/overmap/visitable/ship/tramp_freighter,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ivo" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/table/stone/marble,
@@ -1248,13 +1238,13 @@
 	pixel_y = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "iHx" = (
 /obj/machinery/door/airlock/mining{
 	name = "Crew Bunks"
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "iOh" = (
 /obj/structure/closet/walllocker/emerglocker/west,
 /turf/simulated/floor/shuttle/black,
@@ -1268,12 +1258,12 @@
 /obj/item/gun/projectile/tanto,
 /obj/item/ammo_magazine/mc10mm,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "jgW" = (
 /obj/structure/bed/stool/chair,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "jqx" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/railing/mapped{
@@ -1283,11 +1273,11 @@
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "jCz" = (
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "jIP" = (
 /obj/structure/fuel_port{
 	pixel_x = -32
@@ -1310,18 +1300,18 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ktI" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/loot,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ktN" = (
 /obj/machinery/computer/ship/engines{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "kAt" = (
 /obj/machinery/vending/wallmed1{
 	name = "Medical Supplies";
@@ -1341,15 +1331,15 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/vehicle/train/cargo/engine,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "kSj" = (
 /obj/effect/floor_decal/industrial/loading/yellow,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "lfq" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "lgd" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/closet/crate,
@@ -1363,7 +1353,7 @@
 /obj/item/stamp/denied,
 /obj/item/stamp,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "lgo" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -1373,13 +1363,13 @@
 	},
 /obj/effect/floor_decal/industrial/outline/red,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "llg" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "loX" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -1387,7 +1377,7 @@
 	id_tag = "sfa_patrol_ship_out"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "lGR" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
@@ -1396,11 +1386,11 @@
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "lRa" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "lTL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -1408,23 +1398,23 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "lXE" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "mbR" = (
 /obj/structure/railing/mapped{
 	dir = 4
 	},
 /turf/simulated/wall/shuttle/space_ship,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "mpg" = (
 /obj/structure/sign/nosmoking_1{
 	pixel_y = -32
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "mut" = (
 /obj/structure/bed,
 /obj/item/bedsheet/brown,
@@ -1438,38 +1428,33 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "mDg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/lattice/catwalk/indoor/grate/old,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
-"mUB" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/shuttle_landmark/tramp_freighter/start,
-/turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "mUE" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/bookcase{
 	anchored = 0
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "nty" = (
 /obj/structure/railing/mapped{
 	dir = 4
 	},
 /obj/structure/lattice/catwalk/indoor/grate/old,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "nyj" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Cargo Compartment"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "nHD" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -1482,7 +1467,7 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "nQT" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Telecomms"
@@ -1492,26 +1477,35 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "nZo" = (
 /obj/structure/table/standard,
 /obj/item/device/binoculars,
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "onP" = (
 /obj/machinery/door/airlock{
 	name = "Head"
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ouc" = (
 /obj/machinery/light{
 	icon_state = "tube1";
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
+"ouS" = (
+/obj/machinery/door/airlock/external{
+	frequency = 1380;
+	icon_state = "door_locked";
+	id_tag = "sfa_patrol_ship_out"
+	},
+/obj/effect/shuttle_landmark/tramp_freighter/nav2,
+/turf/simulated/floor,
+/area/ship/tramp_freighter)
 "oyE" = (
 /obj/structure/table/steel,
 /obj/item/storage/bag/ore,
@@ -1520,7 +1514,7 @@
 /obj/item/storage/bag/ore,
 /obj/machinery/recharger,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ozs" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/effect/decal/cleanable/dirt,
@@ -1531,7 +1525,7 @@
 	pixel_y = -1
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "oGo" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/effect/floor_decal/spline/plain{
@@ -1544,20 +1538,20 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "peu" = (
 /obj/structure/railing/mapped{
 	dir = 4
 	},
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "pfE" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "phz" = (
 /turf/simulated/wall/shuttle/space_ship,
 /area/shuttle/freighter_shuttle)
@@ -1569,11 +1563,11 @@
 	},
 /obj/effect/floor_decal/industrial/warning/cee,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "pzo" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "pDO" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	dir = 1
@@ -1582,7 +1576,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/carpet/art,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "pRf" = (
 /obj/effect/step_trigger/teleporter,
 /turf/template_noop,
@@ -1593,7 +1587,7 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "pUZ" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/appliance/cooker/fryer,
@@ -1602,7 +1596,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "que" = (
 /obj/effect/step_trigger/teleporter,
 /turf/space/transit/south,
@@ -1617,14 +1611,14 @@
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "qGN" = (
 /obj/machinery/mineral/unloading_machine,
 /obj/effect/floor_decal/industrial/warning/cee{
 	dir = 1
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "qHm" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 4
@@ -1632,7 +1626,7 @@
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "qKJ" = (
 /obj/machinery/conveyor{
 	dir = 1;
@@ -1646,7 +1640,7 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "qXU" = (
 /obj/structure/bed,
 /obj/item/bedsheet/blue,
@@ -1661,23 +1655,23 @@
 	name = "igs - freight captain"
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "rgA" = (
 /obj/structure/bed/stool/chair{
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "rtf" = (
 /turf/unsimulated/wall/fakepdoor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "rBU" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 10
 	},
 /turf/simulated/floor/carpet/art,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "rMI" = (
 /obj/machinery/light{
 	dir = 4;
@@ -1685,7 +1679,7 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "rNp" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/portable_atmospherics/canister/oxygen,
@@ -1695,31 +1689,31 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "rNF" = (
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "rVB" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 9
 	},
 /turf/simulated/floor/carpet/art,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "rWz" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "shf" = (
 /obj/structure/sign/nosmoking_1{
 	pixel_x = -32
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "snZ" = (
 /obj/machinery/mech_recharger,
 /mob/living/heavy_vehicle/premade/miner,
@@ -1730,17 +1724,17 @@
 /obj/item/cell/mecha,
 /obj/item/cell/mecha,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "sDf" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "sDF" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Propulsion Maintenance"
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "sLj" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/railing/mapped{
@@ -1750,7 +1744,7 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "sLk" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -1758,7 +1752,7 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "sOb" = (
 /obj/effect/step_trigger/teleporter,
 /obj/effect/step_trigger/teleporter,
@@ -1772,12 +1766,12 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "tCo" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/appliance/cooker/oven,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "tGD" = (
 /obj/structure/sign/fire{
 	pixel_x = 33
@@ -1790,12 +1784,12 @@
 	},
 /obj/machinery/cell_charger,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "tSi" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/appliance/cooker/stove,
 /turf/simulated/floor/tiled/white,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "udB" = (
 /obj/structure/table/steel,
 /obj/item/paper_bin,
@@ -1804,14 +1798,14 @@
 	dir = 5
 	},
 /turf/simulated/floor/carpet/art,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "uep" = (
 /obj/machinery/vending/tool,
 /obj/machinery/light/small/emergency{
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "uCl" = (
 /obj/structure/closet,
 /obj/item/clothing/suit/storage/toggle/bomber,
@@ -1841,7 +1835,7 @@
 /obj/item/clothing/gloves/fingerless,
 /obj/item/clothing/gloves/fingerless,
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "uDF" = (
 /obj/effect/shuttle_landmark/tramp_freighter/transit,
 /turf/space/transit/south,
@@ -1851,41 +1845,41 @@
 	dir = 8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "uWk" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/item/reagent_containers/glass/bucket,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "uYP" = (
 /obj/machinery/light{
 	icon_state = "tube1";
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "vwF" = (
 /obj/machinery/atmospherics/binary/pump/high_power{
 	dir = 1;
 	layer = 2.8
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "vCZ" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "vFx" = (
 /obj/machinery/computer/cryopod{
 	pixel_y = -33
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "wci" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/vending/cola,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "wjC" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/railing/mapped{
@@ -1895,7 +1889,7 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "wrJ" = (
 /obj/effect/shuttle_landmark/freighter_shuttle/transit,
 /turf/space/transit/south,
@@ -1904,7 +1898,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small/emergency,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "wCo" = (
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/floor_decal/corner/black/diagonal,
@@ -1913,10 +1907,10 @@
 	inserted_light = /obj/item/light/tube/colored/blue
 	},
 /turf/simulated/floor/tiled/yellow,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "wTJ" = (
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "wUJ" = (
 /obj/machinery/access_button{
 	command = "cycle_interior";
@@ -1930,28 +1924,28 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "wYA" = (
 /turf/simulated/wall/shuttle/space_ship/cardinal,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "wZf" = (
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "wZp" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/freezer/rations,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "xok" = (
 /obj/structure/curtain/black{
 	name = "DO NOT ENTER"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "xto" = (
 /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "xAC" = (
 /obj/machinery/mineral/processing_unit,
 /obj/machinery/conveyor{
@@ -1965,7 +1959,7 @@
 	dir = 4
 	},
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "xRX" = (
 /turf/template_noop,
 /area/space)
@@ -1973,7 +1967,7 @@
 /obj/machinery/atmospherics/unary/engine,
 /obj/structure/window/reinforced,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ylI" = (
 /obj/structure/closet/crate/medical{
 	name = "IAC crate"
@@ -1988,16 +1982,16 @@
 /obj/structure/lattice/catwalk/indoor/grate/old,
 /obj/item/clothing/gloves/latex/nitrile,
 /turf/simulated/floor,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "ylV" = (
 /turf/simulated/wall/shuttle/space_ship,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 "yme" = (
 /obj/machinery/door/airlock/mining{
 	name = "Captain's Office"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/shuttle/tramp_freighter)
+/area/ship/tramp_freighter)
 
 (1,1,1) = {"
 xRX
@@ -34490,9 +34484,9 @@ enr
 euz
 eCb
 eIb
-eMY
+wYA
 hQi
-mUB
+eyx
 eoK
 wYA
 xRX
@@ -36037,7 +36031,7 @@ hei
 lfq
 wTJ
 gHC
-hZl
+iiZ
 ibU
 lXE
 xRX
@@ -36293,9 +36287,9 @@ hdb
 ylV
 fFU
 hsz
+wTJ
 hOr
 nZo
-iiZ
 lXE
 xRX
 xRX
@@ -37048,7 +37042,7 @@ ylV
 xRX
 xRX
 lXE
-loX
+ouS
 loX
 lXE
 xRX
diff --git a/maps/away/ships/wildcard.dm b/maps/away/ships/wildcard.dm
index 4aba53abd61..e2e84007a7c 100644
--- a/maps/away/ships/wildcard.dm
+++ b/maps/away/ships/wildcard.dm
@@ -6,22 +6,15 @@
 	spawn_weight = 1
 	spawn_cost = 1
 	id = "tramp_freighter"
-	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/tramp_freighter, /datum/shuttle/autodock/overmap/freighter_shuttle)
-
-/obj/effect/overmap/visitable/sector/tramp_freighter
-	name = "faint ship activity"
-	desc = "A sector with faint hints of previous ship presence."
-	in_space = 1
+	shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/freighter_shuttle)
 
 /decl/submap_archetype/tramp_freighter
 	map = "Tramp Freighter"
 	descriptor = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space. This one’s transponder identifies it as an independent vessel."
 
 //areas
-
-/area/shuttle/tramp_freighter
+/area/ship/tramp_freighter
 	name = "Tramp Freighter"
-	icon_state = "shuttle"
 
 /area/shuttle/freighter_shuttle
 	name = "Freight Shuttle"
@@ -29,59 +22,46 @@
 
 //ship stuff
 
-/obj/effect/overmap/visitable/ship/landable/tramp_freighter
+/obj/effect/overmap/visitable/ship/tramp_freighter
 	name = "Tramp Freighter"
 	desc = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space. This one’s transponder identifies it as an independent vessel."
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
 	fore_dir = SOUTH
 	vessel_size = SHIP_SIZE_SMALL
-	shuttle = "Tramp Freighter"
 	initial_restricted_waypoints = list(
 		"Freight Shuttle" = list("nav_hangar_tramp")
 	)
 
 	initial_generic_waypoints = list(
-		"nav_tramp_freighter_1"
+		"nav_tramp_freighter_1",
+		"nav_tramp_freighter_2"
 	)
 
-/obj/effect/overmap/visitable/ship/landable/tramp_freighter/New()
+/obj/effect/overmap/visitable/ship/tramp_freighter/New()
     name = "ICV [pick("Tuckerbag", "Do No Harm", "Volatile Cargo", "Stay Clear", "Entrepreneurial", "Good Things Only", "Worthless", "Skip This One", "Pay No Mind", "Customs-Cleared", "Friendly", "Reactor Leak")]"
     ..()
 
 /obj/effect/shuttle_landmark/tramp_freighter/nav1
-	name = "Tramp Freighter #1"
+	name = "Tramp Freighter - Port Side"
 	landmark_tag = "nav_tramp_freighter_1"
 	base_turf = /turf/space/dynamic
-	base_area = /area/template_noop
+	base_area = /area/space
 
-/datum/shuttle/autodock/overmap/tramp_freighter
-	name = "Tramp Freighter"
-	warmup_time = 5
-	range = 1
-	current_location = "nav_tramp_freighter_start"
-	shuttle_area = list(/area/shuttle/tramp_freighter)
-	knockdown = FALSE
-
-	fuel_consumption = 4
-	logging_home_tag = "nav_tramp_freighter_start"
-	defer_initialisation = TRUE
-
-/obj/effect/shuttle_landmark/tramp_freighter/start
-	name = "Uncharted Space"
-	landmark_tag = "nav_tramp_freighter_start"
+/obj/effect/shuttle_landmark/tramp_freighter/nav2
+	name = "Tramp Freighter - Port Airlock"
+	landmark_tag = "nav_tramp_freighter_2"
+	base_turf = /turf/space/dynamic
+	base_area = /area/space
 
 /obj/effect/shuttle_landmark/tramp_freighter/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_tramp_freighter"
 	base_turf = /turf/space/transit/south
 
-/obj/machinery/computer/shuttle_control/explore/tramp_freighter
-	name = "ship control console"
-	shuttle_tag = "Tramp Freighter"
-
-
 //shuttle stuff
 /obj/effect/overmap/visitable/ship/landable/freighter_shuttle
 	name = "Freight Shuttle"
@@ -108,13 +88,12 @@
 	fuel_consumption = 2
 	logging_home_tag = "nav_hangar_tramp"
 	defer_initialisation = TRUE
-	mothershuttle = "Tramp Freighter"
 
 /obj/effect/shuttle_landmark/freighter_shuttle/hangar
 	name = "Freight Shuttle Hangar"
 	landmark_tag = "nav_hangar_tramp"
 	docking_controller = "freighter_shuttle_dock"
-	base_area = /area/shuttle/tramp_freighter
+	base_area = /area/ship/tramp_freighter
 	base_turf = /turf/simulated/floor/plating
 	movable_flags = MOVABLE_FLAG_EFFECTMOVE
 
diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm
index 9b65af844a8..be1d2d6ccce 100644
--- a/maps/sccv_horizon/code/sccv_horizon.dm
+++ b/maps/sccv_horizon/code/sccv_horizon.dm
@@ -110,16 +110,10 @@
 		/datum/shuttle/autodock/ferry/merchant_aurora,
 		/datum/shuttle/autodock/ferry/autoreturn/ccia,
 		/datum/shuttle/autodock/overmap/orion_express_shuttle,
-		/datum/shuttle/autodock/overmap/orion_express_ship,
-		/datum/shuttle/autodock/overmap/sfa_patrol_ship,
 		/datum/shuttle/autodock/overmap/sfa_shuttle,
-		/datum/shuttle/autodock/overmap/tcfl_peacekeeper_ship,
 		/datum/shuttle/autodock/overmap/tcfl_shuttle,
-		/datum/shuttle/autodock/overmap/ee_spy_ship,
 		/datum/shuttle/autodock/overmap/ee_shuttle,
-		/datum/shuttle/autodock/overmap/fsf_patrol_ship,
 		/datum/shuttle/autodock/overmap/fsf_shuttle,
-		/datum/shuttle/autodock/overmap/tramp_freighter,
 		/datum/shuttle/autodock/overmap/freighter_shuttle
 	)
 
diff --git a/maps/sccv_horizon/code/sccv_horizon_overmap.dm b/maps/sccv_horizon/code/sccv_horizon_overmap.dm
index 428bdec8fe0..b87fbf31343 100644
--- a/maps/sccv_horizon/code/sccv_horizon_overmap.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_overmap.dm
@@ -64,4 +64,4 @@
 	name = "Starboard Primary Docking Arm"
 	landmark_tag = "nav_hangar_horizon_3"
 	base_turf = /turf/simulated/floor/reinforced/airless
-	base_area = /area/template_noop
\ No newline at end of file
+	base_area = /area/space
\ No newline at end of file
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index a25fbdc9f79..b162c6a6a4c 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -184,7 +184,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/highsecurity{
 	name = "Shield Generator Room";
-	req_one_access = list(11, 24)
+	req_one_access = list(11,24)
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -341,7 +341,7 @@
 /obj/machinery/door/airlock/glass_command{
 	id_tag = "sbridgedoor";
 	name = "Bridge";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /turf/simulated/floor/tiled,
 /area/bridge)
@@ -1280,10 +1280,10 @@
 /obj/structure/table/reinforced/steel,
 /obj/structure/window/reinforced,
 /obj/machinery/door/window/brigdoor/westright{
-	req_access = list(1, 19)
+	req_access = list(1,19)
 	},
 /obj/machinery/door/window/brigdoor/eastleft{
-	req_access = list(1, 19)
+	req_access = list(1,19)
 	},
 /obj/machinery/door/blast/regular{
 	id = "crew_armoury_desk";
@@ -1348,7 +1348,7 @@
 /obj/machinery/door/airlock/command{
 	id_tag = "conference_room";
 	name = "Conference Room";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/meeting_room)
@@ -1542,7 +1542,7 @@
 "cT" = (
 /obj/machinery/door/airlock/highsecurity{
 	name = "Shield Generator Room";
-	req_one_access = list(11, 24)
+	req_one_access = list(11,24)
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -3143,7 +3143,7 @@
 "fV" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access = null;
-	req_one_access = list(11, 24)
+	req_one_access = list(11,24)
 	},
 /obj/machinery/door/firedoor,
 /obj/structure/cable/green{
@@ -3202,7 +3202,7 @@
 "ga" = (
 /obj/machinery/door/airlock/glass_security{
 	name = "Crew Armoury";
-	req_one_access = list(1, 19)
+	req_one_access = list(1,19)
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -3271,7 +3271,7 @@
 "gf" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access = null;
-	req_one_access = list(11, 24)
+	req_one_access = list(11,24)
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
@@ -3951,7 +3951,7 @@
 "hv" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Deck 3 Civilian Substation";
-	req_one_access = list(11, 24)
+	req_one_access = list(11,24)
 	},
 /obj/machinery/door/firedoor,
 /obj/structure/cable/green{
@@ -4821,7 +4821,7 @@
 "iR" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Deck 3 Civilian Substation";
-	req_one_access = list(11, 24)
+	req_one_access = list(11,24)
 	},
 /obj/machinery/door/firedoor,
 /obj/structure/cable{
@@ -7757,7 +7757,7 @@
 /obj/machinery/door/airlock/glass_command{
 	id_tag = "";
 	name = "Bridge";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/controlroom)
@@ -10475,7 +10475,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/airlock/engineering{
 	name = "Telecommunications - Access and Bridge Substation";
-	req_one_access = list(11, 24, 57)
+	req_one_access = list(11,24,57)
 	},
 /turf/simulated/floor,
 /area/maintenance/substation/command)
@@ -10634,7 +10634,7 @@
 /obj/machinery/door/airlock/glass_command{
 	id_tag = "";
 	name = "Bridge";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/controlroom)
@@ -10646,7 +10646,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/atmos{
 	name = "Deck 3 Port Auxiliary Atmospherics";
-	req_one_access = list(11, 24)
+	req_one_access = list(11,24)
 	},
 /turf/simulated/floor/tiled,
 /area/maintenance/aux_atmospherics/deck_3)
@@ -11947,7 +11947,7 @@
 /area/horizon/hallway/deck_three/primary/starboard)
 "vZ" = (
 /obj/machinery/door/airlock/maintenance{
-	req_one_access = list(12, 26)
+	req_one_access = list(12,26)
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor,
@@ -13279,7 +13279,7 @@
 "yy" = (
 /obj/machinery/door/airlock/glass_security{
 	name = "Crew Armoury Desk";
-	req_one_access = list(1, 19)
+	req_one_access = list(1,19)
 	},
 /obj/machinery/door/blast/regular{
 	id = "crew_armoury_desk";
@@ -14097,7 +14097,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_command{
 	name = "Break Room";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -15838,7 +15838,7 @@
 /obj/machinery/door/airlock/glass_command{
 	id_tag = "sbridgedoor";
 	name = "Bridge";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -16473,7 +16473,7 @@
 /obj/machinery/door/airlock/glass_command{
 	id_tag = "sbridgedoor";
 	name = "Bridge";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /obj/effect/map_effect/door_helper/unres,
 /obj/machinery/door/firedoor,
@@ -17841,7 +17841,7 @@
 /mob/living/simple_animal/corgi/fox/Chauncey,
 /obj/effect/floor_decal/spline/fancy/wood/full,
 /obj/effect/floor_decal/plaque{
-	desc = "The Stellar Corporate Conglomerate Logo Engraved in bronze." ;
+	desc = "The Stellar Corporate Conglomerate Logo Engraved in bronze.";
 	desc_fluff = "The unbreakable chainklink, the one thing holding the Orion Spur together...";
 	name = "Commemorative SCC Plaque"
 	},
@@ -17906,7 +17906,7 @@
 /obj/machinery/door/airlock/glass_command{
 	id_tag = "";
 	name = "Bridge";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/controlroom)
@@ -19334,7 +19334,7 @@
 /obj/machinery/door/airlock/command{
 	id_tag = "conference_room";
 	name = "Conference Room";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/meeting_room)
@@ -21551,7 +21551,7 @@
 /obj/machinery/door/airlock/glass_command{
 	id_tag = "";
 	name = "Bridge";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/controlroom)
@@ -22246,7 +22246,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/maintenance{
 	name = "Cryogenics Maintenance";
-	req_one_access = list(12, 26)
+	req_one_access = list(12,26)
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/crew_quarters/cryo)
@@ -23058,7 +23058,7 @@
 	},
 /obj/machinery/door/airlock/glass_command{
 	name = "Break Room";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /obj/machinery/door/blast/regular{
 	density = 0;
@@ -25749,7 +25749,7 @@
 	},
 /obj/machinery/door/window/southleft{
 	name = "Cryogenics Maintenance";
-	req_one_access = list(12, 26)
+	req_one_access = list(12,26)
 	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
@@ -26290,7 +26290,7 @@
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/atmos{
 	name = "Deck 3 Port Auxiliary Atmospherics";
-	req_one_access = list(11, 24)
+	req_one_access = list(11,24)
 	},
 /turf/simulated/floor/tiled,
 /area/maintenance/aux_atmospherics/deck_3)
@@ -26460,7 +26460,7 @@
 /obj/machinery/door/airlock/glass_command{
 	id_tag = "";
 	name = "Helm";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/controlroom)
@@ -26582,7 +26582,7 @@
 /obj/structure/cryofeed,
 /obj/machinery/door/window/southright{
 	name = "Cryogenics Maintenance";
-	req_one_access = list(12, 26)
+	req_one_access = list(12,26)
 	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
@@ -28182,7 +28182,7 @@
 /obj/machinery/door/airlock/command{
 	id_tag = "conference_room";
 	name = "Conference Room";
-	req_one_access = list(19, 38)
+	req_one_access = list(19,38)
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/meeting_room)