From b890bacf7fa55527ff8a686b6330062cb568eeb4 Mon Sep 17 00:00:00 2001 From: QuoteFox <49098813+quotefox@users.noreply.github.com> Date: Mon, 6 Apr 2020 09:56:07 +0100 Subject: [PATCH] centcom walls + shuttle wall fix --- .../turfs/simulated/wall/mineral_walls.dm | 2 +- icons/turf/walls/riveted.dmi | Bin 1252 -> 1604 bytes icons/turf/walls/shuttle_wall.dmi | Bin 3233 -> 3225 bytes icons/turf/walls/wall.dmi | Bin 1721 -> 1724 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm index dbffd101..4913fdb9 100644 --- a/code/game/turfs/simulated/wall/mineral_walls.dm +++ b/code/game/turfs/simulated/wall/mineral_walls.dm @@ -192,7 +192,7 @@ explosion_block = 3 flags_1 = CAN_BE_DIRTY_1 | CHECK_RICOCHET_1 sheet_type = /obj/item/stack/sheet/mineral/titanium - smooth = SMOOTH_MORE|SMOOTH_DIAGONAL + smooth = SMOOTH_MORE canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium) /turf/closed/wall/mineral/titanium/nodiagonal diff --git a/icons/turf/walls/riveted.dmi b/icons/turf/walls/riveted.dmi index 90d1e96297b9f3b6f6b9905daa47f38e0d12bcd6..466f40633e8a6aedd4f174f5e6788b5052ea9ebc 100644 GIT binary patch delta 1399 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 JlvsE~{{szmM412p diff --git a/icons/turf/walls/wall.dmi b/icons/turf/walls/wall.dmi index a2b80dd50cc8e10ec52b013b2f312905de408284..15522af6d7007f163d07ccc2df3f512e82406e48 100644 GIT binary patch delta 1407 zcmYk23pA8z7{}jlFvHF;$YpFUpIB{1Mv~M?GgQYl$r8C_TvnxIB$Ar>W?W*zhS+sB zm&tDAlHtU%S&R)kMT2q~LME(9<(lL&W=DI@o_)^mIp=+!^Z!5Z^FF^T|Dl{oLbH?T zZO!#r`wqxk>SvW^U7kf8oQ~Rg#^rw~=qx)71Sdm*N1=iR6Cq#vv>KSDk4{a7V9Kvx;nlL;%j zIqG0o0wQ!kp~pIY@PK=`RFut<9kt~qwYF%Ru{@>uX@p9snnv0M1`^aHx&b}>zFWD6 z7?>BB%s{7lF3+)Myg3YnNx3T-g5neiOh`uaK8p6aN96rHqn-AAzTOBxvPF}QyA9)Y_Yc|F33n;N*#f9dAY9A3>Pt}Z_N$G(E zeb3*dTtMY1T1fMeT_D6h+yq`t+3+fkwmB7ou=@}7QCbN320pu}3Vp8C$`tjA-jq&_ zv*-jy=Nx;?Oy|DJm4?3SO4bs%cnojj9}BHL1Wm=Z3sDUOxV{<19L918Fbl^N%E8Zo z_%Q)&FnFT))JtT_&YpEB#U+p(8y(9ciP!@7tc<+UPG%4tH{gN8W$ z;wLeY!R4=Ts$Bj$c7bjfJhi;@=gE%-;ZL?VhGtAW$qEH-$PQw?)Sc+PoMbfdnP#j> z>G5qlaLhGzYi$Io9-JPml(P9Y?cxl{xOCI*Q(Ac(v%1AyNPeINO8wuh;O)Wqd3OgG}6P74Byg+qHlGF1y?bi1RFtVGlc6uZC z79C&PxzuFj1dU0OFP24#txmq&RhwfM1HOyI?-qe1zX*D3&|MSVRSk+JQFSs>$<&vn z$t2eSMMS+77@$=RnbiQP03Z|$q>*VueA!FtD1gY9NZcA;7ga?aw#ilpF92}BG>!8Y zZ_GKGGC5oGi)%FE-zhkBtd2X{1FEvCl(Xm!i%A-v@bQ$^lO!8U*^t>#tp&vo!z!^iP&WUA)0pV4QF@pPTakcDOa`xUA4qr@9h=;{h3nEWP9^J;z3E zgxh*M>_Fs(!l1oG%5I|%IzR8sNCeg@sJIDIgO+LJ3FFzu>ajaM-p}5Hv1@giCb|nI zyf>T+hILx(b@Mm!I2wWX#iOJ?A^gn2R*Wos6&eVksmwW*YL9DIC#VT+Hr9v5s80Jk z*mtvu%aVH?NX>$wcC3`wq7^S8L%Ks6e|2C2#^+d1>;7l>bJn1*1w~B0uwTW*F+F4= z(Y$iw44LOVHJXuFWcj71Op^a#ef^&NqqGL@-Vd>_bAp*8|50uL%y_rG;wm?b0{DXA z>5u!b7IK;o@-zft(#U#v59N~D)t|I+JYweQw$UjZEw3B{&(4tu)Fxf4+>B=myp;v+ zpj6hnQMZyFrX7VKt)QO^d|LF=gg&c>8fP#7J0GH{Um=|yAg9jnb(=9$YXGuvI_7q? I%AT6=57(HH{{R30 delta 1404 zcmYk5dpOg39LK-A*lI4@F|5UTMk$U?Yjln%wI3l=^vJDMHkU+}rjlH;pG&!P>d=$h zQCU&PospJDa50sEE6Rx;tXrsnf^FWpXc?*=lgv=@Av2PeV)&^NxMNia|@6-z90%NU9drLo@7>s(etWr%9dXZZ<;tU>c zlQv9D?e;hE;8$MByGdmP_8sab-ubd*_c}Gml78u@=WVL}6B-3j(n$fKk(Bt12BRIy;)G+~+;%wwEg|oA6!Ebf*kCn-R*% zBEpgCJm%rw>VJX#^Y348``W!$-UdRDPw5lPwXhYsSSHGBvCxLhcSAcaV#33uhynv` z$ncb)7IZAOod{62ZXM$ioe(95@<#F^k~2_*olzRGt>9xYc)RohI3qDGcUFtWJJXdAhq%Ui9X>+vi zzbZ83`3h+*IE5CWbaDhWPz@tYOA<6@60PNAW6u`U$$uN`W38aJ<%F>~D5Sc=@|)O8Cv!*Q6qv~s=b$qhdQWx- zH8<2a*cbwot;iW6HXpKb`|$&(RHn;bws&l%a2`$}=MN)do#I9%97`zTf(EE3L6#7b z4ER{+I-)1a5-cj<_65S51lXM?L+RuSb*KA1~IXfNboaB_oZ>9Xh%{dFX|v)xW!Pw6=5hor@Ltlb)6Rnp=`x9@~}` z8ERsELF05^YMuXN}b9gE<^iOHn_U>4H%t4{_@1w%D*=q^u7^j4K_S-Bmor+KFWK zi9K{i>Gnv79eTg?Hmev&l@1U3ZO;Bt@==e`&D#!_3Q}`8psn(OP+YU0cr_l!%g|pn zCqV00ig2Pr21uc&vtT?bjR5(m~6VQxi~wxyL=Qw23fJ!pX5adEye15m`Ot6Tn!* zt3fZF2c%65 z7vk0PL{?-^eJ0~_#|2U(5@VyqTG6zk(<9mOJr})a&TG_Gt2a{=jrA*SYK)}W2O1et z&L$qa{p4bltaVv=K=N`ildIXt6*D!Pm4)CcJ0nPvO#LhqjWNCx1jz7{%*5=rdP6MH zw39z;Px48qrm*hL&2+YUkiU7VOWgYviUUcnoQ4PU&o!QMQ}5>g4B&x*__2kZkLo!! z`1tghy=SVCh#>nwczE3mb;}yq*SIdN@o%!2=8cDjN0>BGtZk@;VYVhL zl`yMS$4QaVwtn)b)KR4}2~oyG)FkXQ;PdBV&VA=!$>kIGI1kOj6rc`QCwIpx2UgO5 Dx2B46