From 8cba382bbc0d5cce65afd7c09fddf0c5fe717c69 Mon Sep 17 00:00:00 2001 From: fernerr <35879136+fernerr@users.noreply.github.com> Date: Tue, 25 Aug 2020 01:14:04 +0200 Subject: [PATCH] Some additional shuttle/z-level 1 fixes (#9768) --- code/game/atoms_movable.dm | 6 +- code/modules/shuttles/shuttle.dm | 2 + .../Ferner-200824-bugfix_shuttlefixes2.yml | 7 + icons/turf/shuttles_unique/merc_shuttle.dmi | Bin 15141 -> 14564 bytes maps/_common/areas/special.dm | 4 + maps/aurora/aurora-1_centcomm.dmm | 1168 ++++++++++------- maps/aurora/aurora-5_interstitial.dmm | 77 +- maps/aurora/aurora-6_surface.dmm | 544 ++++---- 8 files changed, 996 insertions(+), 812 deletions(-) create mode 100644 html/changelogs/Ferner-200824-bugfix_shuttlefixes2.yml diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 3e9fd970306..20ccd4ed260 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -241,7 +241,11 @@ G.check_nuke_disks() spawn(0) - if(loc) loc.Entered(src) + if(loc) + var/turf/T = loc + loc.Entered(src) + if(!T.is_hole) + fall_impact(text2num(pickweight(list("1" = 60, "2" = 30, "3" = 10)))) //by default, transition randomly to another zlevel /atom/movable/proc/get_transit_zlevel() diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index a5dbc13d017..47172ad62db 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -231,6 +231,8 @@ if(SW.outside_window) var/turf/target_turf = get_turf(SW) target_turf.ChangeTurf(destination.base_turf) + for(var/obj/effect/energy_field/ef in sub_area) + qdel(ef) // Remove all powernets that were affected, and rebuild them. var/list/cables = list() diff --git a/html/changelogs/Ferner-200824-bugfix_shuttlefixes2.yml b/html/changelogs/Ferner-200824-bugfix_shuttlefixes2.yml new file mode 100644 index 00000000000..1e79702b00d --- /dev/null +++ b/html/changelogs/Ferner-200824-bugfix_shuttlefixes2.yml @@ -0,0 +1,7 @@ +author: Ferner +delete-after: True +changes: + - bugfix: "Fixed players sometimes spawning with ashy feet." + - bugfix: "Fixed a few lighting issues and things related to shuttles." + - bugfix: "Landing back on the asteroid after falling into space now makes you take fall damage again, watch your step out there." + diff --git a/icons/turf/shuttles_unique/merc_shuttle.dmi b/icons/turf/shuttles_unique/merc_shuttle.dmi index a6ba57da83ceaa64d92371de5ae595d04073e148..9c6f8f9b9557d9a5364eb6891f2f1124b74148d9 100644 GIT binary patch delta 13975 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 O$JXkCWwkj9|Nj7~{=Cru delta 14565 zcmZv@c|6qb7dSeLv5b8evWJl2qnId)kc2GRmytE=$XbT?V4||LAhL#}vW;DqF*Ai^ zON*TuyFvzGWV_S%{_eg1-1%c(uje`IbI!Az=RD^I^3F#(3`Z_o-?3qb5Hbd+-d(&J{lD3${k!bICy*=dxDsP;>+fE zjeS8}CG|a%hMh4j+sIWh~6O;9_q4D$`Nu}p7llO$)FOCxe z@3{qg<6k*b1bsQL3)ujm?I|V&zg%!1t9)D!>d_y=e$!p)wWL3ie3!05qC1c3k3wyBwZck$7w%e`ZlElH2Y z=j{3F^WYgmuQr%%Do0}56)u}zykUbc-pM`B_BsC1OOr1uzIzi~N>@2wseQQ|(TRQZ z(re_hva@BvoAH+cieSOZrU~^(fpZVuaej485%OrPtPRgxD_>r%-2>O>owRxIuIyPU zCxZ>(%HYHXwm|`FyFcZ85xzq8e@1MR<~HWq4|^MGcVt^?cQop1Bi<>05E@VT@Oj*T z^m#n^XXfEZ=v{vkU}E$SI|#`iP`Bn2|La@i&-Z!P~}{9NUsqT7SA%9ciV_B$wiyMkb*OV}hOgCL+>@w6e6?qM9!u)sWIW#G`O@o4h!&e6hJ z??Pasn@_96SNon9ELn))I-M@9zTLQXJ@N5fCbuMf*d|)nQJzhMXhPtc`S7=ZDS%)1 zU3!-a@iwDf^0$CFfcGf*k(EKgg7fU_+AZcw<9|@puRZXjAmc zeKZ7E>Xybxa!{dv%^`hk9a1QW+hzI!Sc5D?tz>Wis6vz@o&x?tnToyn$YaeyQ743@Sv;2unA)p|3@*{H;>%>ev;8TOXVOK?_BKdEnyHc z=gsZK#SCt4zA+zv4O-d&E>^AU-A`|ffy7=`2;677j^0GOitdM>rk3m-StDd)z{Ryz*WvKUm`s%Y-Qmn@x$^LPVIX<0tc84vSIuCBQ+3^p-=~k?lnoIN#mcMj@ z(TXsLjZHfbC*eXr+o$Y%5Nn<_ur?!m$<9kDytt945-ee{(^VrA)w|LY(jfMJ39m3TMIZS@oaAS z=Dnj|<9mO5Pt>?oExA2XIm*8bUVNvZjSBeG&_(!wO{R+yg*$gm)8k-5@7OoE0xF}^FUu+eEp2l5E?!j_kL>_yXylmWN&c9_1}z!`cAHjq%@;ntSQcY?qj z7_$pH_5&?#HGl^(2y8k&OC0~_YXsj`ttRTnQBG(&f>{&Jr5Y=;o35=J+8wr@fm;c4qYD`?cg=_WN!b(Ol4JU!7i9<1x{O0C6zmV9{ zy0$;Sn&@-w1D>I)6fb&&EpIg!MW48`{|{9eT-kR*F! zA6^q%#6$bVuoU~=BO`jBdN*k6vf0F{zUSkUH?>;N#;R|3n1YRC1|^tH#WZ=Z#Zc|oT?Me?B40XK<~YF?tx0S6*aQd9MSBqyPK4Yb+6}>D+`X@5Ba2UB(vv1lLf-tuNK0OM zOmL1;#+-q+JzOt`daFjby-L5R>|Q;o|Jav>GB3UIL`flf(G#KmjH}q#ji7c2xR`=< z2;3FagiWD~|6`Ta`!Yt-p2UKdD?f$Wfj)PY;6ZmMyTL~{4qsv|T-rDn!M|iC*v`9P zOeA=@{}cr!ts2Z;{_}=^0Rdh8tNLuxbn`*fOYVksccDZ7Jwn37z0-ZXyV zU8ClnZ@a3X6MFUH1Bvt4z-}I*4(+7%Ez_`rnWbyVTbmj@-t>nO8NA;Tjh)ebE+;1wkY9e#hmE1AEzo+~> z;QhIfwE?#=-^2cMgpQ~dbJ@b`=nK<&vDP~qM^TdlOQFETaaO!d3sFRV_iidh1Snpu~)0;@|rr4S$#|JkmWb%mFQ8Th_it5_n+~m z6D7TP91TUIzm^`x5= zJT<8PyWU5H;&|EU^~8$yy5d1BSVEet#-KbnP<;1O88oV(ve$z3Ayc3lZhb4KkomC< zLMUc)DO!JYxT-S*9T2?mq%Jbzi&zqra2Fd05LVqzB|@slbo>Gr zbmSi=K?*4I$M3P{uYw6%w0qS9Ua8Qu-}&eAJsuB=!ixa;!A@NDC}S{ z!*Se{oj=H1F10a`Kq}|J7mbCjt2mX0xx%C5S2xb6bKvFrz+wbX;#BLcF$dhC9gqcG zloRY7kl|?i49YEf`#Rc(g>YMhg@bp8aoYCoX+kF167!|T9sY*9xxnp}!o5e?it|g| zj&Cv}Wu-m5KSc1|-4_9?>~JN`HF^?@e`M}$5kS3(5l7a0)e_M^AO}2mWw@eZ(~o^X zD_8qEzCY@wmUGZb)50IN*CkA90vxQ_yynp7xO0>{WOd>?gchxedi#Y1Xe*E6=xAZW zr+wTs4Zo1+=7qHz*HH$!6|tsjl2uWcM`>r|Qy@ZoLfCT@Me5jXSoV;|=8WIk^eNQx z4}v&8!*BPy+vnzp<#Gru>)g)3HKLT8IbD=*2NX&cqF9l)L2ipyp+w*UXzN}3O4Ouu zwJOu(&#Rb`jb;Pa25@qF;=_bxOU!xzoR$e{F7)qSbP6y7ZBdbcYq!VzO?EX;i%%Db z16h8=net4q@$P^sIDof`+~g>>3SRutt27E;?Qn$Qw@Zak$2VI!pTCWmmAWS|rBgnR zn*Xcn!h|@2?*(|4}4FYH}jwDnL58Z;djjOhe&DQYp4> zoSL~aphQ%oFrjkM<6m(bJD)L(;Sk~_oYc>_mB)rle-ebD z11l`mjL9ZKynO8{S&G_%6YG;7GOm3N8Ib7ltBthf4g}t{*Flk2Pdpydq`t#BT^F|M zF3y4uh$mO6o1gfd-$4J>UN^)pCl4M`n9QtPw%5%4K4FkKhCMfvGWM!TsY}`^+UE=* zp*>Rb8j`D7+g%t;%wv%xu@q=vg4b?d+58X2TrKU0j-C4Wl~#8>b-5x57ZkAWw3>p6SyMT5<;$4;99P zdcjL7Z!2Jg+dZ}+^NjukH-Y9w{$fTz7cpS#QRQ9u}+vAARy>Nq$QffO2O*Qcyg_L8eTi*aRt7HF{w$$fe&nX%ABG!hJyY1c__yK2aV)qUs z_CoD$4r}%7zSWd?3eq5-CicMj0MOpfm7AA2URFt2#=)uIVhf=K$7nS@&>j>9ipG4y zo}!4^$8JG6dlCJr$G7)vM+~_KBB|KBoHd6Xr->I*3S0Gw>aeYu3b87xnCb1{_wWH` z@tf$gkPuTP`l6Uz8`Z!I=R?#=Qj@+i0^v}!kBV2eZ|6SUEJ1w}@4*Ya@i8%6S3-iq zm8W!^-cZl$M&l+RX$|f{57-4OC`kg&h$~sj$UbR(Sc1lx*g>(p+dXDcFF4y;seIGs zq<>f{e!fmHW7!+o26=7f``EtBc+BDZug}C+NLfePIDWz37$kas@>AyMCe&@14j?Wz8eyZ^*Cxko&J3ao~u|8DIqUf9)v4?t9gm4Cqc4C2k` z9y+jAX|7Mj`9WWgYJH`Wq#)06=TRTDm^ipHt@~sSHk{eiUV;=pf*tC=nY|lhUJ0r4 zatO;dScTyYvkTc+D(I@*L)iFy9u`IWb~l}5O`Ndz5OA5RMwnRP`AqFNQiu3L_HtVM zRFIV+4ETW)ZXjLadJ3kW2I)D0g!*fwD)!_-D>rilyNf?OmC{O%XfgS&nf;$oB^#o* z_=EWDcNbLwqCOd-*0NP4g1^>`bnn;VYBmKGlq{XqyNMEtwjA0=DAl8m_6O3ql zL3?SJ+6i)-!`_WK1xh!HU#>GjQc0&cBGct&3?0rsF}MNdpP-83&Ja4WcLPaS4dZ_( zQ4b`X$yfF4d8%}CuLLAKbO?hHxhSltIx9eqsba-XxXvVW?<9HjQqtd>sy)S$qyQ_1 z6+W}B^okR}s7pj?6#v@u$4o;$>9?>a$;(%t2iSeC^Yztyc){j2SXJU3hn-)EJY5Lf zxS9Fs4EWukd}o%p18$?}+S3!m`DTuxD%ynzu2IL{C2(W3xFs>uC!Np#Gl#o4ei@iJ z^QpKg-%N?h4%yj#){2de?vt`3_4=gK#?;J^knG0;89qaoxN2mmd<0#TqCNw|=R3lh zlnbtde#VP~nioTIZ&FR6xgCMLv3XaT%gbJwE`9vY~k2hLK6J?C(S zUW{E^_#=eM4SvX&26kt21)zWmTQ}GV$6mW^d`I&(Na(tL`w6N+7-1uZklwCExY(8i4?ksW8PQLeLH9r9v9izQsEa~Lh6sydlAFO)!OD`m zq))!NBfp^Euh538cDjtm8p7^lOly}H>P&7EpP`#|{*%fpG=$cfB!diI2x&*Zq%WS} zRh!F=jCQmIW=wZ zejaW9WlVvuvVI5h#9bg3#D@^i39RzjE*1X%$77N{?HsNfc)( zk1C{`ZVvc?a)Heq+Vm1tMryZZd7gNZ;6X#oEI1g-`yZ{H75)d*;P2bT!$6rYMuB*# zpFF_u6!FN${Rj10AiA~P;N}F?M#!a|vtT7I*Nkq^-D-XRWuRi&wf>Og=jh~7ctN9Jp7eU2)3<<#eiJ0+?{H5Z9(;k|@!|}wP zA01}3zGb;goh$b^LvIeX&W$fqNfZ8HQ zy{|J9a>>(s_J8Ezw){szZow^2#vfllgt!m_YnKnx41 z4Qdrno>oatq_>zx{Q4ssL(rSE|6>d1qPHafeslO~8KFjH zlT}205?rzmS;MH@%T*blS@~Yrq1qC5Q-;_yl;5t~UA(cyeyF{~9ijQrJDmoPr)yf$ zmh8hYx;g!ZExfO)f&X%uTc*x^D!sTZ9auE2n8`xC5zfkEHgrl2H@Afc@D}|+L@Dkni>_Ee&%ve@;`lcX^ znHDqtp~UxiefYj6w=xs(Xnc)V~|+iRvQSN-5%fpLb;Jtsrh4D9~PBgQx)n9CuEW}*+Wkf zV<(#O7fu6Fkvr~NnaRGdZ(oGf(K${>`B!vp3bdJq?%g5#H;{&}PU#x_nR{A7oe~WO z@-sg-$4iqt9sYca9buka8?u5=S8p8nF&|(enAM7@%9ol6@mgyxQqLW0YTU%4jxInK zHx!Fd$2sr%usVf9<0t|2dO+A{H~(vD9L3_+_&V^-`OEE`c%FP)wd1pOpBfbB9L|as zNBfk2)h$qiZ4D3u$Jf)(-VzIN^SocPFsx4+_Wlrap$J|uCsEzst}BgAhs(Q|HR3s^ zS-y@iU%!EeHv0*+KYn>IE`84*wk}n9?}c1)@K9hWwOBLiKEa^zWK-@(Y+Ap7bB3YT zZ+aFm7Q&+4<AT{Ld0}f4|MQxFjW(WPDD*)ry>e3FhF7ov2kqc`+t;pBD5t zm3s^Wxq7uc;TPikucg?-5Egv$TSogAT!&o1^VNWH<|fC4^xKFA&!l!W$K>CBr<)a% zr|T_>);fizPLL;*n}2N%%^LUAj`gz#UOeyu>T+m1fwbY9vJ$7*DO!m7yV>v^w%|g; zVAt~pmbKwtTl!AiB~n>5E`hf2h)g^*KsPrp`oB-pRteGkLXD&*3ny>osoW=E=5-X; zWZWcp^_WcU%v(AN5R@uUwQq^b^+S=u_reLipQ{renZO;QPIuZD4dC{VRohd(_Z$QF zrLo%+^$hym2E8e~oY+ib{2@(AHJ8cvu<5*S zq>>)c&fGv>=DJ}``l+I=$DXl1*Z4Y~{muhc%7JFH9E<%;l3^B9Xnk&&1Dz=@L)H>3 zUYQ4#Hvac#F|Ksn9$vy;Alifre@73g!)~*FytWG*%@y{o9v>g>$`G|oka`fo6uFsy zhy8&#igCzva9Xa9Fio108BsRrD&IiUE6Kb)+M*HP4#5qna-pu-^H-l8P4ltSheiWYP3lGu~a=DnSntTb?j%B3;dZ%B4 zF#_2{kD<(cQmJeRBb)*KA2t;zw!0xhF1kW4;d1_+u9tAZu|h5$nruM{W;X+oLN1lL zHsW!Qe9|uwCi>)y;EkYQb)kzc$0W&-p1N~_&f2-(^G)DEwZ)z{VF(c*xuEKJ{_#pZ zrUl*aioKwBg+5uS#>a5!nZHksNF7^AEZL>76|W&!JLv9_uG|G-&*ZUJr{LyC5cYAN z5)><1OE^sR*cmNDjdkFf!CkdNT*}vz!g%ZT3EE~KuHTA=GHH75}7MMZr1?<#559a^xLR(lXahNA&jq?j!-_v7F?&mw!0 zZ4Y?3w>Wh7_%ECbq(Qj1Zjpg!>f52H^cDAdr+?f#L%!ucs-%2v*cuHQ-G}M#1B{@u zXU0Eby_2;ZPN?jV={$`4xn1j)JdDen2QhZmxVs%hA_jovrd4;2Ot%Y5s~F6$HHMiv z%mh5UEi<2%SbbkdIj3KKNPy!QBD{9|qvHmJ$<62ZjJdts`KAdg7{iHUSeSb|Ixa4oE9}`yfpzE`0oBa`VZ2ZcU27F+9VziUyJ<>YldGbI% zYclqM=>7<|^7Ee~M*fA}XIq2{Vm$~NGg!pq`;mJZW>@H)M$>?^AD>!!QFNT{<*0hs z)3SNU!(ogMS=Y^uv|6|(q4cpK8U+`^882o22aw%k{k-1Y#X2!wLR<({@e{T{;bcL} zpE#v#-iSRR-hzX5^nQ*5_ARDTGmaQ3zZ&@z;DQa}3}is=t=a};L9hZ{w8k;LK^OHP z7?l=Z_PR@O^1BS2`Kd2i^!2uv(Qpo0?urk@e1o$jM5M?Ba}w6nxM(uWV~Nf{pEUxw zb7*HH9(X~_H&20HZ!`!_j*Czi6?!c3(s_(j%pi8=%TqRFzZPfqrx7c(KR@>L4?^F6 z0u^j!jIbI)Gn?Er)ZJLRKx87A5H;LXa_FxG4z#iF;~&biDuCI^95jQ;dK2BAB^6?P zH8aPi8CXIis8m{Da-4&@ST+kE0O<6q;6Aoc;%uY;uiyT&=UMPy*O|b!7=EnApVnt% z*e2CvpAWwKA16Dse6P>b*Uc8Yp%7)mhMA?fL2OgU1GA`s? z*&9EwQyHj|G9H@5qf_O+RjPbc_p}Ambd~-{8{8S95Cuuy9msHei#VZ1j8y#$aEvbHf}?~Rmx8`#u!zj&!bXGQ#{S~lbKadAFWX|#-XsA2B@n_j zav~z;Q=m)T^U7x`k#GLn-EY!VLYXl1h!uMIaWcHOUa#jx0D9!2B>4e$TjcrT{>G5N z%@;8ct`xX^>SZy4U1Ms0UJVvn9m8@!@jgkr0;l66*QVU&mM&c~N zbsNgb)sxZnk_pxBm+3mQ#X3=;BS)!RqYLG`1FQ3Kt{-H!U#jMIR>jrq8Yjk|B;4Dj zx=M_mQ+Wm$JJHizp&sjx1*qmtBvneg60$kb@YmC~RH~>*G$04cT|wT(^dC`9ii9$? zCmMccH35bNTA911&%m2Qt3S%`4No7pezzLI+xxvOpZPt>7l>w!=~_#Psx8s-77m(P zxU(e5Q~hZnd-Bix$K}=I2HT^RnDdLli&=}+FFH~RR|YK5yw$XkHnMYdO|REYwL!hc z?d{lgtxGh(Yo)M6Hy+b71(aHpu9K!;*9`5HkW;eme->||qWn$xr- zr35<$*uqd4N(f9Zge-&#Q5B#aetkkC2^>7_YHnND?l!*1f%)!%m zb-Ab)73r1IR7DCdUKaNl8pQ$^!XUhWfK^V2_)@Nwnz;z%pwW~#p=`hD0;h9=@@8{w z&^R>^J@7HM$qs+Z>Q6TyMBza{3w9)_lclLmCn3{G@d#6J2N?Se!v;^|VFq=qann=< zFb@CduTxDe(Pyu*U?~wSQNnOnMjwRH_kRl-=Ar$l*?~t4W;u<kxb8daH=n6O< zlS<5bjmp4>-?3E?UYS1w>RxIUQykp~`v_?X18DA?Q4Kou9s}tODuwnK4NQUBUsq&Q z)c;3h7id#L38BH?)Z#|IV&1}ySWUBk_r#54oRK^D3U3s%nUL!n^#@bbEl9H0?8#vk zTy3vSYg1^-%A@aNi@cbK(v+3#66)TZ2qRDPvci(`m6x)nB_lclM z<`t{&OyaJLCG!oSIfn*u6~UB36$1DPM7$vnhuIe#7U^iiIT7F)LDDJ6S8^RV=a zXEzw4N9KEfONecjrW*Q_e+>sN;MQK6%}#_%q2A;&^#f%B;se3PEhgp;UvUORjIgD< zki9?2>F3^UN=*B6Aof`NB0ls_`*-5k^(;4QWaZdy-Gi=>qs)zB`yM{w?}vwnADh5J z-f_WCVZrAO)Jm7iVzijBJBR8-4@v0tRtQ>EVvi6 z?nWw+b2cOy%+!Y?_U;hPgN>UWu%c??hhV{oYLrQHVtf)n4rhC|t|L@bt|;O}YZQiQ zkUQZYEJ)q4f3@Kf*Mtkyi0dfaFvggfZuOVFEef~$1|_0q>CQ$>q1}OTmntWprAXbJjWN5U{+`sBD`ltPa;i+b{8Xg3D5B&PG5F zxQu<1fncBoi+u}^U|Y8$NukDfy9d7*gT4v2y#c2g`?`uVsX36iW(u#7{!6baqRy)F zi5CSDdIbackKPNYXnznCXiGr|6?wUvV~A~GhVeREHP*1g&rAN_VAU_FogJ}TI52QyZtk#*buuQ=ks&#E&Eq45T$9mGVuSET}=Ta25k>2g2p349 zJefNsDDIHezjtjkPyplA`|~oHntD;`v`D*jH@gyDV8X$DY5}M=(aUx*OCRKg;z;FP zc2;UF;fpXqahOWP?n7gK*oq;j6U#1mo%vuK-bime(eq#Vg==6yDf^SKTh`PKk{}3B ziaLRciB;)wyh&P!F3}atn{)`-Tukb$T1%R)h{?T@^zPf>WYGH5AKi<;A1_3z6?Ays zGoRX$CyeP$^#g>Rib-+ZtNh)ON8_&o=eHhg9Y3Bsh?_j8PBg#1*MRv@>9f9Wf7tW) zgzL zcyk`wHO2OyBKv9EuJ@rPb0-g9u@N8aVMEBiDf0aC#>;YU;%X0Rn- z%0&IMln1}+n1jBZVk8p=rm#}&?vPKYJ9ZbRXG;d%%7;vr>N(xI%vq$Kb2VGED1_jO zs{=bpKfDxmJ7u_L*|T!+U4SN4Q-R3Vs-80rm*v$?sQ$~(ijS?%K%4(R82+kMO`r4* zWl`2a=dIIB&W9@LGs?!mGvg1uEx2GfTHXCtO5?4ex4CH?NGXnPUp^F4pFQyf!sF)#)5Uo7+7{tSu$mIzJxqcGG+ftcaU4a(cUXrDM+eIo}EE{);iJ3m11P|4mHcm)dcoR)$AIq zFN%gxx^=3Jy=B`EN<<`b*K~Cg^nKR1LX-Wv;jNgjT_y)%_F%)kzIPM1!xGn5H;dk< zJE&#??<+o$Tgd)_Fk)#)_v3S_s9XemlxGJd>u3V5dPzl67t}=`e|Zh*p4@z_PVD@L zBMA0zj8mTewP1GxjYFr3q#7?9VUy>~dHjDtm>c4^1hM{#$l(*N5+$;{j&{^+wy5buX5JUDj_EbI7iqw+PCb!I_bo3H35OuOm2 z{PW}Uvsm^ya}j?=nPL4ih_f-tk`0kORKq&OgEpCD^DuKEzO=oCQC33A%-mPkW*nBV zce*hWD0300vp^)--da$tB2$2R4IU(1;=$W;f?C`R{g^Y31y_Eg58I%xlTCqJVQ2M| z;ooEarfgD9xr?J?C&9PO;54KYGwQ1HX<~!Gq>_=bY?uKN7Q*u292?PNu)gF{t35W+T+>jndf5%#c!vRuuyzx}^0)S0uho`B zYQL!8xbza0f^OftDS{4RdIVN&i`C%7JG@yrQ)~v^X?ORA;z1C)i(*&I_8kNcX z`4eGB=ISNxf2sNFfgfwsU4#@QTO#s_Jrvw%+VgoSO9ebSa!r7Cav|AyNL&V^0It&L z5T#WPv0v&S%>V5-Ax20W?zI(nf>|7ahnwe~d^og=g~j1M1Sj}c3^O=3>+2EpQ@U=M zv5pQ^s}wpl%AxF(B`7><R?l7K2~^xGpl zNgD!pNBo;e*DJwQ4qgnmID7bXZHlCJib~>L7{N}&Pd;o+rNAcV1l0?t4D?qsV^&rx z9a|!~QqOTw&wDg(uVf6WP9x<(KDQ0O%OIu{lVwv2=cmSM94TF8JBH)=E-%ne#9D=e zFHB7e1!LF8IywKcbeuC7RC<%On<$j^Cx9s| zR#2b?nvTxyzr$IZ1r)@;e=2x=cH$ZSLzC{zl`UqcYauTU;ZJSUf{NlxPs22v1|lyK zGugJD9)zn{=?W`EeiM&9K00~))~qOgK@5V&FJLBkclL%)RUFLixBMB9gTG8s;z)w6H{`x1?g3+%`)yu!T!Xj zn`4;mgX=z^4%r=$U_gt>XC+#op$OIKF}`<%^v6fYZMLv@VMT@T2wle74Td_@|CHwi zr_-z0L}Z=Ma(5p11BITQZ2k=q@c|0R$PJ!UMf=F~lumzaSET&p4~y&CPY_1PP>Iiv zEGo}jwy(+PN0i^as-X(Uy-&ij8s&ZaE99pt9-Q+h1a9K z9UtLSx~-bHkG@#mW9Ha?tbLt?ExM`3sBN6?ZqYK%*}G>q4P56Lpcu&PC7Sa6a(sl| z&A^_pUOYd7$AmLq;Lp?1)jFK#@}xV|FUxNSr2LgHC=UOUzDEcpHz?iT+ODpA#6K`) zFiWf4tHY@n+T-TT8TaqBulZMNB`W4Ztu3Z+cs?=QdR$Ys=W)RH7J3f&2};|@#QEcp zomp41p{j+)K)`^ON%J@C-LL{+TKgJ1v289i-Qvg-av}F)0g}4MR?Z})-@RwW=0hvx z8Au!Q-!fyAfQ1rL)R>WZTueUcidaKjfeP_7;R^XYh7C9ND6wL@r+mwd$6Sf-e%}|R zFPUR@Ez!4*{1IfnRmwXsn=7vZO8599gqgz?4n_fDt8xwl_8PBHPjRQxRqArgps#7C zcn9Wk8O4k~RWVMv!5L_!HtdtbHIzwO3F`Zo7M=-}8^kI@gdM(Sw1QsTA(n?G#44oVIgz3zHQUCOyHlS&f5l2O zs?5asTktNYMSzd8XCc{3b_aKw-W1_13G~Pwc2*`vHg-rPwHo1+fbSHR5ob9#Y%NE5 zYMwSG{Wdq|!G9|3gp~u9A6Pvw8^K>kOn2B?u|py!9rT*HsLR(#iqyD3UG_4l3#|K$ zMA2npE%2)9>hySpazQliB+)k|t%^I)A{%isg~uFh9>{Grwt4tAAo{!9`qzqd?B0Xm zT+#V6(?9l=KGJr_R_;=&>#lAcqDuB}ck#h3ri-UwpTZWwVX**cV1JY43H{#wey9Jy zZmml`^ILBVDHJ2P=zQjej-8TzOs? z`za&nr<}^PkyFkN<=9586TcUqR8D=FY7_A-_`S4^=BuVKEhUNBO4~8u*qS7e42lrA z4h<0S16e$bdlDtK28o#dM@A*GpBCX9`gH~58U$^7YsAr_XZKywx1n6+Zj@{l783tg>KH7I7xcK%Rq664Ue(cyj$prqb^l zdDK@NdWNsq09GF7u5v{glpP<( zlN(U7#&dW+HzW9|oU#pCsRz<(0(>8n3+rTg?ir($ed}ou-xI@R&9l|HR|?D^6TZ!u zLb$w>=S%1f{8U#W^yGBbr9*)Vq^{z%Q|Ar*TpCbS&xo`}y?=^Yil{#?Qpi{7RKRD*pchX#^Oh diff --git a/maps/_common/areas/special.dm b/maps/_common/areas/special.dm index aeb6eb8ccf0..4ed87c6b7f3 100644 --- a/maps/_common/areas/special.dm +++ b/maps/_common/areas/special.dm @@ -21,6 +21,10 @@ name = "Centcom Preparatory Wing" ambience = AMBIENCE_ARRIVALS +/area/centcom/start + name = "New Player Spawn" + dynamic_lighting = 0 + /area/centcom/evac name = "Centcom Emergency Shuttle" diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index e1e4c495a6f..cc2c17b9025 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -2830,6 +2830,8 @@ "amC" = ( /obj/structure/bed/padded, /obj/effect/decal/cleanable/dirt, +/obj/item/bedsheet/random, +/obj/structure/curtain/open/bed, /turf/simulated/floor/carpet/art, /area/shuttle/skipjack) "amG" = ( @@ -3380,8 +3382,15 @@ dir = 5 }, /obj/structure/table/steel, -/obj/machinery/recharger, /obj/effect/decal/cleanable/dirt, +/obj/item/grenade/flashbang{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/grenade/empgrenade{ + pixel_x = 7; + pixel_y = 6 + }, /turf/simulated/floor/tiled, /area/shuttle/skipjack) "apH" = ( @@ -3391,9 +3400,20 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/card/emag, /obj/effect/decal/cleanable/dirt, /obj/structure/table/steel, +/obj/machinery/recharger{ + pixel_x = 10; + pixel_y = 10 + }, +/obj/item/card/emag{ + pixel_x = -9; + pixel_y = 9 + }, +/obj/item/grenade/spawnergrenade/manhacks{ + pixel_x = -15; + pixel_y = 1 + }, /turf/simulated/floor/tiled, /area/shuttle/skipjack) "apI" = ( @@ -3514,6 +3534,7 @@ /area/shuttle/skipjack) "aqj" = ( /obj/structure/bed/padded, +/obj/item/bedsheet/random, /turf/simulated/floor/carpet, /area/shuttle/skipjack) "aqn" = ( @@ -3530,6 +3551,7 @@ dir = 4 }, /obj/structure/bed/padded, +/obj/item/bedsheet/random, /turf/simulated/floor/carpet, /area/shuttle/skipjack) "aqq" = ( @@ -6572,9 +6594,11 @@ }, /area/centcom/control) "azn" = ( -/turf/simulated/wall/shuttle/unique/mercenary{ - icon_state = "12,17" +/obj/structure/shuttle_part/mercenary{ + icon_state = "12,17"; + opacity = 1 }, +/turf/space/dynamic, /area/shuttle/mercenary) "azo" = ( /obj/structure/window/reinforced, @@ -9849,20 +9873,6 @@ }, /area/centcom/checkpoint/aft) "aHi" = ( -/obj/structure/table/rack, -/obj/item/grenade/spawnergrenade/manhacks, -/obj/item/grenade/flashbang, -/obj/item/grenade/empgrenade, -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, -/area/shuttle/skipjack) -"aHj" = ( /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -9880,6 +9890,29 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/shuttle/skipjack) +"aHj" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/rig/eva/equipped{ + pixel_x = -13; + pixel_y = 7 + }, +/obj/item/rig/hazard/equipped/pirate{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig/industrial/equipped{ + pixel_x = -8; + pixel_y = -2 + }, +/turf/simulated/floor/tiled, +/area/shuttle/skipjack) "aHk" = ( /obj/effect/floor_decal/corner/red{ dir = 5 @@ -9889,7 +9922,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/reagent_containers/glass/bucket/wood, +/obj/structure/bed/chair/shuttle, /turf/simulated/floor/tiled, /area/shuttle/skipjack) "aHl" = ( @@ -10144,7 +10177,6 @@ dir = 10 }, /obj/effect/decal/cleanable/blood/oil, -/obj/structure/table/rack, /obj/item/clothing/suit/space/void/atmos, /obj/item/clothing/head/helmet/space/void/atmos, /obj/item/clothing/head/helmet/space/void/mining, @@ -10154,6 +10186,7 @@ /obj/item/clothing/shoes/magboots, /obj/item/clothing/shoes/magboots, /obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, /turf/simulated/floor/tiled, /area/shuttle/skipjack) "aHP" = ( @@ -10430,7 +10463,7 @@ name = "Secure Holding"; req_access = list(1) }, -/turf/simulated/floor/shuttle/black, +/turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape) "aIE" = ( /obj/structure/shuttle_part/raider{ @@ -10493,7 +10526,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/ramp{ +/turf/simulated/floor/tiled/ramp/bottom{ dir = 4 }, /area/shuttle/skipjack) @@ -10501,6 +10534,9 @@ /obj/structure/lattice/catwalk/indoor/grate, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/plating, /area/shuttle/skipjack) "aIM" = ( @@ -10577,10 +10613,14 @@ /turf/simulated/floor/tiled/dark, /area/centcom/spawning) "aIV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/door/airlock/hatch{ req_access = list(150) }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/plating, /area/shuttle/skipjack) "aIW" = ( @@ -10908,6 +10948,10 @@ dir = 10 }, /obj/effect/decal/cleanable/blood, +/obj/item/reagent_containers/glass/bucket/wood{ + pixel_x = -19; + pixel_y = 6 + }, /turf/simulated/floor/tiled, /area/shuttle/skipjack) "aJL" = ( @@ -10928,19 +10972,15 @@ }, /area/shuttle/skipjack) "aJN" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/window/northleft{ name = "infirmary?"; req_one_access = list(150) }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/effect/floor_decal/corner/green{ - dir = 5 - }, /obj/structure/curtain/open/shower, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 + }, +/turf/simulated/floor/tiled/freezer, /area/shuttle/skipjack) "aJO" = ( /turf/simulated/wall/shuttle/unique/raider{ @@ -11450,7 +11490,12 @@ /area/shuttle/skipjack) "aLp" = ( /obj/structure/table/steel, -/obj/item/deck/cards, +/obj/item/deck/cards{ + pixel_y = -16 + }, +/obj/item/reagent_containers/food/drinks/bottle/rum{ + pixel_y = 7 + }, /turf/simulated/floor/carpet, /area/shuttle/skipjack) "aLq" = ( @@ -11867,7 +11912,9 @@ req_access = list(13) }, /turf/unsimulated/floor, -/area/centcom/spawning) +/area/centcom/spawning{ + name = "NTCC Odin Prepatory Wing" + }) "aMO" = ( /obj/structure/window/reinforced/holowindow{ dir = 4 @@ -11915,7 +11962,9 @@ "aNb" = ( /obj/machinery/megavendor, /turf/unsimulated/floor, -/area/centcom/spawning) +/area/centcom/spawning{ + name = "NTCC Odin Prepatory Wing" + }) "aNc" = ( /obj/machinery/camera/network/crescent{ c_tag = "Crescent Departures"; @@ -11952,20 +12001,13 @@ store_mobs = 0 }, /obj/item/reagent_containers/blood/ripped, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/effect/floor_decal/corner/green{ - dir = 5 - }, /obj/item/reagent_containers/blood/OMinus{ name = "soon-to-expire blood pack" }, /obj/item/reagent_containers/blood/OMinus{ name = "soon-to-expire blood pack" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/freezer, /area/shuttle/skipjack) "aNh" = ( /obj/machinery/optable, @@ -11997,16 +12039,10 @@ /obj/random/medical, /obj/random/medical, /obj/random/medical, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, /obj/item/reagent_containers/glass/bottle/bicaridine, /obj/item/reagent_containers/glass/bottle/dermaline, -/obj/effect/floor_decal/corner/green{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled, +/obj/item/reagent_containers/glass/bottle/thetamycin, +/turf/simulated/floor/tiled/freezer, /area/shuttle/skipjack) "aNi" = ( /turf/simulated/wall/shuttle/unique/raider{ @@ -12099,11 +12135,11 @@ /turf/simulated/floor/plating, /area/shuttle/skipjack) "aNy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, /obj/structure/lattice/catwalk/indoor/grate, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, /turf/simulated/floor/plating, /area/shuttle/skipjack) "aNz" = ( @@ -12338,32 +12374,10 @@ }, /area/centcom/spawning) "aOo" = ( -/obj/structure/table/steel, -/obj/effect/floor_decal/corner/red/full, -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red{ - dir = 10 - }, -/obj/item/rig/industrial/equipped, -/obj/item/rig/eva/equipped{ - pixel_x = 13 - }, -/turf/simulated/floor/tiled, -/area/shuttle/skipjack) -"aOp" = ( /obj/item/gun/energy/rifle/ionrifle, /obj/item/material/harpoon, -/obj/item/clothing/suit/space/void/merc, -/obj/item/clothing/head/helmet/space/void/merc, -/obj/item/clothing/head/helmet/space/void/engineering, -/obj/item/clothing/suit/space/void/engineering, -/obj/item/tank/oxygen, /obj/item/tank/oxygen, /obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/rig/hazard/equipped/pirate, /obj/effect/floor_decal/corner/red{ dir = 5 }, @@ -12372,6 +12386,24 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/table/steel, +/obj/item/clothing/suit/space/void/merc, +/obj/item/clothing/head/helmet/space/void/merc, +/turf/simulated/floor/tiled, +/area/shuttle/skipjack) +"aOp" = ( +/obj/item/gun/energy/rifle/ionrifle, +/obj/item/tank/oxygen, +/obj/item/clothing/shoes/magboots, +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/steel, +/obj/item/clothing/suit/space/void/engineering, +/obj/item/clothing/head/helmet/space/void/engineering, /turf/simulated/floor/tiled, /area/shuttle/skipjack) "aOq" = ( @@ -12380,6 +12412,7 @@ }, /obj/structure/lattice/catwalk/indoor/grate, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plating, /area/shuttle/skipjack) "aOr" = ( @@ -12393,16 +12426,10 @@ /obj/machinery/iv_drip{ pixel_x = -3 }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/effect/floor_decal/corner/green{ - dir = 5 - }, /obj/machinery/shower{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/freezer, /area/shuttle/skipjack) "aOz" = ( /obj/effect/floor_decal/industrial/warning, @@ -13029,9 +13056,6 @@ }, /turf/unsimulated/floor, /area/centcom/spawning) -"aRd" = ( -/turf/unsimulated/wall/riveted, -/area/antag/wizard) "aRi" = ( /obj/structure/table/glass{ name = "reinforced glass table"; @@ -14525,9 +14549,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/escape) -"aXj" = ( -/turf/unsimulated/floor/plating, -/area/shuttle/escape) "aXl" = ( /obj/structure/dueling_table/no_collide/above_layer{ icon_state = "top_right" @@ -15157,34 +15178,15 @@ /turf/space/transit/south, /area/template_noop) "bln" = ( -/obj/structure/table/standard, -/obj/item/reagent_containers/food/drinks/waterbottle{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/waterbottle{ - pixel_x = 1; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/waterbottle{ - pixel_x = 8; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/waterbottle{ - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/waterbottle{ - pixel_x = 1; - pixel_y = 7 - }, -/obj/item/reagent_containers/food/drinks/waterbottle{ - pixel_x = 8; - pixel_y = 7 - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/structure/undies_wardrobe{ + anchored = 1; + icon = 'icons/obj/storage.dmi'; + icon_state = "dropcrate-grey"; + name = "underwear crate" + }, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -15262,20 +15264,13 @@ "brB" = ( /obj/structure/table/standard, /obj/item/storage/box/fancy/tray, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/effect/floor_decal/corner/green{ - dir = 5 - }, /obj/machinery/light/small, -/obj/effect/decal/cleanable/dirt, /obj/structure/toilet{ dir = 4; layer = 2.6; pixel_y = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/freezer, /area/shuttle/skipjack) "brN" = ( /obj/structure/diona/vines, @@ -15744,9 +15739,11 @@ }, /area/centcom/legion) "bRJ" = ( -/turf/simulated/wall/shuttle/unique/mercenary{ - icon_state = "4,16" +/obj/structure/shuttle_part/mercenary{ + icon_state = "4,16"; + opacity = 1 }, +/turf/space/dynamic, /area/shuttle/mercenary) "bSa" = ( /obj/structure/sign/pharmacy, @@ -15870,10 +15867,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/skipjack) "bXB" = ( -/obj/machinery/computer/teleporter, -/turf/unsimulated/floor{ - icon_state = "new_reinforced" - }, +/turf/space, /area/antag/ninja) "bXO" = ( /obj/structure/table/wood, @@ -15911,6 +15905,12 @@ name = "Skipjack" }, /area/shuttle/skipjack) +"cbf" = ( +/obj/machinery/teleport/hub, +/turf/unsimulated/floor{ + icon_state = "new_reinforced" + }, +/area/antag/ninja) "cbz" = ( /obj/item/storage/bag/money{ layer = 2.99; @@ -16022,13 +16022,21 @@ }, /area/shuttle/syndicate_elite) "ceT" = ( -/turf/simulated/wall/shuttle/unique/mercenary{ - icon_state = "12,16" +/obj/structure/shuttle_part/mercenary{ + icon_state = "12,16"; + opacity = 1 }, +/turf/space/dynamic, /area/shuttle/mercenary) "cfo" = ( -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/shuttle/skipjack) +"cfL" = ( +/turf/unsimulated/wall/riveted, +/area/centcom/start) "cgd" = ( /obj/structure/shuttle_part/transfer{ desc = "A large, bloated shuttle designed for automated passenger transport."; @@ -16039,8 +16047,20 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "chb" = ( -/obj/structure/closet/crate/freezer/rations, -/turf/simulated/floor/tiled/dark, +/obj/item/hoist_kit, +/obj/item/ladder_mobile{ + pixel_y = 6 + }, +/obj/structure/closet{ + icon_closed = "toolcloset"; + icon_opened = "toolclosetopen"; + icon_state = "toolcloset" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/item/pickaxe/jackhammer, +/obj/item/pickaxe/jackhammer, +/obj/item/pickaxe/jackhammer, +/turf/simulated/floor/plating, /area/shuttle/skipjack) "chj" = ( /obj/effect/floor_decal/industrial/warning{ @@ -16074,6 +16094,14 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) +"cie" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/skipjack) "ciV" = ( /turf/simulated/wall/elevator, /area/centcom/spawning) @@ -16164,13 +16192,13 @@ /turf/unsimulated/wall/darkshuttlewall, /area/centcom/legion) "coK" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, /obj/structure/closet/walllocker/emerglocker/south{ pixel_y = -27; spawnitems = list(/obj/item/tank/emergency_oxygen/double,/obj/item/clothing/mask/breath) }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, /turf/simulated/floor/shuttle/black, /area/shuttle/distress) "cpq" = ( @@ -16410,9 +16438,6 @@ /area/shuttle/administration) "cCo" = ( /obj/structure/table/rack, -/obj/item/pickaxe/jackhammer, -/obj/item/pickaxe/jackhammer, -/obj/item/pickaxe/jackhammer, /obj/item/device/suit_cooling_unit, /obj/item/device/suit_cooling_unit, /obj/structure/lattice/catwalk/indoor/grate, @@ -16420,7 +16445,9 @@ /area/shuttle/skipjack) "cCB" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/undies_wardrobe, +/obj/structure/undies_wardrobe{ + anchored = 1 + }, /turf/unsimulated/floor{ icon_state = "steel_dirty" }, @@ -16816,6 +16843,12 @@ }, /turf/simulated/floor/carpet, /area/centcom/shared_dream) +"cRP" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/plating, +/area/shuttle/skipjack) "cSw" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -17047,14 +17080,14 @@ /turf/space/dynamic, /area/antag/raider) "dby" = ( -/obj/machinery/light/small{ - brightness_color = "#DA0205"; - brightness_power = 1; - name = "adjusted light fixture" +/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/obj/structure/table/rack, -/obj/item/storage/box/drinkingglasses, -/turf/simulated/floor/tiled/dark, +/obj/item/clothing/head/welding, +/obj/item/weldingtool, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/shuttle/skipjack) "dbL" = ( /obj/structure/window/reinforced/crescent{ @@ -17143,8 +17176,12 @@ }, /area/antag/raider) "dff" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 8; + layer = 3.5 + }, +/turf/simulated/floor/plating, /area/shuttle/skipjack) "dft" = ( /obj/machinery/vending/engivend, @@ -17579,6 +17616,7 @@ layer = 2.8; name = "Pod D" }, +/obj/effect/floor_decal/industrial/loading, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -18638,6 +18676,9 @@ }, /turf/space/dynamic, /area/shuttle/skipjack) +"euT" = ( +/turf/simulated/floor/holofloor/space, +/area/centcom/start) "evt" = ( /obj/structure/bed/chair/office/hover{ can_buckle = 0; @@ -19369,13 +19410,13 @@ /turf/space/dynamic, /area/shuttle/mercenary) "fgy" = ( -/obj/structure/table/standard, /obj/item/storage/toolbox/syndicate{ pixel_y = -11 }, /obj/item/storage/toolbox/syndicate{ pixel_y = 5 }, +/obj/structure/table/standard, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -19656,6 +19697,13 @@ /obj/item/clothing/mask/offworlder, /turf/unsimulated/floor/plating, /area/antag/raider) +"fvg" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/shuttle/skipjack) "fvm" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/paleblue/diagonal{ @@ -20292,7 +20340,12 @@ /turf/unsimulated/wall/riveted, /area/centcom/living) "gaS" = ( -/obj/structure/undies_wardrobe, +/obj/structure/table/rack, +/obj/item/storage/secure/briefcase, +/obj/item/storage/briefcase/aluminium, +/obj/item/device/camera, +/obj/item/device/taperecorder, +/obj/item/device/megaphone, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -20807,6 +20860,12 @@ }, /turf/simulated/floor/plating, /area/shuttle/mercenary) +"gvP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/freezer/rations, +/obj/item/storage/box/drinkingglasses, +/turf/simulated/floor/tiled/dark, +/area/shuttle/skipjack) "gws" = ( /obj/structure/shuttle_part/mercenary{ icon_state = "0,9" @@ -21085,7 +21144,8 @@ /area/centcom/legion/hangar5) "gCr" = ( /turf/unsimulated/wall/riveted{ - opacity = 0 + opacity = 0; + permit_ao = 0 }, /area/antag/wizard) "gDh" = ( @@ -21807,13 +21867,6 @@ }, /turf/simulated/floor/tiled, /area/merchant_station/warehouse) -"hnF" = ( -/obj/structure/bed/chair/office/bridge, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/shuttle/dark_blue, -/area/shuttle/escape) "hnG" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ @@ -22005,9 +22058,6 @@ /area/antag/mercenary) "hyR" = ( /obj/structure/bed/chair/office/bridge, -/obj/structure/window/reinforced{ - dir = 8 - }, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape) "hyU" = ( @@ -23137,6 +23187,13 @@ }, /turf/simulated/floor/plating, /area/merchant_station) +"ioX" = ( +/obj/structure/shuttle_part/merchant{ + density = 0; + icon_state = "0,2" + }, +/turf/space/dynamic, +/area/shuttle/merchant) "ipu" = ( /obj/effect/floor_decal/corner_wide/paleblue/diagonal{ dir = 8; @@ -23690,10 +23747,10 @@ /turf/unsimulated/floor, /area/centcom/spawning) "iKK" = ( -/obj/effect/decal/fake_object/light_source/invisible, /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, +/obj/effect/decal/fake_object/light_source/invisible, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -24125,6 +24182,12 @@ icon_state = "dark2" }, /area/antag/mercenary) +"jbP" = ( +/obj/machinery/computer/teleporter, +/turf/unsimulated/floor{ + icon_state = "new_reinforced" + }, +/area/antag/ninja) "jcc" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -25575,7 +25638,7 @@ }, /area/supply/dock) "kxv" = ( -/obj/machinery/teleport/hub, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -26113,6 +26176,7 @@ layer = 2.8; name = "Pod C" }, +/obj/effect/floor_decal/industrial/loading, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -26160,6 +26224,12 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) +"kYI" = ( +/obj/machinery/teleport/station, +/turf/unsimulated/floor{ + icon_state = "new_reinforced" + }, +/area/antag/ninja) "kYR" = ( /obj/effect/step_trigger/thrower/shuttle/northeast, /turf/space/transit/south, @@ -27382,6 +27452,14 @@ icon_state = "new_reinforced" }, /area/antag/mercenary) +"mbe" = ( +/obj/effect/landmark{ + name = "start" + }, +/turf/simulated/floor/holofloor/space, +/area/centcom/start{ + name = "Romanovich Cloud, Tau Ceti" + }) "mbj" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/unsimulated/floor/plating, @@ -27740,6 +27818,9 @@ layer = 2.8; name = "Pod A" }, +/obj/effect/floor_decal/industrial/loading{ + dir = 1 + }, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -29252,9 +29333,11 @@ }, /area/centcom/legion) "nDv" = ( -/turf/simulated/wall/shuttle/unique/mercenary{ - icon_state = "4,17" +/obj/structure/shuttle_part/mercenary{ + icon_state = "4,17"; + opacity = 1 }, +/turf/space/dynamic, /area/shuttle/mercenary) "nDL" = ( /obj/effect/floor_decal/industrial/warning{ @@ -30068,6 +30151,17 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/legion) +"olC" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/shuttle, +/turf/simulated/floor/tiled, +/area/shuttle/skipjack) "omw" = ( /obj/structure/shuttle_part/transfer{ desc = "A large, bloated shuttle designed for automated passenger transport."; @@ -31030,6 +31124,9 @@ layer = 2.8; name = "Pod B" }, +/obj/effect/floor_decal/industrial/loading{ + dir = 1 + }, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -31886,7 +31983,7 @@ pixel_y = -20 }, /obj/structure/bed/chair/shuttle{ - dir = 1 + dir = 4 }, /turf/simulated/floor/shuttle/black, /area/shuttle/distress) @@ -31923,10 +32020,10 @@ }, /area/centcom/legion) "qcb" = ( -/obj/effect/decal/fake_object/light_source/invisible, /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, +/obj/effect/decal/fake_object/light_source/invisible, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -32732,6 +32829,9 @@ pixel_x = 4; pixel_y = 7 }, +/obj/item/reagent_containers/glass/bottle/thetamycin{ + pixel_x = 9 + }, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "qRm" = ( @@ -33288,6 +33388,13 @@ dynamic_lighting = 1 }, /area/shuttle/merchant) +"rrF" = ( +/obj/structure/shuttle_part/merchant{ + density = 0; + icon_state = "0,6" + }, +/turf/space/dynamic, +/area/shuttle/merchant) "rrS" = ( /turf/simulated/wall/shuttle/unique/distress{ icon_state = "2,0" @@ -33956,11 +34063,13 @@ /turf/simulated/floor/plating, /area/shuttle/burglar) "rZy" = ( -/obj/structure/undies_wardrobe, /obj/machinery/light{ dir = 1; icon_state = "tube1" }, +/obj/structure/undies_wardrobe{ + anchored = 1 + }, /turf/unsimulated/floor{ icon_state = "wood_light" }, @@ -34384,6 +34493,15 @@ icon_state = "6,5" }, /area/shuttle/mercenary) +"suT" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6; + icon_state = "intact" + }, +/turf/simulated/floor/plating, +/area/shuttle/skipjack) "svr" = ( /obj/structure/bed/chair/comfy/brown{ can_buckle = 0; @@ -34602,7 +34720,7 @@ /area/centcom/legion/hangar5) "sEk" = ( /obj/structure/bed/chair/shuttle{ - dir = 1 + dir = 4 }, /turf/simulated/floor/shuttle/black, /area/shuttle/distress) @@ -35889,7 +36007,7 @@ dir = 8 }, /obj/structure/bed/chair/shuttle{ - dir = 1 + dir = 4 }, /turf/simulated/floor/shuttle/black, /area/shuttle/distress) @@ -35929,7 +36047,7 @@ }, /area/antag/mercenary) "tRe" = ( -/obj/machinery/teleport/station, +/obj/effect/decal/fake_object/light_source/invisible, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -36075,7 +36193,8 @@ icon = 'icons/obj/doors/Doorext.dmi'; icon_state = "door_locked"; name = "external airlock"; - opacity = 0 + opacity = 0; + permit_ao = 0 }, /area/antag/raider) "tYm" = ( @@ -36284,6 +36403,7 @@ /area/antag/burglar) "ugF" = ( /obj/structure/shuttle_part/mercenary{ + density = 0; icon_state = "1,13" }, /turf/space/dynamic, @@ -36331,7 +36451,7 @@ /turf/unsimulated/floor/plating, /area/centcom/legion) "ujT" = ( -/obj/effect/decal/fake_object/light_source/invisible, +/obj/structure/table/standard, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -36795,6 +36915,7 @@ /area/centcom/ferry) "uHL" = ( /obj/structure/shuttle_part/mercenary{ + density = 0; icon_state = "15,13" }, /turf/space/dynamic, @@ -37110,12 +37231,22 @@ icon_state = "wood" }, /area/antag/burglar) +"uUa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/airlock/hatch{ + req_access = list(150) + }, +/turf/simulated/floor/plating, +/area/shuttle/skipjack) "uUx" = ( /obj/effect/decal/cleanable/dirt, /turf/unsimulated/wall/fakepdoor{ icon_state = "shutter1"; name = "shutter"; - opacity = 0 + opacity = 0; + permit_ao = 0 }, /area/antag/raider) "uUQ" = ( @@ -37190,9 +37321,11 @@ }, /area/centcom/legion/hangar5) "uXF" = ( -/turf/simulated/wall/shuttle/unique/mercenary{ - icon_state = "1,12" +/obj/structure/shuttle_part/mercenary{ + icon_state = "1,12"; + opacity = 1 }, +/turf/space/dynamic, /area/shuttle/mercenary) "uXQ" = ( /obj/structure/shuttle_part/tcfl{ @@ -39065,7 +39198,42 @@ /turf/space/dynamic, /area/shuttle/mercenary) "wvP" = ( -/turf/template_noop, +/obj/item/paper_bin{ + pixel_x = 7; + pixel_y = -3 + }, +/obj/item/pen/multi{ + pixel_x = 7; + pixel_y = -1 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 7; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 1; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -5; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 7; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 1; + pixel_y = 16 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -5; + pixel_y = 16 + }, +/obj/structure/table/standard, +/turf/unsimulated/floor{ + icon_state = "new_reinforced" + }, /area/antag/ninja) "wwm" = ( /obj/structure/table/rack, @@ -39084,6 +39252,16 @@ }, /turf/unsimulated/floor, /area/centcom/legion) +"wxL" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/binary/passive_gate{ + name = "shuttle airlock pressure regulator"; + target_pressure = 200; + unlocked = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/skipjack) "wxU" = ( /obj/structure/window/shuttle/unique/mercenary/small{ icon_state = "2,12"; @@ -40559,11 +40737,11 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "xNH" = ( +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/rig_module/cooling_unit, +/obj/item/rig_module/cooling_unit, /obj/structure/table/standard, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/rig_module/cooling_unit, -/obj/item/rig_module/cooling_unit, /turf/unsimulated/floor{ icon_state = "new_reinforced" }, @@ -46035,11 +46213,11 @@ ifL aaM jdm jXF -aaM +rrF meB niY omL -aaM +ioX qoj rhD akG @@ -48669,7 +48847,7 @@ iwf gCr yhJ yhJ -aRd +gCr ahV ahV ahV @@ -48926,8 +49104,8 @@ qIj wIF cyJ cuH -aRd -aRd +gCr +gCr ahV ahV ahV @@ -49184,7 +49362,7 @@ qIj qIj qIj pLd -aRd +gCr ahV ahV ahV @@ -49698,7 +49876,7 @@ qIj qIj qIj ghL -aRd +gCr ahV ahV ahV @@ -49954,8 +50132,8 @@ qIj ohI hqT knI -aRd -aRd +gCr +gCr ahV ahV ahV @@ -50211,7 +50389,7 @@ pKH gCr yhJ yhJ -aRd +gCr ahV ahV ahV @@ -52561,10 +52739,10 @@ dfV dfV dfV dfV -dfV -dfV -wvP -wvP +aaM +aaM +aaM +aaM aaM aaM aaM @@ -52818,6 +52996,7 @@ sFP nkc nkc nkc +bXB nkc nkc nkc @@ -52825,7 +53004,6 @@ nkc aaM aaM aaM -aaM aQS pBV aaM @@ -53075,6 +53253,7 @@ sFP nkc nkc nkc +bXB nkc nkc nkc @@ -53082,7 +53261,6 @@ nkc aaM aaM aaM -aaM aQS pBV aaM @@ -53332,6 +53510,7 @@ sSa eew nkc nkc +bXB nkc nkc nkc @@ -53339,7 +53518,6 @@ nkc aaM aaM aaM -aaM aQS pBV aaM @@ -53591,12 +53769,12 @@ uie uie uie uie +uie eew nkc aaM aaM aaM -aaM aQS pBV aaM @@ -53848,12 +54026,12 @@ vRS vRS fgy xNH +gaS sFP nkc aaM aaM aaM -aaM aQS pBV aaM @@ -54105,12 +54283,12 @@ ajm jZc qcb ioz +kxv lKv eew aaM aaM aaM -aaM aQS pBV aaM @@ -54362,12 +54540,12 @@ jCS ioz ioz ioz -bXB +ioz +jbP sFP aaM aaM aaM -aaM aQS pBV aaM @@ -54618,13 +54796,13 @@ aVh jCS gCf ioz -ujT +ioz tRe +kYI sFP aaM aaM aaM -aaM aQS pBV aaM @@ -54873,15 +55051,15 @@ vRS sSa eew jCS -gaS ioz ioz -kxv +ioz +ioz +cbf sFP aaM aaM aaM -aaM aQS pBV aaM @@ -55133,12 +55311,12 @@ peq uDT iKK ioz +ujT dac qTD aaM aaM aaM -aaM aQS pBV aaM @@ -55390,12 +55568,12 @@ vRS vRS bln jbp +wvP sFP nkc aaM aaM aaM -aaM aQS pBV aaM @@ -55647,12 +55825,12 @@ thB thB thB thB +thB qTD nkc aaM aaM aaM -aaM aQS pBV aaM @@ -55902,6 +56080,7 @@ hAO qTD nkc nkc +bXB nkc nkc nkc @@ -55909,7 +56088,6 @@ nkc aaM aaM aaM -aaM aQS pBV aaM @@ -56159,6 +56337,7 @@ sFP nkc nkc nkc +bXB nkc nkc nkc @@ -56166,7 +56345,6 @@ nkc aaM aaM aaM -aaM aQS pBV aaM @@ -56416,6 +56594,7 @@ sFP nkc nkc nkc +bXB nkc nkc nkc @@ -56423,7 +56602,6 @@ nkc aaM aaM aaM -aaM aQS pBV aaM @@ -56673,10 +56851,10 @@ dfV dfV dfV dfV -dfV -dfV -wvP -wvP +aaM +aaM +aaM +aaM aaM aaM aaM @@ -56930,8 +57108,8 @@ dfV ahV ahV ahV -ahV -ahV +aaM +aaM aaM aaM aaM @@ -60017,7 +60195,7 @@ aIK aJk aMn aOd -aMn +gvP bWB cQv dVC @@ -61041,11 +61219,11 @@ apF aoz aGn aHk -aFR -aFR -aFR +suT +cRP +cRP aOq -aNe +uUa cfo dby dXR @@ -61298,7 +61476,7 @@ apG aoz aGt aHl -aFR +cie aJM aNf aOr @@ -61554,8 +61732,8 @@ aoA apH aDR aGu -aJL -aFR +olC +cie aJN aNg brB @@ -62069,7 +62247,7 @@ apJ aEu aGw aIh -aFR +cie aKq aNi aOE @@ -62583,8 +62761,8 @@ apM aEH aGy aIj -aFP -aFR +fvg +wxL aNy aPk bfN @@ -67682,23 +67860,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +cfL +cfL +cfL +cfL +cfL +cfL +cfL +cfL +cfL +cfL +cfL +cfL +cfL +cfL +cfL +cfL +cfL aaM aaM aaM @@ -67939,23 +68117,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +cfL +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -68196,23 +68374,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +cfL +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -68453,23 +68631,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +cfL +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -68710,23 +68888,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +cfL +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -68968,22 +69146,22 @@ aCq aCq aCq aCq -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -69225,22 +69403,22 @@ aJP aJP aKQ aCq -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -69482,22 +69660,22 @@ aGI aGI aKR aCq -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -69739,22 +69917,22 @@ aJQ aJQ aKS aCq -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +euT +euT +euT +euT +euT +euT +euT +mbe +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -69996,22 +70174,22 @@ aJP aJP aKQ aCq -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -70253,22 +70431,22 @@ aGI aGI aKR aCq -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -70510,22 +70688,22 @@ aJQ aJQ aKS aCq -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -70767,22 +70945,22 @@ aDb aDb aDb aCq -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -71024,22 +71202,22 @@ aJS aJS aKT aCq -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -71281,22 +71459,22 @@ aGI aGI aKU aCq -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -71538,22 +71716,22 @@ aJT aJT aKV aCq -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +euT +cfL aaM aaM aaM @@ -83609,7 +83787,7 @@ aWv aWW hHX aXg -aXj +wne wne wzE aJH @@ -84123,7 +84301,7 @@ aWp aWX hgr hOe -aXj +wne wne wzE aJH @@ -84876,7 +85054,7 @@ wne aDK sgv sYx -hnF +hyR aWu aVH kYV diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index 214e0ebd46b..9141a508231 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -12312,6 +12312,7 @@ tag = "icon-warning_dust (SOUTHWEST)" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/splatter, /turf/simulated/floor/airless{ icon_state = "asteroidplating" }, @@ -12428,16 +12429,6 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/simulated/floor/tiled/white, /area/security/forensics_office) -"UQ" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/airless{ - icon_state = "asteroidplating" - }, -/area/mine/unexplored) "UR" = ( /obj/structure/sign/nosmoking_2{ pixel_y = 32 @@ -12652,16 +12643,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/medbay_interstitial) -"Wr" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/splatter, -/turf/simulated/floor/airless{ - icon_state = "asteroidplating" - }, -/area/mine/unexplored) "Wu" = ( /obj/structure/track{ icon_state = "track3" @@ -43708,7 +43689,7 @@ xy Iv Iv UK -UQ +md Ny UA ab @@ -44222,7 +44203,7 @@ xy Iv Iv UK -Wr +me wc ab ab @@ -46523,8 +46504,8 @@ YS Sk YS YS -aa -aa +mo +mo UK vd nm @@ -46779,9 +46760,9 @@ mo YS Ei YS -aa -aa -aa +mo +mo +mo UK nr CN @@ -47036,9 +47017,9 @@ mo YS Ei YS -aa -aa -aa +mo +mo +mo UK FF qT @@ -47293,9 +47274,9 @@ aa YS Ei YS -aa -aa -aa +mo +mo +mo UK YX oX @@ -47550,9 +47531,9 @@ aa YS Ei YS -aa -aa -aa +mo +mo +mo UK PB Tu @@ -47807,9 +47788,9 @@ aa YS Ei YS -aa -aa -aa +mo +mo +mo UK UK UK @@ -48064,10 +48045,10 @@ aa YS Ei YS -aa -aa -aa -aa +mo +mo +mo +mo mo mo mo @@ -48321,7 +48302,7 @@ aa YS Ei YS -aa +mo aa aa aa @@ -48329,10 +48310,10 @@ aa aa aa mo -aa -aa -aa -aa +mo +mo +mo +mo mo ab ab diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 63694adfbdf..6b10e0bee23 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -256,7 +256,7 @@ /area/maintenance/foresolar) "az" = ( /obj/effect/shuttle_landmark/arrival/dock, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "aA" = ( /obj/structure/grille, @@ -900,7 +900,7 @@ /area/tcommsat/computer) "bH" = ( /obj/effect/shuttle_landmark/merc/dock, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "bI" = ( /obj/machinery/power/port_gen/pacman, @@ -1041,7 +1041,7 @@ /area/hallway/secondary/entry/dock) "bU" = ( /obj/effect/shuttle_landmark/merc_elite/green, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "bV" = ( /obj/structure/window/reinforced{ @@ -1137,7 +1137,7 @@ /area/maintenance/cargo/surface) "ce" = ( /obj/effect/shuttle_landmark/admin/green, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "cf" = ( /obj/structure/table/standard, @@ -1606,7 +1606,7 @@ /area/turret_protected/tcomsat) "de" = ( /obj/effect/shuttle_landmark/burglar/surface, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "df" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -2158,7 +2158,7 @@ /area/tcommsat/computer) "ec" = ( /obj/effect/shuttle_landmark/ccia/dock, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "ed" = ( /obj/structure/cable/green{ @@ -2429,6 +2429,14 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/hallway/secondary/entry/port) +"eA" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 1 + }, +/turf/simulated/floor/airless{ + icon_state = "asteroidplating" + }, +/area/mine/explored) "eB" = ( /obj/structure/grille, /obj/structure/window/reinforced{ @@ -2443,7 +2451,7 @@ /area/hallway/secondary/entry/port) "eC" = ( /obj/effect/shuttle_landmark/merchant/dock, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "eD" = ( /obj/structure/grille, @@ -5738,7 +5746,7 @@ /area/bridge/levela/research_dock) "kG" = ( /obj/effect/shuttle_landmark/ert/dock, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "kH" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -6546,11 +6554,11 @@ /area/maintenance/store) "me" = ( /obj/effect/shuttle_landmark/supply/dock, -/turf/unsimulated/floor/asteroid/ash, +/turf/simulated/floor/airless/ceiling, /area/mine/explored) "mf" = ( /obj/effect/shuttle_landmark/emergency/dock, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "mg" = ( /obj/structure/closet, @@ -7269,7 +7277,7 @@ /area/hallway/secondary/entry/fore) "nx" = ( /obj/effect/shuttle_landmark/merc_elite/merchant, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "ny" = ( /obj/item/cell, @@ -7412,6 +7420,9 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) +"nL" = ( +/turf/simulated/floor/airless/ceiling, +/area/mine/explored) "nM" = ( /obj/random/junk, /turf/unsimulated/chasm_mask, @@ -9552,7 +9563,7 @@ /area/shuttle/research) "rM" = ( /obj/effect/shuttle_landmark/admin/command, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "rN" = ( /obj/structure/table/standard, @@ -10704,7 +10715,7 @@ /area/shuttle/research) "uh" = ( /obj/effect/shuttle_landmark/merc_elite/yellow, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "ui" = ( /obj/machinery/door/firedoor, @@ -13096,7 +13107,7 @@ "yN" = ( /obj/effect/shuttle_landmark/burglar/blue, /obj/effect/shuttle_landmark/distress/blue, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "yO" = ( /obj/structure/window/reinforced{ @@ -13512,9 +13523,6 @@ /turf/simulated/floor/plating, /area/maintenance/store) "zB" = ( -/obj/effect/floor_decal/industrial/warning/dust/corner{ - dir = 4 - }, /turf/simulated/floor/airless{ icon_state = "asteroidplating" }, @@ -18424,7 +18432,7 @@ /area/hallway/secondary/entry/emergency) "In" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ - dir = 1 + dir = 4 }, /turf/simulated/floor/airless{ icon_state = "asteroidplating" @@ -18865,7 +18873,7 @@ /area/maintenance/portsolar) "Jc" = ( /obj/effect/shuttle_landmark/skipjack/surface, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "Je" = ( /obj/effect/floor_decal/corner/red, @@ -21389,7 +21397,7 @@ /area/hallway/secondary/entry/emergency) "Oh" = ( /obj/effect/shuttle_landmark/distress/green, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "Oi" = ( /obj/machinery/atmospherics/binary/pump/on{ @@ -23503,7 +23511,7 @@ /area/tcommsat/entrance) "Sv" = ( /obj/effect/shuttle_landmark/merc_elite/command, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "Sw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -24328,7 +24336,7 @@ /area/crew_quarters/fitness) "TW" = ( /obj/effect/shuttle_landmark/legion/merchant, -/turf/unsimulated/chasm_mask, +/turf/unsimulated/floor/asteroid/ash, /area/mine/explored) "TX" = ( /turf/simulated/floor/plating, @@ -47635,8 +47643,8 @@ ZZ ZZ ZZ ZZ -zB -aa +ZZ +In aa aa aa @@ -47881,19 +47889,19 @@ aw Uy aw Yx -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -Xp +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL zB +Pr aa aa aa @@ -48138,18 +48146,18 @@ aw Uy aw Yx -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL Pr aa aa @@ -48395,18 +48403,18 @@ aw Uy aw Yx -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL Pr aa aa @@ -48652,18 +48660,18 @@ aw Uy aw Yx -aw -aw -aw -aw -aw +nL +nL +nL +nL +nL me -aw -aw -aw -aw -aw -aw +nL +nL +nL +nL +nL +nL Pr aw aw @@ -48909,18 +48917,18 @@ aw Uy aw Yx -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL Pr aw aw @@ -49166,18 +49174,18 @@ Is Uy aw Yx -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL AX aw aw @@ -49423,19 +49431,19 @@ aw Uy aw Yx -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -aw -If -In +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +nL +zB +Pr aa aa aa @@ -49691,8 +49699,8 @@ Gz EN Zi Zi -In -aa +Zi +eA aa ag ag @@ -49961,8 +49969,8 @@ ag ag aa aa -aw -aw +aa +aa aa aa aa @@ -50218,18 +50226,18 @@ ag ag aa aa +aa +aa +aa +aa +aa +aa +aa +aa +aw +aw aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -50475,18 +50483,18 @@ ag ag aa aa +aa +aa +aa +aa +aa +aw +aw +aw +aw +aw aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -50732,18 +50740,18 @@ ag ag aa aa +aa +aa +aa +aa +aa +aw +aw +aw aw aw -aa -aa -aa -aa -aa -aa -aa -aa Jc -aa +aw aa aa aa @@ -50989,18 +50997,18 @@ ag ag aa aa +aa +aa +aa +aa +aa +aw +aw +aw +aw +aw aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -51246,18 +51254,18 @@ ag aa aa aa +aa +aa +aa +aa +aa +aw +aw +aw +aw +aw aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -51503,17 +51511,17 @@ ag aa aa aa +aa +aa +aa +aa +aa +aw +aw +aw +aw aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -51761,16 +51769,16 @@ aa aa aa aw +aa +aa +aa +aw +aw +aw +aw +aw +aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -52018,16 +52026,16 @@ aa aa aa aw +aa +aa +aa +aw +aw +aw +aw +aw +aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -52275,16 +52283,16 @@ aa aa aa aw +aa +aa +aa +aw +aw +aw +aw +aw +aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -52532,16 +52540,16 @@ aa aa aa aw +aa +aa +aa +aw +aw +aw +aw +aw +aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -52789,16 +52797,16 @@ aa aa aw aw +aa +aa +aa +aw +aw +aw +aw +aw +aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -53047,15 +53055,15 @@ aa aw aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa +aw +aw +aw +aw +aw +aw +aw +aw +aw aa aa aa @@ -53304,15 +53312,15 @@ aw aw aw aw -aa -aa -aa -aa -aa -aa -aa -aa -aa +aw +aw +aw +aw +aw +aw +aw +aw +aw aa aa aa @@ -53562,14 +53570,14 @@ aw aw UA UA +aw +aw +aw +aw +aw aa -aa -aa -aa -aa -aa -aa -aa +aw +aw aa aa aa @@ -53819,11 +53827,11 @@ aw UA UA UA -aa -aa -aa -aa -aa +aw +aw +aw +aw +aw aa aa aa @@ -54075,12 +54083,12 @@ aw aw UA UA -aa -aa -aa -aa -aa -aa +aw +aw +aw +aw +aw +aw aa aa aa @@ -54327,15 +54335,15 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +aw +aw +aw +aw +aw +aw +aw +aw +aw aa aa aa @@ -54586,13 +54594,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +aw +aw +aw +aw +aw +aw +aw aa aa aa @@ -68931,7 +68939,7 @@ aw aw aw aw -aa +aw Sv aa aa