From b99b88387bf8de9e99a8d0859443ee12305ec85c Mon Sep 17 00:00:00 2001 From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Date: Sat, 6 Jan 2024 13:28:40 +0100 Subject: [PATCH] Goon Base remap (#18125) * a * j * o * 21 * we are so back * i * o * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa * 447534575478u564u8 * areas * air alarms * AIRLOCKS * a * h * c * cc * 6 * tests rerun please * k * 8 * a * 756832 * 6845783578 * 85864354632463 * 2 * kills geeves * a * tests rerun please --------- Co-authored-by: DreamySkrell <> --- aurorastation.dme | 1 + code/game/objects/random/weapon.dm | 8 +- code/modules/power/smes_construction.dm | 4 + .../DreamySkrell-goon-base-remap.yml | 42 + icons/obj/random.dmi | Bin 8155 -> 9800 bytes maps/away/away_site/goon_base/goon_base.dm | 46 +- maps/away/away_site/goon_base/goon_base.dmm | 21657 ++++++++++------ .../away_site/goon_base/goon_base_areas.dm | 79 +- .../goon_base/goon_base_ghostroles.dm | 45 +- .../away_site/goon_base/goon_base_items.dm | 23 + 10 files changed, 14350 insertions(+), 7555 deletions(-) create mode 100644 html/changelogs/DreamySkrell-goon-base-remap.yml create mode 100644 maps/away/away_site/goon_base/goon_base_items.dm diff --git a/aurorastation.dme b/aurorastation.dme index e4434cad5b4..51e36625c63 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3561,6 +3561,7 @@ #include "maps\away\away_site\goon_base\goon_base.dm" #include "maps\away\away_site\goon_base\goon_base_areas.dm" #include "maps\away\away_site\goon_base\goon_base_ghostroles.dm" +#include "maps\away\away_site\goon_base\goon_base_items.dm" #include "maps\away\away_site\hivebot_hub\hivebot_hub.dm" #include "maps\away\away_site\idris_wreck\idris_wreck.dm" #include "maps\away\away_site\konyang\point_verdant\point_verdant.dm" diff --git a/code/game/objects/random/weapon.dm b/code/game/objects/random/weapon.dm index bb8062c3a82..ae762b325b8 100644 --- a/code/game/objects/random/weapon.dm +++ b/code/game/objects/random/weapon.dm @@ -130,8 +130,8 @@ /obj/random/civgun name = "random civilian handgun" desc = "This is a random civilian gun." - icon = 'icons/obj/guns/xenoblaster.dmi' - icon_state = "random" + icon = 'icons/obj/random.dmi' + icon_state = "pistol" has_postspawn = TRUE spawnlist = list( /obj/item/gun/projectile/leyon, @@ -178,8 +178,8 @@ /obj/random/civgun/rifle name = "random civilian longarm" desc = "This is a random civilian long gun." - icon = 'icons/obj/guns/xenoblaster.dmi' - icon_state = "random" + icon = 'icons/obj/random.dmi' + icon_state = "rifle" has_postspawn = TRUE spawnlist = list( /obj/item/gun/projectile/automatic/mini_uzi, diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index f80a3140f39..45b80e8fa5f 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -99,6 +99,10 @@ output_level = 1300000 charge = 5.55e+007 +/obj/machinery/power/smes/buildable/third_party_shuttle/empty/Initialize() + . = ..() + charge = 0 + /obj/machinery/power/smes/buildable/autosolars/Initialize() //for third parties that have their solars autostart, It's slightly upgraded for them . = ..() component_parts += new /obj/item/smes_coil/super_capacity(src) diff --git a/html/changelogs/DreamySkrell-goon-base-remap.yml b/html/changelogs/DreamySkrell-goon-base-remap.yml new file mode 100644 index 00000000000..ee6e3652c0f --- /dev/null +++ b/html/changelogs/DreamySkrell-goon-base-remap.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: DreamySkrell + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Remaps the goon base to be nicer visually and in gameplay." + - maptweak: "Goon base shuttle is now fully functional, just starts unpowered." diff --git a/icons/obj/random.dmi b/icons/obj/random.dmi index 919eef5346c3f69f51ef933218234aa4537e0880..95340e00e916b22d2362f7f66eed3963c3561827 100644 GIT binary patch literal 9800 zcmV-OCb!v%P)V=-0C=2@k2?;7Fc3s*`xGnaqx@Po5m7_|S3m}q*ok2+dkM+yQy`^_OgAGv zz0u@wx!%eeimH?^4AIgA3eLN|6pQWIfP&Le3WN4;crB4NBPht2$YoOWHbhWxkYWgW z#5MmQN5oARG-DEF>`W79@7*WKcIeXEOypX6Cpm8;Z@3b)omyHN#?iYihaU6vOk3^X z{;G1g)&&$*DZf$Nc}^UiR3rcZAOJ~3K~#90?VWdg9M!qMpEEPti?k}MVin7>+%dQS z1_O}|7)a=$b18u&bO;?n2qZTow9pe0NT?wYl1mGaI1o_iU~B_6$g(BNw)#q1?P}Zf z^ZP?dez_NeE7v!PpMSLb(d?P`eZMnv+I!B3mX;QFvg1&8v;qI_>=a-Jvr~W_%uWGz zFxuz+^ThwST>319uoT?$j z{|K%*=6sp4b^K<6n_ql#rx=^y#G}uXhu43Vx7R(zV;i0#a`s9&=VupuDsG?q2zux@ zH;MA0R_s@vBx_}vTQZBqr(MbwUp`)bai;(CbK$8s%9#yEBK90$@8jp=1s?8Sz0qSo zCBVriTp`aq?yA2BcvWTtZTVpoX>!A13%U09FJNgqetG6Ya@FW+a)o|ogi5LQmvF>=S73T<_9+T~v0nU>a@zME zl#}Ni%9QzgFzL_ZdF6v&vtj9Ow61@e2cNlnqY8ZL4)6i~TrUk3^BL6>{IKajylxt= zljX$v67FuAO^=@c!kzhNhJwM^^7+&N)SUL9;>Wp_mp7B%J;0lsL zqDX}rvjauifP$^0FjN(4TpMi#S-Eb0 zK4A`v6D#>BKgxB_J}7QI?nL>1Z#ReR66c!V+{XjgoX6Q09V}11^N-ujnUEAr36!9@ z8NzlKG7!L0!el)oc%1-#N5vPk5E3v!P6Vk6+-iXmk-X&#vWGNyhcH!!hxcs_t=7cr z){(B<7hwpLuJ^W=xd5Df%jvRlK{a(}T**M+3M%%SLw&-}4d`g=%|9 zt$U4F#omP9DZmNa!&*4!_G9Jz{ma;UzbJos>oKO3C5Si7;ns^U=Hcru-mI8xRDe70 zx=R2Y^Vjb+z-7SwUq3>gR2!yhLJ2+jA*u$Rrhy9-iWLHm1C~Tq3y@$X6-a_n^!#h0}qBtd|5 zfNCfR54j>Qqe5Xw3f8(&6xUCtVkT0FV0-I<2!Z4%41=aS+iE6{UUINJX%`Q(cAv&W z-Tj<0WsqIU7IN`rw{zbmn;(4Gim{+m?)js5sw2m%Ylg`b@5N1Wh*il~xbyByIR6Ld zZj%VQR*IoS$y<4nW)DfjC2QwNI3`0F3}Y}*Y%!>t3^^vN2Q*%@ExJZbMw2G%djja` zVe(lYzEw*xdJR$;1-ZN%Cz&JMkwKN)cB4Le{=xF-#t;jdN{OW2=1Nhe_cp$v>* z`F-TeLxf#*Yt7^SuOA_gE)BE)9;FQQ4^lN)MrF<3Tygr3xa?cM-6~~2cP!}hIP2Jrsjk`7m%YUWzkY_(zIv&A`06vZ*dRyApvZEXD+}17h-jHH)-f?a z76}MS%$SNb>Y?=N2pVQlpxm8NvhG}aZszn@S&f%PQ)g7Gq-K}qgY_$LY z_g?&4arP~z%YJ*5hBHoPRbMY7y2&NC-_AGAJ44>TnJt08(W$5C)Kdhc4gnw!NWceD z5s-m=!i&9Hph@Vp!}JInkQAZ`BwkqgM`Tjqx3lEZ60OrhcR>nC(p3q{P2cop#|Vc` zn1IL4aZ^_h*FEz~!Eqv0ESwB$6HCNokIcHuZH`NjOM|{$xd0d=>r-q>)%){qFoch?xWV^d zPNG)FF!qWvBR3Pr8^oiJF#O>lUD-;S79NDX#E&OiAeb1t^2pB=#Mfldt1!2^hLODFhU34<8Mofg*B{vSKG1e)lihpePsE3B zYpl5IT_ =1mXqIGyB}tWAjOHwc#ygBU7JX9i8^y=C zMOCcWkYVsmAA=vi$Z zIq)V?f1Gcxc?nY~!c@aNzCOtXYnCz2AKV@x1Ge*&`}No>kBMiI+e8HANM> zQa2~bUiC+D{*f1MS_CghO#q})}} zkhns@YiB;!gvXw^`M*6{rbOx(A1vh~;pLj&zrv3X`w9m=+_uGW`7FMWN%^}Txk`N0 z`3&;i3f}t7o0!09m6JC8LjfWW-C7u** zIq2aZbMuS8*=_@n+x-ss8;?Kr6LHE>=gU%Qa&rBN%=wH->3_tH2|fwssmhPAL50L8 z8h%~pF*gPxfpBe-g*wDw7R}p-=mTYqg=$)e(NPLs53ydAgcQUSm*uX4FjJUXDQol| z)@RmZXq!KmVR&3V?0SWc$6w{1-`)C!%!7Yn0suVv^gUZ-w8%qeZ-MvwU2Fsj&@DkY zqqvHW;)KZB5|)53lS60{Ps+rI1n_5bsE$esg_wkXKtWJ22mV$%nv=z=x|?m!|k~Zu!H$RhoiTJuAjEbYPUeteh(oH1n~TtC8%xylpF%^;6ems5y%kW z3g$10kn|Vf3F;Vtm5vaf^26;ito-l+2gqSZaLKDLZL++Zf3!$marK`zdEDj?N58sK znwo;w*6F`}FRHJ73r$M)`t5zZbLBS>zOlpf$nM+h?1p<+%7z&gOf+6Y#Q;=(`qayu zeEf6*c0XP$?1+j-TKH5OYr0BL?+6lj=sk^Zom#=D$4_1g)}%^k@6u?Vc-B_ib#?Qh zvRp9`ibe@GULmmq5+4xMz-*8>{;_$6Houp+>oVe1$RSvhjqvylzx&K{Z}uG^g+t@+ zvsrPrpfA|Uyj^EeclX&W2}5PmT%r{#-Z;E1CTR-BA zV`@n(-@sFyy<_VGY>-uB30rb0h!B)4EaS2>0$lY_Kj)n=l~uM6CzM4hHCt`V7jue(Qzf{qCe9F@-REP&84k`set=*g6&ZROQp0V}mdTs(! zsUWX*60-(T7-ho>n^)Tk95vgEQY>)?1+om>SpqHQGMox=*Xudbg#bmiN;`}#I1nJ5 z30q~y?fV}h_mnVAz@HtPMxnAYZ!@O~R*srD?@P=DHb%LmE9IjtrE<*EmFy-HTvu95 zPVdH$1;|D}+t zc*v?5rcM(Gq0z8U31PPY5s8e9tq;(PJphDu3Gm%rJ&YKBN+yrPvTG^S&LG(JA;!em zR@qUIk{;DzqT-^eP*E;fB_&ge1#Y8FiAOMGYiNB?Gy{&&GOQILUhtNZO@tWf3llRE z7|Lg-!fdtxnXYy^9)Aj@Sb_r5D-bo3)TkF(B*+1CcRQT^p=g(ETEdE zllKJ8C8!l}HGwq5e>*>w5+fVNjVMR}DKM=P>VZtzJYsHvrSD`}-rB)Ii>7R`9p8TC zkK*Bj4v-xl8%G5vCFm+~5r)7{35;DG*7tZZ>m)<%D!piYTvm>v!*FX2!pe|tb!fTw zp>3}Nlps9w@}F=U;g~%S>+<0T3Wv;q+gAEmTHMaODpdi|^fdu)OZ7u_WCyE;~+k^#!mkc=?`3wtkJ+Mls>( zXa0m06dZo~!OWi5#0p^06-2cH>)k4p;0StgBfOu48C&NlfUab5gvR1tV=PKi3_SV}1WA&Rf1VTu< z4243y#IVNV+a*1JKW;eU^3rvi7x=%i`K_SoaMYqjj0z7~1bfYEBv*(c6%&vYVs#*D z#`5{MaT%6hI2<}h0pUSPfrv<)c>*b5SP7#mD(|g^lWzPjQt`6eyjslhr-HCSmLXeJ zw892NXB}!f&5Fc|t+wU4qxP4xDxhPkg99WD4~aqWA^Gy9M@v=HIPA(JWhN1(<-yNx z?|&AXEx-#ebrKAA(Ct%6TMDBd7imRt6&1xXS@+Iu7_mvHnJltjg zukcZE7$e7a3qJfG9Sic=4$qCaupBI(f}0m~M+!7L8QxNg02M19Kus27`+(Nv&^b01 zq7Dp$vWDPr0T3uiLUJqJR3w>*LMo-OGN7{GaF)lEZENBEPySB|u;} zIzeh)m*>B~eYb1dDZmb9=Obtbvr~W_%uWGzFgpd0&yZG4o$&zjAm3~vvlH(dGI?ZMHZ@Np_H3sc7YG}u7{vR zAZej)NBh6S(Ygkzk=Zc5HPwX2^;0qGrPq!THC@agG_B~t(G>RH@D7%$kvEf=!b98` zCa9;VaV5oOipmO`(TqYxoqSPr2)#4^O+8c#N!XX;u9f6hXWIapp8XJqLppM;i8F)P)If(uB-jdvM0($2U> z6Cov4^Rm$EMNBYpCYmUK9kr2Ri+p2-cYOP@I$MgRIp_nWq=j#6XRLo?wACXagsD+E z7(x+}@henhAVome39nZPD+)c{VrC7kz{11CTo-9?gfcxvJ|(G+*$gHeQeFak zRUB#VfA}tS2iH@r}6oM*$95)Z? zmDpyG*Y#q4F*u1g^itM+Jd?qJ((U5J?=NbWb<-!&_sF;Z=|oT(-}6)SK{1(#LdE(l zs^fwXAS4YV>xt{bG!^=gNXqp=_O9+?dg%t%wyA`6(P2#hiNHE>2vR;&(?LyZwC!EX zb7gxGMd!6dBfrXzCmu3*Z%rdzops3KA>8ElxdY^`@Z!L4DXp$#?T^m?rxHQwu2%^s z^GsPef;XR`*c>HpjgnO(M6EngTPK?Dry|$Sw8=?EdkT0p$;3$}p>7ZA^gL>vfsz%- zhAbQQiSc&jZ1U1iy_-WHtl}7N7o!C~s|Jfu!lPs@1yDwVJUp$KrX_f$r=2!?oH8Kb!t}8H@_wWusLS^=ssss}S*i*N znnpL^3dx8!LPMoasGw8m9j1KW9EuQx`xNB;OPY1JuAd<|9LwV zc_|acHJm%|+%0Nq-E+u2G9t4~HM?+;45?uz2MywOKY3H5xGI1OME>Kel06LWAF?=o zk;JXEIkz{?t<$qS>YKvaS9>vM&BY8CX#4#L1N>cqAQ;Ld8mnU%wS|7eC5JVn<;IBMt_ ze%5dnXTAG#E}eQg*SB0RuW#P;fZugTJS%mnuyDdz9GGjxkuW7Tgp(K~SRMc~hmlt} z{(vMGeE2l8CN4tGF5s?zj#;PgL8dT?)Nfk&XzuNt&mdoY;{gtte*#88r|pp^iJY+? znPc~0&Z+Huuy`Wlj_;&r>AQ$iru{^g=Y}XZhOiVbnxZlxy_Q;a0N3jw?i(gvW}#}5 z{8WcBkAtYzaVt!4B$=832pE~*qhE{BU8vw`t&;wcVwMg?Sr{+yhwd0oR}D3eO~nVL zNTCzR`l#sY=Dd5RY;|Yg`Rjinv*jL`{vfF`7*L?sf;I)H10GRmx!{#emVf=BPs-z} zzJwt>comhY`A%v?FRtd}+dX$sm55>o8I#~j3gzn9ex>yaDa}h-53*JZ zV~hmJB?AjWRm zR$lDYxwv#D6=niQXgrbp6Rn;OPKXFzNo8;ZC>d})zy@#>IR0CL(2;(cX8TFw=XXN} z*Pkd6WY7l%h%9MTq?1FKd?Bsz>~kbcKkobMe>~QYaJ;uEma3a^B6=o2|l&&EJ>CnWgxCHGuu)8a^nl;Fa<2lQuW$Cve(caZ0QIjJ#<-#97OkFmV9&&nM$F{SF?w52}Aa z%MA~1Qe2N~QtlS$kjprXV&;a2NTk54!iF1FZ z`bK~It_l-(EhhBKW&HSeE#l~-o8{tXT14|9%~B3NK+9vB-u6<7T4^+CQQD{wFE^=D zdMOSYRL#pEq>4;>5iuL%pg{`rM(J-VrAMho3fM4M&N3s;yGA*y2g`W&z5lBrb;>|4vA3kwcwmPrem4;?$slU%Y%-vGqo+Cyc2L}fwK zYP=pvHVkFc^03~Ianc~(Rv+dhn|`W^SFGWc%DHstwX{XyqxH4qEe|EZ0@4Wc+Ugpr z9S3`L9bp|R2PBr?qGDZ&eB340=P+JRQdAfwVC8V6WbPBked;P%`=1xe+NLSIFz_Va zaxlvw0hIR~#~lxzOYDL-Sbg^i#83YttoRUS?ECLqcX1i#9x-{d>X$zs zaH;GLtzxNVVXLsOX@UcL%~0@;2&(3*yuDJeW`jYS1|u%8XDP#zCZfOHi(K6W!0(@F z+2U4(Qb!L{s|FZMY9zB7-hx8X(4aAoBEX!LM+sP@LP4G!w~$V)gk@eo>-sBctQf+| zMR>ilmRFZd!|AS~=EE`+3H9v`qa^~LQ@~>wg!>f&*%Y2!irQR)urY!wHa;0J;o7@I zGTqA|3lGIigW`d-7oJWxQF6sAEWi6S;@@}yl1D=RKKN4yv=wt>50Ji|qb?r{eslAi zo7F-ZX!HO81xZOnK~!U%9UA85aVPQm)KmC*q?i*Iw}=y8ZV|7qb@}s%!>^t#La*GWfWy2_=%lT06EpsWG7;HJG_{Xly!Dk@!;sOwO&R zD^SIR!XROEDl&bj(kA@k6`yH%+Y{%=>OCg&^txwwH3ml*a7U1_B~U-R4}wb|ya3vl za%1PMT;=}(EiLP@GMUj=F%t+yPZNg5Ti8Wb< zfA-zaHU5&{HcQVWc-IR>Ihf>wB?Z6{@a``;V5&{m@@4$|suQ+pcIU#Q50t70TupN4 zW1kk_Z(Ms!v;4q@(3EPM3{E7sMJ%!M#r6%-e{eIi!-G-~}R#`OglEf$2bl96&jFq=dw z3XYJ3GDGB4AJg*dDb072^v9@D2beOufY<-|kLcPj-6~#c|AfP87V+UH!<@C-Rq(L_ zySVVeB1Ll{DBHz(PkbJ+c-}TG#>b`W?#r1_7@L(Ji0Xxb5o){L2I%Kv7a2B$B1^U1;d( zKnPgkDPkZKWw9(_-9R1f@9z$dVA`;Qa0QksXss0l3!n#!2 zhiJ?XqT%8?5}(hZw9+PCX5*WcLwJC|Htr$tFM#G2JM>P9BNdzbqYFqo0m4ZyUAZ9R ziX@*TgXowj2rNxdyL1AI?J~PHkH3(?@Q0|)^x_Hy)iLm@ekNu&Uii-;*fl?XqW`|W%;y_T}d2=&V=-0C=2@&dmygFc1XbbMh36-b??kxfDe_=qpInZId=;C0T3x_B{x_mGm|P zAI#)%DXY4LqN(K*L$u^U!FjirVznb1P;fd*VbI@kvBMRCt{2op*d)#hLfNbI!TFNLRfVOLCycmMmLc_v$v?cKW=3DEodk zZ`^IxNzm^iT^F5{$BLCQ!kg5uE{BF=g@ucFI0(!zVc6tfhE?N5?m8^|OBg;4^36 zATK=grvK;Q^|?WMi%Aq|@~uxTcdavz9WRc#HL`V*ni3dMYkk zA2j}A2oh4TboP1t=)y>p3ELqgS@MxOyjtZ{%!5wU#TE)Z9Y~A?)Vr!*{E6==H zX7wcZ&N`fz61}X;CkT2?4zFusaX_-)k&C%*`6GPc$ItH7$@s<#ejwXjK}tvzsnBHh zqevT2u$2sks^WDDcyMtd0?l>tXfF0F1>u_>7ALeI5ou9WHFRK8-jCspf)qHO5QV}# zesSFyd)4ksZof=+Ej@^q^Y0-2=4xsuS~#H1&+V6A#REUOdAn_GH4Cx|!#p@^5zoih z@osU7umAF4ap#%m$W^1me0={JZu$8`{P>p3xcI7%$#d`h?Oy9lNDAf#D$v{q!Beb-(6;Z(YH~w|_#OcjI$=1%d!3wQ`2W{yst38HL=a|IYA|pV-nZR`w z62ib^8n{5ITp{2%U`b?y00~w~ffN{J4(*O)%5qta2gQj}sH`VEIYPP?WL&{loyBnW z&f@>U@0=oUIKG0eWsUrJeT>uQyhTWy$z`8Dg-37x)=v9km#n$y|NK%soy_x}Zzid& zt7fcvlJVhJx#N+Wx$}Ex>~U@yut%vbtweQ8xWbPlhfpnieg`e=;>+6*k|01jKm(M7 zheDZ`DWNba1)JO`it8s=djL|2V0&AE2!YfTBtg@iJvEcZuKAe!^!^?e9y*^#hR6Bb z+ywhqE#vCz?%|HY#QZA_9YU&8HjlJ%(dGtS zQK=|zm-_i?Ll={N$&*|9SR8KQ-#2e${w9Y8QG>GRBrdz@dtCUn-A_Vx8vwuqS3e~# z{_gp5+@7NSg3qviY?QQaa?L&WaM5KK$RF-xCh*@H&@&9^83Iy=08j)Z-~*`$$U!mg z#oi#$B#hc&MuZJWO3^qHFRc45G9~cac?wyHHejKyh~^Z4gydwAfM6S?@7`#En9)9^h40PwHZKO!!<{W7VVw@)ub zUS7?Xi570T;dU;$@G7~Zg~viOPQYI2$CED+j8DJ$)oF!%XbOGHW|E_??a&TSsEIFa zd7pb{9gdsm<)2ReybO934ryp2U6g$5tS@rGoj>FYKi=~-&|b;O9=P#e#5=EPtiA6I zIyY#H4U9ANd_Q0L-kn_f#c%EOoM57%S&~6ZlBu?sDp*XmIZQbgV^Z*Q#Yf}u^{gGt zk$A;N;=Naxd}orrYzu=U4b-%ph4Qs{vir}2dSq}^b)?bO1a}9u!BkX!n1Ca ziyJ@6dHY?@js352Ow~LVM5@u;2q7zj&xvr!V~_8(D!^Xb5qtFd&x_3~f5~gB`)O*3 zk?Buy_oX+`7CnT|pL)ekLGWuP{%VJa?qJVXz$?(h3OPrkKjz`%xdOe#04?3~u}}CU z;jW|LfO81VUr6miXMh4ltsKR&h&mee;}$hjK5AT*Q%Xsq5>&UeT^kHQ4>d3_@d{CY z4PV*#drYMaQw{UPmK0ZPe2YeZaBsK_*vngzkAD60VrccRS-<>uyztJ?D62h?mPIL+ zw4Tc4r(C&X2wsqyz&=*sR)SJ3>G4L{R3B!&&*DkDmQVT&6t|4(p7((oxqr5Cm2r?8cX9KF%_3`N5dA9yw*UYo!%h;DI~9Kc$5o&biVlRQ{NU9fjSDF21fN1 zzx?7I92wo8SF*-l^4MOO1O9(K@Z+1smFM0j>#G;hzGxDFceXskP9=XHpi&|V5&^i1 zAQQ1D12PCEgAN<)L&?lJm_R%Wj6usZSFO*&3iAp%yX=>3=>yr6zwakEiFXH3Rm+2HqQICxMTYhbcgV-9mkCL z(TWCoMTm08gDWHsk~T{)DJ13k8wBi89L2lS{W$-u8)c$u9@?@q346kGE+wMms)5Q#jRcMLHG%0>&-v=CEMl)N5dqbhMJh$${>Tm@lfFttiH>LYB)ZNboX zelNrDxV$s;BK=Ri#P|R0&JScC`~w33@Yplo-zB3(5e7y}tQvQ*5h%d01mR5KDmsc2 zB5zAr3BFtbp-DU$6C)D9pD&;~Dj5`F62<`qLCKu>@28_VdAzE-)Al^^)9-%ZhYz;8 zAv2@@JqKv3GOtF-X@3vAjvi)1PWLQ*9yI;J3^D@0Q+l|_@5!Eqc< zfVSKqBO-)a%2Q_MiJE!p^f-d)Md8SLA0TO1T!4at^gGxe&mcW2R&5El%t8u{j0nv{ zz+1y}SZBv5i)7i5D&y$ZI4d?cQ8f}pF5VDI@Dt;>LB4IN_ zM{bZ%Ku6cg+5fO2nVgDRE(w-fQ0-zY*75#6f;_ND;LQpq4)D^awzANkoQZ&bzeFN< zeyA2CtXMOPxjC0mK@v*>5(0$`$m#Nk$1LIm%4jN%(P$=#2OEe7YKT-gbOkpvl~ai= z)T!wxg5NP5^laXL*Dz>eC;utl*W$LqeM*pRQp(j4@OO0vQ? z17JfsgfKPg5+M{JXp%AP$AmSiHCe{K6Ev-OI zMO=; z2rZ>?V)-o$gxhEiXNW{yG|k1gK*tv^A!$!fk2gftMquQ#qlbpxOjrc*-P=`5oRWC(BtOOKC`@|WQW>KK5P zjZic9+uJNF54Wn!em_S=+{RPN5%QVDtSRzpglZ#6)Yj3=EM*er&q*;l=%=bv(mC5C zH0(hxC?Z=7+`K@x=NW9PW*|6^pe)kr7APg^IXy7M?fEXY6ul_nDe{>JtZikEn%xBe zFRhcNrr@=8#_w4|!>zBPNy(C@9^&;IFGBdHKc+_x-Qybi-~;Pq`~J0b8ZV;~1yp|U z^b36EtV0Oc<9LZ;M^rr0!l&9;3sgo%(@5ZvHyyrwu7@d4grXE|%v7+V??Kt!`K7Jj zQgkc?pc**@lD1SoQ@(N}4zu%pcpVFgN?Uk@F{gpLmg)V4(kvSkNeGECPe(?JNCcZA zoy>B_7^94mD|nt7-Y$hu1mJ4eylqA!M)`>4?qfsjzbS-?ZtwzU=NEATu96P z7qc=9bzO%Lt!-jcW&*MK4JrML_6Wi(tB-m5^f`W0l+)AmE*G5MOnl8CPY;Yv-w&`s z)=wYUlB+?4pki4S*If|crbouP?Cg20w|zLFJW^@eW?Ku^j3X66OL3ejB}mxJQ(ubH zH8qGUBx!Gi_Bx$VNvAZLr241=iV%dy6y&i*Y_9^AgA|fq)EvvljWzsR@Ni~j9G;~a zy{d#hRK;7Hn~|1=HhUw{jjeR94>3~Z?gD^6T{80@^C$}aw z^AU^=td=$5{dWJjo*TzhYALD%#H<7gQw*-Pd8xO=sRw&e$|Y_>AgjP#D9~aq$xMj* z{!k!W3Q%UN^uhFn0|COBwcVbX{xaNB65+bU{gt$5$4U6hSWugyddmP|=>wr61rPyR z3&@@@Zc)WKdJ;QkkjTxZPYLsoeH@2aNnZ5U;93%dKu$IzH5+fdf&*4nkO-?dLedc5 z1pq!wqFuEd`qgVe1ynff`fHJ@00FLmN&$wDY!E6nyX*bwMaP3^ipk1 zVkurUMMc^!ZR!NMjE9;UmzwYtYPqD??SMxhJu33JEW(kL(p8WFX4!nw9$=VS9`n>Q zo-SwgWRzt!CEivu$W#;6o+7SZNrj;kDEO!y8r^vSxuHJ#pLiOjT!I49D-cbR%#;^d zCMW=h9CQ-nlSve3=T9DNO)vEHa10G}edch`T!LB&R})A>{8{_dNsN3LH=<0}A*H~y zDrg0ARf~zaC04(lXH8E(CmcU_t8EoEKNH?45ot0v(@R}3fvsqyBT*Js3?iys%Igj6 zfW$klA{LcE0oU|kE{PK#Z^3G}iEClDh#3EFwxgQx$Np9{k40~PC0Njv(J)LuWfKyw z?cn;Fi&G;QDz9c`*kYcL_PC%om)Z%E!1igMf%Z?OX7dM9O@0$ z77yjI`E7jC8X+PLem6Lu+J+pj4>WRALxz_(G_lcEX-NC=jfQC6?BcOaT;ZjBcoTN4 zZs!5GK{)li;~@aj21^xaic1?XU68ZIXXx05dwIjSLc&+9aJPpaKi#w z38W-WgYrk|aaepP9nST70l6a|tc?XV=nNp}b zDmPtT$g9YLhN2l1vJ|Hms_~jaMVHL6!_S4Ad#0 zyR>9XYB#w!st125N6^u!DI|6w3t9lD9)CPj!b2XxlEobqN>QX@0+Ld!1w_;IdHy}T zhUFIyCoWPzc#u*cA`)k@Knh4IVRS|1%?wBga)Z@WkCGPzF*5`!EG<*u|<>$d39ci|NE8 zDicLNvTHNPmkvUDVh96#8(zR@IUO}VhP%ZFB~WuYq)$WH&ZUe(Llxe%OJgX3*CWZ- zf|#$v7C*+P6L@=k7_)5>o90qeyO9l%DE)dfy-~}~t3RIezod+ z>5cf%kxZ(f6uOX}^+<6nM(5GU&DHQ8XagCnU^U*!EOuD{)y$!82S5uWh%LiScqeYA1QCcQ${RsKOelhg^uJxXz#- zTKgOltt#cY5+1`KJnkcqPvS8$G?(J&(j@Jx|Ld#;`D}-0(=Mz5%ctNL1;ddN9Zrr{ zl`=rZstKT`%CUVw&l(t*u7#)*Nl-QtOqKwFf+Qrj-A$k7&|aG&-|Q01foRonODg7~ zJa`=n?xo(j82$>XCom!e+p`RfF5_#IDfGujsK<+cJrmt?IVXh}q^gX2}OPt4$| z7BXb=hIS~Pc9))ThzHHja+cD^cS{HHkqVcgL^<|wElQ-sfo2}zXhg?DNFi|*53Z`< z&5q*=g|sI|V`-d-k-_iUxB_N1>wld9{x?-yYf=h2cp7wY1ft16nGz^?uyDvWdWcDb zl%g>hfu9Z?&DvC$IyBTs8c~%60g+Wv@)3c@$>GZ?XjX}aFq7OL+aekOlqS zs?o&LU?WWz^RPU2O^I+cOsdUGpLPTbvMTr4i@;SV8GhEieh_M10;75qrRXEn*G#~G zs&tN0NTqFE9)wE0Jw?`6MrSFGYpDp^pwURv(k_TQE#&o0RMgB2K@hQV<`;1y7M^us zs43B>HIWlu{LQHb5^OFw3 z6)4x_Vckc!O@qsNeS0)$guh6+I%%Ovlog6Nni2rNy|ym}Uj?Q(EW5q~L%;SbTA z8^sk0s$<|){dDFBv4o1pE>aUIQdT91st$UaMZ}b#N`xQGql+^DGFBC#F`Gc6B$26O zgDNO`0vy|FB?h*!7{&9s>}7^)axkz&Z}zpGxtOk4(-) z!A@$AigCZ`{)TkDp9kk*B=Afe?q3+<%zwIv+M<;4@+K}_eCf=8T-uKIC<5Gt?Kqz; zV6QrjxB^3+aO&i8KH9z?-_O5FbA2n{Sn-XSXxNVSC;~*8g`Nw+p$~%}j&WfW_)_LU zI1cXm$z80t;>DQ=*p7BP0-inT8`79pBC-Aq##UX%paOkBuML>M0~IsQ-wEx~e!z3x z|0sGPrXaOkGw^F*h|2UHcZAV)L zu<4(!l-83!kjwAwmMj6I9ww8Zv?x4v&l$w7Sj~g?Tm!lX;}tXOf>F1_&|_AF?JY3MaibxY4|c*6^21(@xFl_kIt z@Wzk$=scUDHE;3YO=s`cQ1f92u-!>`=)bO$=O1+u&LCW0c_rClSeXIRA!v<4-|Kw! zgxTW3o6Z*hbF%I3e(}$Sp6>3)XNIC}XonGS*B@_@hlE1BlC7q_t(gaZdk384gS+Oi z;;!%g*<0V;{YSa0lkSH-0(NO7eABbvmS+4g-Wq;{72o*jUde7g>;QIYC4AdSUlG7w zbN-BWqZoJh7d|@U{Jp4|V=4PsGXVCnW&rGC{aBF@0r3C;002ovPDHLkV1gC5 BbhQ8g diff --git a/maps/away/away_site/goon_base/goon_base.dm b/maps/away/away_site/goon_base/goon_base.dm index 6e5427f18e3..22f32493a0f 100644 --- a/maps/away/away_site/goon_base/goon_base.dm +++ b/maps/away/away_site/goon_base/goon_base.dm @@ -7,7 +7,6 @@ ship_cost = 1 id = "goon" shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/goon_ship) - unit_test_groups = list(2) /singleton/submap_archetype/goon @@ -16,7 +15,12 @@ /obj/effect/overmap/visitable/sector/goon name = "asteroid lair" - desc = "Scans reveal that there is a unregistered structure within this asteroid, as well as an unpowered vessel docked in a makeshift hangar on the south outer layer. Further examination reveals it is wanted in the Coalition of Colonies and that its crew have a bounty on them for piracy and kidnapping. Extreme caution is advised." + desc = "\ + Scans reveal that there is a unregistered structure within this asteroid, \ + as well as an unpowered vessel docked in a makeshift hangar on the south outer layer. \ + Further examination reveals it is wanted in the Coalition of Colonies and that its crew have a bounty on them for piracy and kidnapping. \ + Extreme caution is advised.\ + " icon_state = "object" initial_generic_waypoints = list( "nav_goon_1", @@ -31,39 +35,15 @@ base_turf = /turf/space base_area = /area/space -/obj/item/paper/goon_base - name = "/obj/item/paper/goon_base/ parent object" - desc = DESC_PARENT - -/obj/item/paper/goon_base/note - name = "dirty note" - info = "hey, boss
\ -
\ -
\ - i had a bit of an acidnet when i was workig the smes
\ - it fuckcng blew up
\ - it wasnt my fault this time. i dident fuck up like u always say i do. it just blew op on its own
\ -
\ - only reason im teling you throgh this note insted of in person
\ - (i fuckimg hate writing) is becaus i knew youd kill me
\ - you threw jake, the olnly real enginer we ever had in this crew out of the airlock cause he short circiuted the booze vendor by accidnet
\ -
\ - so honestely if you guys are stuck here now and have to cannibelaize that dork we snatched last job to not starve then seriusly its ur fault not mine
\ - i got a contact to pick me up, im far gon. u wont find me. dont try to find me if you dont end up starveng here
\ -
\ -
\ - ~love, daryl
\ - " - -/obj/item/paper/goon_base/notice - name = "important notice" - info = "REMEMBER TO PUT THE BOOKSHELVES BACK IN PLACE WHEN YOU LEAVE! DON'T WANT ANY POTENTIAL TRESPASSING ASSHOLES STEALING OUR SHIT WHEN WE AREN'T HERE." - //ship stuff /obj/effect/overmap/visitable/ship/landable/goon_ship name = "Wanted Vessel" class = "ICV" - desc = "A Leapfrog model multi-purpose vessel. An old, rudimentary Hephaestus manufactured vessel that sees use by all sorts of people. This one has a bounty placed on it by the Coalition of Colonies for piracy and kidnapping." + desc = "\ + A Leapfrog model multi-purpose vessel. \ + An old, rudimentary Hephaestus manufactured vessel that sees use by all sorts of factions and organization. \ + This one has a bounty placed on it by the Coalition of Colonies for piracy and kidnapping.\ + " shuttle = "Wanted Vessel" icon_state = "shuttle" moving_state = "shuttle_moving" @@ -89,8 +69,8 @@ /datum/shuttle/autodock/overmap/goon_ship name = "Wanted Vessel" move_time = 20 - shuttle_area = list(/area/shuttle/goon_ship/bridge, /area/shuttle/goon_ship/storage, /area/shuttle/goon_ship/med, - /area/shuttle/goon_ship/starboard, /area/shuttle/goon_ship/port, /area/shuttle/goon_ship/living) + shuttle_area = list(/area/shuttle/goon_shuttle/bridge, /area/shuttle/goon_shuttle/storage, /area/shuttle/goon_shuttle/med, + /area/shuttle/goon_shuttle/starboard, /area/shuttle/goon_shuttle/port, /area/shuttle/goon_shuttle/living) dock_target = "goon_ship" current_location = "nav_hangar_goon_ship" landmark_transition = "nav_transit_goon_ship" diff --git a/maps/away/away_site/goon_base/goon_base.dmm b/maps/away/away_site/goon_base/goon_base.dmm index 967c56fd9a5..d18cdbd2ebb 100644 --- a/maps/away/away_site/goon_base/goon_base.dmm +++ b/maps/away/away_site/goon_base/goon_base.dmm @@ -1,24 +1,90 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/orange, +/obj/effect/ghostspawpoint{ + identifier = "goon" + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"ab" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/equipment) +"ac" = ( +/obj/random/dirt_75, +/obj/machinery/light/colored/decayed{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"ad" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) "ag" = ( /obj/effect/map_effect/airlock/long/square, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/living) -"ax" = ( -/obj/effect/decal/cleanable/dirt, +/area/shuttle/goon_shuttle/storage) +"an" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) +/area/goonbase/maint_north) +"ao" = ( +/turf/simulated/wall/r_wall, +/area/goonbase/kitchen) +"ar" = ( +/obj/random/dirt_75, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled, +/area/goonbase/maint_north) +"as" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/alarm/north, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"av" = ( +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/port) "aA" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/effect/floor_decal/corner/grey{ + dir = 6 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "aD" = ( /obj/effect/map_effect/airlock/s_to_n, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/storage) -"aE" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/living) "aI" = ( /obj/item/reagent_containers/glass/bucket/wood{ pixel_y = -7 @@ -29,18 +95,24 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "aJ" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 13 +/obj/effect/floor_decal/industrial/warning, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/tech_supply{ + pixel_x = 15 }, -/obj/structure/mirror{ - pixel_x = 27 +/turf/simulated/floor/tiled, +/area/goonbase/power) +"aK" = ( +/obj/effect/decal/cleanable/acid_remnants{ + pixel_y = 8; + pixel_x = 20 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) "aL" = ( /obj/structure/cable{ d2 = 2; @@ -48,7 +120,20 @@ }, /obj/machinery/power/apc/empty/north, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/starboard) +"aM" = ( +/obj/structure/girder, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/goonbase/living) "aP" = ( /obj/structure/table/rack, /obj/item/clothing/shoes/magboots, @@ -58,18 +143,87 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"aT" = ( -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" +/area/shuttle/goon_shuttle/storage) +"aR" = ( +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic, +/obj/machinery/light/small/emergency{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/item/trash/candy, +/turf/simulated/floor/plating, +/area/goonbase/living) +"aS" = ( +/obj/random/dirt_75, +/obj/random/junk, +/obj/effect/decal/cleanable/generic{ + pixel_x = -9; + pixel_y = 14 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/goonbase/living) +"aT" = ( +/obj/effect/floor_decal/corner/grey/full{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"aV" = ( +/obj/item/device/flashlight/flare/glowstick/random{ + pixel_y = -10; + pixel_x = -5 + }, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"aY" = ( +/obj/structure/closet/crate/bin{ + name = "trashbin" + }, +/obj/random/junk, +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"ba" = ( +/turf/simulated/wall, +/area/goonbase/power) +"bb" = ( +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"bc" = ( +/obj/structure/table/wood, +/obj/random/dirt_75, +/obj/item/reagent_containers/bowl/plate{ + pixel_x = 2 + }, +/obj/item/reagent_containers/food/snacks/berrymuffin{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/machinery/light/colored/decayed{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "bi" = ( /obj/item/trash/cigbutt, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"bj" = ( +/obj/effect/floor_decal/corner/grey/full{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "bk" = ( /obj/effect/floor_decal/spline/plain/black{ dir = 1 @@ -90,44 +244,126 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"bm" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/eva) "bp" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) +/area/shuttle/goon_shuttle/living) +"bt" = ( +/obj/structure/reagent_dispensers/radioactive_waste{ + pixel_x = 7 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/greenglow/radioactive{ + pixel_x = 12; + pixel_y = -5 + }, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) "bu" = ( /turf/template_noop, /area/space) -"bL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 8; - pixel_x = 0; - icon_state = "tube_empty" +"bz" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"bA" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"bC" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = -19; + dir = 1 }, /turf/simulated/floor/plating, -/area/goonbase) -"bN" = ( -/obj/structure/table/reinforced/steel, -/obj/item/clothing/head/helmet/merc{ - pixel_x = 6 +/area/goonbase/hallway_south) +"bF" = ( +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 8 }, -/obj/effect/floor_decal/spline/plain/black, /turf/simulated/floor/plating, -/area/goonbase) -"bQ" = ( -/obj/machinery/door/airlock/maintenance{ +/area/goonbase/maint_south) +"bH" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/hallway_north) +"bN" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "bR" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) +"bV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) "bW" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -138,99 +374,278 @@ icon_state = "1-2" }, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) -"bZ" = ( +/area/shuttle/goon_shuttle/living) +"bY" = ( +/obj/structure/table/wood, +/obj/item/storage/pill_bottle/dice/gaming{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/machinery/alarm/west, +/turf/simulated/floor/carpet/red, +/area/goonbase/living) +"cb" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) +/area/goonbase/maint_north) +"cg" = ( +/obj/random/dirt_75, +/obj/machinery/alarm/south, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"ch" = ( +/obj/random/pottedplant, +/obj/effect/floor_decal/corner/yellow/diagonal, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"ci" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/machinery/light{ + dir = 8; + pixel_x = 0; + icon_state = "tube_empty" + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "cm" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) +"cn" = ( +/turf/simulated/wall/r_wall, +/area/goonbase/maint_airlock) "ct" = ( /obj/effect/shuttle_landmark/goon_ship/hangar, /turf/unsimulated/floor/asteroid/ash/rocky, /area/mine) "cu" = ( +/obj/random/dirt_75, /obj/structure/table/rack, -/obj/item/ammo_magazine/mc9mm, -/obj/item/ammo_magazine/mc9mm, -/obj/item/ammo_magazine/mc9mm, -/obj/item/ammo_magazine/mc9mm, -/obj/item/ammo_magazine/mc9mm, -/obj/item/ammo_magazine/mc9mm, -/obj/item/gun/projectile/pistol{ - layer = 2.99; - pixel_y = 6 - }, -/obj/item/gun/projectile/pistol, -/obj/effect/floor_decal/spline/plain{ - dir = 9 +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"cw" = ( +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 8 }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) +"cx" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/mirror{ + pixel_y = 31 + }, +/obj/structure/sink{ + pixel_y = 21 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/living) +"cA" = ( +/obj/structure/structural_support{ + pixel_y = 8 + }, +/turf/simulated/floor/airless/ceiling, +/area/mine) +"cF" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_maint"; + name = "airlock_goon_base_maint" + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 2; + pixel_y = 28; + pixel_x = -6 + }, +/obj/machinery/airlock_sensor{ + dir = 2; + pixel_y = 28; + pixel_x = 6 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"cG" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "cH" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/machinery/light{ - dir = 8; - pixel_y = 0; - icon_state = "tube_empty" +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"cK" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/loot{ + pixel_y = 6; + pixel_x = -11 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating, -/area/goonbase) -"cK" = ( -/obj/structure/bed/stool/chair{ +/area/goonbase/maint_north) +"cN" = ( +/obj/random/dirt_75, +/turf/simulated/floor/airless/ceiling, +/area/mine) +"cO" = ( +/obj/structure/table/steel, +/obj/random/bomb_supply{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/random/dirt_75, +/obj/item/device/transfer_valve{ + pixel_x = -7; + pixel_y = 5 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"cP" = ( +/turf/simulated/floor/tiled/dark, +/area/shuttle/goon_shuttle/bridge) +"cT" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/storage/toolbox/electrical{ + pixel_y = 11; + pixel_x = 10 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"cV" = ( +/obj/structure/closet/crate/bin{ + name = "trashbin" + }, +/obj/random/junk, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_south) +"cW" = ( +/obj/random/dirt_75, +/obj/structure/barricade/metal{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/obj/effect/decal/cleanable/generic, +/obj/item/ammo_casing/c45/practice{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/ammo_casing/c45/practice{ + pixel_x = -10; + pixel_y = -1 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"cY" = ( +/obj/random/dirt_75, +/obj/item/tank/air{ + pixel_x = -9 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_north) +"cZ" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/equipment) +"da" = ( +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"dc" = ( +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/ammo_magazine/a10mm, +/obj/item/ammo_magazine/a10mm, +/obj/item/ammo_magazine/a10mm, +/obj/item/gun/projectile/automatic/c20r, +/obj/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/goonbase) -"cN" = ( -/obj/item/material/ashtray/bronze, -/obj/structure/table/wood, -/turf/simulated/floor/carpet/red, -/area/goonbase) -"cP" = ( -/turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) -"cY" = ( -/obj/structure/table/reinforced/steel, -/obj/item/clothing/suit/armor/carrier/heavy, -/obj/effect/floor_decal/spline/plain/black, -/turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/equipment) "dd" = ( /obj/structure/bed/padded/bunk{ pixel_y = 0 }, /obj/item/bedsheet/black, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "dg" = ( /obj/effect/landmark/entry_point/west{ name = "starboard, storage" }, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/storage) +/area/shuttle/goon_shuttle/living) "dh" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/item/paper/crumpled, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) "dr" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 +/obj/random/tech_supply{ + pixel_x = -9; + pixel_y = 5 }, -/turf/simulated/floor/carpet/red, -/area/goonbase) +/turf/simulated/floor/tiled/full, +/area/goonbase/living) "dt" = ( /obj/effect/shuttle_landmark/automatic/ghostrole_activation, /turf/template_noop, /area/space) +"dv" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) "dx" = ( /obj/structure/table/steel, /obj/item/device/binoculars, @@ -239,7 +654,40 @@ }, /obj/structure/railing/mapped, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"dz" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/obj/structure/table/wood, +/obj/machinery/light, +/obj/random/loot, +/turf/simulated/floor/wood, +/area/goonbase/living) +"dE" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + id_tag = "goon_base_prison_door"; + locked = 1 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/living) +"dH" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"dI" = ( +/obj/item/pickaxe/drill{ + pixel_y = 7; + pixel_x = -10 + }, +/turf/simulated/floor/airless/ceiling, +/area/mine) "dJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -248,87 +696,253 @@ dir = 8 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "dK" = ( -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) +"dQ" = ( +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/structure/closet/crate/freezer, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/tank/anesthetic, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical, +/obj/item/clothing/mask/breath/medical, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) "dT" = ( -/obj/structure/bed/padded/bunk{ - pixel_y = 0 +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/gun/energy/gun{ + pixel_y = 3; + pixel_x = -2 }, -/obj/item/bedsheet/black, -/obj/item/toy/plushie/farwa{ - pixel_y = -3; - pixel_x = 7 - }, -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" - }, -/obj/effect/ghostspawpoint{ - identifier = "goon" +/obj/item/gun/energy/rifle/ionrifle{ + pixel_y = -2 }, /turf/simulated/floor/tiled/dark, -/area/goonbase) -"eb" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) -"ee" = ( -/obj/machinery/atmospherics/binary/pump/high_power, -/turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) -"eh" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 +/area/goonbase/equipment) +"dU" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 }, -/turf/simulated/floor/carpet/red, -/area/goonbase) -"er" = ( -/obj/structure/table/reinforced/steel, -/obj/item/clothing/glasses/sunglasses/aviator{ - pixel_x = -5; - pixel_y = 6 +/obj/item/target, +/obj/item/clothing/suit/storage/target_costume, +/obj/structure/target_stake, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"dV" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 5 }, -/obj/effect/floor_decal/spline/plain/black{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/goonbase) -"eA" = ( -/obj/structure/table/standard, -/obj/item/storage/box/fancy/tray, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/machinery/computer/operating/terminal, +/obj/random/dirt_75, /obj/machinery/light{ dir = 8; pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/medbay) +"dW" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"dX" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"dY" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"ed" = ( +/obj/machinery/portable_atmospherics/powered/scrubber, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/port) +"ef" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"eh" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"ei" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"en" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/computer_hardware/network_card/signaler{ + pixel_x = -1; + pixel_y = -10 + }, +/obj/item/weldingtool/emergency{ + pixel_x = -7; + pixel_y = 5 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"eq" = ( +/obj/item/reagent_containers/glass/bucket/wood{ + pixel_y = -3; + pixel_x = 5 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"er" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"eu" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/tank/oxygen/red{ + pixel_x = -2; + pixel_y = 1 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/equipment) +"ew" = ( +/obj/machinery/portable_atmospherics/canister/empty, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/airless, +/area/mine) +"eA" = ( +/obj/structure/table/reinforced/steel, +/obj/item/storage/toolbox/lunchbox/filled{ + pixel_x = 1; + pixel_y = 13 + }, +/obj/item/storage/toolbox/lunchbox/heart{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/storage/toolbox/lunchbox/cat/filled{ + pixel_x = 4; + pixel_y = 1 + }, +/turf/simulated/floor/tiled/dark/full, +/area/goonbase/equipment) "eB" = ( -/obj/structure/table/wood, -/turf/simulated/floor/carpet/red, -/area/goonbase) +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = -9; + pixel_y = 14 + }, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"eC" = ( +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) "eE" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/structure/table/steel, -/obj/item/storage/toolbox/mechanical, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = 17; + pixel_y = -8 + }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/power) +"eF" = ( +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = 20; + pixel_y = 15 + }, +/obj/effect/decal/cleanable/generic{ + pixel_x = 12; + pixel_y = 28 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "eH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/item/reagent_containers/inhaler/space_drugs, -/obj/item/reagent_containers/inhaler/space_drugs, -/obj/item/reagent_containers/inhaler/space_drugs, -/obj/item/reagent_containers/syringe/drugs, -/obj/item/reagent_containers/syringe/drugs, -/obj/item/reagent_containers/syringe/drugs, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/effect/decal/cleanable/greenglow/radioactive{ + pixel_x = -10; + pixel_y = 9 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = -2; + pixel_y = -1 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) "eI" = ( /obj/structure/closet/walllocker/medical{ pixel_x = -32 @@ -337,35 +951,78 @@ /obj/item/tank/anesthetic, /obj/item/tank/anesthetic, /obj/item/tank/anesthetic, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /obj/machinery/light{ dir = 8; pixel_x = 0; icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) "eJ" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"eK" = ( +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) +"eL" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/power/portgen/basic/advanced, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/power) +"eN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/quarters) "eO" = ( /turf/simulated/floor/holofloor/tiled/ramp/bottom, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"eP" = ( +/obj/item/trash/tray{ + pixel_x = 7 + }, +/obj/random/dirt_75, +/obj/machinery/alarm/west, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) "eS" = ( /obj/item/trash/chips, /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "eT" = ( /obj/structure/bed/stool/chair/office/bridge/generic{ dir = 1; pixel_y = 5 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"eW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/random/dirt_75, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"fa" = ( +/obj/structure/trash_pile, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/alarm/north, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "fb" = ( /obj/effect/decal/cleanable/generic, /obj/structure/bed/stool, @@ -378,43 +1035,82 @@ icon_state = "4-8" }, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "fe" = ( -/obj/item/broken_bottle, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"ff" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"fg" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"fh" = ( +/obj/structure/curtain/open{ + color = "#854636" + }, +/obj/effect/map_effect/window_spawner/full/reinforced/polarized/grille{ + id = "goon_base_prison_window" + }, +/turf/simulated/floor/plating, +/area/goonbase/living) "fj" = ( /obj/structure/dispenser/oxygen, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"fk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/area/shuttle/goon_shuttle/storage) +"fl" = ( +/turf/simulated/wall, +/area/goonbase/medbay) "fm" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) +/area/shuttle/goon_shuttle/living) "fo" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"fp" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/floodlight/randomcharge{ + dir = 2 + }, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "fr" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/item/trash/ramen, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/item/clothing/shoes/slippers/carp{ + pixel_y = -4; + pixel_x = -5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "fs" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /obj/structure/bed/roller, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) "ft" = ( /obj/structure/closet/crate/bin{ name = "trashbin"; @@ -422,151 +1118,515 @@ pixel_x = 5 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "fv" = ( -/obj/machinery/power/portgen/basic, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) "fz" = ( -/obj/structure/table/rack, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"fG" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/item/trash/pistachios, -/turf/simulated/floor/plating, -/area/goonbase) -"fM" = ( -/obj/structure/table/reinforced/steel, -/obj/item/clothing/suit/armor/cuirass, -/obj/effect/floor_decal/spline/plain/black{ - dir = 6 +/obj/machinery/light/small/emergency{ + dir = 8 }, /turf/simulated/floor/plating, -/area/goonbase) -"fW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/item/stack/material/silver, -/obj/item/stack/material/silver, -/obj/item/stack/material/silver, +/area/goonbase/equipment) +"fA" = ( +/obj/structure/table/rack, +/obj/item/clothing/suit/space/void/tcaf, +/obj/item/clothing/head/helmet/space/void/tcaf, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"fB" = ( +/obj/structure/reagent_dispensers/radioactive_waste{ + pixel_x = -8 + }, +/obj/effect/decal/cleanable/acid_remnants, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_y = -7; + pixel_x = 2 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) +"fC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/atmos) +"fG" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/mirror{ + pixel_y = 31 + }, +/obj/structure/sink{ + pixel_y = 21 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/quarters) +"fI" = ( +/obj/structure/bed/stool/padded/orange{ + dir = 1 + }, +/turf/simulated/floor/carpet/red, +/area/goonbase/living) +"fL" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/table/rack, +/obj/item/gun/energy/disruptorpistol/practice, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"fM" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"fR" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"fW" = ( +/obj/structure/table/rack, +/obj/item/ammo_magazine/mc9mm{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/mc9mm{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/mc9mm{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/mc9mm{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/mc9mm{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/mc9mm{ + pixel_x = 6 + }, +/obj/item/gun/projectile/pistol{ + pixel_y = 6; + pixel_x = -4 + }, +/obj/item/gun/projectile/pistol{ + pixel_y = -3; + pixel_x = 2 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"fX" = ( +/obj/random/dirt_75, +/obj/random/junk{ + pixel_x = -9 + }, +/turf/simulated/floor/airless/ceiling, +/area/mine) "fY" = ( /turf/simulated/mineral/surface, /area/space) +"gc" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) "gi" = ( -/obj/effect/floor_decal/corner_wide/lime{ +/obj/structure/table/steel, +/obj/random/desktoy{ + pixel_x = -7; + pixel_y = 8 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"gj" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"gm" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 10; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -10; + pixel_y = -2 + }, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"gn" = ( +/obj/structure/table/rack, +/obj/item/clothing/suit/space/syndicate/black, +/obj/item/clothing/head/helmet/space/syndicate/black, +/obj/effect/floor_decal/corner/grey{ dir = 5 }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"gp" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/steel, +/obj/item/trash/gum{ + pixel_y = 7; + pixel_x = -4 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/heart{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup{ + pixel_x = -5; + pixel_y = -8 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"gq" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"gj" = ( -/obj/effect/floor_decal/corner_wide/lime{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"gm" = ( -/obj/structure/toilet{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "gr" = ( /obj/structure/table/steel, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"gw" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 +/area/shuttle/goon_shuttle/storage) +"gs" = ( +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 }, -/turf/simulated/floor/carpet/red, -/area/goonbase) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/goonbase/living) +"gu" = ( +/obj/random/dirt_75, +/obj/structure/structural_support{ + pixel_y = 8 + }, +/turf/simulated/floor/airless/ceiling, +/area/mine) +"gw" = ( +/obj/random/dirt_75, +/obj/item/storage/toolbox/emergency{ + pixel_x = 4; + pixel_y = 19 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "gx" = ( -/obj/machinery/sleeper{ +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"gE" = ( +/obj/structure/bed/stool{ dir = 1 }, -/obj/effect/floor_decal/corner_wide/lime{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"gI" = ( +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/goonbase/maint_airlock) +"gF" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/machinery/door/airlock/maintenance_hatch{ + id_tag = "goon_base_secret_exit_door"; + locked = 1 + }, +/turf/simulated/floor/plating, +/area/goonbase/equipment) +"gG" = ( +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/equipment) +"gH" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/wall{ + can_open = 1; + color = "#DDDDDD" + }, +/area/goonbase/equipment) "gJ" = ( /obj/item/trash/raisins, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"gL" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/obj/structure/bed/stool/chair/sofa/corner/concave/red, +/turf/simulated/floor/wood, +/area/goonbase/living) "gM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/cheesie, +/obj/random/dirt_75, +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/storage/box/produce, +/obj/item/storage/box/produce, +/obj/item/storage/box/produce, +/obj/item/storage/box/produce, +/obj/item/storage/box/produce, +/obj/item/storage/box/produce, +/obj/item/storage/box/produce, +/obj/machinery/button/remote/airlock{ + dir = 2; + id = "goon_base_freezer_door"; + specialfunctions = 4; + pixel_y = -19 + }, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"gO" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/food/drinks/carton/milk, +/obj/item/reagent_containers/food/drinks/carton/milk, +/obj/item/reagent_containers/food/drinks/carton/milk, +/obj/item/reagent_containers/food/drinks/carton/milk, +/obj/item/reagent_containers/food/drinks/carton/milk, +/obj/item/storage/box/fancy/egg_box, +/obj/item/storage/box/fancy/egg_box, +/obj/item/storage/box/fancy/egg_box, +/obj/item/storage/box/fancy/egg_box, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/fish/fishfillet, +/obj/item/reagent_containers/food/snacks/fish/fishfillet, +/obj/item/reagent_containers/food/snacks/fish/fishfillet, +/obj/item/reagent_containers/food/snacks/fish/fishfillet, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"gV" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/hallway_north) "gX" = ( -/obj/effect/decal/cleanable/floor_damage/random_broken, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/decal/cleanable/generic{ - pixel_x = 17; - pixel_y = -8 +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/effect/decal/cleanable/generic{ - pixel_x = -19; - pixel_y = -5 - }, -/obj/item/broken_device, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/smes/buildable/third_party_shuttle/empty, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) "gZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"hc" = ( +/obj/random/dirt_75, +/obj/item/ammo_casing/c45/practice{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/ammo_casing/c45/practice{ + pixel_x = 11; + pixel_y = -7 + }, +/obj/item/trash/cigbutt{ + pixel_y = -13; + pixel_x = -2 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "he" = ( -/obj/structure/closet/crate, -/obj/item/clothing/head/headbando/random, -/obj/item/clothing/suit/storage/toggle/track/red, -/obj/item/clothing/suit/storage/vest, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/structure/reagent_dispensers/coolanttank, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"ho" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 4 + }, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"hp" = ( +/obj/machinery/floodlight/randomcharge{ + dir = 2 + }, +/turf/simulated/floor/airless/ceiling, +/area/mine) +"hq" = ( +/obj/item/storage/bag/ore{ + pixel_x = 7 + }, +/turf/simulated/floor/airless/ceiling, +/area/mine) +"hr" = ( +/obj/item/wrench{ + pixel_x = 10; + pixel_y = 3 + }, +/obj/random/dirt_75, +/obj/item/paper/goon_base/secret_base_note{ + pixel_x = -3; + pixel_y = -3 + }, +/turf/simulated/floor/tiled, +/area/goonbase/living) +"hu" = ( +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = 8 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"hv" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"hA" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/random/dirt_75, +/obj/machinery/alarm/west, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "hC" = ( /obj/structure/sign/greencross{ pixel_x = -32 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"hE" = ( +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_south) +"hF" = ( +/obj/effect/floor_decal/corner/purple{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "hG" = ( /obj/machinery/door/airlock/maintenance{ dir = 8 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"hI" = ( -/obj/machinery/portable_atmospherics/powered/pump/filled, -/turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) -"hS" = ( -/obj/structure/table/steel{ - pixel_x = -2 +/area/shuttle/goon_shuttle/storage) +"hK" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 }, -/obj/item/trash/waffles, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/item/target, +/obj/structure/target_stake, +/obj/effect/decal/cleanable/generic, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"hL" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"hN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"hS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"hT" = ( +/obj/random/dirt_75, +/obj/structure/closet/toolcloset, +/turf/simulated/floor/plating, +/area/goonbase/power) "hV" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /obj/structure/bed/roller, /obj/machinery/light{ dir = 8; @@ -574,12 +1634,12 @@ icon_state = "tube_empty" }, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) "hZ" = ( -/obj/item/trash/tray, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) "ia" = ( /obj/item/deck/cards, /obj/item/reagent_containers/food/drinks/bottle/whiskey{ @@ -601,21 +1661,110 @@ }, /obj/structure/table/wood, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"ib" = ( +/obj/structure/bed/stool/chair/office/light{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "id" = ( -/obj/structure/bed/stool, -/turf/simulated/floor/carpet/red, -/area/goonbase) -"ie" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/goonbase) -"ip" = ( -/obj/item/deck/cards, /obj/structure/table/wood, +/obj/item/deck/cards{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/material/ashtray/bronze{ + pixel_x = 6; + pixel_y = -3 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one{ + pixel_x = -20 + }, /turf/simulated/floor/carpet/red, -/area/goonbase) +/area/goonbase/living) +"ie" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -7; + pixel_y = -15 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 1; + pixel_y = 0 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/machinery/alarm/north, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"if" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"ig" = ( +/obj/structure/table/rack, +/obj/item/clothing/suit/space/syndicate/black/engie, +/obj/item/clothing/head/helmet/space/syndicate/black/engie, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"ik" = ( +/obj/random/dirt_75, +/obj/structure/table/reinforced/steel, +/obj/item/ammo_magazine/c45m/practice{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/ammo_magazine/c45m/practice{ + pixel_y = 3 + }, +/obj/item/ammo_magazine/c45m/practice{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/item/ammo_magazine/c45m/practice{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/ammo_magazine/c45m/practice{ + pixel_y = 3 + }, +/obj/item/ammo_magazine/c45m/practice{ + pixel_x = 9; + pixel_y = 9 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"ip" = ( +/obj/structure/structural_support{ + pixel_y = 8 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_north) +"is" = ( +/obj/machinery/atmospherics/pipe/tank/air, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) "it" = ( /obj/structure/table/steel, /obj/item/reagent_containers/glass/rag, @@ -628,7 +1777,7 @@ pixel_x = -6 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "iu" = ( /obj/item/broken_bottle, /obj/effect/decal/cleanable/dirt, @@ -638,7 +1787,23 @@ icon_state = "tube_empty" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"iy" = ( +/obj/effect/decal/cleanable/acid_remnants{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/greenglow/radioactive{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/effect/decal/cleanable/generic{ + pixel_x = 2; + pixel_y = -10 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) "iA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet/north{ @@ -646,32 +1811,89 @@ }, /obj/item/trash/chips, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"iV" = ( -/obj/item/trash/broken_electronics, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"iW" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) -"iX" = ( -/obj/structure/table/standard, -/obj/item/device/breath_analyzer{ - pixel_x = 7 +/area/shuttle/goon_shuttle/storage) +"iD" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/item/device/healthanalyzer{ - pixel_x = -4 - }, -/obj/effect/floor_decal/corner_wide/lime{ +/turf/simulated/floor/tiled/full, +/area/goonbase/power) +"iK" = ( +/obj/effect/floor_decal/corner/grey{ dir = 10 }, -/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"iO" = ( +/obj/structure/closet/crate/bin{ + name = "trashbin" + }, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/goonbase/equipment) +"iQ" = ( +/obj/machinery/door/airlock/glass{ + locked = 1; + id_tag = "goon_base_freezer_door" + }, +/turf/simulated/floor/plating, +/area/goonbase/kitchen) +"iR" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/random/dirt_75, /turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/medbay) +"iV" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"iX" = ( +/obj/structure/trash_pile, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "iY" = ( -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/table/steel, +/obj/random/tool{ + pixel_y = 2 + }, +/obj/item/tank/emergency_oxygen/double{ + pixel_y = 5 + }, +/obj/item/tank/emergency_oxygen/double{ + pixel_y = 5 + }, +/obj/item/tank/emergency_oxygen/double{ + pixel_y = 5 + }, +/obj/item/tank/emergency_oxygen/double{ + pixel_y = 5 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"je" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_north) "jg" = ( /obj/machinery/body_scanconsole{ dir = 1; @@ -679,54 +1901,204 @@ pixel_y = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) +"jq" = ( +/obj/machinery/door/airlock/glass{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/kitchen) "js" = ( /obj/structure/bed/stool, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "jv" = ( -/obj/machinery/vending/boozeomat/merchant, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"jz" = ( -/obj/item/rig/merc/ninja{ - req_access = list(202) +/obj/random/dirt_75, +/obj/random/tool{ + pixel_y = 6; + pixel_x = 8 }, -/obj/structure/table/rack, -/turf/simulated/floor/wood, -/area/goonbase) -"jZ" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"jw" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"jy" = ( +/obj/effect/floor_decal/corner/grey{ dir = 6 }, -/turf/simulated/floor/carpet/red, -/area/goonbase) -"kg" = ( -/obj/machinery/vending/dinnerware, +/obj/machinery/alarm/east, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"jz" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack, +/obj/item/clothing/suit/armor/carrier/heavy{ + pixel_x = -6; + pixel_y = 1 + }, +/obj/item/clothing/suit/armor/carrier/heavy{ + pixel_x = -6; + pixel_y = 0 + }, +/obj/item/clothing/head/helmet/merc{ + pixel_x = 4 + }, +/obj/item/clothing/head/helmet/merc{ + pixel_x = 4 + }, /turf/simulated/floor/tiled/dark, -/area/goonbase) -"kj" = ( -/obj/machinery/door/airlock{ +/area/goonbase/equipment) +"jB" = ( +/obj/machinery/floodlight/randomcharge{ dir = 1 }, -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/turf/simulated/floor/airless/ceiling, +/area/mine) +"jH" = ( +/turf/simulated/wall, +/area/goonbase/living) +"jK" = ( +/obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_maint"; + name = "airlock_goon_base_maint" + }, +/obj/machinery/light/small/emergency, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"jP" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_north) +"jS" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"jU" = ( +/turf/simulated/wall/shuttle/raider, +/area/shuttle/goon_shuttle/starboard) +"jV" = ( +/obj/item/reagent_containers/glass/bucket/wood{ + pixel_y = 6; + pixel_x = -6 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/trash/cigbutt{ + pixel_y = -13; + pixel_x = 11 + }, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled, +/area/goonbase/living) +"jW" = ( +/obj/structure/dispenser/oxygen, +/obj/random/dirt_75, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"jY" = ( +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"jZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_south) +"ka" = ( +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_north) +"kg" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/tech_supply{ + pixel_y = -12 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) +"kj" = ( +/obj/effect/floor_decal/corner/blue/diagonal, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"kk" = ( +/turf/simulated/wall, +/area/goonbase/maint_airlock) +"km" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "kn" = ( /obj/structure/closet, /obj/item/clothing/accessory/tshirt, /obj/item/clothing/accessory/holster/utility/machete, +/obj/item/material/hatchet/machete/steel, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "kp" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/port) "kr" = ( /obj/effect/landmark/entry_point/south{ name = "fore, bridge" @@ -738,38 +2110,126 @@ /turf/simulated/floor/plating{ temperature = 278.15 }, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "ku" = ( -/obj/structure/table/steel{ - pixel_x = -2 - }, -/obj/item/material/kitchen/rollingpin, -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) "kz" = ( -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/obj/item/trash/coffee, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) "kB" = ( -/obj/item/storage/pill_bottle/dice/gaming, -/obj/structure/table/wood, -/turf/simulated/floor/carpet/red, -/area/goonbase) +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate/loot, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"kE" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/closet/crate, +/obj/item/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/syringe/drugs, +/obj/item/reagent_containers/inhaler/space_drugs{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/reagent_containers/inhaler/space_drugs{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/reagent_containers/inhaler/space_drugs{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/reagent_containers/inhaler/space_drugs{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/reagent_containers/inhaler/xuxigas{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/reagent_containers/inhaler/xuxigas{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/reagent_containers/inhaler/xuxigas{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/reagent_containers/inhaler/xuxigas{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/reagent_containers/inhaler/soporific{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/reagent_containers/inhaler/soporific{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/reagent_containers/pill/tox{ + pixel_x = -5; + pixel_y = -2 + }, +/obj/item/reagent_containers/pill/nerospectan{ + pixel_x = 6 + }, +/obj/item/reagent_containers/pill/happy{ + pixel_x = 2; + pixel_y = -5 + }, +/obj/item/reagent_containers/pill/bio_vitamin{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/reagent_containers/pill/heroin{ + pixel_x = 7; + pixel_y = -6 + }, +/obj/item/reagent_containers/pill/cocaine{ + pixel_x = -8; + pixel_y = -7 + }, +/obj/item/reagent_containers/inhaler/raskara_dust{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/item/reagent_containers/pill/happy{ + pixel_x = 2; + pixel_y = -5 + }, +/obj/item/reagent_containers/syringe/drugs, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "kH" = ( /obj/item/trash/gum, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"kI" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/goonbase/power) "kJ" = ( /obj/machinery/sleeper, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) "kK" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -778,29 +2238,29 @@ pixel_y = -31 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "kL" = ( -/obj/structure/table/rack, -/obj/item/towel/random, -/obj/item/towel/random, -/obj/item/towel/random, -/obj/item/towel/random, -/obj/item/towel/random, -/obj/item/towel/random, -/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/medbay) +"kQ" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/space_heater, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "kR" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/structure/bed/stool/chair/office/dark{ - dir = 8 +/obj/effect/floor_decal/corner/purple{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/random/dirt_75, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "kS" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/starboard) "kU" = ( /obj/structure/table/steel, /obj/item/reagent_containers/food/condiment/shaker/peppermill{ @@ -817,25 +2277,41 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "kV" = ( -/obj/machinery/chemical_dispenser/bar_alc/full{ - dir = 8; - pixel_x = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "kW" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 7 +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/red, +/obj/random/civgun/rifle, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"kZ" = ( +/obj/random/dirt_75, +/obj/structure/table/rack, +/obj/item/gun/energy/rifle/laser/practice, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"lb" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate, +/obj/random/dirt_75, +/obj/item/stack/material/plastic/full{ + pixel_y = 3 + }, +/obj/item/stack/material/plastic/full{ + pixel_y = 3 }, -/turf/simulated/floor/carpet/red, -/area/goonbase) -"kX" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/goonbase/maint_north) "le" = ( /obj/effect/floor_decal/corner/black/diagonal, /obj/effect/floor_decal/corner/black/diagonal{ @@ -845,78 +2321,239 @@ dir = 8 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"ln" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/can, -/turf/simulated/floor/plating, -/area/goonbase) -"lo" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"lq" = ( -/obj/machinery/optable, -/obj/item/storage/firstaid/surgery, -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) -"lz" = ( -/obj/machinery/vending/engineering{ - req_access = null +/area/shuttle/goon_shuttle/storage) +"lh" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) -"lI" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/item/trash/match, +/area/goonbase/power) +"lj" = ( +/obj/structure/table/rack, +/obj/item/clothing/suit/space/syndicate/black/green, +/obj/item/clothing/head/helmet/space/syndicate/black/green, +/obj/random/dirt_75, +/obj/random/dirt_75, /obj/machinery/light{ - dir = 4; + dir = 8; pixel_x = 0; icon_state = "tube_empty" }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"ll" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_airlock) +"lo" = ( +/obj/structure/table/reinforced/steel, +/obj/item/stack/material/glass/reinforced/full{ + pixel_x = -16; + pixel_y = 4 + }, +/obj/item/stack/material/glass/reinforced/full{ + pixel_x = -16; + pixel_y = 4 + }, +/obj/item/stack/material/glass/reinforced/full{ + pixel_x = -16; + pixel_y = 4 + }, +/obj/item/stack/material/steel/full{ + pixel_y = 4 + }, +/obj/item/stack/material/steel/full{ + pixel_y = 4 + }, +/obj/item/stack/material/steel/full{ + pixel_y = 4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/plating, +/area/goonbase/equipment) +"lq" = ( +/obj/machinery/optable, +/obj/item/storage/firstaid/surgery, +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/floor/tiled/white, +/area/shuttle/goon_shuttle/med) +"lv" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/shower{ + dir = 4 + }, +/obj/item/bikehorn/rubberducky{ + pixel_y = -5; + pixel_x = 4 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/quarters) +"lw" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 + }, +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"lz" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/power/apc/west, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"lA" = ( +/turf/simulated/floor/tiled/full, +/area/goonbase/quarters) +"lI" = ( +/obj/item/storage/toolbox/emergency{ + pixel_x = -11; + pixel_y = -8 + }, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"lJ" = ( +/obj/item/crowbar, +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/obj/random/dirt_75, +/obj/machinery/alarm/north, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"lK" = ( +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/structure/table/standard, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -11; + pixel_y = 12 + }, +/obj/item/storage/box/masks{ + pixel_y = 8; + pixel_x = 4 + }, +/obj/item/storage/box/gloves{ + pixel_x = -1; + pixel_y = 2 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) "lQ" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"lR" = ( +/obj/structure/closet/crate/miningcart, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) "lU" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"lW" = ( +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_south) "lY" = ( /obj/item/trash/liquidfood, /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "mf" = ( /obj/structure/closet, /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless, /obj/item/ammo_magazine/c45m, /obj/item/gun/projectile/sec/wood, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"mj" = ( -/obj/structure/table/reinforced/steel, -/obj/effect/floor_decal/spline/plain/black{ - dir = 1 +/area/shuttle/goon_shuttle/living) +"mg" = ( +/obj/random/dirt_75, +/obj/item/tank/emergency_oxygen/double{ + pixel_y = 3; + pixel_x = -3 }, -/obj/item/clothing/suit/armor/cuirass, +/obj/machinery/light/small/emergency, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/equipment) +"mh" = ( +/obj/machinery/portable_atmospherics/canister/empty/hydrogen, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/airless, +/area/mine) +"mj" = ( +/obj/random/dirt_75, +/obj/item/clothing/head/cone{ + pixel_x = 12; + pixel_y = 4 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"mn" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/hallway_north) +"mr" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_north) "ms" = ( -/turf/simulated/wall/shuttle/space_ship/mercenary, -/area/goonbase) +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/full, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_maint"; + name = "airlock_goon_base_maint" + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_x = 12; + pixel_y = -28; + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"mt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) "mv" = ( /obj/structure/railing/mapped, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"my" = ( +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/living) "mz" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ @@ -926,61 +2563,139 @@ }, /obj/structure/closet/crate, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) +/area/shuttle/goon_shuttle/living) "mE" = ( -/obj/structure/closet/crate, -/obj/item/storage/box/freezer/organcooler, -/obj/item/storage/box/freezer/organcooler, -/obj/item/storage/box/freezer/organcooler, -/obj/item/storage/box/freezer/organcooler, -/obj/item/storage/box/freezer/organcooler, -/obj/effect/floor_decal/corner_wide/lime{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "mI" = ( /turf/simulated/mineral/surface, /area/mine) -"mJ" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 4 +"mN" = ( +/obj/effect/decal/cleanable/acid_remnants, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_x = -8; + pixel_y = 6 }, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/machinery/door/window{ - dir = 4 +/obj/effect/decal/cleanable/acid_remnants{ + pixel_y = -7; + pixel_x = 2 }, -/obj/structure/window/reinforced{ +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/greenglow/radioactive, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) +"mO" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/steel, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot{ + pixel_x = -7; + pixel_y = 4 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot{ + pixel_y = 4; + pixel_x = 3 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot{ + pixel_y = -3 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"mQ" = ( +/obj/random/dirt_75, +/obj/random/loot, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"mV" = ( +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"mW" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 1 }, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) -"mQ" = ( -/obj/structure/sink/kitchen{ - name = "sink"; - pixel_y = 26 +/area/goonbase/maint_airlock) +"mX" = ( +/obj/structure/closet/crate, +/obj/effect/floor_decal/corner/blue{ + dir = 10 }, -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"mV" = ( -/obj/effect/decal/cleanable/molten_item, -/obj/machinery/light{ - dir = 8; - pixel_x = 0; - icon_state = "tube_empty" +/obj/effect/floor_decal/corner/blue{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"mW" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/item/clothing/shoes/laceup, +/obj/item/clothing/shoes/laceup/brown, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots/cavalry, +/obj/item/clothing/shoes/jackboots/toeless, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/cowboy/classic, +/obj/item/clothing/shoes/cowboy/lizard, +/obj/item/clothing/shoes/winter, +/obj/item/clothing/shoes/winter/toeless, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/shoes/workboots/brown, +/obj/item/clothing/shoes/workboots/toeless, +/obj/item/clothing/shoes/konyang, +/obj/item/clothing/shoes/sneakers/rainbow, +/obj/item/clothing/shoes/sneakers/blue, +/obj/item/clothing/shoes/sandals/caligae, +/obj/item/clothing/shoes/workboots/toeless, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "nf" = ( -/obj/structure/bookcase, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/reagent_containers/food/snacks/sliceable/bread, +/obj/item/reagent_containers/food/snacks/sliceable/bread{ + pixel_y = -4; + pixel_x = 3 + }, +/obj/item/reagent_containers/food/snacks/pbjsandwich{ + pixel_y = -4 + }, +/obj/item/reagent_containers/food/snacks/reubensandwich{ + pixel_y = 10 + }, +/obj/item/reagent_containers/food/snacks/NTellabread{ + pixel_y = 11 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"ng" = ( +/obj/structure/closet, +/obj/random/suit, +/obj/random/suit, +/obj/random/suit, +/obj/item/clothing/shoes/laceup{ + pixel_y = -8 + }, +/obj/item/clothing/under/pj/red, +/obj/item/clothing/under/pants/jeans{ + pixel_y = -5 + }, +/obj/item/clothing/suit/storage/hooded/wintercoat/mars, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"nj" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/random/pottedplant, +/obj/machinery/light{ + dir = 1 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "nk" = ( /obj/structure/table/steel, /obj/item/paper_bin{ @@ -992,65 +2707,146 @@ dir = 5 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"nl" = ( +/obj/structure/table/wood, +/obj/item/modular_computer/laptop/preset/civilian{ + pixel_y = 9 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"nn" = ( +/turf/simulated/mineral/surface, +/area/goonbase/maint_south) "no" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/ramen, -/turf/simulated/floor/carpet/red, -/area/goonbase) +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) "np" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/steel, +/obj/item/reagent_containers/food/drinks/carton/milk{ + pixel_y = 10; + pixel_x = -4 + }, +/obj/item/reagent_containers/food/drinks/carton/milk{ + pixel_y = 12; + pixel_x = 7 + }, +/obj/item/storage/box/fancy/egg_box{ + pixel_y = 6; + pixel_x = -2 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"nq" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "nr" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"nt" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"nw" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "nA" = ( /obj/machinery/atmospherics/unary/engine{ dir = 1 }, /turf/simulated/floor/airless, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/starboard) +"nB" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/airless/ceiling, +/area/mine) "nC" = ( /obj/structure/table/rack, -/obj/item/storage/box/shotgunammo, -/obj/item/storage/box/shotgunammo, -/obj/item/gun/projectile/shotgun/pump/combat, -/obj/effect/floor_decal/spline/plain{ +/obj/item/clothing/accessory/storage/pouches/brown{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/accessory/storage/pouches/brown{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/accessory/storage/pouches/brown{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"nE" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/power) "nI" = ( /obj/structure/bed/stool, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "nJ" = ( -/obj/effect/floor_decal/spline/plain/black{ - dir = 5 - }, -/obj/structure/table/steel{ +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/gun/energy/gun{ + pixel_y = 3; pixel_x = -2 }, -/obj/item/wrench, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/item/gun/energy/rifle/laser/noctiluca{ + pixel_y = -2 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) "nM" = ( /obj/effect/floor_decal/corner/beige{ dir = 5 }, /obj/machinery/computer/ship/engines, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "nQ" = ( -/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/light{ + dir = 8 + }, +/obj/random/civgun/rifle, /turf/simulated/floor/tiled/dark, -/area/goonbase) +/area/goonbase/equipment) "nR" = ( /obj/structure/table/steel, /obj/item/trash/proteinbar{ @@ -1065,7 +2861,7 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "nS" = ( /obj/effect/floor_decal/spline/plain/black{ dir = 1 @@ -1075,15 +2871,21 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "nT" = ( -/obj/structure/trash_pile, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"nV" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) "nX" = ( /obj/structure/table/steel, /obj/item/gun/projectile/revolver/lemat, @@ -1091,7 +2893,15 @@ dir = 5 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"nY" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_south) +"oa" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/full, +/area/goonbase/eva) "oc" = ( /obj/effect/floor_decal/spline/plain/black{ dir = 4 @@ -1101,32 +2911,71 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"od" = ( +/obj/machinery/cryopod, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"oe" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 5 + }, +/obj/machinery/optable, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) "of" = ( -/obj/effect/floor_decal/spline/plain/black{ - dir = 8 - }, -/obj/structure/table/steel{ - pixel_x = -2 - }, -/obj/item/storage/toolbox{ - pixel_y = 2; - pixel_x = 1 - }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"op" = ( +/obj/machinery/media/jukebox, /obj/machinery/light{ - dir = 4; - pixel_x = 0; - icon_state = "tube_empty" + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/goonbase/living) +"os" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) "ov" = ( -/obj/structure/closet/crate, -/obj/item/clothing/head/beret, -/obj/item/clothing/suit/storage/toggle/flannel/gray, -/obj/item/clothing/suit/storage/vest, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack, +/obj/item/clothing/suit/armor/carrier/generic{ + pixel_x = -6 + }, +/obj/item/clothing/suit/armor/carrier/generic{ + pixel_x = -6 + }, +/obj/item/clothing/suit/armor/carrier/generic{ + pixel_x = -6 + }, +/obj/item/clothing/head/helmet/merc{ + pixel_x = 4 + }, +/obj/item/clothing/head/helmet/merc{ + pixel_x = 4 + }, +/obj/item/clothing/head/helmet/merc{ + pixel_x = 4 + }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, -/area/goonbase) +/area/goonbase/equipment) "ox" = ( /obj/structure/table/steel, /obj/item/paper_bin{ @@ -1138,51 +2987,106 @@ dir = 5 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"oz" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/fruit_smudge, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"oB" = ( +/turf/simulated/wall/r_wall, +/area/goonbase/quarters) "oE" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "oH" = ( -/obj/effect/floor_decal/corner_wide/lime{ - dir = 5 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/cable{ + icon_state = "2-8" }, -/obj/effect/decal/cleanable/dirt, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/kitchen) "oI" = ( -/obj/machinery/gumballmachine, -/turf/simulated/floor/wood, -/area/goonbase) -"oK" = ( -/obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 8; - pixel_x = 5 +/obj/random/dirt_75, +/obj/random/tool{ + pixel_y = -10 }, -/obj/machinery/light{ - dir = 4; - pixel_x = 0; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"oM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plating, -/area/goonbase) -"oP" = ( -/obj/structure/bed/stool/chair/sofa/right/black, -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" +/area/goonbase/maint_north) +"oK" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/full, +/area/goonbase/eva) +"oL" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 2 }, -/turf/simulated/floor/wood, -/area/goonbase) +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"oM" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"oP" = ( +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/ammo_magazine/c45m{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/c45m{ + pixel_x = 7 + }, +/obj/item/ammo_magazine/c45m{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/c45m{ + pixel_x = 7 + }, +/obj/item/ammo_magazine/c45m{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/c45m{ + pixel_x = 7 + }, +/obj/item/gun/projectile/sec/lethal{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/gun/projectile/sec/lethal{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"oT" = ( +/obj/machinery/papershredder, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"oU" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "oX" = ( /obj/structure/closet/walllocker/medical{ pixel_y = -32 @@ -1190,37 +3094,144 @@ /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/OMinus, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) +"pa" = ( +/obj/machinery/atmospherics/binary/pump/high_power/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"pb" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/random/dirt_75, +/obj/machinery/light{ + dir = 4; + pixel_x = 0; + icon_state = "tube_empty" + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"pd" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack, +/obj/item/storage/box/donkpockets{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/box/donkpockets{ + pixel_x = -3; + pixel_y = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"pe" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/quarters) +"pf" = ( +/obj/structure/table/steel, +/obj/item/deck/cards{ + pixel_x = 7; + pixel_y = 6 + }, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"ph" = ( +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"pn" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/toilet{ + dir = 4; + pixel_y = 0 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/living) "pp" = ( /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/starboard) +"pq" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) "pr" = ( /obj/effect/landmark/entry_point/east{ name = "port, medbay" }, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/med) -"px" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/goonbase) -"pB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 8; - pixel_x = 0; - icon_state = "tube_empty" +/area/shuttle/goon_shuttle/med) +"pt" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 26 }, -/obj/structure/closet/crate, -/obj/item/stack/material/diamond, -/obj/item/stack/material/diamond, -/obj/item/stack/material/diamond, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"pw" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/random/soap{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/table/standard, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/quarters) +"px" = ( +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/tech_supply, +/turf/simulated/floor/tiled, +/area/goonbase/power) +"pz" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/corner/grey/full{ + dir = 1 + }, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"pB" = ( +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = -9 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/goonbase/kitchen) "pI" = ( /obj/structure/railing/mapped{ dir = 8 @@ -1230,18 +3241,48 @@ }, /obj/machinery/shipsensors, /turf/simulated/floor/airless, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "pJ" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/item/trash/liquidfood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_airlock) "pN" = ( /obj/effect/landmark/entry_point/east{ name = "port, power" }, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"pO" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/light/small/emergency, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"pQ" = ( +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/atmos) "pT" = ( /obj/item/storage/pill_bottle/dice/gaming, /obj/item/trash/cigbutt{ @@ -1255,7 +3296,7 @@ }, /obj/structure/table/wood, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "pU" = ( /obj/structure/cable{ d1 = 1; @@ -1263,14 +3304,183 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"qy" = ( -/obj/machinery/door/airlock{ - dir = 1; - req_access = list(202) +/area/shuttle/goon_shuttle/living) +"pV" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/steel, +/obj/item/trash/waffles{ + pixel_y = 5; + pixel_x = -1 }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/obj/item/reagent_containers/food/snacks/jellystew{ + pixel_y = 8; + pixel_x = -1 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"pW" = ( +/turf/simulated/wall, +/area/goonbase/atmos) +"pZ" = ( +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"qb" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, +/obj/structure/table/standard, +/obj/item/device/healthanalyzer{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/device/breath_analyzer{ + pixel_x = 7 + }, +/obj/item/bodybag/cryobag{ + pixel_x = -4 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/stethoscope, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) +"qf" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/equipment) +"qj" = ( +/obj/structure/table/rack, +/obj/item/clothing/suit/space/syndicate/black/med, +/obj/item/clothing/head/helmet/space/syndicate/black/med, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"qq" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/item/device/paicard{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/clothing/head/ushanka/dominia{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"qr" = ( +/obj/random/dirt_75, +/obj/machinery/light/small/emergency, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"qt" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 5 + }, +/obj/structure/table/standard, +/obj/item/storage/firstaid/surgery{ + pixel_y = 8 + }, +/obj/item/storage/firstaid{ + pixel_x = -3; + pixel_y = -7 + }, +/obj/random/dirt_75, +/obj/item/storage/pill_bottle/cocaine{ + pixel_x = 9; + pixel_y = -1 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) +"qv" = ( +/obj/structure/closet/crate, +/obj/item/coin/diamond, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/wrists/watch/gold, +/obj/item/flame/lighter/zippo/gold, +/obj/item/coin/gold, +/obj/random/dirt_75, +/obj/item/stack/material/gold/full{ + pixel_y = 4 + }, +/obj/random/highvalue/no_weapon, +/obj/item/clothing/accessory/crucifix/gold, +/obj/random/melee/highvalue, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"qw" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/goonbase/power) +"qy" = ( +/obj/effect/floor_decal/corner/purple{ + dir = 10 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"qz" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 5 + }, +/obj/machinery/body_scanconsole{ + dir = 4 + }, +/obj/item/storage/box/freezer/organcooler{ + pixel_y = -9; + pixel_x = -12 + }, +/obj/random/dirt_75, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) +"qC" = ( +/obj/structure/table/wood, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_y = 14; + pixel_x = 6 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/rocks{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/machinery/light{ + dir = 4; + pixel_x = 0; + icon_state = "tube_empty" + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "qD" = ( /obj/item/clothing/head/collectable/paper{ pixel_y = -3; @@ -1280,84 +3490,220 @@ dir = 4 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"qF" = ( +/obj/effect/floor_decal/corner/blue, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "qJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/freezer, -/area/goonbase) -"qN" = ( -/obj/item/clothing/gloves/janitor, -/obj/structure/table/rack, -/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, -/area/goonbase) -"qP" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 0; - icon_state = "tube_empty" - }, -/obj/machinery/portable_atmospherics/canister/phoron_scarce, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/goonbase) -"qW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/cigbutt, -/turf/simulated/floor/plating, -/area/goonbase) -"qX" = ( -/obj/structure/table/steel{ - pixel_x = -2 - }, -/obj/item/trash/gum, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"rc" = ( -/obj/effect/floor_decal/spline/plain/black{ +/area/goonbase/power) +"qL" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/table/steel{ - pixel_x = -2 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 }, -/obj/item/gun/custom_ka/frame05, -/obj/machinery/light{ - dir = 8; - pixel_y = 0; - icon_state = "tube_empty" +/obj/random/dirt_75, +/obj/random/tech_supply{ + pixel_y = 6; + pixel_x = 7 }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/power) +"qM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/random/dirt_75, +/obj/random/tool{ + pixel_y = 6; + pixel_x = 8 + }, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/power) +"qN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"qO" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"qP" = ( +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/stack/liquidbags/half_full{ + pixel_x = -3 + }, +/obj/item/stack/barbed_wire/half_full{ + pixel_x = 3; + pixel_y = 2 + }, +/turf/simulated/floor/plating, +/area/goonbase/equipment) +"qR" = ( +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/port) +"qW" = ( +/obj/structure/reagent_dispensers/radioactive_waste, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_y = -7; + pixel_x = 2 + }, +/obj/effect/decal/cleanable/greenglow/radioactive, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"qX" = ( +/turf/simulated/wall/r_wall, +/area/goonbase/equipment) +"rc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"ri" = ( +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"rj" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/machinery/atmospherics/portables_connector, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/starboard) +"rl" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_north) +"rm" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = 17; + pixel_y = -8 + }, +/obj/effect/decal/cleanable/generic{ + pixel_x = -2; + pixel_y = 16 + }, +/obj/item/ammo_casing/c45/practice{ + pixel_x = -13; + pixel_y = 10 + }, +/obj/item/trash/cigbutt{ + pixel_y = -13; + pixel_x = 11 + }, +/obj/machinery/floodlight/randomcharge{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "rn" = ( -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/obj/effect/decal/cleanable/dirt, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/closet/toolcloset, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) +"ro" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/turf/simulated/floor/plating, +/area/goonbase/medbay) +"rq" = ( +/obj/structure/closet/crate/medical, +/obj/item/roller, +/obj/random/medical, +/obj/random/medical, +/obj/random/medical, +/obj/random/medical, +/obj/random/medical, +/obj/random/dirt_75, /turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/medbay) +"ru" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) "rw" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/starboard) -"rF" = ( -/obj/structure/table/rack, -/obj/item/ammo_magazine/d762, -/obj/item/ammo_magazine/d762, -/obj/item/ammo_magazine/d762, -/obj/item/gun/projectile/dragunov, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/area/shuttle/goon_shuttle/starboard) +"rD" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/black, +/obj/effect/ghostspawpoint{ + identifier = "goon" }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"rF" = ( +/obj/random/dirt_75, +/obj/machinery/pipedispenser, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/atmos) "rN" = ( -/obj/effect/decal/cleanable/spiderling_remains, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/full, +/area/goonbase/eva) "rU" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/light{ @@ -1366,142 +3712,464 @@ icon_state = "tube_empty" }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"rV" = ( +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_south) "rW" = ( -/obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" +/obj/structure/reagent_dispensers/radioactive_waste, +/obj/effect/decal/cleanable/acid_remnants, +/obj/effect/decal/cleanable/greenglow/radioactive, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"rY" = ( +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"rZ" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"sa" = ( -/turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/storage) +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 2; + pixel_y = 28; + pixel_x = -6 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"sc" = ( +/obj/item/trash/tuna{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic, +/turf/simulated/floor/plating, +/area/goonbase/living) +"se" = ( +/obj/random/dirt_75, +/turf/simulated/floor/airless, +/area/mine) "sg" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) +"sh" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"sl" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"sp" = ( +/obj/random/dirt_75, +/obj/random/tech_supply{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"sx" = ( +/turf/simulated/wall/shuttle/raider, +/area/shuttle/goon_shuttle/med) +"sz" = ( +/obj/random/dirt_75, +/obj/structure/reagent_dispensers/cookingoil, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) "sB" = ( /turf/unsimulated/floor/asteroid/ash/rocky, /area/mine) +"sC" = ( +/obj/structure/closet/crate/freezer/rations, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) "sI" = ( -/obj/item/trash/kokobar, -/obj/machinery/light{ - dir = 4; - pixel_x = 0; - icon_state = "tube_empty" - }, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/random/dirt_75, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "sK" = ( -/obj/machinery/shower{ +/obj/structure/structural_support{ + pixel_y = 8 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) +"sM" = ( +/obj/structure/bed/stool/chair/office/light{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/freezer, -/area/goonbase) +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/atmos) +"sN" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/purple, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "sO" = ( -/turf/simulated/floor/carpet/red, -/area/goonbase) -"sP" = ( -/obj/item/clothing/accessory/longsleeve_s, -/obj/structure/closet{ - icon_door = "blue"; - name = "misc clothing" - }, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/tactical, -/obj/item/clothing/under/pants/black, -/obj/item/clothing/under/color/brown, -/obj/item/clothing/suit/storage/toggle/trench/grey, -/obj/item/clothing/head/softcap/himeo, -/obj/item/clothing/suit/storage/toggle/leather_vest, -/obj/item/clothing/under/service_overalls, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"sX" = ( -/obj/effect/floor_decal/spline/plain/black{ - dir = 6 - }, -/obj/structure/table/steel{ - pixel_x = -2 - }, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/plating, -/area/goonbase) -"sZ" = ( -/obj/structure/table/reinforced/steel, -/obj/effect/floor_decal/spline/plain/black{ +/obj/structure/closet, +/obj/effect/floor_decal/corner/blue{ dir = 10 }, -/obj/item/clothing/suit/armor/cuirass, +/obj/item/clothing/head/softcap, +/obj/item/clothing/suit/storage/toggle/leather_jacket/designer/black, +/obj/item/clothing/suit/storage/legion, +/obj/item/clothing/head/beret/legion/field, +/obj/item/clothing/head/softcap/tcfl, +/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/white, +/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/green, +/obj/item/clothing/suit/storage/toggle/leather_jacket/designer/red, +/obj/item/clothing/suit/storage/leathercoat, +/obj/item/clothing/gloves/fingerless, +/obj/item/clothing/head/ushanka/dominia, +/obj/item/clothing/suit/storage/toggle/bomber, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"sP" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"sS" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/airless/ceiling, +/area/mine) +"sT" = ( +/obj/structure/bed/stool/chair/office/dark, +/obj/random/dirt_75, +/obj/machinery/alarm/north, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_south) +"sX" = ( +/obj/item/clothing/shoes/workboots/toeless{ + pixel_x = 6; + pixel_y = -5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"sY" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/equipment) +"sZ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) "te" = ( -/obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/syndicate/black, -/obj/item/clothing/head/helmet/space/syndicate/black, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "tp" = ( /obj/structure/closet, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/suit/storage/toggle/leather_jacket/flight, /obj/item/clothing/gloves/black, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"tr" = ( +/obj/structure/table/rack, +/obj/item/clothing/suit/space/void/mining, +/obj/item/clothing/head/helmet/space/void/mining, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"tt" = ( +/obj/effect/floor_decal/corner/purple{ + dir = 5 + }, +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = 26 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"tu" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) "tv" = ( /obj/structure/extinguisher_cabinet/north{ pixel_y = 30 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"tz" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/area/shuttle/goon_shuttle/living) +"tw" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) "tA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/can, -/turf/simulated/floor/wood, -/area/goonbase) -"tI" = ( -/turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/starboard) -"tL" = ( -/obj/machinery/portable_atmospherics/canister/hydrogen, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate, +/obj/random/dirt_75, +/obj/item/material/twohanded/fireaxe, +/obj/item/wirecutters/clippers, +/obj/item/wirecutters, +/obj/item/tank/jetpack/void, +/obj/item/weldingtool/hugetank, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) -"tR" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"uy" = ( -/obj/effect/floor_decal/spline/fancy{ +/area/goonbase/maint_north) +"tF" = ( +/obj/structure/bed/stool/chair/office/light{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/power) +"tL" = ( +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ dir = 1 }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"tN" = ( +/obj/structure/reagent_dispensers/radioactive_waste{ + pixel_y = -8 + }, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_y = -7; + pixel_x = 2 + }, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/greenglow/radioactive{ + pixel_x = -10; + pixel_y = 9 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"tR" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/structure/closet/toolcloset, +/turf/simulated/floor/plating, +/area/goonbase/power) +"tS" = ( +/obj/structure/structural_support{ + pixel_y = 8 + }, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_north) +"ua" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"ui" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/random/dirt_75, +/obj/random/junk{ + pixel_x = -20; + pixel_y = -10 + }, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) +"um" = ( +/obj/structure/reagent_dispensers/radioactive_waste{ + pixel_x = 12; + pixel_y = 9 + }, +/obj/effect/decal/cleanable/acid_remnants, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_y = -7; + pixel_x = 2 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"un" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"up" = ( +/obj/effect/floor_decal/corner/yellow/diagonal, /obj/machinery/light{ - dir = 4; + dir = 8; pixel_x = 0; icon_state = "tube_empty" }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"uq" = ( +/obj/machinery/power/rtg, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"uu" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/grey, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"uv" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/appliance/cooker/stove, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"uy" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/machinery/power/apc/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/goonbase/power) +"uz" = ( +/turf/simulated/floor/tiled, +/area/goonbase/kitchen) "uB" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 }, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/starboard) +"uD" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/steel, +/obj/item/trash/coffee{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot{ + pixel_y = 2; + pixel_x = -4 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"uE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"uG" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/reagent_containers/weldpack{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/machinery/power/apc/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"uJ" = ( +/obj/effect/floor_decal/industrial/loading/grey{ + dir = 1 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/equipment) +"uN" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"uT" = ( +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/random/pottedplant, +/turf/simulated/floor/wood, +/area/goonbase/living) +"uU" = ( +/obj/structure/trash_pile, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) "va" = ( /obj/item/trash/cigbutt{ pixel_y = 7; @@ -1509,45 +4177,123 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "vc" = ( -/obj/structure/bed/stool/chair, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/structure/table/steel, +/obj/item/clothing/head/cowboy{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/melee/telebaton{ + pixel_x = 5; + pixel_y = -2 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"vd" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "vh" = ( /obj/structure/sign/emergency/meetingpoint{ pixel_y = 31 }, /obj/machinery/media/jukebox, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"vi" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 1 + }, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) "vj" = ( /obj/structure/closet, /obj/item/clothing/suit/storage/toggle/leather_jacket/designer/black, /obj/item/clothing/accessory/tajaran/charm/stone, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"vk" = ( +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_north) +"vq" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/item/towel/random{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/quarters) +"vr" = ( +/turf/simulated/wall/r_wall, +/area/goonbase/maint_south) +"vs" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/eva) "vt" = ( -/obj/item/reagent_containers/food/drinks/bottle/rum, -/obj/structure/table/wood, -/turf/simulated/floor/carpet/red, -/area/goonbase) +/obj/structure/table/reinforced/steel, +/obj/item/melee/baton{ + pixel_y = 3 + }, +/obj/item/melee/telebaton{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/melee/baton/stunrod{ + pixel_x = -4; + pixel_y = 7 + }, +/turf/simulated/floor/tiled/dark/full, +/area/goonbase/equipment) +"vv" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = 2; + pixel_y = -10 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) +"vw" = ( +/obj/random/dirt_75, +/obj/structure/barricade/metal{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/obj/item/ammo_casing/c45/practice{ + pixel_y = -9 + }, +/obj/item/ammo_casing/c45/practice{ + pixel_x = -7; + pixel_y = 5 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "vx" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /obj/machinery/iv_drip, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) "vz" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/unsimulated/floor/asteroid/ash/rocky, +/turf/simulated/floor/airless/ceiling, /area/mine) "vB" = ( /obj/structure/table/steel, /obj/item/tank/air, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "vC" = ( /obj/effect/floor_decal/spline/plain/black{ dir = 1 @@ -1562,7 +4308,7 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "vD" = ( /obj/structure/table/steel, /obj/item/trash/raisins, @@ -1571,70 +4317,226 @@ }, /obj/structure/railing/mapped, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "vG" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/obj/item/handcuffs, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"vJ" = ( -/obj/structure/bed/padded/bunk{ - pixel_y = 0 - }, -/obj/item/bedsheet/black, -/obj/effect/ghostspawpoint{ - identifier = "goon" - }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"vR" = ( -/obj/machinery/door/airlock{ - dir = 8; - req_access = list(202) - }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"wh" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/structure/closet/crate, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) -"wo" = ( -/obj/machinery/body_scanconsole{ - pixel_x = -1 +/area/goonbase/maint_north) +"vH" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"vI" = ( +/obj/structure/table/wood, +/obj/item/material/ashtray/bronze{ + pixel_x = -7; + pixel_y = -1 }, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/clothing/mask/smokable/cigarette/cigar/oracle{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/item/device/flashlight/lamp/green{ + pixel_y = 14 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"vJ" = ( +/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/kitchen) +"vM" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/suit/storage/hooded/wintercoat/iac, +/obj/item/clothing/suit/storage/toggle/labcoat/accent, +/obj/item/clothing/shoes/sneakers/hitops/brown{ + pixel_y = -7 + }, +/obj/item/clothing/under/pants/tacticool, +/obj/item/clothing/under/syndicate/tracksuit, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"vR" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = -9; + pixel_y = 3 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"vZ" = ( +/obj/effect/floor_decal/corner/grey, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"wb" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"wc" = ( +/turf/simulated/wall/r_wall, +/area/goonbase/atmos) +"wg" = ( +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"wo" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) "wp" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) -"wD" = ( -/obj/structure/trash_pile, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ +/area/shuttle/goon_shuttle/starboard) +"ws" = ( +/obj/effect/floor_decal/corner/grey{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"wu" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/wood, +/area/goonbase/living) +"wv" = ( +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_north) +"wA" = ( +/obj/random/dirt_75, +/obj/item/pickaxe/drill{ + pixel_y = 10; + pixel_x = 9 + }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/equipment) +"wB" = ( +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/item/device/assembly/signaler{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/item/grenade/chem_grenade{ + pixel_x = -1; + pixel_y = 1 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"wD" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "wG" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /obj/machinery/door/airlock/maintenance{ dir = 8 }, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/living) -"wL" = ( -/obj/machinery/optable, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/area/shuttle/goon_shuttle/med) +"wH" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/quarters) +"wJ" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 5 + }, +/obj/structure/bed/stool/chair/folding, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/north, /turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/medbay) +"wL" = ( +/obj/structure/trash_pile, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"wS" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"wU" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/airless, +/area/mine) +"wV" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"wX" = ( +/obj/random/dirt_75, +/obj/item/trash/cigbutt{ + pixel_x = 7; + pixel_y = -10 + }, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"wY" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/turf/simulated/floor/plating, +/area/goonbase/quarters) "wZ" = ( /obj/structure/cable{ d1 = 4; @@ -1642,14 +4544,20 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"xc" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "xf" = ( -/obj/structure/closet/crate, -/obj/item/clothing/head/bearpelt, -/obj/item/clothing/suit/storage/toggle/leather_jacket/military/old, -/obj/item/clothing/suit/storage/vest, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/structure/table/steel, +/obj/item/storage/box/yarn{ + pixel_x = -3; + pixel_y = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "xi" = ( /obj/structure/closet/crate, /obj/item/reagent_containers/food/snacks/cheesiehonkers, @@ -1663,7 +4571,7 @@ /obj/item/reagent_containers/food/snacks/no_raisin, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) +/area/shuttle/goon_shuttle/living) "xn" = ( /obj/effect/decal/cleanable/spiderling_remains, /obj/machinery/light{ @@ -1673,36 +4581,119 @@ }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/starboard) +"xp" = ( +/obj/structure/table/rack, +/obj/item/clothing/suit/space/syndicate/black, +/obj/item/clothing/head/helmet/space/syndicate/black, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) "xr" = ( -/obj/item/bedsheet/black, -/obj/effect/decal/cleanable/dirt, -/obj/effect/ghostspawpoint{ - identifier = "goon_prisoner" +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 }, +/obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, -/area/goonbase) -"xH" = ( -/obj/machinery/door/airlock{ - dir = 8; - req_access = list(202) - }, -/obj/effect/decal/cleanable/dirt, +/area/goonbase/hallway_south) +"xs" = ( +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/ammo_magazine/c762, +/obj/item/ammo_magazine/c762, +/obj/item/ammo_magazine/c762, +/obj/item/gun/projectile/automatic/rifle/sts35, /turf/simulated/floor/tiled/dark, -/area/goonbase) +/area/goonbase/equipment) +"xu" = ( +/turf/simulated/wall/r_wall, +/area/goonbase/hallway_south) +"xy" = ( +/obj/effect/floor_decal/corner/grey/full{ + dir = 8 + }, +/obj/machinery/power/apc/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/alarm/west, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"xz" = ( +/obj/machinery/power/rtg, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"xB" = ( +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"xE" = ( +/obj/structure/bed/stool/chair/folding{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/quarters) +"xH" = ( +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/item/storage/backpack/messenger/syndie{ + pixel_x = -2; + pixel_y = 9 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"xJ" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/machinery/shower{ + dir = 8 + }, +/obj/item/bikehorn/rubberducky{ + pixel_y = -5; + pixel_x = 4 + }, +/obj/item/towel/random{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/living) "xK" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) +"xL" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/full, +/area/goonbase/quarters) "xM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 4; - pixel_x = 0; - icon_state = "tube_empty" +/obj/structure/table/reinforced/steel, +/obj/item/storage/pill_bottle/mortaphenyl{ + pixel_x = -13; + pixel_y = 4 }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/item/storage/pill_bottle/inaprovaline{ + pixel_y = 5 + }, +/obj/item/storage/pill_bottle/perconol{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/storage/pill_bottle/inaprovaline{ + pixel_x = 7; + pixel_y = 2 + }, +/turf/simulated/floor/tiled/dark/full, +/area/goonbase/equipment) "xO" = ( /obj/item/trash/cigbutt, /obj/effect/floor_decal/spline/plain/black{ @@ -1716,29 +4707,52 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "xQ" = ( /obj/structure/table/steel, -/obj/item/tank/air, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/item/device/versebook/trinary{ + pixel_x = 4; + pixel_y = 3 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "xX" = ( -/obj/structure/closet/walllocker/medical{ - pixel_y = 29 +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/table/rack, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"xY" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/tank/anesthetic, -/obj/item/tank/anesthetic, -/obj/item/tank/anesthetic, -/obj/item/clothing/mask/breath/medical, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/kitchen) "xZ" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 +/obj/structure/reagent_dispensers/keg/beerkeg/rice, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/alarm/east, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) +"yb" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" }, -/turf/simulated/floor/carpet/red, -/area/goonbase) +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/port) "ye" = ( /obj/structure/cable{ d2 = 2; @@ -1746,42 +4760,75 @@ }, /obj/machinery/power/apc/empty/north, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"yf" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"yk" = ( +/turf/simulated/floor/tiled, +/area/goonbase/living) "yl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/effect/floor_decal/corner/blue/diagonal, +/obj/structure/closet/crate, +/obj/item/clothing/head/sol/marine, +/obj/item/clothing/head/sol/marine/grey, +/obj/item/clothing/head/sol/garrison, +/obj/item/clothing/head/sol/army/service/officer, +/obj/item/clothing/head/sol/garrison, +/obj/item/clothing/under/rank/sol/marine, +/obj/item/clothing/under/rank/sol/marine, +/obj/item/clothing/under/rank/sol/marine/grey, +/obj/item/clothing/under/rank/sol/service/marine, +/obj/item/clothing/under/rank/sol/army/grey, +/obj/item/clothing/under/rank/sol/army/service, +/obj/item/clothing/under/rank/sol/army/service/officer, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "ym" = ( /obj/structure/cable{ icon_state = "2-4" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "yp" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, /obj/item/trash/cheesie, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"yq" = ( +/obj/structure/table/reinforced/steel, +/obj/item/storage/toolbox/electrical{ + pixel_y = 12 + }, +/obj/item/storage/toolbox/mechanical, +/turf/simulated/floor/tiled/dark/full, +/area/goonbase/equipment) "yr" = ( -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/obj/item/trash/cigbutt, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/obj/random/junk, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"ys" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/light/small/emergency, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "yx" = ( /obj/effect/landmark/entry_point/north{ name = "north, starboard engines" @@ -1790,24 +4837,74 @@ dir = 1 }, /turf/simulated/floor/airless, -/area/shuttle/goon_ship/starboard) -"yP" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/item/frame/apc{ - pixel_y = -6; - pixel_x = -9 +/area/shuttle/goon_shuttle/starboard) +"yy" = ( +/obj/effect/floor_decal/corner/blue/diagonal, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"yC" = ( +/turf/simulated/wall, +/area/goonbase/maint_north) +"yD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, /obj/random/dirt_75, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) -"yS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/spiderling_remains, +/area/goonbase/atmos) +"yH" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/atmos) +"yJ" = ( +/obj/effect/decal/cleanable/acid_remnants{ + pixel_y = -7; + pixel_x = 2 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/greenglow/radioactive, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) +"yP" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/port) +"yQ" = ( +/turf/simulated/floor/tiled/full, +/area/goonbase/kitchen) +"yR" = ( +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"yS" = ( +/obj/random/dirt_75, +/obj/random/tech_supply{ + pixel_x = -9; + pixel_y = 5 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "yW" = ( /obj/structure/bed/padded/bunk{ pixel_y = 0 @@ -1819,57 +4916,120 @@ icon_state = "tube_empty" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "yX" = ( -/obj/structure/closet/crate, -/obj/item/coin/diamond, -/obj/item/clothing/wrists/goldbracer, -/obj/item/clothing/wrists/armchain, -/obj/item/clothing/wrists/goldbracer/emerald, -/obj/item/gun/projectile/automatic/rifle/dpra/gold, -/obj/random/melee/highvalue, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "zb" = ( -/obj/item/trash/cigbutt, -/turf/simulated/floor/wood, -/area/goonbase) -"zd" = ( -/turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/bridge) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/tank/emergency_oxygen/engi{ + pixel_x = -6; + pixel_y = 5 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"zj" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/machinery/recharger/wallcharger{ + pixel_y = 27; + pixel_x = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"zk" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) "zn" = ( /obj/structure/closet, /obj/item/clothing/head/softcap, /obj/item/clothing/accessory/holster/waist, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"zp" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/storage) +"zq" = ( +/obj/random/dirt_75, +/obj/random/loot, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) "zr" = ( -/obj/structure/table/steel{ - pixel_x = -2 +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/trash/snack_bowl, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) "zs" = ( /obj/structure/table/steel, /obj/item/device/healthanalyzer, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) "zz" = ( -/obj/machinery/giga_drill{ - name = "himean drill"; - desc = "A giant, Himean drill - usually digging tunnels deep beneath the planet Himeo." +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/maint_north) +"zB" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, +/obj/random/medical, +/obj/random/medical, +/obj/random/medical, +/obj/random/medical, +/obj/random/medical, +/obj/random/medical, +/obj/structure/closet/crate, /obj/machinery/light{ - dir = 8; + dir = 4; pixel_x = 0; icon_state = "tube_empty" }, -/turf/simulated/floor/plating, -/area/goonbase) +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) "zC" = ( /obj/structure/bed/padded/bunk{ pixel_y = 0 @@ -1877,72 +5037,248 @@ /obj/item/bedsheet/black, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"Ag" = ( -/obj/structure/bookcase, -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" +/area/shuttle/goon_shuttle/living) +"zD" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/goonbase) -"Ak" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate, -/obj/item/stack/material/platinum, -/obj/item/stack/material/platinum, -/obj/item/stack/material/platinum, +/obj/structure/target_stake, +/obj/item/target/syndicate, +/obj/effect/decal/cleanable/generic, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"zM" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"zQ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 2 + }, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_airlock) +"zR" = ( +/obj/effect/floor_decal/corner/yellow/diagonal, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"zU" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"zW" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"Aa" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/quarters) +"Ac" = ( +/obj/machinery/atmospherics/portables_connector/aux{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"Ad" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 8 + }, +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"Ae" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/full, +/area/goonbase/quarters) +"Af" = ( +/turf/simulated/wall/r_wall, +/area/goonbase/power) +"Ag" = ( +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/item/storage/toolbox/emergency{ + pixel_x = 4; + pixel_y = 19 + }, +/obj/item/storage/toolbox/electrical{ + pixel_y = 11 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 3; + pixel_x = 2 + }, +/turf/simulated/floor/tiled, +/area/goonbase/atmos) +"Ah" = ( +/obj/effect/floor_decal/corner/red{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"Al" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = -3 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"An" = ( +/obj/random/dirt_75, +/obj/structure/trash_pile, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"Ap" = ( +/obj/structure/structural_support{ + pixel_y = 8 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_north) +"Au" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/goonbase/power) "Aw" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/cable{ - d1 = 1; - d2 = 4; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/port) +"Ay" = ( +/obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/lattice/catwalk/indoor/grate, /obj/random/dirt_75, -/turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) -"Ay" = ( -/obj/structure/table/steel{ - pixel_x = -2 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "AA" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/starboard) +"AH" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"AI" = ( +/obj/structure/bed/stool/padded/orange{ + dir = 2 + }, +/turf/simulated/floor/carpet/red, +/area/goonbase/living) +"AL" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "AR" = ( /obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/starboard) +"AS" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) "AU" = ( /obj/structure/platform, /obj/effect/floor_decal/corner/grey{ dir = 10 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "AV" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) -"Ba" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, +/area/shuttle/goon_shuttle/med) +"AW" = ( +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) +"Ba" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/port) "Be" = ( /obj/structure/closet/crate, /obj/item/reagent_containers/food/snacks/liquidfood, @@ -1958,7 +5294,33 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) +/area/shuttle/goon_shuttle/living) +"Bf" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) +"Bm" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/stack/material/silver/full{ + pixel_x = -6 + }, +/obj/item/stack/material/silver/full{ + pixel_x = 6 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "Bn" = ( /obj/effect/decal/cleanable/generic, /obj/effect/floor_decal/spline/plain/black{ @@ -1969,13 +5331,7 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"Bo" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 - }, -/turf/simulated/floor/airless, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/storage) "Bq" = ( /obj/structure/table/steel, /obj/item/reagent_containers/glass/rag, @@ -1988,54 +5344,245 @@ pixel_x = -6 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "Br" = ( -/obj/machinery/iv_drip, -/obj/effect/floor_decal/corner_wide/lime{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/alarm/north, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"Bt" = ( +/obj/effect/floor_decal/corner/grey{ dir = 10 }, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"Bt" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"Bu" = ( +/turf/simulated/wall/r_wall, +/area/goonbase/maint_north) +"Bw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/chips, -/turf/simulated/floor/carpet/red, -/area/goonbase) +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "By" = ( /obj/structure/table/steel, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "Bz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/trash/chipbasket, -/turf/simulated/floor/plating, -/area/goonbase) -"BE" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/goonbase) -"BK" = ( -/obj/structure/table/reinforced/steel, -/obj/item/clothing/accessory/holster/thigh/brown, -/obj/item/clothing/accessory/holster/thigh/brown{ - pixel_y = 9 +/obj/structure/table/steel, +/obj/item/gamehelm/pink{ + icon_state = "closed_pink"; + pixel_y = 2; + pixel_x = 3 }, -/obj/effect/floor_decal/spline/plain/black{ +/obj/machinery/light/colored/decayed{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"BC" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"BE" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8; + pixel_x = 0; + icon_state = "tube_empty" + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"BH" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/obj/item/tank/emergency_oxygen/double{ + pixel_y = 5 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"BI" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"BJ" = ( +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"BK" = ( +/obj/effect/floor_decal/corner/blue/diagonal, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 8; + pixel_x = 0; + icon_state = "tube_empty" + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"BM" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/paper/goon_base/secret_back_exit_note{ + pixel_x = -10; + pixel_y = -3 + }, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "goon_base_secret_exit_door"; + specialfunctions = 4; + pixel_x = 22; + pixel_y = 10 + }, +/turf/simulated/floor/plating, +/area/goonbase/equipment) +"BO" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"BW" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/obj/random/loot{ + pixel_x = -11 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) +"Ca" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"Cb" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/eva) +"Ce" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"Cf" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"Ch" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 4 + }, +/obj/structure/closet/crate/bin{ + name = "trashbin" + }, +/obj/random/junk, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/living) +"Cj" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"Cm" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 8 + }, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"Co" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/goonbase/equipment) +"Cp" = ( +/obj/effect/floor_decal/corner/red{ dir = 5 }, -/turf/simulated/floor/plating, -/area/goonbase) -"BW" = ( -/obj/effect/decal/cleanable/generic, -/turf/simulated/floor/wood, -/area/goonbase) -"Cf" = ( -/turf/simulated/floor/wood, -/area/goonbase) +/obj/machinery/recharger/wallcharger{ + pixel_y = 27; + pixel_x = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) "Cr" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ @@ -2044,154 +5591,88 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"Cs" = ( +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/goonbase/maint_north) "Cz" = ( -/obj/structure/closet/cabinet, -/obj/item/clothing/head/cowboy, -/obj/item/clothing/shoes/cowboy, -/obj/item/clothing/under/pants/camo, -/obj/item/clothing/under/pants/camo, -/obj/item/clothing/under/syndicate/tacticool, -/obj/item/clothing/under/pants/tacticool, -/obj/item/clothing/under/rank/sol/marine, -/obj/item/clothing/head/sol/marine, -/obj/item/clothing/under/rank/sol, -/obj/item/clothing/under/rank/elyran_fatigues, -/obj/item/clothing/under/dominia/fleet, -/obj/item/clothing/under/dominia/fleet/armsman, -/obj/item/clothing/head/dominia/fleet, -/obj/item/clothing/head/dominia/fleet/armsman, -/obj/item/clothing/under/pants/jeans, -/obj/item/clothing/under/pants/jeansblack, -/obj/item/clothing/head/beanie/random, -/obj/item/clothing/head/beanie/random, -/obj/item/clothing/head/headbando/random, -/obj/item/clothing/head/headbando/random, -/obj/item/clothing/head/beret/colorable/random, -/obj/item/clothing/head/bandana/colorable/random, -/obj/item/clothing/head/bandana/colorable/random, -/obj/item/clothing/head/softcap/colorable/random, -/obj/item/clothing/head/softcap/colorable/random, -/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/random, -/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/random, -/obj/item/clothing/suit/storage/toggle/trench/colorable/random, -/obj/item/clothing/suit/storage/toggle/trench/colorable/random, -/obj/random/bandana, -/obj/random/belt, -/obj/random/colored_jumpsuit, -/obj/random/colored_jumpsuit, -/obj/random/colored_jumpsuit, -/obj/random/hoodie, -/obj/random/hoodie, -/obj/random/suit, -/obj/random/suit, -/obj/random/softcap, -/obj/random/gloves, -/obj/random/gloves, -/obj/item/clothing/suit/storage/toggle/trench/colorable/random, -/obj/item/clothing/suit/storage/toggle/trench, -/obj/item/clothing/under/uniform/gadpathur, -/obj/item/clothing/head/gadpathur, -/obj/item/clothing/head/sidecap/pmcg, -/obj/item/clothing/head/sidecap/zavod, -/obj/item/clothing/under/pmc_modsuit, -/obj/item/clothing/under/rank/security/zavod, -/obj/item/clothing/shoes/sneakers/hitops/red, -/obj/item/clothing/shoes/sneakers/hitops/black, -/obj/item/clothing/shoes/laceup, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/under/syndicate, -/obj/item/clothing/suit/storage/toggle/leather_jacket/military, -/obj/item/clothing/suit/storage/toggle/leather_jacket/military, -/obj/item/clothing/suit/storage/toggle/leather_jacket/military/old, -/obj/item/clothing/suit/storage/toggle/leather_jacket/military/old, -/obj/item/clothing/suit/storage/toggle/leather_jacket/military/old/alt, -/obj/item/clothing/suit/storage/toggle/leather_jacket/military/old/alt, -/obj/item/clothing/suit/storage/toggle/leather_jacket/military/tan, -/obj/item/clothing/suit/storage/toggle/leather_jacket/military/tan, -/obj/item/clothing/suit/storage/toggle/dominia/bomber, -/obj/item/clothing/suit/storage/toggle/bomber, -/obj/item/clothing/head/ushanka/dominia, -/obj/item/clothing/gloves/black_leather, -/obj/item/clothing/gloves/black_leather, -/obj/item/clothing/gloves/fingerless, -/obj/item/clothing/gloves/fingerless, -/obj/item/clothing/suit/storage/leathercoat, -/obj/item/clothing/suit/storage/toggle/leather_jacket, -/obj/item/clothing/suit/storage/toggle/leather_jacket/designer, -/obj/item/clothing/suit/storage/toggle/leather_jacket/designer/black, -/obj/item/clothing/suit/storage/toggle/leather_jacket/designer/red, -/obj/item/clothing/suit/storage/toggle/leather_jacket/flight, -/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/green, -/obj/item/clothing/suit/storage/toggle/leather_jacket/flight/white, -/obj/item/clothing/head/softcap/tcfl, -/obj/item/clothing/head/softcap/tcfl, -/obj/item/clothing/head/beret/legion, -/obj/item/clothing/head/beret/legion/field, -/obj/item/clothing/suit/storage/legion, -/obj/item/clothing/suit/storage/legion, -/obj/item/clothing/under/legion, -/obj/item/clothing/under/legion, -/obj/item/clothing/suit/storage/vest/legion, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/pouches/black, -/obj/item/clothing/accessory/storage/pouches/black, -/obj/item/clothing/accessory/storage/pouches/brown, -/obj/item/clothing/accessory/storage/pouches/brown, -/obj/item/clothing/accessory/storage/pouches/white, -/obj/item/clothing/accessory/storage/pouches/white, -/obj/item/clothing/accessory/holster/armpit/brown, -/obj/item/clothing/accessory/holster/hip/brown, -/obj/item/clothing/accessory/holster/thigh/brown, -/obj/item/clothing/accessory/holster/thigh, -/obj/item/clothing/accessory/holster/hip, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/suit/storage/toggle/leather_jacket/designer/black, -/obj/item/clothing/head/softcap, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/random/junk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"CC" = ( +/obj/machinery/atmospherics/portables_connector/aux{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"CL" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/starboard) +"CQ" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) "CR" = ( -/obj/structure/bed/padded/bunk{ - pixel_y = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/item/bedsheet/black, -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/effect/ghostspawpoint{ - identifier = "goon" - }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) "CS" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "CY" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"CZ" = ( -/obj/effect/floor_decal/spline/fancy{ +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"CZ" = ( +/obj/item/melee/baton/stunrod{ + pixel_x = 9; + pixel_y = -4 + }, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"Df" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) "Dj" = ( /obj/effect/floor_decal/spline/plain/black{ dir = 5 @@ -2201,13 +5682,13 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "Dl" = ( /obj/effect/landmark/entry_point/west{ name = "starboard, substation" }, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "Dm" = ( /obj/structure/railing/mapped{ dir = 1 @@ -2217,19 +5698,78 @@ }, /obj/machinery/iff_beacon/name_change, /turf/simulated/floor/airless, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"Do" = ( +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"Dp" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/loading/grey, +/turf/simulated/floor/plating, +/area/goonbase/equipment) "Dr" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 +/turf/simulated/wall, +/area/mine) +"Du" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"Dx" = ( +/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) +"DB" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"DE" = ( +/obj/random/dirt_75, +/obj/structure/closet/crate/freezer, +/obj/item/organ/internal/lungs, +/obj/item/organ/internal/kidneys, +/obj/item/organ/internal/liver, +/obj/item/organ/internal/heart, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"DF" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/yellow, +/area/shuttle/goon_shuttle/living) "DI" = ( /obj/structure/table/steel, /obj/item/tank/air, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"DJ" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"DL" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/living) "DN" = ( /obj/effect/floor_decal/spline/plain/black, /obj/effect/decal/cleanable/dirt, @@ -2241,78 +5781,271 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "DO" = ( /obj/structure/closet, /obj/item/clothing/suit/storage/toggle/leather_jacket, /obj/item/clothing/glasses/sunglasses/fluff, /obj/item/storage/box/fancy/cigarettes, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"DT" = ( -/obj/effect/decal/cleanable/generic, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/area/shuttle/goon_shuttle/living) +"DR" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/equipment) +"DV" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_south) +"DY" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 5 + }, +/obj/machinery/bodyscanner{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/machinery/light{ + dir = 4; + pixel_x = 0; + icon_state = "tube_empty" + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) "Ea" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/random/dirt_75, +/obj/item/trash/cigbutt{ + pixel_y = -9; + pixel_x = 1 + }, +/obj/item/trash/match{ + pixel_y = 11; + pixel_x = -7 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/carpet/red, -/area/goonbase) -"El" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/structure/dispenser/oxygen, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/living) +"Ee" = ( +/obj/structure/trash_pile, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) +"Ei" = ( +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"Ek" = ( +/obj/effect/floor_decal/industrial/warning/dust, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"El" = ( +/obj/structure/table/steel, +/obj/item/paper_bin{ + pixel_y = 4; + pixel_x = 3 + }, +/obj/item/pen/fountain/black{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 4; + pixel_x = 0; + icon_state = "tube_empty" + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "Em" = ( /obj/structure/curtain/open/medical, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) +"Ep" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"Eq" = ( +/obj/random/dirt_75, +/obj/random/tech_supply{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"Ew" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 2 + }, +/obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"Ex" = ( +/obj/structure/bed/stool/padded/orange{ + dir = 8 + }, +/turf/simulated/floor/carpet/red, +/area/goonbase/living) +"Ez" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 10; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/trash/cigbutt{ + pixel_y = -9; + pixel_x = 1 + }, +/obj/item/trash/match{ + pixel_y = 11; + pixel_x = -11 + }, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/goonbase/living) "EE" = ( /obj/structure/table/steel, /obj/item/storage/toolbox/mechanical, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) -"EP" = ( -/obj/machinery/bodyscanner{ - dir = 1 +/area/shuttle/goon_shuttle/storage) +"EI" = ( +/obj/structure/table/standard, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal{ + pixel_x = -6 }, -/obj/effect/floor_decal/corner_wide/lime{ - dir = 10 +/turf/simulated/floor/tiled, +/area/goonbase/kitchen) +"EJ" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 6 }, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"EV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/cryopod, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"Fc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"EL" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_north) +"EP" = ( +/obj/effect/floor_decal/corner/purple{ + dir = 10 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"EQ" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) +"EV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"EZ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"Fa" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"Fb" = ( +/obj/structure/bed/stool, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"Fc" = ( +/turf/simulated/floor/carpet/red, +/area/goonbase/living) "Fe" = ( -/obj/structure/table/wood, -/obj/item/material/ashtray/bronze, -/turf/simulated/floor/wood, -/area/goonbase) -"Fk" = ( -/obj/machinery/portable_atmospherics/powered/scrubber, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"Fo" = ( -/obj/structure/bed/stool/chair/office/dark, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_airlock) +"Fh" = ( +/obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/airless, +/area/mine) +"Fj" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"Fo" = ( +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/random/tech_supply, +/obj/machinery/light/colored/decayed{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/atmos) "Fp" = ( -/obj/structure/curtain/black, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/random/tech_supply{ + pixel_x = -9; + pixel_y = 5 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "Ft" = ( /obj/effect/floor_decal/spline/plain/black{ dir = 6 @@ -2325,114 +6058,386 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"Fv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"Fz" = ( +/obj/effect/floor_decal/corner/red{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/goonbase/living) +"FB" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/yellow, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"FD" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/goonbase/power) "FE" = ( -/obj/item/wrench, -/obj/effect/decal/cleanable/dirt, +/obj/random/dirt_75, +/obj/machinery/portable_atmospherics/powered/scrubber, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/atmos) "FF" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) +"FL" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "FO" = ( /obj/item/trash/liquidfood, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"FP" = ( +/obj/structure/reagent_dispensers/radioactive_waste{ + pixel_x = 6 + }, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/greenglow/radioactive{ + pixel_x = -10; + pixel_y = 9 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"FR" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/obj/structure/bed/padded, +/obj/item/bedsheet/blue, +/obj/effect/ghostspawpoint{ + identifier = "goon_boss" + }, +/turf/simulated/floor/wood, +/area/goonbase/quarters) "FT" = ( /obj/structure/closet/walllocker{ pixel_x = 30 }, /obj/item/storage/bag/inflatable, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"FU" = ( +/obj/effect/floor_decal/corner/grey/full{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"FZ" = ( +/obj/item/handcuffs/cable{ + pixel_y = -11; + pixel_x = -13 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/trash/cigbutt/roll{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/machinery/power/apc/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/goonbase/living) +"Ga" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) "Gb" = ( -/obj/structure/table/steel, -/obj/item/storage/firstaid/combat{ - pixel_x = -4 +/obj/structure/table/rack, +/obj/item/clothing/shoes/magboots{ + pixel_x = -4; + pixel_y = 5 }, -/obj/item/storage/firstaid/trauma, -/obj/item/storage/firstaid/fire{ - pixel_x = 4 +/obj/item/clothing/shoes/magboots{ + pixel_x = 1; + pixel_y = -1 }, -/obj/effect/floor_decal/corner_wide/lime{ +/obj/item/clothing/shoes/magboots{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 1; + pixel_y = -1 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 1; + pixel_y = -1 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/eva) +"Gc" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/snacks/chocolatebar, +/obj/item/reagent_containers/food/snacks/chocolatebar, +/obj/item/reagent_containers/food/snacks/chocolatebar, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/flour, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"Gh" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "Gi" = ( -/obj/machinery/pipedispenser, -/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) +"Gn" = ( +/obj/structure/table/steel, +/obj/random/tool{ + pixel_x = -1; + pixel_y = -5 + }, +/obj/item/clothing/ears/earmuffs/earphones/headphones{ + pixel_y = 2; + pixel_x = 3 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "Gp" = ( /obj/effect/step_trigger/teleporter, /turf/template_noop, /area/space) "Gs" = ( -/obj/structure/bed/stool/chair/sofa/black, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 10; + pixel_y = 2 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"Gv" = ( +/turf/simulated/wall, +/area/goonbase/maint_south) "Gw" = ( /obj/machinery/light{ dir = 8 }, /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) "Gy" = ( /obj/effect/decal/cleanable/generic, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) +/area/shuttle/goon_shuttle/living) +"Gz" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/glass{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/quarters) "GB" = ( -/obj/structure/table/reinforced/glass, -/obj/item/material/ashtray{ - pixel_y = 2; - pixel_x = 3 +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/whitewine{ - desc = "A mediocsre quality white wine, intended more for making spritzers than for drinking by itself. Produced on Visegrad by Idris."; - pixel_y = 7; - pixel_x = -7 - }, -/turf/simulated/floor/wood, -/area/goonbase) -"GH" = ( -/obj/machinery/light{ - dir = 8; - pixel_x = 0; - icon_state = "tube_empty" - }, -/turf/simulated/floor/wood, -/area/goonbase) -"GI" = ( +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"GF" = ( /obj/structure/table/rack, -/obj/item/wrench, -/obj/item/wrench, -/obj/item/wrench, -/obj/item/wrench, -/obj/item/wrench, -/obj/item/paper/goon_base/notice, +/obj/item/clothing/mask/gas/syndicate{ + pixel_x = -5 + }, +/obj/item/clothing/mask/gas/syndicate{ + pixel_x = -5 + }, +/obj/item/clothing/mask/gas/alt{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas/alt{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas/alt{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/mask/gas/tactical{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/clothing/mask/gas/tactical{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/clothing/mask/gas/tactical{ + pixel_x = 4; + pixel_y = -6 + }, /turf/simulated/floor/tiled/dark, -/area/goonbase) +/area/goonbase/equipment) +"GG" = ( +/turf/simulated/wall, +/area/goonbase/hallway_south) +"GH" = ( +/obj/random/dirt_75, +/obj/machinery/vending/engineering{ + req_access = null + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"GI" = ( +/obj/random/dirt_75, +/obj/item/clothing/gloves/yellow{ + pixel_x = -9; + pixel_y = 7 + }, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"GK" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/airless, +/area/mine) +"GL" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/bed/stool/chair/sofa/right/red{ + dir = 2 + }, +/turf/simulated/floor/wood, +/area/goonbase/living) +"GM" = ( +/obj/structure/closet, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/item/clothing/under/syndicate, +/obj/item/clothing/suit/storage/toggle/leather_jacket/military, +/obj/item/clothing/suit/storage/toggle/leather_jacket/military/old/alt, +/obj/item/storage/belt/fannypack/recolorable/random, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"GP" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/goonbase/living) +"GV" = ( +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"GX" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/maint_north) "GY" = ( /obj/effect/overmap/visitable/ship/landable/goon_ship, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "GZ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"Hr" = ( -/obj/machinery/computer/operating, -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/area/shuttle/goon_shuttle/storage) +"Hb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/living) +"Hd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/random/dirt_75, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"Hf" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"Ho" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"Hp" = ( +/obj/structure/bed, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/ghostspawpoint{ + identifier = "goon_prisoner" + }, +/turf/simulated/floor/tiled, +/area/goonbase/living) "Hs" = ( /obj/structure/table/steel, /obj/item/storage/firstaid/o2{ @@ -2442,15 +6447,39 @@ /obj/item/storage/firstaid/toxin{ pixel_x = 4 }, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) "Ht" = ( /obj/effect/landmark/entry_point/north{ name = "aft, airlock" }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"Hu" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 6 + }, +/obj/random/dirt_75, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"Hw" = ( +/obj/item/pickaxe{ + pixel_y = -9 + }, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"Hx" = ( +/obj/machinery/atmospherics/binary/pump/high_power/on{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) "Hy" = ( /obj/structure/table/steel, /obj/item/trash/snacktray{ @@ -2461,49 +6490,176 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "HB" = ( -/obj/machinery/appliance/cooker/oven, -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "HC" = ( /obj/machinery/smartfridge/foodheater, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "HD" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/port) +"HF" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"HH" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"HJ" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/obj/random/pottedplant, +/turf/simulated/floor/wood, +/area/goonbase/quarters) +"HK" = ( +/obj/effect/floor_decal/corner/red{ + dir = 2 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"HO" = ( +/obj/random/dirt_75, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"HU" = ( +/obj/structure/closet/cabinet{ + pixel_y = 0 + }, +/obj/item/reagent_containers/food/drinks/bottle/whitewine{ + pixel_y = 0; + pixel_x = -4 + }, +/obj/item/reagent_containers/food/drinks/bottle/rum{ + pixel_x = 5 + }, +/obj/item/reagent_containers/food/drinks/bottle/sake, +/obj/item/reagent_containers/food/drinks/bottle/algae_wine{ + pixel_x = -3 + }, +/obj/item/reagent_containers/food/drinks/bottle/absinthe{ + pixel_x = 4 + }, +/obj/item/reagent_containers/food/drinks/bottle/champagne, +/obj/item/reagent_containers/food/drinks/bottle/small/beer{ + pixel_x = -3 + }, +/obj/item/reagent_containers/food/drinks/bottle/small/beer{ + pixel_x = 5 + }, +/obj/item/reagent_containers/food/drinks/bottle/small/beer{ + pixel_x = -3 + }, +/obj/item/reagent_containers/food/drinks/bottle/small/beer{ + pixel_x = 5 + }, +/obj/item/reagent_containers/food/drinks/bottle/small/beer/light, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled, +/area/goonbase/kitchen) +"HV" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"HW" = ( +/obj/structure/table/rack, +/obj/item/clothing/suit/space/syndicate/covert, +/obj/item/clothing/head/helmet/space/syndicate/covert, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/light/colored/decayed{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"HY" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/trash/cigbutt/cigarbutt/alt, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"HZ" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/decal/cleanable/generic{ - pixel_x = -2; - pixel_y = 3 +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/item/paper/goon_base/note, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) -"HZ" = ( -/obj/structure/curtain/medical, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/maint_north) "Ia" = ( -/obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"Ib" = ( -/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_x = 28; + pixel_y = -20; + dir = 1 + }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/goonbase/hallway_south) +"Ic" = ( +/obj/structure/closet/crate, +/obj/random/dirt_75, +/obj/random/bomb_supply, +/obj/random/bomb_supply, +/obj/random/bomb_supply, +/obj/random/bomb_supply, +/obj/random/bomb_supply, +/obj/random/bomb_supply{ + pixel_x = -6 + }, +/obj/random/tech_supply, +/obj/item/grenade/chem_grenade{ + pixel_x = 11 + }, +/obj/item/grenade/chem_grenade{ + pixel_x = 11 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) "Id" = ( /obj/machinery/door/airlock/maintenance{ dir = 8 @@ -2512,46 +6668,160 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) "Ie" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 0; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"Ig" = ( /obj/structure/table/steel, -/obj/item/storage/toolbox/electrical{ - pixel_y = 12 +/obj/random/dirt_75, +/obj/random/hardhat, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled, +/area/goonbase/atmos) +"Ig" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"Io" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/storage/toolbox/mechanical, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/kitchen) +"Iy" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/greenglow/radioactive{ + pixel_x = -13; + pixel_y = 9 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) "Iz" = ( -/obj/machinery/power/portgen/basic, -/obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) "IA" = ( -/obj/machinery/media/jukebox, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"IB" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/power/smes/buildable/third_party_shuttle, +/turf/simulated/floor/plating, +/area/goonbase/power) +"IF" = ( +/obj/random/junk{ + pixel_x = -9 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/full, +/area/goonbase/quarters) +"IG" = ( +/obj/effect/floor_decal/corner/yellow/diagonal, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"II" = ( +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "IL" = ( /obj/structure/cable{ icon_state = "2-4" }, /obj/machinery/hologram/holopad/long_range, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) -"IS" = ( -/obj/structure/table/steel{ - pixel_x = -2 +/area/shuttle/goon_shuttle/bridge) +"IN" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = 17; + pixel_y = -8 }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"IP" = ( +/turf/simulated/wall/r_wall, +/area/goonbase/eva) +"IQ" = ( +/obj/structure/bed/stool/chair/sofa/left/red{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/goonbase/living) +"IS" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/plating, +/area/goonbase/power) +"IU" = ( +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"IV" = ( +/obj/structure/filingcabinet/chestdrawer{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"IW" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"IX" = ( +/obj/structure/table/rack, +/obj/item/clothing/suit/space/syndicate/black/red, +/obj/item/clothing/head/helmet/space/syndicate/black/red, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/eva) "IZ" = ( /obj/effect/floor_decal/spline/plain/black{ dir = 8 @@ -2561,7 +6831,15 @@ dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"Ja" = ( +/obj/random/dirt_75, +/obj/item/weldingtool/emergency{ + pixel_x = 11; + pixel_y = 15 + }, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) "Jf" = ( /obj/structure/table/steel, /obj/item/storage/firstaid/combat{ @@ -2571,22 +6849,31 @@ /obj/item/storage/firstaid/fire{ pixel_x = 4 }, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) -"Jj" = ( -/obj/effect/map_effect/window_spawner/full/reinforced, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/area/shuttle/goon_shuttle/med) +"Ji" = ( +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "Jl" = ( -/obj/machinery/light{ - dir = 4; - pixel_x = 0; - icon_state = "tube_empty" +/obj/random/dirt_75, +/obj/random/loot, +/obj/structure/table/rack, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"Jm" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/chem_heater, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"Jn" = ( +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/item/trash/match, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/turf/simulated/floor/plating, +/area/goonbase/power) "Jo" = ( /obj/structure/bed/padded/bunk{ pixel_y = 0 @@ -2598,27 +6885,175 @@ icon_state = "tube_empty" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "Jp" = ( /obj/effect/decal/cleanable/generic, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"Jq" = ( +/obj/effect/floor_decal/corner/lime/diagonal{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) +"Ju" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "Jw" = ( -/obj/item/clothing/gloves/yellow, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/portables_connector/aux{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/hallway_south) +"Jx" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/trash/match, +/obj/random/junk{ + pixel_x = -11; + pixel_y = 10 + }, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"Jz" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"JA" = ( +/obj/random/dirt_75, +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"JC" = ( +/obj/effect/floor_decal/corner/purple{ + dir = 10 + }, +/obj/item/reagent_containers/glass/bucket{ + pixel_x = -8; + pixel_y = -2 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "JD" = ( -/obj/item/trash/cheesie, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/clothing/wrists/armchain/emerald{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/item/clothing/wrists/armchain{ + pixel_y = 3; + pixel_x = -4 + }, +/obj/item/clothing/under/goldendeep/vest, +/obj/item/clothing/wrists/goldbracer/ruby{ + pixel_y = -6 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"JF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"JH" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" + }, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"JJ" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = 2; + pixel_y = -10 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"JK" = ( +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"JU" = ( +/obj/random/dirt_75, +/obj/structure/barricade/metal{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/obj/item/ammo_casing/c45/practice, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"JV" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "JW" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/goonbase/atmos) +"JX" = ( +/obj/structure/trash_pile, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"JY" = ( +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/starboard) "JZ" = ( -/obj/machinery/power/portgen/basic/advanced, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) "Ka" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2627,81 +7062,261 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/starboard) +"Kb" = ( +/obj/structure/structural_support{ + pixel_y = 8 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_south) "Ke" = ( -/obj/structure/closet/toolcloset, -/obj/effect/decal/cleanable/dirt, +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/storage/belt/military{ + pixel_y = 5; + pixel_x = 2 + }, +/obj/item/storage/belt/military{ + pixel_y = 5; + pixel_x = 2 + }, +/obj/item/storage/belt/military{ + pixel_y = 5; + pixel_x = 2 + }, +/obj/item/storage/belt/military{ + pixel_y = -3; + pixel_x = -3 + }, +/obj/item/storage/belt/military{ + pixel_y = -3; + pixel_x = -3 + }, +/obj/item/storage/belt/military{ + pixel_y = -3; + pixel_x = -3 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"Kg" = ( +/obj/machinery/atmospherics/binary/pump/high_power, /turf/simulated/floor/plating, -/area/goonbase) +/area/shuttle/goon_shuttle/starboard) "Ki" = ( /obj/structure/cable{ icon_state = "1-8" }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) -"KB" = ( -/obj/structure/table/rack, -/obj/item/stack/material/plasteel/full, -/obj/item/stack/material/plasteel/full, -/obj/item/stack/material/plasteel/full, -/obj/effect/floor_decal/spline/plain/black{ - dir = 6 +/area/shuttle/goon_shuttle/starboard) +"Kj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/goonbase) -"KE" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/item/broken_bottle, +/area/goonbase/atmos) +"Kp" = ( +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/hallway_north) +"Ks" = ( +/obj/structure/table/standard, +/obj/machinery/chemical_dispenser/coffee/full{ + pixel_y = 16; + pixel_x = -3 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_x = 5; + pixel_y = 2 + }, +/turf/simulated/floor/tiled, +/area/goonbase/kitchen) +"Kw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"KB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"KD" = ( +/obj/structure/bed/stool/chair/office/light{ + dir = 4 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/full, +/area/goonbase/quarters) +"KE" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"KF" = ( +/obj/structure/table/standard, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/alarm/north, +/obj/item/modular_computer/laptop/preset/civilian{ + pixel_y = 9; + pixel_x = -7 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "KG" = ( -/obj/structure/table/rack, -/obj/item/soap/syndie, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/freezer, -/area/goonbase) +/obj/random/dirt_75, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"KJ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) "KK" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/port) +"KL" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/toilet{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/quarters) +"KO" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/machinery/power/apc/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/goonbase/equipment) "KR" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/item/trash/cigbutt, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/effect/floor_decal/corner/grey/full{ + dir = 4 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"KS" = ( +/obj/structure/bed/stool/chair/folding{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/quarters) +"KV" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/turf/simulated/wall/shuttle/raider, +/area/shuttle/goon_shuttle/port) "KW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/trash_pile, +/obj/machinery/atmospherics/binary/pump/aux/on, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/alarm/east, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/hallway_south) +"KX" = ( +/obj/item/device/flashlight/flare{ + pixel_x = -8; + pixel_y = 6 + }, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"KZ" = ( +/turf/simulated/wall{ + can_open = 1; + color = "#DDDDDD" + }, +/area/goonbase/equipment) "La" = ( /obj/effect/floor_decal/corner/beige{ dir = 5 }, /obj/machinery/computer/ship/helm, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "Ld" = ( -/obj/structure/noticeboard{ - pixel_y = -30 +/obj/effect/floor_decal/corner/grey/full{ + dir = 8 }, -/obj/item/trash/candy, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "Lg" = ( /obj/effect/floor_decal/corner/beige{ dir = 5 }, /obj/machinery/computer/shuttle_control/explore/goon_ship, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "Lh" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/starboard) +"Li" = ( +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"Ll" = ( +/obj/structure/structural_support{ + pixel_y = 8 + }, +/obj/random/dirt_75, +/obj/machinery/alarm/south, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) +"Lm" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "Lq" = ( /obj/structure/cable{ d1 = 4; @@ -2712,29 +7327,303 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) -"Mo" = ( -/obj/structure/table/standard, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/effect/floor_decal/corner_wide/lime{ +/area/shuttle/goon_shuttle/living) +"Lu" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/machinery/portable_atmospherics/powered/scrubber, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"Lv" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"Lw" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled/full, +/area/goonbase/quarters) +"Lz" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"LF" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 6 + }, +/obj/random/dirt_75, +/obj/machinery/alarm/east, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"LM" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"LR" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 + }, +/obj/machinery/alarm/west, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"LS" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"LU" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"LY" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/item/stack/material/graphite/full{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/stack/material/uranium/full{ + pixel_x = 6; + pixel_y = 2 + }, +/turf/simulated/floor/plating, +/area/goonbase/power) +"LZ" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"Mf" = ( +/obj/structure/reagent_dispensers/radioactive_waste, +/obj/effect/decal/cleanable/acid_remnants, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_y = 16; + pixel_x = 2 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/greenglow/radioactive{ + pixel_x = -4; + pixel_y = 9 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"Mh" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate/loot, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"Mk" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/item/paper_bin{ + pixel_y = 5; + pixel_x = 4 + }, +/obj/item/pen/black{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/melee/baton/stunrod{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4; + pixel_x = 0; + icon_state = "tube_empty" + }, +/turf/simulated/floor/tiled, +/area/goonbase/living) +"Ml" = ( +/obj/effect/floor_decal/corner/lime{ dir = 10 }, +/obj/structure/closet/crate/bin{ + name = "trashbin" + }, +/obj/item/reagent_containers/blood/ripped, +/obj/item/reagent_containers/syringe{ + pixel_x = 5; + pixel_y = -2 + }, /turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/medbay) +"Mm" = ( +/obj/structure/bed/stool/chair/folding{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"Mo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"Mu" = ( +/obj/effect/floor_decal/corner/grey/full, +/obj/random/dirt_75, +/obj/random/tech_supply{ + pixel_x = -9; + pixel_y = 5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) "Mw" = ( /turf/space, /area/space) -"MB" = ( -/obj/item/storage/box/drinkingglasses, -/obj/structure/table/steel{ - pixel_x = -2 +"Mx" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/eva) +"My" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_north) +"Mz" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/button/switch/windowtint{ + dir = 8; + id = "goon_base_prison_window"; + pixel_x = -22; + pixel_y = -4 + }, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "goon_base_prison_door"; + specialfunctions = 4; + pixel_x = -22; + pixel_y = 10 + }, +/turf/simulated/floor/wood, +/area/goonbase/living) +"MA" = ( +/obj/structure/reagent_dispensers/radioactive_waste, +/obj/effect/decal/cleanable/acid_remnants, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = 2; + pixel_y = -10 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"MB" = ( +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = 17; + pixel_y = -8 + }, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_south) +"ME" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"MH" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/power) +"MI" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) "MJ" = ( /obj/structure/table/steel, /obj/item/paper/crumpled, @@ -2750,10 +7639,46 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"MM" = ( +/obj/random/junk, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"MQ" = ( +/obj/random/dirt_75, +/obj/structure/reagent_dispensers/coolanttank, +/turf/simulated/floor/plating, +/area/goonbase/power) "MR" = ( -/turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/living) +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/junk{ + pixel_x = -9 + }, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"MS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/random/dirt_75, +/obj/item/tank/emergency_oxygen/double{ + pixel_y = -9; + pixel_x = -6 + }, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"MT" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/empty/phoron, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/floor/plating, +/area/goonbase/atmos) "MV" = ( /obj/effect/landmark/entry_point/north{ name = "aft, port engines" @@ -2762,7 +7687,7 @@ dir = 1 }, /turf/simulated/floor/airless, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) "MZ" = ( /obj/item/paper/crumpled{ pixel_y = 13; @@ -2774,86 +7699,286 @@ }, /obj/machinery/power/apc/empty/south, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "Nc" = ( /obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) -"Nk" = ( -/obj/effect/decal/cleanable/dirt, +/area/shuttle/goon_shuttle/starboard) +"Ne" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"Nf" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/rainbow, +/obj/effect/ghostspawpoint{ + identifier = "goon" + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"Ng" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/kitchen) +"Nh" = ( +/obj/random/dirt_75, /obj/machinery/portable_atmospherics/powered/scrubber, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/plating, -/area/goonbase) -"Nr" = ( -/obj/item/paper/crumpled, -/obj/machinery/light{ - dir = 8; - pixel_x = 0; - icon_state = "tube_empty" +/area/goonbase/maint_north) +"Ni" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"Nk" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) +"Nl" = ( +/obj/random/dirt_75, +/obj/random/loot, +/obj/structure/table/rack, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"Np" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/obj/item/trash/cigbutt{ + pixel_y = -9; + pixel_x = -5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/wood, -/area/goonbase) +/area/goonbase/living) +"Nq" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/empty/air, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"Nr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"Nt" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/random/dirt_75, +/obj/structure/table/steel, +/obj/item/storage/belt/utility/alt{ + pixel_y = 2 + }, +/obj/random/tool{ + pixel_y = 9 + }, +/turf/simulated/floor/tiled, +/area/goonbase/power) +"Nz" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"NA" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/living) +"NB" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) "NF" = ( /obj/structure/noticeboard{ pixel_y = 32 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "NH" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/living) +"NO" = ( +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = 2; + pixel_y = -10 + }, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) "NP" = ( -/obj/structure/table/rack, -/obj/item/ammo_magazine/a10mm, -/obj/item/ammo_magazine/a10mm, -/obj/item/ammo_magazine/a10mm, -/obj/item/gun/projectile/automatic/c20r, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"NQ" = ( +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ dir = 1 }, -/turf/simulated/floor/plating, -/area/goonbase) +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) "NT" = ( -/obj/structure/table/steel, -/obj/item/trash/cigbutt{ - pixel_y = -4; - pixel_x = -9 +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 4; + pixel_y = 12 }, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ - pixel_y = 8; - pixel_x = 6 +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"NU" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/power) "NX" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 7 +/obj/random/dirt_75, +/obj/item/pipewrench{ + pixel_x = -6; + pixel_y = 6 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/carpet/red, -/area/goonbase) +/turf/simulated/floor/plating, +/area/goonbase/atmos) "NY" = ( /obj/effect/decal/cleanable/generic, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) +/area/shuttle/goon_shuttle/living) +"Od" = ( +/obj/random/dirt_75, +/obj/random/tech_supply{ + pixel_x = -9; + pixel_y = 5 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"Of" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4; + pixel_x = 0; + icon_state = "tube_empty" + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"Og" = ( +/obj/structure/closet/crate/miningcart/ore, +/turf/simulated/floor/airless/ceiling, +/area/mine) "On" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/obj/item/trash/cigbutt, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/eva) +"Oo" = ( +/obj/structure/bed/stool/chair{ + dir = 4 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/kitchen) +"Or" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/bed/stool/chair/sofa/red, +/obj/item/handcuffs{ + pixel_x = -10 + }, +/turf/simulated/floor/wood, +/area/goonbase/living) "Os" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/freezer/rations, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/random/dirt_75, +/obj/item/trash/cigbutt{ + pixel_y = -13; + pixel_x = 11 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/living) +"Ot" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "Ow" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_north) +"Ox" = ( +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/item/device/assembly/timer{ + pixel_y = -21; + pixel_x = -4 + }, +/obj/item/integrated_circuit/input/signaler{ + pixel_x = 9; + pixel_y = -8 + }, +/obj/item/clothing/glasses/welding{ + pixel_x = -1; + pixel_y = 7 + }, +/obj/machinery/light/small/emergency{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_south) +"Oy" = ( +/obj/random/dirt_75, +/obj/random/loot, +/obj/structure/table/rack, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"Oz" = ( +/obj/random/junk, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) "OA" = ( /obj/structure/table/steel, /obj/item/reagent_containers/food/drinks/bottle/vodka/mushroom{ @@ -2863,7 +7988,37 @@ dir = 5 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"OF" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled/full, +/area/goonbase/eva) +"OH" = ( +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/gun/projectile/automatic/rifle/dpra/gold, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"OI" = ( +/obj/structure/table/reinforced/steel, +/obj/item/clothing/glasses/sunglasses/aviator{ + pixel_y = 9 + }, +/obj/item/clothing/glasses/sunglasses/aviator{ + pixel_y = 6 + }, +/obj/item/clothing/glasses/sunglasses/aviator{ + pixel_y = 3 + }, +/obj/item/clothing/glasses/sunglasses/aviator, +/turf/simulated/floor/tiled/dark/full, +/area/goonbase/equipment) "OL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/fuel_port/hydrogen{ @@ -2871,7 +8026,7 @@ }, /obj/machinery/portable_atmospherics/canister/hydrogen, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/starboard) "OM" = ( /obj/structure/cable{ icon_state = "1-8" @@ -2880,97 +8035,292 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "OP" = ( -/turf/simulated/wall/shuttle/space_ship/mercenary, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"OQ" = ( +/obj/machinery/portable_atmospherics/canister/empty/air, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/airless, /area/mine) -"OW" = ( -/obj/machinery/portable_atmospherics/powered/scrubber, +"OS" = ( +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_south) +"OX" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/goonbase/maint_north) "Pc" = ( -/obj/structure/table/reinforced/steel, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = -8 +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/storage/toolbox/emergency{ + pixel_x = -11; + pixel_y = -8 }, -/obj/item/clothing/accessory/storage/black_vest{ - pixel_x = 8 - }, -/obj/effect/floor_decal/spline/plain/black{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) "Pk" = ( /obj/effect/overmap/visitable/sector/goon, /turf/simulated/mineral/surface, /area/mine) -"Pp" = ( -/obj/structure/bed/stool/chair/office/dark{ - dir = 8 +"Po" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 5 }, -/turf/simulated/floor/wood, -/area/goonbase) -"Pu" = ( /obj/machinery/light{ - dir = 4; - pixel_x = 0; - icon_state = "tube_empty" + dir = 1 }, -/turf/simulated/floor/wood, -/area/goonbase) -"PC" = ( -/obj/machinery/bodyscanner, -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) -"PK" = ( -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"PL" = ( -/obj/effect/floor_decal/spline/plain/black{ - dir = 9 +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"Pp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/table/steel{ - pixel_x = -2 +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/tape_roll, -/turf/simulated/floor/plating, -/area/goonbase) -"PR" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/structure/bed/stool/chair/office/dark{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plating, -/area/goonbase) -"PV" = ( -/obj/structure/bed/stool/chair/sofa/left/black, -/turf/simulated/floor/wood, -/area/goonbase) -"PW" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 1 +/area/goonbase/maint_south) +"Pu" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"Pw" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"Pz" = ( +/obj/effect/floor_decal/corner/red{ + dir = 5 + }, +/obj/machinery/recharger/wallcharger{ + pixel_y = 27 }, /turf/simulated/floor/tiled/dark, -/area/goonbase) -"PY" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ - pixel_y = 8; - pixel_x = 6 +/area/goonbase/equipment) +"PA" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"PC" = ( +/obj/machinery/bodyscanner, +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/floor/tiled/white, +/area/shuttle/goon_shuttle/med) +"PD" = ( +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/north, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"PG" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/random/junk{ + pixel_x = -9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"PK" = ( +/obj/machinery/iv_drip, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) +"PL" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/structure/table/rack, +/obj/item/device/gps{ + pixel_x = 5 + }, +/obj/item/device/gps{ + pixel_x = -6 + }, +/obj/item/device/gps{ + pixel_x = 5 + }, +/obj/item/device/gps{ + pixel_x = -6 + }, +/obj/item/device/gps{ + pixel_x = 5 + }, +/obj/item/device/gps{ + pixel_x = -6 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"PO" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/obj/random/dirt_75, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"PP" = ( +/obj/machinery/light/colored/decayed{ + dir = 4 + }, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"PQ" = ( +/obj/random/dirt_75, +/obj/random/glowstick{ + pixel_x = 10; + pixel_y = 2 + }, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_north) +"PS" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, /turf/simulated/floor/wood, -/area/goonbase) +/area/goonbase/living) +"PV" = ( +/obj/structure/table/reinforced/steel, +/obj/item/storage/belt/utility/alt{ + pixel_x = -1; + pixel_y = 13 + }, +/obj/item/storage/belt/utility/alt{ + pixel_x = -1; + pixel_y = 13 + }, +/obj/item/storage/belt/utility/alt{ + pixel_x = -1; + pixel_y = 13 + }, +/obj/item/storage/box/zipties{ + layer = 2.99; + pixel_x = 11; + pixel_y = -2 + }, +/obj/item/clothing/mask/balaclava/grey{ + pixel_x = -3; + pixel_y = -9 + }, +/obj/item/clothing/mask/balaclava/grey{ + pixel_x = -3; + pixel_y = -9 + }, +/obj/item/clothing/mask/balaclava/grey{ + pixel_x = -3; + pixel_y = -9 + }, +/obj/item/clothing/mask/balaclava/grey{ + pixel_x = -3; + pixel_y = -9 + }, +/obj/item/clothing/mask/balaclava/grey{ + pixel_x = -3; + pixel_y = -9 + }, +/obj/item/clothing/mask/balaclava/grey{ + pixel_x = -3; + pixel_y = -9 + }, +/obj/item/device/flashlight/flare/glowstick/random{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/device/flashlight/flare/glowstick/random{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/device/flashlight/flare/glowstick/random{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/device/flashlight/flare/glowstick/random{ + pixel_x = -4; + pixel_y = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/goonbase/equipment) +"PX" = ( +/obj/random/dirt_75, +/obj/item/device/flashlight/marshallingwand{ + pixel_x = -9; + pixel_y = 5 + }, +/turf/simulated/floor/airless/ceiling, +/area/mine) +"PY" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/tech_supply, +/obj/machinery/light/colored/decayed/dimmed{ + dir = 4 + }, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) "PZ" = ( /obj/structure/table/rack, /obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical/w, -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) +"Qc" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/empty/oxygen, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"Qe" = ( +/obj/effect/decal/cleanable/generic{ + pixel_x = 8 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "Qf" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4; @@ -2978,93 +8328,246 @@ }, /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) +/area/shuttle/goon_shuttle/living) +"Qg" = ( +/obj/effect/floor_decal/corner/grey/full{ + dir = 1 + }, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/eva) "Qh" = ( /obj/item/trash/coffee, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) -"Ql" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/portgen/basic, +/area/shuttle/goon_shuttle/bridge) +"Qj" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) +"Qk" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/clothing/suit/bomb_suit{ + pixel_y = -3 + }, +/obj/item/clothing/head/bomb_hood{ + pixel_y = 9 + }, +/obj/structure/table/rack, +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"Ql" = ( +/turf/simulated/wall, +/area/goonbase/hallway_north) "Qm" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/random/dirt_75, +/obj/item/clothing/shoes/magboots{ + pixel_x = 12; + pixel_y = -12 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/eva) +"Qu" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/equipment) "Qv" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/plating{ temperature = 278.15 }, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "Qw" = ( -/obj/structure/punching_bag, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -7; + pixel_y = -15 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "Qx" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) +"Qy" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, +/obj/structure/table/standard, +/obj/item/storage/firstaid/combat{ + pixel_x = -4 + }, +/obj/item/storage/firstaid/trauma, +/obj/item/storage/firstaid/fire{ + pixel_x = 4 + }, +/obj/random/dirt_75, +/obj/machinery/light{ + dir = 8; + pixel_x = 0; + icon_state = "tube_empty" + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) "Qz" = ( /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) +/area/shuttle/goon_shuttle/storage) +"QB" = ( +/turf/simulated/wall, +/area/goonbase/eva) "QC" = ( /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/bridge) +"QD" = ( +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "QE" = ( -/obj/structure/table/steel{ - pixel_x = -2 +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/item/storage/toolbox/electrical{ + pixel_y = 11 }, -/obj/item/trash/plate/steak, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/item/storage/toolbox/mechanical{ + pixel_y = 3; + pixel_x = 2 + }, +/obj/machinery/light/colored/decayed{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/goonbase/power) +"QK" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/airless/ceiling, +/area/mine) "QM" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"QO" = ( -/obj/structure/closet{ - icon_door = "blue"; - name = "misc clothing" +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/item/clothing/accessory/university/black, -/obj/item/clothing/under/syndicate/ninja, -/obj/item/clothing/under/pants/ripped, -/obj/item/clothing/under/pants/tacticool, -/obj/item/clothing/under/vysoka, -/obj/item/clothing/suit/storage/toggle/varsity, -/obj/item/clothing/suit/storage/toggle/leather_jacket/midriff, -/obj/item/clothing/under/suit_jacket/charcoal, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"QP" = ( -/obj/item/reagent_containers/glass/bucket/wood{ - pixel_y = -7 - }, -/obj/effect/decal/cleanable/dirt, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/hallway_north) +"QO" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic{ + pixel_x = 8 + }, +/obj/item/reagent_containers/food/snacks/koisbar{ + pixel_x = -5; + pixel_y = -12 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"QP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) +"QQ" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"QR" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/alarm/west, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"QS" = ( +/obj/structure/reagent_dispensers/radioactive_waste{ + pixel_y = -6 + }, +/obj/effect/decal/cleanable/acid_remnants, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_y = -7; + pixel_x = 2 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) "QT" = ( /obj/machinery/atmospherics/binary/pump/high_power, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) +"QV" = ( +/obj/random/dirt_75, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) "QX" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/machinery/light/small{ +/turf/simulated/floor/plating, +/area/goonbase/equipment) +"Rb" = ( +/obj/machinery/door/airlock/external, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, +/obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_x = 28; + dir = 2 + }, /turf/simulated/floor/plating, -/area/goonbase) -"Rb" = ( -/turf/simulated/floor/plating, -/area/goonbase) -"Rc" = ( -/turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/med) +/area/goonbase/hallway_south) +"Rd" = ( +/obj/structure/reagent_dispensers/radioactive_waste{ + pixel_y = 6; + pixel_x = 5 + }, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_y = -7; + pixel_x = 2 + }, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/greenglow/radioactive, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) "Rg" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 7 @@ -3073,7 +8576,12 @@ icon_state = "1-2" }, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"Rh" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "Ri" = ( /obj/structure/closet/crate/freezer, /obj/item/storage/box/freezer/organcooler{ @@ -3090,22 +8598,108 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) -"Rv" = ( -/obj/effect/floor_decal/spline/plain/black{ +/area/shuttle/goon_shuttle/living) +"Rj" = ( +/obj/machinery/hologram/holopad/long_range, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/living) +"Rl" = ( +/obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, -/obj/structure/table/steel{ - pixel_x = -2 - }, -/obj/item/clothing/head/hardhat/dblue, -/turf/simulated/floor/plating, -/area/goonbase) -"RE" = ( -/obj/structure/table/rack, -/obj/item/clothing/gloves/boxing, /turf/simulated/floor/wood, -/area/goonbase) +/area/goonbase/quarters) +"Rn" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"Rt" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/living) +"Rv" = ( +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/item/clothing/glasses/welding, +/obj/item/weldingtool{ + pixel_y = 4 + }, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled, +/area/goonbase/power) +"Rx" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/stack/packageWrap{ + pixel_x = 10; + pixel_y = 5 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"Ry" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/closet/crate, +/obj/item/target, +/obj/item/target, +/obj/item/target, +/obj/item/target, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"RD" = ( +/obj/structure/reagent_dispensers/radioactive_waste, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/acid_remnants{ + pixel_y = -7; + pixel_x = 2 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/maint_south) +"RE" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"RL" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"RO" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled/full, +/area/goonbase/atmos) +"RP" = ( +/obj/random/dirt_75, +/turf/simulated/mineral/surface, +/area/mine) "RQ" = ( /obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/atmospherics/portables_connector{ @@ -3113,12 +8707,63 @@ layer = 2.8 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "RR" = ( -/obj/effect/decal/cleanable/ash, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/structure/closet/crate/bin{ + name = "trashbin" + }, +/obj/random/junk, +/obj/item/trash/can, +/turf/simulated/floor/tiled, +/area/goonbase/kitchen) +"RY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/alarm/east, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"RZ" = ( +/turf/simulated/floor/tiled/yellow, +/area/shuttle/goon_shuttle/storage) +"Sd" = ( +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/turf/simulated/floor/plating, +/area/goonbase/medbay) +"Se" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/storage/box/produce{ + layer = 2.99; + pixel_x = 3; + pixel_y = -5 + }, +/obj/item/storage/box/fancy/egg_box, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/reagent_containers/food/snacks/meat/chicken, +/obj/item/storage/box/fancy/egg_box, +/obj/item/reagent_containers/food/drinks/carton/milk, +/obj/item/reagent_containers/food/drinks/carton/milk, +/obj/item/reagent_containers/food/drinks/carton/milk, +/obj/item/reagent_containers/food/drinks/carton/milk, +/obj/item/reagent_containers/food/drinks/carton/soymilk, +/obj/item/reagent_containers/food/drinks/carton/soymilk, +/obj/item/reagent_containers/food/drinks/carton/milk, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) "Sf" = ( /obj/structure/table/steel, /obj/item/trash/proteinbar, @@ -3126,91 +8771,242 @@ dir = 1 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "Sj" = ( -/obj/structure/table/steel, -/obj/item/clothing/glasses/welding, -/obj/item/weldingtool, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/goonbase) -"Sk" = ( -/obj/effect/decal/cleanable/generic, -/obj/machinery/light, -/turf/simulated/floor/wood, -/area/goonbase) -"Sm" = ( -/obj/structure/table/rack, -/obj/item/ammo_magazine/mc9mm, -/obj/item/ammo_magazine/mc9mm, -/obj/item/ammo_magazine/mc9mm, -/obj/item/ammo_magazine/mc9mm, -/obj/item/ammo_magazine/mc9mm, -/obj/item/ammo_magazine/mc9mm, -/obj/item/gun/projectile/pistol{ - layer = 2.99; - pixel_y = 6 +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/item/gun/projectile/pistol, -/obj/effect/floor_decal/spline/plain{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"Sk" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = -3 + }, +/obj/effect/decal/cleanable/generic{ + pixel_x = -9; + pixel_y = 14 + }, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"Sm" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ dir = 1 }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) +"Su" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/glass{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/kitchen) +"Sv" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" + }, +/obj/machinery/airlock_sensor{ + dir = 2; + pixel_y = 28; + pixel_x = 6 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"Sw" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/simulated/floor/airless, +/area/shuttle/goon_shuttle/port) +"Sx" = ( +/obj/item/stack/material/plasteel/full{ + pixel_y = 4 + }, +/obj/item/stack/material/plasteel/full{ + pixel_y = 4 + }, +/obj/item/stack/material/plasteel/full{ + pixel_y = 4 + }, +/obj/structure/table/reinforced/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/plating, +/area/goonbase/equipment) "Sz" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/item/trash/uselessplastic, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/random/dirt_75, +/obj/random/loot{ + pixel_x = -11 + }, +/turf/simulated/floor/tiled, +/area/goonbase/maint_north) "SE" = ( -/obj/structure/table/steel, -/obj/item/storage/firstaid/o2{ - pixel_x = -4 +/obj/random/dirt_75, +/obj/random/tech_supply{ + pixel_x = -9; + pixel_y = 5 }, -/obj/item/storage/firstaid/radiation, -/obj/item/storage/firstaid/toxin{ - pixel_x = 4 - }, -/obj/effect/floor_decal/corner_wide/lime{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "SF" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/item/clothing/gloves/yellow{ + pixel_y = 9 + }, +/obj/machinery/light/small/emergency{ + dir = 1 + }, +/obj/item/device/flashlight{ + pixel_x = 2; + pixel_y = -1 + }, +/turf/simulated/floor/tiled, +/area/goonbase/power) "SG" = ( -/obj/structure/lattice/catwalk/indoor/grate/old, -/obj/machinery/light{ - dir = 4; - pixel_x = 0; - icon_state = "tube_empty" +/obj/item/trash/chips/dirtberry{ + pixel_x = 10; + pixel_y = -4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) +"SH" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, +/obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"SI" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) +"SJ" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/plating, +/area/goonbase/living) "SK" = ( /obj/item/trash/cigbutt, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) -"SU" = ( -/obj/structure/table/wood, -/obj/item/modular_computer/laptop/preset/civilian{ - pixel_y = 9 +/area/shuttle/goon_shuttle/bridge) +"SL" = ( +/turf/simulated/wall, +/area/goonbase/equipment) +"SM" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/random/dirt_75, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/goonbase/power) +"SQ" = ( +/obj/random/dirt_75, +/obj/machinery/alarm/west, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"SS" = ( +/obj/random/dirt_75, +/obj/structure/undies_wardrobe, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"ST" = ( +/obj/item/paper/goon_base/secret_base_note{ + pixel_x = 11; + pixel_y = 5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"SU" = ( +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/item/gun/custom_ka/frame05{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/stack/cable_coil{ + pixel_x = 7; + pixel_y = -7 + }, +/obj/item/wrench{ + pixel_y = -10 + }, +/turf/simulated/floor/tiled, +/area/goonbase/atmos) +"SW" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 6 + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "SX" = ( -/obj/machinery/light, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) +"SY" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "SZ" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) +"Tb" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"Tc" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "Td" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -3219,333 +9015,779 @@ }, /obj/machinery/power/apc/empty/west, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) -"To" = ( -/obj/structure/trash_pile, -/obj/effect/decal/cleanable/dirt, +/area/shuttle/goon_shuttle/living) +"Tg" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"Tj" = ( +/obj/structure/closet/firecloset, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"Tn" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/hallway_north) +"To" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/obj/structure/table/rack, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/oxygen, +/turf/simulated/floor/tiled, +/area/goonbase/eva) "Tr" = ( -/obj/effect/floor_decal/corner_wide/lime/diagonal, +/obj/effect/floor_decal/corner/lime/diagonal, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, /obj/machinery/power/apc/empty/west, /turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) +/area/shuttle/goon_shuttle/med) "Ts" = ( -/obj/structure/closet/crate, -/obj/item/clothing/accessory/medal/gold, -/obj/item/clothing/accessory/crucifix/gold, -/obj/item/clothing/wrists/watch/gold, -/obj/item/coin/gold, -/obj/item/flame/lighter/zippo/gold, -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/material/phoron/full, -/obj/random/highvalue/no_weapon, +/obj/effect/floor_decal/industrial/loading/grey, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/equipment) "Tt" = ( /obj/machinery/vending/dinnerware/plastic, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "Tu" = ( -/obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 10; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 1; + pixel_y = 19 + }, +/obj/item/trash/cigbutt/cigarbutt/alt{ + pixel_x = -1; + pixel_y = 4 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) "Ty" = ( /obj/machinery/light, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) "TA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 4; - icon_state = "tube_empty" +/obj/machinery/door/airlock/external, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/obj/random/dirt_75, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_main"; + name = "airlock_goon_base_main" + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_x = -28; + dir = 2 }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/hallway_south) +"TG" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) "TH" = ( -/obj/machinery/appliance/cooker/fryer, -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/broken_bottle{ + pixel_x = -6; + pixel_y = 9 }, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) "TJ" = ( -/obj/structure/bed/roller, -/obj/effect/floor_decal/industrial/outline/medical, -/obj/effect/floor_decal/corner_wide/lime{ +/obj/random/dirt_75, +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_south) +"TN" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille, +/turf/simulated/floor/plating, +/area/goonbase/kitchen) +"TO" = ( +/obj/effect/floor_decal/corner/grey{ dir = 5 }, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "TQ" = ( /obj/structure/table/rack, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/steel/full, -/obj/effect/floor_decal/spline/plain/black{ +/obj/item/clothing/accessory/holster/thigh/brown{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/accessory/holster/thigh/brown{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/accessory/holster/thigh/brown{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/accessory/holster/hip/brown{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/clothing/accessory/holster/hip/brown{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/clothing/accessory/holster/hip/brown{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"TW" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"Uc" = ( +/obj/effect/floor_decal/corner/grey{ dir = 5 }, -/obj/machinery/light{ - dir = 8; - pixel_x = 0; - icon_state = "tube_empty" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/goonbase) -"TY" = ( -/obj/structure/closet/crate, -/obj/item/clothing/suit/pirate, -/obj/item/storage/box/fancy/cigarettes/nicotine, -/obj/item/storage/box/fancy/cigarettes/nicotine, -/obj/item/storage/box/fancy/cigarettes/nicotine, -/obj/item/reagent_containers/food/drinks/bottle/vintage_wine, -/obj/item/reagent_containers/food/drinks/bottle/goldschlager, -/obj/item/reagent_containers/food/drinks/bottle/melonliquor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"Uf" = ( +/obj/random/dirt_75, +/obj/item/melee/energy/sword/pirate/generic, +/obj/item/clothing/head/bandana/red, +/obj/machinery/alarm/north, +/obj/structure/closet/cabinet, +/obj/item/spacecash/c1000, +/obj/item/spacecash/c500, /obj/random/spacecash, /obj/random/spacecash, /obj/random/spacecash, +/obj/item/spacecash/c200, /obj/random/spacecash, /obj/random/spacecash, -/turf/simulated/floor/wood, -/area/goonbase) -"Uc" = ( -/obj/structure/table/rack, -/obj/item/ammo_magazine/c45m, -/obj/item/ammo_magazine/c45m, -/obj/item/ammo_magazine/c45m, -/obj/item/gun/projectile/automatic/lebman, -/obj/effect/floor_decal/spline/plain{ +/obj/item/clothing/under/pants/designer{ + pixel_y = -3 + }, +/obj/item/clothing/suit/storage/toggle/leather_jacket/designer/red{ + pixel_x = 1; + pixel_y = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"Uh" = ( +/obj/machinery/atmospherics/portables_connector/aux{ dir = 1 }, -/obj/machinery/light{ - dir = 2; - pixel_y = 0; - icon_state = "tube_empty" - }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) -"Ud" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/goonbase/maint_airlock) "Ui" = ( /obj/effect/landmark/entry_point/south{ name = "fore, bridge" }, /turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"Uk" = ( +/obj/effect/floor_decal/corner/red/diagonal, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) "Ul" = ( /obj/effect/floor_decal/corner/beige{ dir = 5 }, /obj/machinery/computer/ship/sensors, /turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) +/area/shuttle/goon_shuttle/bridge) +"Um" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/ammo_casing/c45/practice{ + pixel_x = 7; + pixel_y = -8 + }, +/obj/item/ammo_casing/c45/practice, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"Un" = ( +/obj/structure/table/steel, +/obj/item/trash/stew{ + pixel_x = 4; + pixel_y = 8 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/kitchen) "Up" = ( -/obj/structure/table/rack, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/mask/surgical/w, -/obj/item/melee/baton/stunrod, -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"Uq" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ +/obj/structure/table/steel, +/obj/item/material/knife{ + pixel_x = 5; + pixel_y = 12 + }, +/obj/item/material/kitchen/rollingpin{ + pixel_y = 5 + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/kitchen) +"Ur" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/random/dirt_75, +/obj/item/trash/cigbutt/roll{ + pixel_x = 6; + pixel_y = -8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/wall/shuttle/raider, -/area/shuttle/goon_ship/starboard) -"Ur" = ( -/obj/structure/closet/crate, -/obj/item/clothing/head/bandana/pirate, -/obj/item/clothing/suit/storage/toggle/leather_jacket/flight, -/obj/item/clothing/suit/storage/vest, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"Uv" = ( +/obj/random/dirt_75, +/turf/simulated/floor/tiled/full, +/area/goonbase/kitchen) +"Uz" = ( +/obj/structure/table/standard, +/obj/item/modular_computer/handheld/pda/civilian{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/light{ + dir = 8; + pixel_x = 0; + icon_state = "tube_empty" + }, +/obj/item/pen/fountain/silver{ + pixel_x = -5; + pixel_y = -1 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) "UA" = ( /obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/shuttle/goon_shuttle/port) +"UB" = ( +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + layer = 5; + name = "adjusted reinforced window"; + pixel_y = -6 + }, +/obj/item/clothing/accessory/crucifix/gold{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/clothing/wrists/watch/gold{ + pixel_x = 5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "UD" = ( /obj/structure/table/rack, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/syndicate/black, /obj/item/clothing/head/helmet/space/syndicate/black, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "UE" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/freezer/rations, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/storage) +/area/shuttle/goon_shuttle/living) +"UG" = ( +/obj/random/dirt_75, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) "UH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/noticeboard{ pixel_y = 32 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"UX" = ( -/obj/machinery/portable_atmospherics/canister/phoron_scarce, -/obj/effect/decal/cleanable/dirt, +/area/shuttle/goon_shuttle/storage) +"UN" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) -"Vc" = ( -/obj/machinery/appliance/cooker/stove, -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/obj/item/trash/stew, +/area/goonbase/maint_north) +"UP" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/starboard) +"UX" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/trash/cigbutt{ + pixel_x = -10; + pixel_y = -3 + }, +/obj/random/dirt_75, /turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/kitchen) +"Vb" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/brown, +/obj/item/toy/plushie/farwa{ + pixel_y = -3; + pixel_x = 7 + }, +/obj/effect/ghostspawpoint{ + identifier = "goon" + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"Vc" = ( +/obj/machinery/atmospherics/binary/pump/aux/on{ + dir = 8 + }, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"Vi" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/pickaxe{ + pixel_y = -16; + pixel_x = 6 + }, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/equipment) +"Vj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"Vk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/random/dirt_75, +/obj/item/storage/belt/utility/alt{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/atmos) "Vo" = ( /obj/structure/closet/walllocker/medical{ pixel_y = -32 }, /obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"Vp" = ( -/obj/structure/table/steel{ - pixel_x = -2 +/area/shuttle/goon_shuttle/storage) +"Vq" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 9 }, -/obj/item/paper_bin, -/obj/item/pen/black, -/obj/item/device/gps, -/obj/item/device/gps, -/obj/item/device/gps, -/turf/simulated/floor/wood, -/area/goonbase) -"Vs" = ( -/obj/structure/table/steel{ - pixel_x = -2 - }, -/obj/item/trash/tray, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"Vu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing/mapped, -/turf/simulated/floor/tiled/dark, -/area/shuttle/goon_ship/bridge) -"Vx" = ( -/obj/item/reagent_containers/glass/bucket, -/obj/item/mop, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/goonbase) -"VB" = ( -/obj/machinery/chemical_dispenser/bar_alc/full{ - dir = 1; - pixel_y = -2 - }, -/turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"VD" = ( -/obj/structure/table/rack, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/carbondioxide, -/obj/item/tank/jetpack/carbondioxide, -/obj/machinery/light{ - dir = 1; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"VL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/generic, -/turf/simulated/floor/plating, -/area/goonbase) -"VY" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/table/steel, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/obj/item/device/flashlight/lantern, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"Wb" = ( -/obj/item/trash/can, -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) -"Wq" = ( -/obj/effect/floor_decal/spline/fancy{ - dir = 1 +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /obj/machinery/light{ dir = 8; pixel_x = 0; icon_state = "tube_empty" }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"Vs" = ( +/obj/random/junk, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/generic, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"Vu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing/mapped, /turf/simulated/floor/tiled/dark, -/area/goonbase) -"Wv" = ( -/obj/structure/bed/padded/bunk{ - pixel_y = 0 - }, -/obj/item/bedsheet/black, -/obj/effect/ghostspawpoint{ - identifier = "goon_boss" - }, -/turf/simulated/floor/wood, -/area/goonbase) -"WG" = ( -/obj/item/storage/box/handcuffs, -/obj/item/melee/baton/stunrod, +/area/shuttle/goon_shuttle/bridge) +"Vw" = ( +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"Vx" = ( /obj/structure/table/steel, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/item/storage/box/fancy/chocolate_box{ + pixel_x = -2; + pixel_y = 14 + }, +/obj/item/storage/box/fancy/chips/variety{ + pixel_x = 17; + pixel_y = 5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"Vz" = ( +/obj/structure/table/standard, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/device/flashlight/lamp/off{ + pixel_x = -6; + pixel_y = 11 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"VB" = ( +/obj/machinery/chemical_dispenser/bar_alc/full{ + dir = 1; + pixel_y = -2 + }, +/turf/simulated/floor/tiled/yellow, +/area/shuttle/goon_shuttle/storage) +"VD" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/item/storage/box/fancy/cigarettes/nicotine{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/storage/box/handcuffs{ + pixel_x = -2; + pixel_y = -9 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/recharger{ + pixel_x = 7; + pixel_y = 5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/living) +"VK" = ( +/turf/simulated/floor/tiled/dark/full, +/area/goonbase/equipment) +"VL" = ( +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/civgun, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"VR" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, +/obj/structure/bed/roller, +/obj/machinery/iv_drip{ + pixel_x = 7 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) +"VY" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) +"VZ" = ( +/turf/simulated/wall/shuttle/raider, +/area/shuttle/goon_shuttle/storage) +"Wb" = ( +/obj/item/trash/can, +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/goon_shuttle/med) +"Wk" = ( +/obj/machinery/vending/dinnerware, +/obj/machinery/power/apc/north, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/goonbase/kitchen) +"Wn" = ( +/obj/structure/closet/crate, +/obj/item/clothing/under/rank/security/zavod, +/obj/item/clothing/under/pmc_modsuit, +/obj/item/clothing/under/pmc_modsuit, +/obj/item/clothing/head/sidecap/zavod, +/obj/item/clothing/head/sidecap/pmcg, +/obj/item/clothing/head/gadpathur, +/obj/item/clothing/under/uniform/gadpathur, +/obj/item/clothing/suit/storage/toggle/trench, +/obj/random/gloves, +/obj/random/softcap, +/obj/random/suit, +/obj/random/hoodie, +/obj/random/colored_jumpsuit, +/obj/random/bandana, +/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/random, +/obj/item/clothing/head/bandana/colorable/random, +/obj/item/clothing/head/beanie/random, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled/full, +/area/goonbase/quarters) +"Wq" = ( +/obj/random/dirt_75, +/obj/random/loot, +/obj/random/tech_supply{ + pixel_x = -9; + pixel_y = 5 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) +"Ws" = ( +/obj/random/junk{ + pixel_x = -9 + }, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"Wt" = ( +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/device/radio/off{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/device/radio/off{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/device/radio/off{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/device/radio/off{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/device/radio/off{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/device/radio/off{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/obj/item/device/flashlight/flare, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"Wu" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/maint_north) +"Wv" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/reagent_dispensers/fueltank, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"Ww" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, +/obj/structure/table/standard, +/obj/item/storage/firstaid/o2{ + pixel_x = -4 + }, +/obj/item/storage/firstaid/radiation, +/obj/item/storage/firstaid/toxin{ + pixel_x = 4 + }, +/turf/simulated/floor/tiled/white, +/area/goonbase/medbay) +"Wy" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/mine) +"WA" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"WB" = ( +/obj/effect/floor_decal/corner/red{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"WD" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/appliance/cooker/oven, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/kitchen) +"WG" = ( +/obj/structure/table/steel, +/obj/item/towel/random{ + pixel_x = 12; + pixel_y = 10 + }, +/obj/item/device/hand_labeler{ + pixel_x = -5; + pixel_y = 1 + }, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"WH" = ( +/turf/simulated/wall, +/area/goonbase/kitchen) +"WI" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "WL" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"WM" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/air, +/obj/random/dirt_75, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/atmos) "WO" = ( /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "WQ" = ( /obj/machinery/chemical_dispenser/bar_soft/full{ pixel_y = -2; dir = 1 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "WR" = ( -/obj/machinery/door/airlock{ - dir = 1 +/obj/random/dirt_75, +/obj/random/tool{ + pixel_y = 6; + pixel_x = 8 }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"WS" = ( -/obj/structure/closet/crate/loot, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/atmos) +"WS" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 10; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/reagent_containers/food/drinks/waterbottle{ + pixel_x = -6; + pixel_y = -5 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"Xa" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/structure/table/rack, +/obj/item/clothing/suit/hazmat/general, +/obj/item/clothing/head/hazmat/general{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/reagent_containers/pill/hyronalin, +/obj/item/reagent_containers/hypospray/autoinjector/hyronalin{ + pixel_x = 3 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) "Xb" = ( /obj/effect/shuttle_landmark/goon_ship/transit, /turf/space, @@ -3559,7 +9801,20 @@ dir = 4 }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"Xf" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/living) +"Xl" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/random/dirt_75, +/obj/machinery/power/portgen/basic, +/turf/simulated/floor/plating, +/area/goonbase/power) +"Xm" = ( +/turf/simulated/wall/shuttle/raider, +/area/shuttle/goon_shuttle/living) "Xn" = ( /obj/effect/floor_decal/spline/plain/black, /obj/effect/floor_decal/corner/black/diagonal, @@ -3570,14 +9825,17 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"Xr" = ( +/turf/simulated/wall, +/area/goonbase/quarters) "Xt" = ( /obj/structure/dispenser/oxygen, /obj/machinery/light{ dir = 8 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "Xw" = ( /obj/structure/bed/stool, /obj/effect/floor_decal/spline/fancy/wood{ @@ -3587,116 +9845,316 @@ icon_state = "4-8" }, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "Xx" = ( -/obj/structure/table/reinforced/steel, -/obj/item/clothing/mask/gas/syndicate{ - layer = 2.99; - pixel_y = 6 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/floor_decal/spline/plain/black{ - dir = 1 +/obj/structure/lattice/catwalk/indoor/grate, +/obj/random/dirt_75, +/obj/random/junk{ + pixel_x = -9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/goonbase) -"Xz" = ( -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/goonbase) -"XP" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/area/goonbase/maint_north) +"Xy" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ dir = 4 }, -/turf/simulated/floor/carpet/red, -/area/goonbase) +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/hallway_south) +"Xz" = ( +/obj/structure/table/steel, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/item/clothing/gloves/boxing, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"XF" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/machinery/suit_cycler, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"XG" = ( +/obj/random/pottedplant, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/goonbase/kitchen) +"XH" = ( +/obj/effect/decal/cleanable/generic{ + pixel_x = 8 + }, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"XI" = ( +/obj/structure/closet/cabinet, +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/machinery/power/apc/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/item/clothing/head/bearpelt, +/obj/item/clothing/suit/storage/toggle/leather_jacket/military/old, +/obj/item/clothing/under/service_overalls, +/obj/item/clothing/suit/storage/toggle/leather_vest, +/obj/item/clothing/head/softcap/himeo, +/obj/item/clothing/suit/storage/toggle/trench/grey, +/obj/item/clothing/under/color/brown, +/obj/item/clothing/under/pants/black, +/obj/item/clothing/under/tactical, +/obj/item/clothing/under/syndicate/tacticool, +/obj/item/clothing/accessory/longsleeve_s, +/obj/item/clothing/suit/storage/toggle/leather_jacket/flight, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"XP" = ( +/obj/structure/table/rack, +/obj/item/device/flashlight/lantern{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/device/flashlight/lantern{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/device/flashlight/lantern{ + pixel_x = -6; + pixel_y = 3 + }, +/obj/item/device/flashlight{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/device/flashlight{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/device/flashlight{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/device/flashlight{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/device/flashlight{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/device/flashlight/heavy, +/turf/simulated/floor/plating, +/area/goonbase/equipment) "XS" = ( /obj/machinery/computer/ship/engines{ dir = 8 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) -"XY" = ( -/obj/effect/decal/cleanable/dirt, +/area/shuttle/goon_shuttle/port) +"XT" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, /obj/structure/closet/crate, -/obj/item/device/paicard, -/obj/item/material/twohanded/fireaxe, -/obj/item/weldingtool/hugetank, -/obj/item/tank/jetpack/void, -/obj/item/wirecutters/toolbelt, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/ears/earmuffs, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"XU" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor/plating/asteroid, +/area/goonbase/hallway_south) +"XY" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/goonbase/hallway_south) +"Ya" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack, +/obj/item/storage/box/smokebombs{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/box/flashbangs{ + pixel_x = -3 + }, +/obj/machinery/light{ + dir = 4; + pixel_x = 0; + icon_state = "tube_empty" + }, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"Yf" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/random/dirt_75, +/obj/machinery/power/apc/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/alarm/east, +/turf/simulated/floor/tiled, +/area/goonbase/eva) "Yh" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, /turf/simulated/floor/carpet, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "Yi" = ( -/obj/structure/closet/crate, -/obj/item/clothing/head/turban, -/obj/item/clothing/accessory/poncho, -/obj/item/clothing/suit/storage/vest, -/turf/simulated/floor/tiled/dark, -/area/goonbase) -"Yp" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock{ - dir = 8; - req_access = list(202) - }, +/obj/random/dirt_75, +/obj/random/dirt_75, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_south) +"Yo" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/port) +"Yp" = ( +/obj/effect/floor_decal/corner/grey/full{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"Yq" = ( +/turf/simulated/wall/shuttle/raider, +/area/shuttle/goon_shuttle/port) "Yt" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"Yu" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"Yx" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "Yz" = ( -/obj/structure/table/steel{ - pixel_x = -2 - }, -/obj/item/reagent_containers/food/drinks/carton/milk{ - pixel_y = 7 - }, -/obj/item/storage/box/fancy/egg_box, -/obj/effect/floor_decal/corner_wide/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/goonbase) +/obj/structure/trash_pile, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) "YA" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/starboard) +/area/shuttle/goon_shuttle/starboard) "YD" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) -"YK" = ( -/obj/machinery/computer/operating, -/obj/effect/floor_decal/corner_wide/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/shuttle/goon_ship/med) -"YV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/freezer, -/obj/item/organ/internal/heart, -/obj/item/organ/internal/lungs, -/obj/item/organ/internal/liver, -/obj/item/organ/internal/kidneys, -/turf/simulated/floor/plating, -/area/goonbase) -"YW" = ( +/area/shuttle/goon_shuttle/living) +"YG" = ( +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"YI" = ( +/obj/structure/closet, +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, /obj/structure/cable{ - d2 = 2; - icon_state = "0-2" + icon_state = "4-8" }, /obj/random/dirt_75, -/obj/item/trash/broken_electronics, +/obj/item/clothing/head/turban, +/obj/item/clothing/head/turban/gadpathur, +/obj/item/clothing/head/turban/brown, +/obj/random/gloves, +/obj/random/gloves, +/obj/item/clothing/accessory/poncho, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) +"YK" = ( +/obj/machinery/computer/operating, +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/floor/tiled/white, +/area/shuttle/goon_shuttle/med) +"YP" = ( +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/shuttle/goon_ship/port) +/area/goonbase/maint_north) +"YT" = ( +/turf/simulated/mineral/surface, +/area/goonbase/equipment) +"YU" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/table/standard, +/obj/random/soap{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled/white, +/area/goonbase/living) +"YV" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/random/dirt_75, +/turf/simulated/floor/wood, +/area/goonbase/quarters) +"YW" = ( +/obj/machinery/power/apc/empty/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/plating, +/area/shuttle/goon_shuttle/port) "YX" = ( /obj/item/trash/cigbutt{ pixel_y = -14; @@ -3704,60 +10162,118 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "YZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light{ - dir = 8; - pixel_x = 0; - icon_state = "tube_empty" - }, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/machinery/light, /turf/simulated/floor/tiled/white, -/area/goonbase) +/area/goonbase/living) "Zc" = ( -/obj/item/trash/maps, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/effect/floor_decal/corner/grey/full, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"Zd" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/yellow, +/area/shuttle/goon_shuttle/storage) "Ze" = ( /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/living) "Zf" = ( /obj/structure/table/steel, /obj/item/wrench, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) +"Zg" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/machinery/door/firedoor/noid, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/goonbase/medbay) "Zi" = ( -/obj/structure/table/rack, -/obj/item/ammo_magazine/c762, -/obj/item/ammo_magazine/c762, -/obj/item/ammo_magazine/c762, -/obj/item/gun/projectile/automatic/rifle/sts35, -/obj/effect/floor_decal/spline/plain{ +/obj/structure/closet, +/obj/item/clothing/under/suit_jacket/charcoal, +/obj/item/clothing/suit/storage/toggle/leather_jacket/midriff, +/obj/item/clothing/suit/storage/toggle/varsity, +/obj/item/clothing/under/pants/tacticool, +/obj/item/clothing/under/pants/ripped, +/obj/item/clothing/accessory/university/black, +/obj/item/clothing/suit/storage/toggle/track/red, +/obj/item/clothing/suit/storage/toggle/flannel/gray, +/obj/item/clothing/head/beret, +/obj/item/clothing/head/headbando/random, +/obj/item/clothing/under/vysoka, +/obj/item/clothing/suit/storage/toggle/leather_jacket/military/tan, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/light{ - dir = 2; - pixel_y = 0; - icon_state = "tube_empty" - }, -/turf/simulated/floor/plating, -/area/goonbase) +/turf/simulated/floor/tiled/full, +/area/goonbase/quarters) "Zk" = ( -/obj/effect/map_effect/airlock/long/square{ - required_access = null +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/random/dirt_75, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/turf/simulated/wall/shuttle/space_ship/mercenary, -/area/goonbase) -"Zu" = ( -/obj/structure/janitorialcart/full, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) +"Zl" = ( +/obj/random/junk, +/obj/random/dirt_75, +/turf/simulated/floor/plating, +/area/goonbase/hallway_north) +"Zo" = ( +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/window/reinforced{ + layer = 5; + name = "adjusted reinforced window"; + pixel_y = -6 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/stack/material/phoron/full, +/obj/item/stack/material/phoron{ + pixel_x = -4; + pixel_y = 7 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) +"Zq" = ( +/obj/structure/reagent_dispensers/radioactive_waste{ + pixel_x = -9 + }, +/obj/random/dirt_75, +/obj/effect/decal/cleanable/greenglow/radioactive, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/maint_south) +"Zs" = ( +/obj/machinery/photocopier, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"Zv" = ( +/obj/machinery/light, +/turf/simulated/floor/carpet/red, +/area/goonbase/living) "Zw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb2, -/turf/simulated/floor/plating, -/area/goonbase) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/goonbase/quarters) "Zx" = ( /obj/effect/floor_decal/spline/plain/black{ dir = 10 @@ -3770,32 +10286,171 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/yellow, -/area/shuttle/goon_ship/living) +/area/shuttle/goon_shuttle/storage) "ZB" = ( -/obj/structure/table/reinforced/steel, -/obj/item/clothing/head/helmet/material/makeshift, -/obj/effect/floor_decal/spline/plain/black, +/obj/random/dirt_75, +/obj/item/tank/oxygen/brown{ + pixel_x = -10; + pixel_y = -5 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) +"ZC" = ( +/obj/random/dirt_75, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/exoplanet/barren, +/area/goonbase/hallway_north) +"ZH" = ( +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"ZI" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/goonbase) +/area/goonbase/maint_north) "ZJ" = ( -/obj/structure/table/steel{ - pixel_x = -2 +/obj/effect/floor_decal/corner/grey{ + dir = 1 }, -/obj/item/trash/plate, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_south) "ZL" = ( -/obj/machinery/light{ - dir = 8; - pixel_y = 0; - icon_state = "tube_empty" +/obj/random/dirt_75, +/obj/structure/closet/toolcloset, +/turf/simulated/floor/plating, +/area/goonbase/atmos) +"ZO" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, -/area/goonbase) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/goonbase/eva) +"ZR" = ( +/obj/structure/closet/crate/freezer{ + name = "emergency rations (vaurca)" + }, +/obj/item/reagent_containers/chem_disp_cartridge/clean_kois, +/obj/item/reagent_containers/food/snacks/koisbar{ + pixel_x = -5 + }, +/obj/item/reagent_containers/food/snacks/koisbar{ + pixel_x = -5 + }, +/obj/item/reagent_containers/food/snacks/koisbar{ + pixel_x = -5 + }, +/obj/item/reagent_containers/food/snacks/koisbar{ + pixel_x = -5 + }, +/obj/item/reagent_containers/food/snacks/koisbar{ + pixel_x = -5 + }, +/obj/item/reagent_containers/food/snacks/koisbar{ + pixel_x = -5 + }, +/obj/item/reagent_containers/food/snacks/koisbar_clean{ + pixel_x = 8 + }, +/obj/item/reagent_containers/food/snacks/koisbar_clean{ + pixel_x = 8 + }, +/obj/item/reagent_containers/food/snacks/koisbar_clean{ + pixel_x = 8 + }, +/obj/item/reagent_containers/food/snacks/koisbar_clean{ + pixel_x = 8 + }, +/obj/item/reagent_containers/food/snacks/koisbar_clean{ + pixel_x = 8 + }, +/obj/item/reagent_containers/food/snacks/koisbar_clean{ + pixel_x = 8 + }, +/obj/item/reagent_containers/food/snacks/koisbar{ + pixel_x = -5 + }, +/obj/item/reagent_containers/food/snacks/koisbar{ + pixel_x = -5 + }, +/obj/item/reagent_containers/food/snacks/koisbar_clean{ + pixel_x = 8 + }, +/obj/item/reagent_containers/food/snacks/koisbar_clean{ + pixel_x = 8 + }, +/obj/machinery/alarm/north, +/turf/simulated/floor/tiled/freezer, +/area/goonbase/kitchen) +"ZS" = ( +/obj/random/dirt_75, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_south) +"ZT" = ( +/obj/effect/floor_decal/corner/purple{ + dir = 5 + }, +/obj/structure/mopbucket, +/obj/item/mop, +/obj/random/dirt_75, +/obj/random/dirt_75, +/turf/simulated/floor/tiled, +/area/goonbase/hallway_north) "ZW" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/wood, -/area/goonbase) +/obj/structure/table/rack, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light, +/obj/random/civgun, +/turf/simulated/floor/tiled/dark, +/area/goonbase/equipment) +"ZX" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 + }, +/turf/unsimulated/floor/asteroid/ash, +/area/mine) +"ZY" = ( +/obj/machinery/door/airlock/external{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/red, +/obj/effect/floor_decal/industrial/warning/full, +/obj/effect/map_effect/marker/airlock{ + master_tag = "airlock_goon_base_maint"; + name = "airlock_goon_base_maint" + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_x = -12; + pixel_y = 28; + dir = 8 + }, +/turf/simulated/floor/plating, +/area/goonbase/maint_airlock) (1,1,1) = {" Mw @@ -16569,6 +23224,8 @@ bu bu bu bu +mI +mI bu bu bu @@ -16588,11 +23245,9 @@ bu bu bu bu -bu -bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -16823,6 +23478,10 @@ bu bu bu bu +mI +mI +mI +mI bu bu bu @@ -16842,15 +23501,11 @@ bu bu bu bu -bu -bu -bu -bu -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI bu bu bu @@ -17081,6 +23736,8 @@ bu bu bu bu +mI +mI bu bu bu @@ -17101,13 +23758,11 @@ bu bu bu bu -bu -bu -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI bu bu bu @@ -17359,11 +24014,11 @@ bu bu bu bu -bu -bu -fY -fY -fY +sB +sB +mI +mI +mI bu bu bu @@ -17614,12 +24269,12 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB bu bu bu @@ -17870,6 +24525,13 @@ bu bu bu bu +sB +sB +sB +sB +sB +sB +sB bu bu bu @@ -17877,20 +24539,13 @@ bu bu bu bu +mI +mI +sB +sB bu bu -bu -bu -bu -bu -bu -fY -fY -bu -bu -bu -bu -bu +sB bu bu bu @@ -18125,29 +24780,29 @@ bu bu bu bu +sB +sB +sB +sB +kz +kz +kz +sB +sB +sB bu bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -fY -fY -fY -fY -bu -bu -bu -bu +mI +mI +mI +mI +sB +sB +sB +sB bu bu bu @@ -18380,30 +25035,30 @@ bu bu bu bu +sB +sB +sB +sB +kz +kz +sB +kz +sB +sB +sB +sB bu bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -fY -fY -fY -fY -fY -bu -bu +mI +mI +mI +mI +mI +sB +sB bu bu bu @@ -18633,34 +25288,34 @@ bu bu bu bu +sB +sB +sB +sB +sB +kz +kz +kz +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -fY -fY -fY -fY -bu -bu +sB +mI +mI +mI +mI +sB +sB bu bu bu @@ -18905,17 +25560,17 @@ mI mI mI mI -bu -bu -bu -bu -bu -bu -bu -fY -fY -fY -bu +sB +sB +sB +sB +sB +sB +sB +mI +mI +mI +sB bu bu bu @@ -19164,15 +25819,15 @@ mI mI mI mI -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB +sB +sB bu bu bu @@ -19396,7 +26051,6 @@ bu bu bu bu -bu mI mI mI @@ -19422,6 +26076,14 @@ mI mI mI mI +mI +sB +sB +sB +sB +sB +sB +sB bu bu bu @@ -19434,14 +26096,7 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -fY +mI bu bu bu @@ -19653,7 +26308,6 @@ bu bu bu bu -bu mI mI mI @@ -19681,6 +26335,11 @@ mI mI mI mI +mI +sB +sB +sB +sB bu bu bu @@ -19692,14 +26351,10 @@ bu bu bu bu -bu -bu -bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -19938,6 +26593,10 @@ mI mI mI mI +sB +sB +sB +sB bu bu bu @@ -19949,14 +26608,10 @@ bu bu bu bu -bu -bu -bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -20195,6 +26850,10 @@ mI mI mI mI +sB +sB +sB +sB bu bu bu @@ -20206,14 +26865,10 @@ bu bu bu bu -bu -bu -bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -20454,6 +27109,8 @@ mI mI mI mI +sB +sB bu bu bu @@ -20466,10 +27123,8 @@ bu bu bu bu -bu -bu -fY -fY +mI +mI bu bu bu @@ -20711,8 +27366,8 @@ mI mI mI mI -bu -bu +sB +sB bu bu bu @@ -20935,7 +27590,7 @@ bu bu bu bu -bu +fY mI mI mI @@ -20968,7 +27623,7 @@ mI mI mI mI -bu +sB bu bu bu @@ -21230,9 +27885,9 @@ mI bu bu bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -21487,9 +28142,9 @@ mI mI bu bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -21745,7 +28400,7 @@ mI bu bu bu -fY +mI bu bu bu @@ -22179,8 +28834,8 @@ bu bu bu bu -bu -bu +sB +sB bu bu bu @@ -22432,13 +29087,13 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB bu bu bu @@ -22687,16 +29342,16 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB bu bu bu @@ -22943,12 +29598,12 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB mI mI mI @@ -23027,6 +29682,7 @@ mI mI mI mI +sB bu bu bu @@ -23043,9 +29699,8 @@ bu bu bu bu -bu -fY -fY +mI +mI bu bu bu @@ -23198,23 +29853,23 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -mI -mI -mI -mI -mI -mI -mI -mI -mI +sB +sB +sB +kz +kz +sB +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI bu mI mI @@ -23284,6 +29939,7 @@ mI mI mI mI +sB bu bu bu @@ -23300,11 +29956,10 @@ bu bu bu bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -23453,16 +30108,16 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +kz +sB +kz +sB +sB +sB +sB mI mI mI @@ -23541,6 +30196,7 @@ mI mI mI mI +sB bu bu bu @@ -23557,11 +30213,10 @@ bu bu bu bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -23708,18 +30363,18 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +kz +kz +kz +kz +sB +kz +sB +sB +sB +sB +sB mI mI mI @@ -23798,6 +30453,7 @@ mI mI mI mI +sB bu bu bu @@ -23815,10 +30471,9 @@ bu bu bu bu -bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -23920,10 +30575,10 @@ bu bu bu bu +sB +sB bu -bu -bu -bu +sB mI mI mI @@ -23937,6 +30592,7 @@ mI mI mI mI +sB bu bu bu @@ -23962,20 +30618,19 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +kz +sB +sB +kz +kz +sB +sB +sB +sB +sB mI mI mI @@ -24055,8 +30710,8 @@ mI mI mI mI -bu -bu +sB +sB bu bu bu @@ -24176,11 +30831,11 @@ bu bu bu bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB mI mI mI @@ -24194,6 +30849,7 @@ mI mI mI mI +sB bu bu bu @@ -24216,21 +30872,20 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +kz +kz +kz +kz +kz +sB +sB +sB +sB +sB mI mI mI @@ -24312,12 +30967,12 @@ mI mI mI mI -bu -bu -bu -bu -bu -fY +sB +sB +sB +sB +sB +mI bu bu bu @@ -24425,15 +31080,15 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +kz +kz +kz +sB +sB +sB +sB mI mI mI @@ -24451,6 +31106,8 @@ mI mI mI mI +sB +sB bu bu bu @@ -24462,32 +31119,30 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB mI mI mI @@ -24569,14 +31224,14 @@ mI mI mI mI -bu -bu -bu -bu -fY -fY -fY -fY +sB +sB +sB +sB +mI +mI +mI +mI bu bu bu @@ -24680,19 +31335,70 @@ bu bu bu bu +sB +sB +kz +kz +kz +kz +kz +kz +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +sB +sB +sB +sB +sB +sB +sB bu bu bu bu bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB mI mI +sB +sB +sB +sB +sB mI mI mI @@ -24708,42 +31414,8 @@ mI mI mI mI -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu mI mI -bu -bu -bu -bu -bu mI mI mI @@ -24809,32 +31481,15 @@ mI mI mI mI +sB +sB +sB +sB mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -bu -bu -bu -bu -fY -fY -fY -fY -bu +sB bu bu bu @@ -24931,26 +31586,22 @@ bu mI mI mI -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB +sB +sB mI mI mI +sB +sB +sB +sB mI mI mI @@ -24970,34 +31621,34 @@ mI mI mI mI -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu mI mI mI mI -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB mI mI mI mI +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB mI mI mI @@ -25083,15 +31734,19 @@ mI mI mI mI -bu -bu -bu -bu -fY -fY -fY -fY -bu +mI +mI +mI +mI +sB +sB +sB +sB +mI +mI +mI +mI +sB bu bu bu @@ -25193,169 +31848,169 @@ mI mI mI mI -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +mI +mI +mI +mI +mI +mI +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +sB +sB +sB +sB +sB +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +sB +sB +sB bu mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -bu -bu -bu -bu -bu -bu -bu -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -bu -bu -bu -bu -fY -fY -fY -fY -bu -bu -bu -bu -bu +sB +sB bu bu bu +sB +sB +sB bu bu bu @@ -25597,24 +32252,24 @@ mI mI mI mI +sB +sB bu bu +mI +mI +mI +mI +sB +sB +sB bu -bu -fY -fY -fY -fY -bu -bu -bu -bu -bu -bu -bu -bu -fY -fY +sB +sB +sB +sB +mI +mI bu bu bu @@ -25854,26 +32509,26 @@ mI mI mI mI +sB +sB bu bu bu +mI +mI bu +sB +sB +sB +sB +sB +sB bu -fY -fY -bu -bu -bu -bu -bu -bu -bu -bu -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI bu bu bu @@ -26111,6 +32766,8 @@ mI mI mI mI +sB +sB bu bu bu @@ -26118,19 +32775,17 @@ bu bu bu bu +sB +sB +sB +sB bu bu -bu -bu -bu -bu -bu -bu -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI bu bu bu @@ -26191,7 +32846,6 @@ bu bu bu bu -bu mI mI mI @@ -26368,6 +33022,10 @@ mI mI mI mI +mI +kz +sB +sB bu bu bu @@ -26376,18 +33034,15 @@ bu bu bu bu +sB +sB bu -bu -bu -bu -bu -bu -fY -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI +mI bu bu bu @@ -26446,9 +33101,6 @@ bu bu bu bu -bu -bu -bu mI mI mI @@ -26625,6 +33277,13 @@ mI mI mI mI +mI +mI +mI +kz +sB +sB +sB bu bu bu @@ -26635,16 +33294,12 @@ bu bu bu bu -bu -bu -bu -bu -fY -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI +mI bu bu bu @@ -26882,6 +33537,10 @@ mI mI mI mI +kz +sB +sB +sB bu bu bu @@ -26892,16 +33551,12 @@ bu bu bu bu -bu -bu -bu -bu -fY -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI +mI bu bu bu @@ -27139,6 +33794,10 @@ mI mI mI mI +kz +kz +sB +sB bu bu bu @@ -27152,11 +33811,7 @@ bu bu bu bu -bu -bu -bu -bu -fY +mI bu bu bu @@ -27396,10 +34051,10 @@ mI mI mI mI -bu -bu -bu -bu +kz +kz +sB +sB bu bu bu @@ -27653,10 +34308,10 @@ mI mI mI mI -bu -bu -bu -bu +kz +kz +kz +sB bu bu bu @@ -27910,10 +34565,10 @@ mI mI mI mI -bu -bu -bu -bu +kz +sB +sB +sB bu bu bu @@ -28167,15 +34822,15 @@ mI mI mI mI +sB +sB +sB +sB bu -bu -bu -bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -28424,15 +35079,15 @@ mI mI mI mI +sB +sB +sB +sB bu bu -bu -bu -bu -bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -28681,9 +35336,9 @@ mI mI mI mI -bu -bu -bu +sB +sB +sB bu bu bu @@ -28938,9 +35593,9 @@ mI mI mI mI -bu -bu -bu +sB +sB +sB bu bu bu @@ -29194,8 +35849,8 @@ mI mI mI mI -bu -bu +sB +sB bu bu bu @@ -29451,7 +36106,7 @@ mI mI mI mI -bu +sB bu bu bu @@ -29708,6 +36363,7 @@ mI mI mI mI +sB bu bu bu @@ -29723,9 +36379,8 @@ bu bu bu bu -bu -fY -fY +mI +mI bu bu bu @@ -29981,8 +36636,8 @@ bu bu bu bu -fY -fY +mI +mI bu bu bu @@ -30227,7 +36882,7 @@ bu bu bu bu -fY +mI bu bu bu @@ -30238,7 +36893,7 @@ bu bu bu bu -fY +mI bu bu bu @@ -30483,9 +37138,9 @@ bu bu bu bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -30740,9 +37395,9 @@ bu bu bu bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -30997,9 +37652,9 @@ bu bu bu bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -31255,7 +37910,7 @@ bu bu bu bu -fY +mI bu bu bu @@ -31268,7 +37923,7 @@ bu bu bu bu -fY +mI bu bu bu @@ -31523,10 +38178,10 @@ bu bu bu bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -31780,10 +38435,10 @@ bu bu bu bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -32037,10 +38692,10 @@ bu bu bu bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -32295,8 +38950,8 @@ bu bu bu bu -fY -fY +mI +mI bu bu bu @@ -33306,9 +39961,9 @@ mI bu bu bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -33398,13 +40053,13 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI +Af +Af +Af +Af +Af +Af +Af mI mI mI @@ -33563,9 +40218,9 @@ mI bu bu bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -33655,6 +40310,13 @@ mI mI mI mI +Af +ba +ba +ba +ba +ba +Af mI mI mI @@ -33665,15 +40327,8 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +MA +Rd mI mI mI @@ -33912,6 +40567,13 @@ mI mI mI mI +Af +ba +dv +qM +NU +ba +Af mI mI mI @@ -33921,24 +40583,17 @@ mI mI mI mI +bt +fB +RD +aK mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +vr +vr +vr +vr +vr +vr mI mI mI @@ -34165,37 +40820,37 @@ mI mI mI mI +Af +Af +Af +Af +Af +ba +Du +uq +KJ +ba +Af +Af +Af +Af mI mI mI mI +no +NO +QS +mN +vv +FP mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +vr +Gv +Gv +Gv +Gv +vr mI mI mI @@ -34314,15 +40969,15 @@ mI mI sB sB -sB -sB -sB +Dr +Dr +Dr +Dr mI mI mI mI -mI -sB +kz mI mI mI @@ -34422,11 +41077,45 @@ mI mI mI mI +Af +ba +ba +ba +ba +ba +wV +ad +qL +ba +ba +ba +ba +Af mI mI mI +Zq +iy +tN +yJ +ui +CQ mI mI +vr +Gv +Ox +wB +Gv +vr +IP +IP +IP +IP +IP +IP +cn +cn mI mI mI @@ -34521,42 +41210,8 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -sB -sB +kz +kz mI mI mI @@ -34571,18 +41226,18 @@ sB sB sB sB -sB -sB -sB -sB +Dr +ew +mh +Dr mI mI sB mI -sB -sB -sB -sB +kz +kz +kz +kz mI mI sB @@ -34679,15 +41334,45 @@ mI mI mI mI +Af +ba +px +QE +Nt +jS +EZ +lh +sZ +gc +jw +NU +ba +Af mI mI mI mI mI mI +um +Hf mI mI mI +vr +Gv +sT +cO +Gv +Gv +QB +QB +QB +QB +QB +QB +kk +cn mI mI mI @@ -34782,54 +41467,12 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +kz +kz +kz +kz +kz +kz sB sB sB @@ -34840,9 +41483,21 @@ sB sB sB sB +Dr +Fh +GK +nB +DB +vi sB sB sB +kz +kz +kz +kz +kz +kz sB sB bu @@ -34920,36 +41575,6 @@ mI mI mI mI -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI mI mI mI @@ -34966,15 +41591,45 @@ mI mI mI mI +Af +ba +SF +tF +aJ +IB +eE +Jz +MQ +MH +xz +nE +ba +Af mI mI mI mI mI mI +TG +Mf mI mI mI +vr +Gv +uG +cT +en +Ic +QB +gn +HW +ig +lj +fA +kk +cn mI mI mI @@ -35069,6 +41724,13 @@ mI mI mI mI +kz +PA +PA +PA +kz +kz +kz sB sB sB @@ -35078,31 +41740,24 @@ sB sB sB sB +Dr +wU +OQ +nB +AH +sB +Wy +LS +LS +ho +sB +kz +kz +kz sB sB sB sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -bu bu bu bu @@ -35177,43 +41832,6 @@ mI mI mI mI -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI mI mI mI @@ -35230,8 +41848,45 @@ mI mI mI mI +Af +ba +Rv +iD +Au +FD +SM +qw +hT +zU +dY +bA +ba +Af +Bu +Bu +Bu +Bu +Bu mI +JJ +Iy mI +vr +vr +vr +Gv +Qk +hv +Jm +Ho +QB +wb +KR +oK +Qg +bm +kk +cn mI mI mI @@ -35325,6 +41980,11 @@ mI mI mI mI +tw +hL +hL +lw +kz sB sB sB @@ -35337,29 +41997,24 @@ sB sB sB sB +Dr +Dr +nB +nB +AH +sB +Ek +sS +sS +yf +sB +sB +kz +kz +kz sB sB sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -bu bu bu bu @@ -35429,54 +42084,6 @@ mI mI mI mI -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI mI mI mI @@ -35498,8 +42105,55 @@ mI mI mI mI +Af +ba +uy +Jn +tR +ba +ba +kI +ba +ba +ba +ba +ba +ba +yC +yC +yC +yC +yC mI +QO +rW mI +Gv +Gv +Gv +Gv +Gv +Lv +Gv +Gv +QB +qj +OF +jv +Qm +xp +kk +cn +cn +cn +cn +cn +cn +cn +cn +cn +cn +cn mI mI mI @@ -35537,6 +42191,7 @@ mI mI mI mI +cN mI mI mI @@ -35582,6 +42237,10 @@ mI mI mI mI +PO +Ja +mV +oL sB sB sB @@ -35596,29 +42255,25 @@ sB sB sB sB +Ad +Fj +Fj +PA +kz +Ek +QK +QK +yf +sB +sB +sB +kz +kz +kz sB sB sB sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -bu -bu -bu bu bu bu @@ -35686,55 +42341,6 @@ mI mI mI mI -OP -OP -OP -OP -OP -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI mI mI mI @@ -35756,8 +42362,55 @@ mI mI mI mI +Af +ba +LY +da +IS +ba +Jl +Ep +jY +yC +JX +MM +jY +an +ZI +sI +cw +Jl +yC mI +qW +eH mI +Gv +wL +bF +Yi +JK +eC +bF +xB +QB +IX +Mu +vs +FU +tr +kk +kk +kk +kk +kk +kk +kk +kk +kk +kk +kk +cn mI mI mI @@ -35795,6 +42448,8 @@ mI mI mI mI +cN +cN mI mI mI @@ -35839,6 +42494,10 @@ mI mI mI mI +PO +mV +Ws +oL sB sB sB @@ -35855,6 +42514,13 @@ sB sB sB sB +kz +kz +kz +Ek +QK +QK +yf sB sB sB @@ -35866,17 +42532,6 @@ sB sB sB sB -sB -sB -sB -sB -sB -sB -sB -bu -bu -bu -bu bu bu bu @@ -35941,58 +42596,6 @@ bu mI mI mI -OP -OP -OP -OP -OP -OP -OP -ms -mW -mW -pB -Ak -fW -YV -zz -mW -px -ms -ms -ms -ms -ms -ms -ms -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI mI mI mI @@ -36014,9 +42617,57 @@ mI mI mI mI +wc +wc +wc +ba +eL +qJ +Xl +ba +tL +AL +zW +LU +Ca +Ca +II +Dx +RY +EV +qN +hS +yC mI mI +vR mI +Gv +Br +Kw +Cz +Kw +bV +Kw +Kw +Mx +KB +Yp +rN +pz +BH +kk +UG +SQ +cu +kk +Fb +pf +gE +ll +Uh +kk +cn mI mI mI @@ -36053,7 +42704,11 @@ mI mI mI mI +cN +cN +se mI +Dr mI mI mI @@ -36096,6 +42751,10 @@ mI mI mI mI +Pw +Yu +Yu +ZX sB sB sB @@ -36115,6 +42774,10 @@ sB sB sB sB +Ek +sS +sS +yf sB sB sB @@ -36126,14 +42789,6 @@ sB sB sB sB -sB -sB -sB -sB -bu -bu -bu -bu bu bu bu @@ -36198,83 +42853,78 @@ bu mI mI mI -OP -OP -OP -ms -ms -ms -ms -ms +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +wc +pW +pW +pW +pW +pW +pW +pW +UN +GX +if +yC +yC +yC +LZ +yC +yC +yC +yC +Bw +yC +mI +sK +ef +mI +Gv +Pp +JK +Gv +BO +Nl +wL +Gv +QB +XF +oa +ZO +Gb +To +kk +GV +Od +GV +kk +PD +Mm +yr mW -mW -mW -mW -mW -mW -mW -mW -px -ms -QP -mW -bL -mW -xr -ms -OP -ms -ms -ms -ms -ms -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +Uh +kk +cn mI mI mI @@ -36310,7 +42960,12 @@ mI mI mI mI +Dr +se +se +se mI +Dr mI mI mI @@ -36376,6 +43031,10 @@ sB sB sB sB +Cm +HH +HH +vi sB sB sB @@ -36386,10 +43045,6 @@ sB sB sB sB -sB -bu -bu -bu bu bu bu @@ -36455,67 +43110,6 @@ bu mI mI mI -OP -OP -OP -ms -Fe -SU -PY -ms -mW -mW -WS -eH -Os -XY -mW -mW -ie -ms -mW -mW -mW -mW -mW -ms -ms -ms -Ql -Ig -Iz -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI mI mI mI @@ -36532,7 +43126,62 @@ mI mI mI mI +wc +wc +wc +wc +wc +wc +pW +yH +Hd +ME +Vk +tu +pW +un +GX +if +yC +kE +cw +JV +Lm +QR +tA +yC +Bw +yC mI +Xa +gj +Ll +Gv +KE +Gv +Gv +GG +GG +GG +GG +QB +ZH +Zc +On +aT +Fv +iV +pJ +pJ +pJ +iV +CR +zb +Nr +zQ +Wq +kk +cn mI mI mI @@ -36568,6 +43217,12 @@ mI mI mI mI +Dr +se +se +se +se +Dr mI mI mI @@ -36618,25 +43273,27 @@ sB sB sB sB -Rc -Rc -Rc -Rc +sx +sx +sx +sx pr -Rc -Rc -Rc -Rc -MR +sx +sx +sx +sx +sx sB sB sB pN -QC -QC -QC -QC -QC +Yq +Yq +Yq +Yq +Yq +sB +sB sB sB sB @@ -36644,8 +43301,6 @@ sB sB sB sB -bu -bu bu bu bu @@ -36712,84 +43367,78 @@ bu bu mI mI -OP -OP -OP -ms -aT +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +wc +pW +pW +pW +pW +pW +pW +rF +pa +ru +vH +NX +pW +qO +Xx +pO +yC +IN +mE +Bm +dK +cK +vG +yC +Bw +yC +yC +NQ +gj +qr +Gv Pp -Cf -ms -mW -mW -mW -mW -mW -VL -mW -mW -Tu -ms -mW -mW -mW -hZ -mW -ms -ms -np -mW -gM -Jw -Ke -ms -nT -mW -mW -mW -To -ms -ms -KW -oM -Nk -lz -mW -mW -To -ms -ms -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +ZS +zq +GG +Vz +Uz +oT +QB +Yf +yR +er +jW +ei +kk +Oy +An +GV +kk +lJ +Vc +kk +ZY +kk +kk +cn mI mI mI @@ -36825,6 +43474,12 @@ mI mI mI mI +Dr +cN +PX +se +se +Dr mI mI mI @@ -36875,7 +43530,7 @@ sB sB sB sB -Rc +sx lq eI Em @@ -36884,24 +43539,24 @@ hV fs vx oX -MR -MR -MR -MR -MR -hI -OW -Ud -xK -QC -QC -QC -QC -QC -QC +sx +VZ +VZ +VZ +VZ +av +ed +yb +yb +Yq +Yq +Yq +Yq +Yq +Yq +sB sB sB -bu bu bu bu @@ -36969,65 +43624,6 @@ bu bu mI mI -OP -OP -OP -ms -TY -Cf -Cf -ms -mW -mW -qP -UX -Ts -yX -TA -mW -Tu -ms -mW -mW -mW -mW -mW -ms -ms -px -mW -mW -mW -mW -BE -mW -mW -mW -mW -mW -BE -mW -qW -mW -mW -mW -mW -mW -mW -ie -ms -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -OP mI mI mI @@ -37044,6 +43640,65 @@ mI mI mI mI +wc +pW +MT +WM +Lu +NB +pW +is +vH +Hx +yD +tu +pW +as +GX +gw +yC +dK +Rx +dh +Mh +Ce +lb +yC +hN +qN +nV +QP +QP +QP +QP +Sj +Eq +AS +GG +KF +ib +Li +QB +QB +QB +Cb +QB +QB +kk +kk +kk +kk +kk +uU +Fe +kk +cF +jK +kk +cn +mI +mI +mI mI mI mI @@ -37076,12 +43731,12 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI +Dr +cN +cN +fX +cN +Dr mI mI mI @@ -37132,7 +43787,7 @@ sB sB sB pI -Rc +sx YK AV Em @@ -37141,24 +43796,24 @@ Qx cm AV Jf -MR +sx UD -Ze +RZ Bq -MR +VZ yP Ba -JW -JW +JZ +fv Gw -aE -aE -aE +kp +kp +kp FF -nA -sB -sB -bu +Sw +PA +PA +PA bu bu bu @@ -37226,78 +43881,78 @@ bu bu mI mI -OP -OP -OP +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +wc +pW +QQ +GI +bb +Ga +pW +KG +pa +MS +FE +pW +pW +zz +GX +JX +yC +qv +ph +kB +Wu +Ce +Gi +yC +sI +jY +yC +nn +nn +nn +nn +wL +Ei +JK +GG +Zs +nq +IV +GG +xy +BE +JF +IW +xr +Jw +GG +mI +mI +kk +Fa +Fa +kk ms -Wv -Cf -jz -ms -Yp -ms -ms -ms -ms -ms -ms -ms -ms -ms -Jj -Jj -xH -Jj -Jj -ms -ms -Sj -mW -mW -mW -Fc -ms -Bz -To -mW -To -Fc -ms -To -mW -mW -mW -mW -mW -Fc -mW -mW -ms -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -OP -mI -mI -mI -mI -mI -sB -sB -sB -mI -mI -mI -mI -mI +kk +kk +cn mI mI mI @@ -37306,11 +43961,11 @@ mI mI sB sB -sB -sB -sB -sB -sB +nT +nT +nT +nT +nT mI mI mI @@ -37330,15 +43985,15 @@ sB sB sB sB -sB -sB -sB -mI -mI -mI -mI -mI -mI +nT +nT +nT +Dr +Dr +cN +cN +Dr +Dr mI mI mI @@ -37386,36 +44041,36 @@ sB sB sB sB -zd -zd -zd -zd -zd -zd +QC +QC +QC +QC +QC +QC PC jg AV sg AV zs -MR +sx aP Jp fj -MR +VZ gX HD UA -JW -JW -JW -JW -JW -uB +qR +qR +qR +qR +qR +KV MV +PA +kz sB -sB -bu bu bu bu @@ -37483,79 +44138,79 @@ bu bu mI mI -OP -OP -OP -ms -ms -vR -ms -ms -iY -TQ -KB -fz -GI -ms -nf -Cf -Nr -Vp -Cf -JD -Cf -GH -WG -ms -ms -ms -ms -bQ -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -bQ -ms -ms -Ow -ms -ms -bQ -ms -ms -OP -ms -ms -ms -ms -ms -ms -OP -OP -OP -OP -OP +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +wc +pW +Nq +bb +WR +bb +bb +bb +uu +uu +JW +pW +EQ +OX +yC +yC +yC +yC +yC +yC +yC +cG +yC +yC +yC +YP +yC +Ql +rY +Ap +nn +Gv +Gv +RL +GG +GG +Xy +GG +GG +TO +lW +jZ +Ji +fR +CC +GG mI mI mI sB sB sB +kz +kz sB sB sB -sB -sB -sB -sB -mI mI mI sB @@ -37565,10 +44220,10 @@ sB sB sB sB -sB -sB -sB -sB +nT +nT +nT +nT mI mI mI @@ -37589,12 +44244,12 @@ sB sB sB sB -sB -sB -sB -sB -sB -sB +nT +nT +nT +nT +nT +nT sB mI mI @@ -37608,11 +44263,11 @@ mI mI mI mI -sB -sB -sB -sB -sB +kz +kz +kz +kz +kz mI mI mI @@ -37643,33 +44298,34 @@ sB sB sB sB -zd +QC MJ vD AU cP -zd +QC kJ AV PZ sg AV Hs -MR +sx UD -Ze +RZ Zf -MR +VZ YW Aw -fv -JZ +Yo +xK XS -kX -pp +KK +AW QT bR -nA +Sw +PA sB sB bu @@ -37719,7 +44375,6 @@ bu bu bu bu -bu "} (133,1,1) = {" bu @@ -37737,105 +44392,95 @@ bu bu bu bu +bu mI mI mI -OP -OP -OP -ms -xf -iY -Yi -ms -iY -iY -iY -iY -iY -qy -nf -BW -Cf -Pp -Cf -Cf -zb -ZW -Cf -ms -ms -ZL -iY -eJ -iY -ZL -ms -ms -nJ +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +wc +pW +NB +Qc +Ga +pq +pW +GH +Kj +fC +pQ +WA rc -sX -ms -ms -iY -eJ -ZL -ms -ms -ms -ZL -eJ -iY -ms -ms -ms -te -te -te -te -ms -ms -ms -OP -OP -OP -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +bz +Ql +UB +up +IG +OH +Ql +Ld +Gh +Vq +LR +ff +Vw +mn +je +Fp +Ow +rV +XU +Rn +Ji +Rh +ci +Ji +IW +IW +ZJ +uE +kV +Ji +mt +GG +GG +mI +sB +sB +sB +sB +mV +mV +kz +kz +kz +kz +kz +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +nT +nT sB sB sB @@ -37847,9 +44492,19 @@ sB sB sB sB +nT +nT +nT sB sB sB +kz +kz +kz +kz +nT +nT +nT sB sB sB @@ -37864,12 +44519,12 @@ mI mI mI mI -sB -sB -sB -sB -sB -sB +kz +kz +kz +kz +kz +kz mI mI sB @@ -37899,34 +44554,34 @@ mI sB sB sB -sB +kz Ui nk Vu AU Ty -zd -MR -MR -MR +QC +sx +sx +sx wG -MR -MR -MR -MR +sx +sx +sx +VZ hG -MR -MR -QC +VZ +VZ +Yq Id -QC -QC -QC -QC -QC -QC -QC -QC +Yq +Yq +Yq +Yq +Yq +Yq +Yq +Yq sB sB bu @@ -37994,94 +44649,84 @@ bu bu bu bu +bu +bu mI mI mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +wc +pW +pW +pW +pW +pW +pW +Ie +sM +RO +sl +pW +Cs +if +Ql +ch +vk +vk +IG +Kp +HF +vk +mr +Vw +ff +Vw +Kp +Do +Do +OS +OS +OS +ri +nq +Rh +Ji +lW +TJ +nq OP -OP -OP -ms -dT -iY -vJ -Fp -tz -iY -DT -iY -cu -ms -Ag -xZ -eh -eh -eh -eh -eh -Ea -SX -ms -iY -tz -fG -eJ -eJ -tz -ms -iV -eJ -kR -eJ -iY -ms -iY -eJ -tz -Fk -ms -PK -iY -eJ -iY -iY -ms -VD -eJ -eJ -eJ -Zc -lU -mJ -ms -OP -OP -ms -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +lW +GG +CY +bC +GG +cN +cN +vz +sB +sB +sB +mV +mV +mV +mV +kz +kz +kz +kz sB sB sB @@ -38103,9 +44748,19 @@ sB sB sB sB +nT +nT +nT +nT sB sB sB +kz +kz +kz +kz +kz +kz sB sB sB @@ -38123,13 +44778,13 @@ sB sB sB sB -sB -sB -sB -sB -sB -sB -sB +kz +kz +kz +kz +kz +kz +kz sB sB sB @@ -38152,24 +44807,24 @@ mI mI mI mI -sB -sB -sB -sB -sB +kz +kz +kz +kz +PA Qv nX cP eO SK -zd +QC dd zC yW SZ hC vj -MR +Xm lQ ym lY @@ -38177,13 +44832,13 @@ dJ WO OM iA -MR +VZ By DI Xt EE it -MR +VZ sB sB bu @@ -38251,103 +44906,82 @@ bu bu bu bu +bu +bu mI mI mI -OP -OP -OP -ms -sP -iY -iY -Fp -iY -er -sZ -iY -Zi -ms -oI -dr -no -sO -id -sO -sO -kW -Ld -ms -eJ -eJ -eJ -eJ -eJ -eJ -cH -eJ -eJ -eJ -eJ -eJ -cH -eJ -eJ -eJ -iY -cH -iY -eJ -KR -eJ -tz -ms -eJ -eJ -eJ -eJ -eJ -iY -fk -ms -ms -ms -Zk -vz -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +mI +mI +mI +mI +mI +mI +mI +mI +qX +qX +qX +qX +qX +qX +qX +SL +xX +xX +iX +bN +pW +SU +Fo +Ag +ZL +pW +GX +if +Ql +Zo +zR +IG +JD +Ql +gq +jP +vZ +BI +ff +jy +mn +wv +rY +MB +OS +hE +Rn +LF +Cf +Hu +aA +SW +DJ +ws +Tg +GG +JH +Ew +GG +GG +cN +cN sB sB +kz +kz +kz +mV +mV +nT +nT sB sB sB @@ -38364,6 +44998,9 @@ sB sB sB sB +kz +kz +kz sB sB sB @@ -38378,6 +45015,11 @@ sB sB sB sB +kz +kz +kz +kz +kz sB sB sB @@ -38392,14 +45034,27 @@ sB sB sB sB +kz +kz +kz +kz +kz +kz sB sB sB sB +nT +nT sB sB sB sB +kz +kz +kz +kz +kz mI mI mI @@ -38411,22 +45066,22 @@ mI mI sB sB -sB -sB -sB +PA +PA +PA Qv nM eT AU nr -zd +QC NF Ze FO SZ va kn -MR +Xm vh xO IZ @@ -38434,13 +45089,13 @@ Bn IZ Zx HC -MR -gI -gI -gI -gI +VZ +Qz +Qz +Qz +Qz aI -MR +VZ sB sB bu @@ -38508,134 +45163,106 @@ bu bu bu bu +bu +bu mI mI mI -OP -OP -OP -ms -Ur +mI +mI +mI +mI +mI +mI +mI +mI +qX +YT +qX +YT +qX +YT +qX +SL +Vs +HY +mE iY -iY -Fp -iY -Pc -ZB -tz -Zi -ms -tA -dr -sO -eB -eB -eB -sO -kW -Cf -ms -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -pJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -ms -eJ -eJ -El -eJ -eJ -eJ -Dr -Rb -eJ -eJ -Rb -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +pW +pW +pW +pW +pW +pW +Sz +if +fl +fl +fl +fl +fl +fl +dH +Vw +iK +Ql +Ql +Ql +Ql +Ql +mj +rV +Kb +GG +GG +GG +GG +GG +GG +XY +SE +Uc +lW +GG +Sv +SH +dX +TA +cN +vz +nT +cN +kz +cN sB +vz sB +vz +nT sB +vz +nT +nT +nT +vz sB +vz sB sB sB +vz sB +vz +kz +mV +mV +mV +kz +kz sB +vz sB +vz sB sB sB @@ -38646,6 +45273,14 @@ sB sB sB sB +kz +kz +kz +kz +mV +nT +nT +nT sB sB sB @@ -38654,6 +45289,12 @@ sB sB sB sB +kz +kz +kz +kz +kz +kz sB sB sB @@ -38661,6 +45302,19 @@ sB sB sB sB +nT +nT +nT +nT +lI +kz +kz +kz +kz +kz +kz +nT +nT sB sB sB @@ -38671,19 +45325,20 @@ sB sB sB sB +kz Qv Lg cP AU GY -zd +QC YX eS nI Xw Yh DO -MR +Xm ye bk Xd @@ -38691,12 +45346,12 @@ Xd Xd Xn VB -MR -gI -gI -MR -MR -MR +VZ +Qz +Qz +VZ +VZ +VZ ag sB sB @@ -38765,68 +45420,75 @@ bu bu bu bu +bu +bu mI mI mI -OP -OP -OP -ms -Cz -iY -iY -Fp -iY -Xx -bN -tz -NP -ms -Cf -dr -id -kB +mI +mI +mI +mI +mI +mI +qX +qX +qX +qX +qX +qX +qX +qX +qX +SL +fa +Pc +oI +jY +yC +JX +an +ZI +MM +HB +Iz +ys +fl +dV +dQ +PK +Qy +fl +WI +WI +WI +Ql +tt +JC +Ql ip -vt -id -kW -Cf -WR -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -KR -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -NH -eJ -eJ -eE -eJ -eJ -eJ -eJ -Rb -eJ -QX +xc +mI +mI +mI +xu +xu +xu +GG +Ig +sP +cV +km +lW +GG +rZ +SH +dX Rb +vz +vz +nT +nT sB sB sB @@ -38836,6 +45498,10 @@ sB sB sB sB +nT +nT +nT +nT sB sB sB @@ -38843,6 +45509,13 @@ sB sB sB sB +mV +mV +mV +mV +mV +mV +kz sB sB sB @@ -38863,17 +45536,45 @@ sB sB sB sB +nT +nT +nT +nT +nT +nT +nT +nT +vz sB +vz sB +vz sB +vz sB sB +vz sB sB sB +vz sB sB +nT +nT +nT +nT +nT sB +kz +kz +kz +nT +nT +nT +kz +kz +kz sB sB sB @@ -38881,53 +45582,7 @@ sB sB sB sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +kz kr La eT @@ -38939,7 +45594,7 @@ bW pT ia Rg -WO +DF YD WO vC @@ -38947,12 +45602,12 @@ nR kU Hy DN -Ze +RZ CS -gI +Qz WL oE -gI +Qz Yt Ht ct @@ -39022,111 +45677,87 @@ bu bu bu bu +bu +bu +bu mI mI mI -OP -OP -OP -ms -QO -iY -iY -Fp -iY -mj -cY -iY -nC -ms -Cf -dr -sO +mI +mI +mI +mI +mI +qX +YT +qX +YT +qX +SL +SL +SL +SL +SL +Sm +Ur +SG +Al +cb +Nz +PG +fg +dW +HZ +GX +yS +fl +oe +SX +kL +Ww +fl +Po +Vw +hF +Ql +ZT +qy +Ql +mI +mI +mI +mI +mI +mI +mI +xu +GG +GG +wD +GG +Uc +Tg +GG +JH +Df +GG +GG cN -eB -kB -sO -kW -Cf -ms -eJ -eJ -eJ -KE -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -eJ -dh -eJ -eJ -eJ -ms -fr -eJ -El -eJ -eJ -iY -iY -ms -ms -ms -ms -vz -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +cN +nT +nT +nT sB +nT sB sB sB sB +nT +nT +nT +nT +nT sB sB sB @@ -39134,6 +45765,12 @@ sB sB sB sB +mV +mV +mV +mV +mV +mV sB sB sB @@ -39146,6 +45783,8 @@ sB sB sB sB +nT +nT sB sB sB @@ -39156,6 +45795,10 @@ sB sB sB sB +nT +nT +nT +nT sB sB sB @@ -39176,28 +45819,40 @@ sB sB sB sB +nT +nT +nT sB sB sB +kz +nT +nT +nT sB +kz +kz +mV +kz sB sB sB sB sB +kz Qv nM Qh AU MZ -zd +QC kH gZ js fb yp zn -MR +Xm ft nS le @@ -39205,13 +45860,13 @@ le le Xn WQ -MR -gI +VZ +Qz fo -gI -gI +Qz +Qz FT -gI +Qz sB sB bu @@ -39279,114 +45934,85 @@ bu bu bu bu +bu +bu +bu mI mI mI -OP -OP -OP -ms -ov -iY -he -Fp -iY -BK -fM -iY -rF -ms -IA -dr -sO -sO -id -sO -sO -NX -Cf -ms -eJ -eJ -eJ -eJ -eJ -eJ -SG -eJ -Sz -eJ -eJ -eJ -lI -eJ -eJ -eJ -iY -SG -DT -eJ -eJ -eJ -RR -ms -eJ -eJ -eJ -eJ -eJ -VY -xQ -ms -OP -OP -ms -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +mI +mI +mI +mI +mI +qX +qX +qX +qX +qX +SL +KO +qf +Dp +gH +Nh +sp +mQ +Oz +jH +jH +jH +jH +jH +Qj +ar +yC +fl +qt +lK +kL +Ml +fl +SY +vk +vd +Tn +vd +kR +Ql +mI +mI +mI +mI +mI +mI +mI +xu +GG +GG +GG +GG +Uc +lW +GG +CY +Ia +GG +hp +cN +cN +mV +mV +mV +mV +mV sB sB sB sB +nT +nT +nT sB sB sB @@ -39394,6 +46020,13 @@ sB sB sB sB +mV +mV +mV +mV +mV +mV +kz sB sB sB @@ -39406,6 +46039,9 @@ sB sB sB sB +nT +nT +nT sB sB sB @@ -39423,20 +46059,39 @@ sB sB sB sB +kz +kz +kz sB sB sB +nT +nT +nT +nT +nT +mI +mI +mI sB sB sB sB sB +nT +nT sB sB sB sB +nT +nT sB sB +kz +mV +mV +mV sB sB sB @@ -39447,14 +46102,14 @@ Ul eT AU cP -zd +QC tv Ze bi wZ Ze tp -MR +Xm UH Dj oc @@ -39462,13 +46117,13 @@ oc oc Ft Tt -MR -gI +VZ +Qz kK -MR -MR -MR -MR +VZ +VZ +VZ +VZ sB sB bu @@ -39536,111 +46191,77 @@ bu bu bu bu +bu +bu +bu mI mI mI -OP -OP -OP -ms -CR -iY -vJ -Fp -iY -iY -tz -iY -Uc -ms -oP -gw -Bt -XP -XP -XP -XP -jZ -Sk -ms -iY -DT -eJ -eJ -eJ -iY -ms -rN -eJ -PR -eJ -iY -ms -tz -eJ -iY -nQ -ms -iY -tz -eJ -iY -iY -ms -rW -eJ -eJ -eJ -iY -ms -ms -ms -OP -OP -OP -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +mI +mI +mI +mI +mI +qX +YT +qX +SL +SL +SL +SL +QX +SL +SL +jH +aM +jH +jH +jH +AI +bY +fI +jH +Zk +Iz +Ay +Zg +SI +eK +eK +qb +ro +LM +vk +EP +Ql +Ql +Ql +Ql +mI +mI +mI +mI +mI +mI +mI +xu +xu +xu +GG +nY +YG +Ji +Ji +nq +mt +GG +GG +nT +nT +mV +mV +mV +kz sB sB sB @@ -39655,6 +46276,14 @@ sB sB sB sB +kz +mV +gu +cN +vz +vz +vz +cA sB sB sB @@ -39666,6 +46295,9 @@ sB sB sB sB +nT +nT +nT sB sB sB @@ -39677,15 +46309,34 @@ sB sB sB sB +kz +kz +kz +kz sB +kz +kz +kz +kz sB sB +nT +KX +nT +nT +nT +mI +mI +mI +mI sB sB sB sB sB sB +nT +nT sB sB sB @@ -39694,6 +46345,10 @@ sB sB sB sB +kz +mV +mV +mV sB sB sB @@ -39704,28 +46359,28 @@ OA nr eO cP -zd +QC dd dd Jo wZ gJ mf -MR +Xm qD -Ze -Ze +RZ +RZ iu -Ze -SZ +RZ +Zd Vo -MR -gI +VZ +Qz oE rU -Ib +zp RQ -MR +VZ sB sB bu @@ -39793,83 +46448,83 @@ bu bu bu bu +bu +bu +bu +bu mI mI mI -OP -OP -OP -ms -iY -iY -iY -ms -yl -Jl -iY -iY -Sm -ms -Gs -GB -Cf -Cf -Cf -ZW -Cf -Cf -Cf -ms -ms -Ie -iY -eJ -iY -xM -ms -ms -PL -of -Rv -ms -ms -tR -eJ -Ie -ms -ms -ms -Ie -eJ -iY -ms -ms -ms -te -te -te -te -ms -OP -OP -OP -OP -OP -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +mI +mI +qX +qX +qX +qX +qX +SL +SL +nQ +nJ +ua +dT +SL +aR +Ea +dE +Mz +wu +AI +id +fI +jH +tL +GX +Qj +fl +wJ +Jq +Jq +eK +Sd +Vw +cY +Bt +Ql mI mI mI mI +mI +mI +mI +mI +mI +mI +mI +mI +xu +GG +DV +yX +TJ +TJ +ZB +mt +JA +GG +nT +nT +nT +sB +sB +aV +sB +sB +nT +nT +nT +mI sB mI sB @@ -39880,25 +46535,25 @@ sB sB sB sB +vz +Og +vz +vz +vz +vz sB sB sB sB +nT +nT +nT sB sB sB sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +nT +nT sB sB sB @@ -39914,20 +46569,20 @@ mI mI mI mI -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +kz +kz +kz +kz +kz +kz +nT +nT +nT +nT +nT +nT +nT +nT sB sB sB @@ -39949,10 +46604,10 @@ mI mI mI mI -sB -sB -sB -sB +mV +mV +mV +kz sB sB sB @@ -39961,28 +46616,28 @@ ox mv AU Ty -zd -MR -MR -MR +QC +Xm +Xm +Xm Lq -MR -MR -MR -MR +Xm +Xm +Xm +VZ hG -MR -MR -tI +VZ +VZ +jU Ka -tI -tI -tI -tI -tI -tI -tI -tI +jU +jU +jU +jU +jU +jU +jU +jU sB sB bu @@ -40050,78 +46705,51 @@ bu bu bu bu -mI -mI -mI -OP -OP -ms -ms -ms -vR -ms -ms -ms -ms -vR -ms -ms -ms -PV -Cf -Pu -Cf -Cf -Cf -sI -RE -Qw -ms -ms -ms -ms -bQ -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -bQ -ms -ms -Tu -ms -ms -bQ -ms -ms -OP -ms -ms -ms -ms -ms -ms -OP -OP -mI -mI -OP +bu +bu +bu +bu mI mI mI mI -sB -sB -sB -sB -sB -sB +mI +qX +YT +qX +YT +qX +SL +dc +HK +Uk +eJ +oP +SL +FZ +aS +fh +GL +Np +Fc +Ex +Zv +jH +JX +GX +Qj +fl +qz +Jq +Jq +VR +ro +LM +vd +Bt +Ql +Ap +oM mI mI mI @@ -40131,34 +46759,61 @@ mI mI mI mI +mI +xu +GG +GG +GB +ku +lU +eh +IA +Li +GG +nT +nT +sB +sB +sB +sB +nT +nT +nT +nT +mI +mI +mI +mI +mI +mI sB sB sB sB sB sB +vz +vz +vz +vz +dI +vz sB sB sB sB sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +nT +nT +nT +nT +nT +nT +nT +kz +kz +kz +kz sB sB sB @@ -40171,6 +46826,15 @@ mI mI mI mI +kz +kz +kz +kz +kz +kz +mV +mV +mV sB sB sB @@ -40182,16 +46846,7 @@ sB sB sB sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +nT mI mI mI @@ -40213,34 +46868,34 @@ sB sB sB sB -zd +QC Sf dx AU nr -zd +QC Qf -Qz +my Td -wh -Qz +DL +my Ri -MR +Xm UD -Ze +RZ gr -MR -tL +VZ +JY Lh -bZ -bZ -bZ -KK -iW -ee +JY +JY +JY +rj +pp +Kg rw -Bo -sB +nA +PA sB bu bu @@ -40307,68 +46962,73 @@ bu bu bu bu +bu +bu +bu +bu mI mI mI -OP -OP -ms -sK -HZ -lo -YZ -kL -ms -TJ -QM -SF -Gb -ms -ms -ms -ms -ms -vR -ms -ms -ms -ms -ms -OP -ms -NT -yS -FE -Zu -ms +mI +mI +qX +qX +qX +qX +qX +SL +kW +eJ +Uk +Uk +VL +SL +jV +sc +fh +Or +gs +GP +GP +uT +jH +Jl +GX +os +fl +DY +iR +rq +zB +fl +WI +WI +WI +Ql +ie +Qw +WS +mI +Ap +Tu +mI +mI +mI +mI +mI +mI +xu +xu +GG +Mo +KW +eW +Ac +Ac +GG +GG +nT nT -mW -To -mW -mW -ms -mW -mW -oM -mW -mW -mW -mW -mW -mW -ms -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -OP mI mI mI @@ -40389,6 +47049,73 @@ mI mI mI mI +hq +vz +vz +jB +vz +vz +sB +sB +sB +sB +sB +sB +nT +nT +nT +nT +kz +kz +kz +kz +kz +kz +kz +sB +sB +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +mI +mI +mI +sB +sB +sB +sB +nT +nT +nT +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI mI mI @@ -40398,107 +47125,35 @@ sB sB sB sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -mI -mI -mI -mI -mI -mI -mI -mI -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -mI -mI -mI -sB -sB -sB -sB -sB -sB -sB -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -sB -sB -sB -sB -zd -zd -zd -zd -zd -zd +QC +QC +QC +QC +QC +QC Be UE xi NY -Qz +my bp -MR +Xm aP -Ze +RZ fj -MR +VZ aL Ki -bZ -bZ +JY +JY kS -bZ -bZ -bZ -Uq +JY +JY +JY +uB yx -sB -sB +PA +kz bu bu bu @@ -40564,65 +47219,72 @@ bu bu bu bu +bu +bu +bu +bu mI mI mI -OP -OP -ms -qJ -HZ -lo -lo -lo -ms -oH -QM -QM -iX -ms -Ia -rn -Wq -iY -tz -mV -MB -Qm -ms -OP -OP -ms -Fo -mW -mW -mW -BE -mW -mW -mW -mW -mW -BE -mW -mW -mW -mW -mW -mW -mW -mW -px -ms -OP -OP -OP -OP -OP -OP -OP -OP -OP +mI +mI +qX +YT +qX +SL +SL +SL +xs +eJ +VK +Ah +ZW +SL +Ez +Hp +fh +gL +IQ +PS +PS +dz +jH +yC +yC +Lz +fl +fl +fl +fl +fl +fl +dH +Vw +iK +Ql +fp +NT +of +of +oM +Wv +mI +mI +mI +mI +mI +mI +mI +xu +GG +GG +GG +GG +GG +GG +GG +xu +nT mI mI mI @@ -40644,35 +47306,28 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -sB -sB -sB -sB -sB -sB +cA +vz +vz +vz +vz +cA mI mI mI sB sB sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz mI mI mI @@ -40689,7 +47344,7 @@ mI mI mI mI -sB +kz mI mI mI @@ -40730,32 +47385,32 @@ sB sB sB Dm -sa -sa +Xm +Xm aD Gy -ax -Qz -Qz -ax +Xf +my +my +Xf bp -MR +Xm UD GZ vB -MR +VZ OL -bZ -bZ -bZ +JY +JY +JY xn -kp -kp +UP +UP wp AA -Bo -sB -sB +nA +PA +PA bu bu bu @@ -40823,61 +47478,69 @@ bu bu bu bu +bu +bu mI -OP -OP -ms -KG -HZ -EV +mI +Vi +sY +mI +qX +qX +qX +SL +ov +jz +HV +eJ +VK +eJ +fW +SL +SL +SL +SL +op +Hb +yk +yk +Fz +jH +TW +BC +bH +nt +lz +hA +gx +ff +BC +Ni +vk +iK +mn +ka +ka +kQ +NP gm -aJ -ms -gi -On -QM -SE -ms -CY -Xz -PW -DT -iY -iY -iY -tz -ms -OP -OP -ms -ln -ie -Vx -qN -ms -Zw -mW -mW -qW -wD -ms -ms -To -mW -To -Gi -dK -Fc -KW -ms -ms -OP -OP -OP -OP -OP -OP -OP +mI +mI +fL +kZ +mI +mI +mI +mI +xu +xu +xu +xu +xu +xu +xu +xu +xu mI mI mI @@ -40901,29 +47564,21 @@ mI mI mI mI +nT +Hw +nT mI mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -sB -sB -sB -sB -sB -sB -sB +kz +kz +kz +kz +kz +kz +kz mI mI mI @@ -40987,30 +47642,30 @@ sB sB sB sB -Qz -Qz -ax +my +my +Xf fm bp bp bp mz bp -MR -MR -MR -MR -MR +Xm +VZ +VZ +VZ +VZ Nc AR YA -eb -tI -tI -tI -tI -tI -tI +CL +jU +jU +jU +jU +jU +jU sB sB bu @@ -41080,60 +47735,57 @@ bu bu bu bu +bu +bu mI -OP -OP -ms -ms -ms -ms -ms -ms -ms -gj -QM -vG -Mo -ms -TH -yr -PW -vc -Vs -ZJ -cK -aA -ms -OP -OP -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -OP -OP -mI -mI -mI -mI -mI +mI +cZ +gG +mg +qX +Co +wA +SL +Uk +Uk +Ah +eJ +VK +eJ +BJ +QX +fz +Ts +KZ +hr +Os +Rj +dr +yk +SJ +Vw +vd +Nk +vd +EL +rl +Vw +ff +Vw +vk +vk +vd +Kp +ka +ka +te +cH +Pu +Ow +Ow +My +ZC +XT mI mI mI @@ -41168,6 +47820,9 @@ mI mI mI mI +sB +sB +nT mI mI mI @@ -41238,31 +47893,31 @@ mI mI sB sB +kz +kz sB sB sB sB -sB -sB -sa -sa -sa -sa +Xm +Xm +Xm +Xm dg -sa -sa -sa -sa -MR +Xm +Xm +Xm +Xm +Xm sB sB sB Dl -tI -tI -tI -tI -tI +jU +jU +jU +jU +jU sB sB sB @@ -41270,7 +47925,7 @@ sB sB sB sB -bu +kz bu bu bu @@ -41337,198 +47992,198 @@ bu bu bu bu -mI -mI -OP -OP -OP -OP -ms -eA -Up -ms -mE -QM -QM -Br -ms -Vc -Xz -CZ -iY -IS -qX -iY -iY -ms -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB bu bu +mI +mI +eu +DR +gG +gF +BM +Qu +uJ +Uk +Uk +Ah +HK +Uk +eJ +BJ +QX +QX +QX +SL +NH +VD +Mk +NH +Ch +jH +nw +Of +gV +FL +Yx +zM +Of +ff +Of +EJ +vd +bj +mn +ka +ka +Gs +tS +mI +mI +PQ +rY +xc +Ry +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +lR +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +sB +sB +PA +kz +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +PA +bu bu bu bu @@ -41594,197 +48249,197 @@ bu bu bu bu -mI -mI -OP -OP -OP -OP -ms -xX -QM -kj -QM -QM -SF -Br -ms -HB -Xz -PW -vc -hS -QE -cK -iY -ms -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB bu +mI +mI +mI +ab +mI +mI +qX +qX +qX +SL +Ya +pd +HV +OI +PV +vt +BJ +QX +iO +SL +SL +Rt +WH +WH +Su +WH +WH +WH +WH +zr +wS +Xr +Xr +Xr +Xr +Xr +Xr +Gz +Xr +Ql +oU +he +he +mI +mI +ik +hc +rm +Um +rY +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +sB +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +sB +sB +PA +kz +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +kz +kz +kz +sB +sB +sB +sB +sB +sB +sB +sB +sB +PA +PA bu bu bu @@ -41851,197 +48506,197 @@ bu bu bu bu -mI -mI -mI -mI -OP -OP -ms -wL -QM -Jj -gj -QM -wo -EP -ms -Yz -kz -PW -iY -IS -IS -tz -fe -ms -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB bu +mI +mI +mI +mI +mI +mI +qX +YT +qX +SL +SL +SL +Cp +xM +yq +eA +BJ +QX +Sx +SL +pn +NA +WH +Ks +uz +RR +pB +EI +WH +zr +Tj +Xr +sX +xf +Vx +Xr +aY +QD +Xr +mI +mI +mI +mI +mI +mI +mI +cW +vw +JU +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +sB +sB +kz +PA +kz +kz +kz +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +kz +kz +PA +kz +kz +sB +sB +sB +sB +sB +sB +sB +sB +kz +PA bu bu bu @@ -42112,54 +48767,53 @@ mI mI mI mI -OP -OP -ms -Hr -QM -Jj -oH -QM -QM -gx -ms -ku -Xz -PW -vc -zr -Vs -cK -aA -ms -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +mI +mI +mI +qX +qX +qX +qX +qX +SL +zj +eJ +Uk +Ah +BJ +QX +lo +SL +cx +YZ +WH +HU +yQ +Uv +Uv +XG +WH +MI +Ql +Xr +wg +KS +xQ +Xr +Tc +Ju +Xr +Xr +Xr +Xr +Xr +Xr +oB +mI +pZ +pZ +Cj +RP mI mI mI @@ -42195,6 +48849,7 @@ mI mI mI mI +sB mI mI mI @@ -42267,6 +48922,12 @@ mI sB sB sB +PA +PA +PA +kz +kz +kz sB sB sB @@ -42278,6 +48939,11 @@ sB sB sB sB +PA +MR +PA +kz +kz sB sB sB @@ -42285,20 +48951,9 @@ sB sB sB sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -bu +kz +kz +PA bu bu bu @@ -42369,53 +49024,53 @@ mI mI mI mI -OP -OP -ms -ms -ms -ms -ms -ms -ms -ms -ms -Ay -Xz -PW -tz -iY -DT -iY -iY -ms -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI mI mI mI +qX +YT +qX +YT +qX +SL +Pz +eJ +VK +eJ +Wt +QX +Ts +KZ +xJ +YU +WH +Wk +Ng +Oo +Oo +Oo +WH +Bf +Ee +Xr +Ot +Lw +QD +wY +Ot +QD +qq +Xr +fG +vq +lv +Xr +oB mI +hu +rY +rY +rY mI mI mI @@ -42526,6 +49181,9 @@ sB sB sB sB +PA +PA +kz sB sB sB @@ -42534,28 +49192,25 @@ sB sB sB sB +kz +kz +kz +kz +PA +kz +kz +kz +kz sB sB sB sB sB sB +kz sB sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -sB -bu +kz bu bu bu @@ -42626,53 +49281,53 @@ mI mI mI mI -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -ms -mQ -Xz -uy -kg -kV -oK -jv -iY -ms -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI mI mI mI +qX +qX +qX +qX +qX +SL +GF +TQ +nC +WB +Ke +XP +qP +SL +WH +WH +WH +pV +fM +mO +gp +uD +WH +BW +Zl +Xr +FB +ac +sN +Xr +nj +Lw +QD +wY +Aa +KL +pw +Xr +oB mI +hK +rY +rY +rY mI mI mI @@ -42794,15 +49449,15 @@ mI mI mI mI -sB -sB -sB -sB +kz +kz +kz +kz mI mI sB -sB -sB +kz +kz sB mI mI @@ -42812,7 +49467,7 @@ sB sB sB sB -bu +kz bu bu bu @@ -42883,53 +49538,53 @@ mI mI mI mI -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -ms -ms -ms -ms -ms -ms -ms -ms -ms -ms -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI mI mI mI mI mI +qX +YT +qX +SL +SL +SL +SL +SL +SL +SL +SL +SL +WH +WH +pt +wo +UX +QV +QV +np +WH +VY +rn +Xr +Xr +Xr +Xr +Xr +PL +Lw +GM +Xr +Xr +Xr +Xr +Xr +oB mI mI +rY +eF +rY mI mI mI @@ -43053,7 +49708,7 @@ mI mI mI mI -sB +kz mI mI mI @@ -43069,7 +49724,7 @@ mI sB sB sB -bu +kz bu bu bu @@ -43140,52 +49795,52 @@ mI mI mI mI -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI mI mI mI mI mI +qX +qX +qX +qX +qX +qX +qX +qX +qX +qX +qX +qX +ao +WH +uv +oH +RE +zk +xY +xY +Io +kg +QM +wH +fe +qF +BK +kj +yl +yy +mX +Xr +vM +QD +WG +Xr +oB mI mI +dU +rY mI mI mI @@ -43402,47 +50057,47 @@ mI mI mI mI +qX +YT +qX +YT +qX +YT +qX +YT +qX +YT +qX +YT +ao +WH +WD +pb +Un +Up +vJ +nf +WH +Yz +xZ +Xr +od +Xr +YI +Ae +lA +ST +QD +wY +QD +IF +Xz +Xr +oB mI mI mI -mI -mI -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +XH mI mI mI @@ -43659,47 +50314,47 @@ mI mI mI mI +qX +qX +qX +qX +qX +qX +qX +qX +qX +qX +qX +qX +ao +WH +WH +WH +WH +WH +jq +WH +WH +WH +WH +WH +Xr +Xr +XI +eN +xE +QD +sO +Xr +HO +xL +fr +Xr +oB mI mI mI -mI -mI -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -OP -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +zD mI mI mI @@ -43928,31 +50583,31 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +ao +ao +ao +ao +WH +sC +IU +gM +WH +sz +eP +DE +Xr +Xr +Wn +Vj +El +Zw +Zi +Xr +Nf +bc +rD +Xr +oB mI mI mI @@ -44188,28 +50843,28 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +ao +WH +ZR +CZ +Ne +iQ +wX +eB +TH +Xr +Xr +Xr +pe +Xr +pe +Xr +Xr +Xr +Xr +Xr +Xr +oB mI mI mI @@ -44445,28 +51100,28 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +ao +WH +gO +Tb +Gc +TN +hZ +Jx +oz +Xr +Gn +xH +QD +Xr +QD +QD +vc +gi +Xr +oB +oB +oB mI mI mI @@ -44702,26 +51357,26 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +ao +WH +Se +PP +sh +WH +eq +PY +Sk +Xr +SS +Lw +cg +Xr +Uf +lA +Lw +QD +Xr +oB mI mI mI @@ -44959,26 +51614,26 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +ao +WH +WH +WH +WH +WH +WH +WH +WH +Xr +ng +lA +Qe +Xr +vI +KD +YV +Rl +Xr +oB mI mI mI @@ -45139,9 +51794,9 @@ bu bu bu bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -45190,6 +51845,8 @@ bu bu bu bu +bu +bu mI mI mI @@ -45214,28 +51871,26 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +ao +ao +ao +ao +ao +ao +ao +ao +ao +Xr +Vb +Bz +aa +Xr +nl +qC +FR +HJ +Xr +oB mI mI mI @@ -45395,11 +52050,11 @@ bu bu bu bu -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI bu bu bu @@ -45447,6 +52102,8 @@ bu bu bu bu +bu +bu mI mI mI @@ -45479,20 +52136,18 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI +ao +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +oB mI mI mI @@ -45652,11 +52307,11 @@ bu bu bu bu -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI bu bu bu @@ -45705,13 +52360,7 @@ bu bu bu bu -mI -mI -mI bu -mI -mI -mI bu mI mI @@ -45744,12 +52393,18 @@ mI mI mI mI -mI -mI -mI -mI -mI -mI +ao +oB +oB +oB +oB +oB +oB +oB +oB +oB +oB +oB mI mI mI @@ -45909,11 +52564,11 @@ bu bu bu bu -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI bu bu bu @@ -45962,15 +52617,15 @@ bu bu bu bu +bu +bu +mI +mI +mI +mI mI mI mI -bu -bu -bu -bu -bu -bu mI mI mI @@ -46167,10 +52822,10 @@ bu bu bu bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -46219,14 +52874,6 @@ bu bu bu bu -mI -mI -mI -bu -bu -bu -bu -bu bu bu bu @@ -46244,10 +52891,18 @@ mI mI mI mI -bu -bu -bu -bu +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI mI mI @@ -46424,9 +53079,9 @@ bu bu bu bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -46478,33 +53133,33 @@ bu bu bu bu -mI -bu -bu -bu -bu -bu -bu bu bu mI mI -bu -bu -bu -mI -mI -bu -bu -bu mI mI mI -bu -bu -bu -bu -bu +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI mI mI @@ -46738,30 +53393,30 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI mI mI @@ -46996,37 +53651,37 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI mI mI @@ -47256,34 +53911,6 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu mI mI mI @@ -47291,13 +53918,41 @@ mI mI mI mI -bu -bu -bu -bu -bu -bu -bu +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI mI mI @@ -47518,45 +54173,45 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI mI mI @@ -47703,9 +54358,9 @@ bu bu bu bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -47777,51 +54432,6 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -mI -bu -bu -bu -bu -bu -bu -bu mI mI mI @@ -47863,6 +54473,51 @@ mI mI mI mI +sB +sB +sB +sB +sB +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI mI mI @@ -47960,8 +54615,8 @@ bu bu bu bu -fY -fY +mI +mI bu bu bu @@ -48036,56 +54691,56 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB mI mI mI @@ -48295,54 +54950,6 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu mI mI mI @@ -48376,6 +54983,54 @@ mI mI mI mI +sB +sB +sB +sB +sB +sB +bu +bu +bu +bu +bu +sB +sB +sB +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI mI mI @@ -48554,52 +55209,6 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu mI mI mI @@ -48629,6 +55238,52 @@ mI mI mI mI +sB +sB +sB +sB +sB +sB +bu +bu +bu +bu +bu +bu +bu +bu +bu +sB +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI mI mI @@ -48812,51 +55467,6 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu mI mI mI @@ -48883,6 +55493,51 @@ mI mI mI mI +sB +sB +sB +sB +sB +sB +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI mI mI mI @@ -49070,28 +55725,30 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI bu bu bu @@ -49238,31 +55895,29 @@ mI mI mI mI +sB +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +mI mI mI -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -fY -fY -fY bu bu bu @@ -49328,6 +55983,28 @@ bu bu bu bu +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI bu bu bu @@ -49353,28 +56030,6 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -mI -mI mI mI bu @@ -49497,6 +56152,7 @@ mI mI mI mI +sB bu bu bu @@ -49515,11 +56171,10 @@ bu bu bu bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -49587,24 +56242,24 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI bu bu bu @@ -49649,7 +56304,7 @@ bu mI mI mI -bu +sB mI mI mI @@ -49754,6 +56409,7 @@ mI mI mI mI +sB bu bu bu @@ -49773,9 +56429,8 @@ bu bu bu bu -bu -fY -fY +mI +mI bu bu bu @@ -49845,8 +56500,22 @@ bu bu bu bu +mI bu bu +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI bu bu bu @@ -49892,26 +56561,12 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB mI mI mI @@ -50011,7 +56666,7 @@ mI mI mI mI -bu +sB bu bu bu @@ -50106,6 +56761,15 @@ bu bu bu bu +mI +mI +mI +mI +mI +mI +mI +mI +mI bu bu bu @@ -50154,21 +56818,12 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB mI mI mI @@ -50268,8 +56923,8 @@ mI mI mI mI -bu -bu +sB +sB bu bu bu @@ -50364,6 +57019,10 @@ bu bu bu bu +mI +mI +mI +mI bu bu bu @@ -50417,24 +57076,20 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +kz +kz +sB +sB mI mI mI mI -mI -bu -bu -bu -bu +sB +sB +sB +sB mI mI mI @@ -50525,8 +57180,8 @@ mI mI mI mI -bu -bu +sB +sB bu bu bu @@ -50678,20 +57333,20 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +kz +kz +kz +kz +kz mI mI mI -bu -bu -bu -bu +sB +sB +sB +sB mI mI mI @@ -50782,8 +57437,8 @@ mI mI mI mI -bu -bu +kz +sB bu bu bu @@ -50936,19 +57591,19 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +kz +kz +kz +kz +kz +kz +sB +sB +sB +sB +sB mI mI mI @@ -51039,9 +57694,9 @@ mI mI mI mI -bu -bu -bu +kz +sB +sB bu bu bu @@ -51193,20 +57848,20 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +kz +kz +kz +kz +kz +kz +kz +kz +sB +sB +sB mI mI mI @@ -51297,8 +57952,8 @@ mI mI mI mI -bu -bu +sB +sB bu bu bu @@ -51452,18 +58107,18 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB mI mI mI @@ -51554,8 +58209,8 @@ mI mI mI mI -bu -bu +sB +sB bu bu bu @@ -51717,10 +58372,10 @@ bu bu bu bu -bu -bu -bu -bu +sB +sB +sB +sB mI mI mI @@ -51811,6 +58466,8 @@ mI mI mI mI +sB +sB bu bu bu @@ -51823,12 +58480,10 @@ bu bu bu bu -bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -51976,8 +58631,8 @@ bu bu bu bu -bu -bu +sB +sB mI mI mI @@ -52068,6 +58723,8 @@ mI mI mI mI +sB +sB bu bu bu @@ -52080,12 +58737,10 @@ bu bu bu bu -bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -52233,8 +58888,8 @@ bu bu bu bu -bu -bu +sB +sB mI mI mI @@ -52325,6 +58980,7 @@ mI mI mI mI +sB bu bu bu @@ -52338,11 +58994,10 @@ bu bu bu bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -52491,7 +59146,7 @@ bu bu bu bu -bu +sB mI mI mI @@ -52582,14 +59237,14 @@ mI mI mI mI +sB bu bu bu bu bu bu -bu -fY +mI bu bu bu @@ -52748,7 +59403,7 @@ bu bu bu bu -bu +sB mI mI mI @@ -52839,15 +59494,15 @@ mI mI mI mI +sB bu bu bu bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -53005,7 +59660,7 @@ bu bu bu bu -bu +sB mI mI mI @@ -53101,10 +59756,10 @@ bu bu bu bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -53358,9 +60013,9 @@ bu bu bu bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -54301,7 +60956,7 @@ bu bu bu bu -bu +sB mI mI mI @@ -54558,7 +61213,7 @@ bu bu bu bu -bu +sB mI mI mI @@ -54815,7 +61470,7 @@ bu bu bu bu -bu +sB mI mI mI @@ -55071,9 +61726,8 @@ bu bu bu bu -bu -bu -mI +sB +sB mI mI mI @@ -55084,6 +61738,7 @@ mI mI mI mI +sB mI mI mI @@ -55328,9 +61983,8 @@ bu bu bu bu -bu -bu -mI +sB +sB mI mI mI @@ -55341,6 +61995,7 @@ mI mI mI mI +sB mI mI mI @@ -55585,10 +62240,8 @@ bu bu bu bu -bu -bu -mI -mI +sB +sB mI mI mI @@ -55598,6 +62251,8 @@ mI mI mI mI +sB +sB mI mI mI @@ -55842,11 +62497,8 @@ bu bu bu bu -bu -bu -mI -mI -mI +sB +sB mI mI mI @@ -55856,6 +62508,9 @@ mI mI mI mI +kz +kz +sB mI mI mI @@ -56099,21 +62754,21 @@ bu bu bu bu -bu -bu -bu -bu +sB +sB +sB +sB mI -bu +sB mI mI mI -bu -bu -bu -bu -bu -bu +kz +kz +kz +kz +kz +sB mI mI mI @@ -56185,7 +62840,7 @@ bu bu bu bu -bu +mI bu bu bu @@ -56356,21 +63011,21 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB mI mI -mI -bu -bu -bu -bu -bu -bu +kz +kz +kz +sB +sB +sB mI mI mI @@ -56441,9 +63096,9 @@ bu bu bu bu -fY -fY -bu +mI +mI +sB bu bu bu @@ -56615,24 +63270,24 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +kz +kz +kz +sB +sB +sB +sB +sB +sB +sB +sB +sB mI mI mI @@ -56698,9 +63353,9 @@ bu bu bu bu -fY -fY -bu +mI +mI +sB bu bu bu @@ -56875,21 +63530,21 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB mI mI mI @@ -56954,16 +63609,16 @@ mI bu bu bu -bu -fY -fY +kz +mI +mI +sB +sB +sB bu bu bu -bu -bu -bu -fY +mI bu bu bu @@ -57132,6 +63787,12 @@ bu bu bu bu +sB +sB +sB +sB +sB +sB bu bu bu @@ -57139,88 +63800,82 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +kz +kz +kz +kz +kz +sB +sB +sB +sB +sB bu mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -fY -fY bu bu bu @@ -57390,6 +64045,10 @@ bu bu bu bu +sB +sB +sB +sB bu bu bu @@ -57399,6 +64058,69 @@ bu bu bu bu +sB +sB +sB +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +mI +kz bu bu bu @@ -57406,80 +64128,13 @@ bu bu bu bu +sB +sB +sB mI mI mI mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -mI -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -fY -fY -fY -fY bu bu bu @@ -57648,6 +64303,8 @@ bu bu bu bu +sB +sB bu bu bu @@ -57659,10 +64316,8 @@ bu bu bu bu -bu -bu -bu -bu +sB +sB mI mI mI @@ -57731,12 +64386,12 @@ bu bu bu bu -bu -bu -fY -fY -fY -fY +sB +sB +mI +mI +mI +mI bu bu bu @@ -57919,8 +64574,8 @@ bu bu bu bu -bu -bu +sB +sB mI mI mI @@ -57990,10 +64645,10 @@ bu bu bu bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -58247,10 +64902,10 @@ bu bu bu bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -58505,8 +65160,8 @@ bu bu bu bu -fY -fY +mI +mI bu bu bu @@ -59765,9 +66420,9 @@ mI mI mI mI -bu -bu -bu +sB +sB +sB bu bu bu @@ -59979,6 +66634,7 @@ bu bu bu bu +bu mI mI mI @@ -60003,6 +66659,35 @@ mI mI mI mI +sB +sB +sB +sB +sB +sB +kz +kz +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +bu +bu +bu +bu +bu +bu +bu +bu +bu mI bu bu @@ -60033,36 +66718,6 @@ bu bu bu bu -fY -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu bu bu bu @@ -60258,6 +66913,28 @@ mI mI mI mI +sB +sB +sB +sB +sB +sB +sB +sB +kz +kz +kz +kz +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB bu bu bu @@ -60266,32 +66943,10 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -fY -fY -fY -fY +mI +mI +mI +mI bu bu bu @@ -60495,9 +67150,6 @@ bu bu bu bu -bu -bu -bu mI mI mI @@ -60515,6 +67167,30 @@ mI mI mI mI +mI +mI +mI +sB +sB +sB +PA +kz +kz +kz +kz +kz +uN +PA +kz +kz +sB +sB +sB +sB +sB +sB +sB +sB bu bu bu @@ -60525,30 +67201,9 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -fY -fY -fY +mI +mI +mI bu bu bu @@ -60766,6 +67421,34 @@ mI mI mI mI +sB +sB +sB +sB +bu +sB +sB +sB +sB +sB +kz +PA +PA +PA +PA +PA +kz +PA +kz +kz +sB +sB +sB +sB +sB +sB +sB +sB bu bu bu @@ -60775,36 +67458,8 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -fY -fY +mI +mI bu bu bu @@ -61012,7 +67667,7 @@ bu bu bu bu -mI +bu mI mI mI @@ -61030,28 +67685,28 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +kz +sB +kz +PA +PA +PA +kz +kz +kz +kz +sB +kz +kz +kz +sB +sB +sB bu bu bu @@ -61269,8 +67924,8 @@ bu bu bu bu -mI -mI +bu +bu mI mI mI @@ -61289,27 +67944,27 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +kz +PA +PA +PA +kz +PA +PA +kz +kz +sB +sB bu bu bu @@ -61547,26 +68202,26 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +kz +kz +kz +kz +kz +kz +sB +sB bu bu bu @@ -61806,24 +68461,24 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -fY -bu +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +sB +mI +sB bu bu bu @@ -62071,17 +68726,17 @@ bu bu bu bu -bu -bu -bu -bu -bu -bu -fY -fY -fY -bu -bu +sB +sB +sB +sB +sB +sB +mI +mI +mI +sB +mI bu bu bu @@ -62330,16 +68985,16 @@ bu bu bu bu -bu -bu -bu -bu -fY -fY -fY -fY -fY -fY +sB +sB +sB +sB +mI +mI +mI +mI +mI +mI bu bu bu @@ -62592,11 +69247,11 @@ bu bu bu bu -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI bu bu bu @@ -62826,6 +69481,9 @@ bu bu bu bu +mI +mI +mI bu bu bu @@ -62846,14 +69504,11 @@ bu bu bu bu -bu -bu -bu -fY -fY -fY -fY -fY +mI +mI +mI +mI +mI bu bu bu @@ -63082,6 +69737,9 @@ bu bu bu bu +mI +mI +mI bu bu bu @@ -63105,11 +69763,8 @@ bu bu bu bu -bu -bu -bu -bu -bu +mI +mI bu bu bu @@ -63581,9 +70236,9 @@ bu bu bu bu -bu -bu -bu +mI +mI +mI bu bu bu @@ -63837,10 +70492,10 @@ bu bu bu bu -bu -bu -bu -bu +mI +mI +mI +mI bu bu bu @@ -64096,7 +70751,7 @@ bu bu bu bu -bu +mI bu bu bu diff --git a/maps/away/away_site/goon_base/goon_base_areas.dm b/maps/away/away_site/goon_base/goon_base_areas.dm index 8f0301e5716..0f29e8531bc 100644 --- a/maps/away/away_site/goon_base/goon_base_areas.dm +++ b/maps/away/away_site/goon_base/goon_base_areas.dm @@ -1,32 +1,89 @@ -/area/goonbase - name = "goon base" - icon_state = "outpost_mine_main" - requires_power = FALSE +// base -/area/shuttle/goon_ship +/area/goonbase + name = "goon base base/abstract area" + icon_state = "outpost_mine_main" + requires_power = TRUE + +/area/goonbase/equipment + name = "" + icon_state = "eva" + +/area/goonbase/living + name = "" + icon_state = "crew_area" + +/area/goonbase/kitchen + name = "" + icon_state = "kitchen" + +/area/goonbase/quarters + name = "" + icon_state = "crew_quarters" + +/area/goonbase/atmos + name = "" + icon_state = "atmos" + +/area/goonbase/power + name = "" + icon_state = "engine" + +/area/goonbase/hallway_north + name = "" + icon_state = "hallC1" + +/area/goonbase/hallway_south + name = "" + icon_state = "hallC1" + +/area/goonbase/maint_north + name = "" + icon_state = "maintenance" + +/area/goonbase/maint_south + name = "" + icon_state = "maintenance" + +/area/goonbase/medbay + name = "" + icon_state = "medbay" + +/area/goonbase/eva + name = "" + icon_state = "eva" + +/area/goonbase/maint_airlock + name = "" + icon_state = "maintenance" + +// shuttle + +/area/shuttle/goon_shuttle + name = "goon shuttle base/abstract area" icon_state = "red" requires_power = TRUE -/area/shuttle/goon_ship/living +/area/shuttle/goon_shuttle/living name = "Wanted Vessel Living Area" icon_state = "hallC1" -/area/shuttle/goon_ship/port +/area/shuttle/goon_shuttle/port name = "Wanted Vessel Port Thruster" icon_state = "substation" -/area/shuttle/goon_ship/starboard +/area/shuttle/goon_shuttle/starboard name = "Wanted Vessel Starboard Thruster" icon_state = "substation" -/area/shuttle/goon_ship/med +/area/shuttle/goon_shuttle/med name = "Wanted Vessel Medical" icon_state = "medbay" -/area/shuttle/goon_ship/storage +/area/shuttle/goon_shuttle/storage name = "Wanted Vessel Storage" icon_state = "maintcentral" -/area/shuttle/goon_ship/bridge +/area/shuttle/goon_shuttle/bridge name = "Wanted Vessel Bridge" icon_state = "bridge_helm" diff --git a/maps/away/away_site/goon_base/goon_base_ghostroles.dm b/maps/away/away_site/goon_base/goon_base_ghostroles.dm index 5e74f230a84..9a3a026fd9e 100644 --- a/maps/away/away_site/goon_base/goon_base_ghostroles.dm +++ b/maps/away/away_site/goon_base/goon_base_ghostroles.dm @@ -1,9 +1,22 @@ /datum/ghostspawner/human/goon short_name = "goon" name = "Pirate Gang Member" - desc = "You are part of a wanted pirate gang stranded in their own base due to their vessel being broken down. Now that a unknown ship has landed outside your asteroid base, they might prove to be your ticket to being free once more, or they may be the end of the line for your whole crew. Whatever the case, they'd best buckle up; they're on your turf now. (OOC Note: This is an antagonist role.)" - welcome_message = "You awake to the sound of an alarm signifying that a ship has landed nearby! Given that one of your ex-crew members blew up the SMES of your ship some time ago, these trespassers might actually be a blessing in disguise since they may have the tools and expertise to get it back running again. But be careful, odds are they know about your bounty in the Coalition of Colonies. Better gear up and come up with a gameplan for how you're gonna approach this fast before they come kicking the door down. (OOC Note: This is an antagonist role which places typical antagonist expectations on you. You're expected to try to generate an interesting encounter with whoever has docked on the away site. Remember to follow basic escalation rules, and have fun!)" tags = list("External") + desc = "\ + You are part of a pirate gang residing in your own base, having just scored a hit and captured a hostage, \ + trying to wait out a bounty that was placed on your ship and its crew. \ + Just now a unknown ship has landed outside your asteroid base, they'd best buckle up, they're on your turf now. \ + (OOC Note: This is an antagonist role.)\ + " + welcome_message = "\ + You awake to the sound of an alarm signifying that a ship has landed nearby! \ + Better gear up and come up with a gameplan for how you're gonna approach this fast before they come kicking the door down. \ + You have a shuttle, but it is completely unpowered. Better deal with the intruders before you go fix your shuttle. \ + There is a secret equipment room, north from the living room, read the note on the floor of your crew quarters on how to access it. \ + (OOC Note: This is an antagonist role which places typical antagonist expectations on you. \ + You're expected to try to generate an interesting encounter with whoever has docked on the away site. \ + Remember to follow basic escalation rules, and have fun!)\ + " spawnpoints = list("goon") max_count = 4 @@ -67,9 +80,22 @@ /datum/ghostspawner/human/goon/boss short_name = "goon_boss" name = "Pirate Gang Boss" - desc = "You are the head honcho of a wanted pirate gang stranded in their own base due to their vessel being broken down. Now that a unknown ship has landed outside your asteroid base, they might prove to be your ticket to being free once more, or they may be the end of the line for your whole crew. Whatever the case, they'd best buckle up; they're on your turf now. (OOC Note: This is an antagonist role.)" tags = list("External") - welcome_message = "You awake to the sound of an alarm signifying that a ship has landed nearby! Given that one of your ex-crew members blew up the SMES of your ship some time ago, these trespassers might actually be a blessing in disguise since they may have the tools and expertise to get it back running again. But be careful, odds are they know about your bounty in the Coalition of Colonies. Better gear up and come up with a gameplan for how you're gonna approach this fast before they come kicking the door down. (OOC Note: This is an antagonist role which places typical antagonist expectations on you. You're expected to try to generate an interesting encounter with whoever has docked on the away site. Remember to follow basic escalation rules, and have fun!)" + desc = "\ + You are the head honcho of a pirate gang residing in your own base, having just scored a hit and captured a hostage, \ + trying to wait out a bounty that was placed on your ship and its crew. \ + Just now a unknown ship has landed outside your asteroid base, they'd best buckle up, they're on your turf now. \ + (OOC Note: This is an antagonist role.)\ + " + welcome_message = "\ + You awake to the sound of an alarm signifying that a ship has landed nearby! \ + Better gear up and come up with a gameplan for how you're gonna approach this fast before they come kicking the door down. \ + You have a shuttle, but it is completely unpowered. Better deal with the intruders before you go fix your shuttle. \ + There is a secret equipment room, north from the living room, read the note on the floor of your crew quarters on how to access it. \ + (OOC Note: This is an antagonist role which places typical antagonist expectations on you. \ + You're expected to try to generate an interesting encounter with whoever has docked on the away site. \ + Remember to follow basic escalation rules, and have fun!)\ + " spawnpoints = list("goon_boss") max_count = 1 @@ -99,9 +125,16 @@ /datum/ghostspawner/human/goon/prisoner short_name = "goon_prisoner" name = "Pirate Gang Captive" - desc = "Life hasn't been kind to you lately, and now you find yourself a prisoner to a savage pirate gang. Maybe today will finally be the day where your luck turns?" tags = list("External") - welcome_message = "Despite the unfortunate luck that has gotten you in this situation, there's one positive thing: the pirates neglected to search you when they first brought you in. It is up to you if you decide it's worth the risk to attempt an escape with what you got, or lie low and hope someone sweeps in and saves you." + desc = "\ + Life hasn't been kind to you lately, and now you find yourself a prisoner to a savage pirate gang. \ + Maybe today will finally be the day where your luck turns?\ + " + welcome_message = "\ + Despite the unfortunate luck that has gotten you in this situation, \ + there's one positive thing: the pirates neglected to fully search you when they first brought you in. \ + It is up to you if you decide it's worth the risk to attempt an escape with what you got, or lie low and hope someone sweeps in and saves you.\ + " spawnpoints = list("goon_prisoner") max_count = 1 diff --git a/maps/away/away_site/goon_base/goon_base_items.dm b/maps/away/away_site/goon_base/goon_base_items.dm new file mode 100644 index 00000000000..052b8487763 --- /dev/null +++ b/maps/away/away_site/goon_base/goon_base_items.dm @@ -0,0 +1,23 @@ + +/obj/item/paper/goon_base + name = "parent/base object" + +/obj/item/paper/goon_base/secret_base_note + name = "note" + info = "\ + there is secret entrances to gear equipment room with guns and stuff in fake walls you can just move by over.
\ + in living room beside jukebox.
\ + in bathroom near living room (not our quarters) behind shower.
\ + in maint room beside prisoner cell behind portable scrubber.
\ + do not let any visitors see it.
\ + ~jake\ + " + +/obj/item/paper/goon_base/secret_back_exit_note + name = "note" + info = "\ + this is for emergency time exit when everything is fucked. \ + take pickaxe or drill or whatever and dig straight directly forward north to get to space. \ + remember eva suit and air ~jake\ + " +