From 567bb27722f28810d246e35eb874d06f968a6e32 Mon Sep 17 00:00:00 2001 From: Menshin Date: Mon, 29 Dec 2014 01:25:44 +0100 Subject: [PATCH 1/2] * Fixed unwrencheable atmos objects' stored pipe being wrongly created on New() because initialize directions weren't set when instanciating * Fixed constructed unwrencheable atmos objects having a stored straight pipe , because dirs weren't set on instanciation Those fixes, at least, bend pipes transforming into straight pipes on wrench/unwrench * Fixed the digital valve pathing in some places * Fixed bend pipes appearing as straight pipes when wrenched without connecting to anything * Pipe colors are now preserved on wrenching/unwrenching * Various clean-up of unaligned partially connected pipes icons --- code/ATMOSPHERICS/atmospherics.dm | 13 +++++- .../binary_devices/binary_atmos_base.dm | 13 +++--- .../components/binary_devices/pump.dm | 5 +-- .../trinary_devices/trinary_base.dm | 18 +++++---- .../components/unary/unary_base.dm | 4 +- code/ATMOSPHERICS/components/valve.dm | 2 +- code/ATMOSPHERICS/he_pipes.dm | 2 + code/ATMOSPHERICS/pipes/manifold.dm | 1 + code/ATMOSPHERICS/pipes/manifold4w.dm | 3 ++ code/ATMOSPHERICS/pipes/simple.dm | 10 ++++- code/game/machinery/pipe/construction.dm | 38 +++++++++--------- icons/obj/pipes.dmi | Bin 75647 -> 75571 bytes 12 files changed, 70 insertions(+), 39 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index abf71c4ea0d..953988cf929 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -26,9 +26,14 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/New() ..() + + SetInitDirections() if(can_unwrench) stored = new(src, make_from=src) +/obj/machinery/atmospherics/proc/SetInitDirections() + return + /obj/machinery/atmospherics/proc/safe_input(var/title, var/text, var/default_set) var/new_value = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",default_set) as num if(usr.canUseTopic(src)) @@ -124,9 +129,15 @@ Pipelines + Other Objects -> Pipe network return img -/obj/machinery/atmospherics/construction(D, P) +/obj/machinery/atmospherics/construction(D, P, var/pipe_type, var/obj_color) dir = D initialize_directions = P + if(can_unwrench) + color = obj_color + pipe_color = obj_color + stored.dir = D //need to define them here, because the obj directions... + stored.pipe_type = pipe_type //... were not set at the time the stored pipe was created + stored.color = obj_color var/turf/T = loc level = T.intact ? 2 : 1 initialize() diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index 8e81d0469f5..88ae07300b8 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -17,6 +17,14 @@ /obj/machinery/atmospherics/binary/New() ..() + + air1 = new + air2 = new + + air1.volume = 200 + air2.volume = 200 + +/obj/machinery/atmospherics/binary/SetInitDirections() switch(dir) if(NORTH) initialize_directions = NORTH|SOUTH @@ -26,11 +34,6 @@ initialize_directions = EAST|WEST if(WEST) initialize_directions = EAST|WEST - air1 = new - air2 = new - - air1.volume = 200 - air2.volume = 200 //Separate this because we don't need to update pipe icons if we just are going to change the state /obj/machinery/atmospherics/binary/proc/update_icon_nopipes() diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 6fdd2c66f21..77508a31c7d 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -44,7 +44,7 @@ Thus, the two variables affect pump operation are set in New(): /obj/machinery/atmospherics/binary/pump/process() // ..() if(stat & (NOPOWER|BROKEN)) - return + return 0 if(!on) return 0 @@ -70,8 +70,7 @@ Thus, the two variables affect pump operation are set in New(): return 1 - //Radio remote control - +//Radio remote control /obj/machinery/atmospherics/binary/pump/proc/set_frequency(new_frequency) radio_controller.remove_object(src, frequency) frequency = new_frequency diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index 94c92c5ff18..d687da775df 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -20,6 +20,16 @@ /obj/machinery/atmospherics/trinary/New() ..() + + air1 = new + air2 = new + air3 = new + + air1.volume = 200 + air2.volume = 200 + air3.volume = 200 + +/obj/machinery/atmospherics/trinary/SetInitDirections() switch(dir) if(NORTH) initialize_directions = EAST|NORTH|SOUTH @@ -29,14 +39,6 @@ initialize_directions = EAST|WEST|SOUTH if(WEST) initialize_directions = WEST|NORTH|EAST - air1 = new - air2 = new - air3 = new - - air1.volume = 200 - air2.volume = 200 - air3.volume = 200 - /* Iconnery */ diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm index e33065ff618..b0574071ee8 100644 --- a/code/ATMOSPHERICS/components/unary/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary/unary_base.dm @@ -10,10 +10,12 @@ /obj/machinery/atmospherics/unary/New() ..() - initialize_directions = dir air_contents = new air_contents.volume = 200 + +/obj/machinery/atmospherics/unary/SetInitDirections() + initialize_directions = dir /* Iconnery */ diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index 8ccf44a4d2a..9685f0ba257 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -69,7 +69,7 @@ desc = "A digitally controlled valve." icon_state = "dvalve_map" -/obj/machinery/atmospherics/valve/digital/attack_ai(mob/user) +/obj/machinery/atmospherics/binary/valve/digital/attack_ai(mob/user) return src.attack_hand(user) /obj/machinery/atmospherics/binary/valve/digital/update_icon_nopipes(animation) diff --git a/code/ATMOSPHERICS/he_pipes.dm b/code/ATMOSPHERICS/he_pipes.dm index 182696fe101..e37c7ba74bc 100644 --- a/code/ATMOSPHERICS/he_pipes.dm +++ b/code/ATMOSPHERICS/he_pipes.dm @@ -50,6 +50,8 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/New() ..() + +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/SetInitDirections() switch(dir) if(SOUTH) initialize_directions = NORTH diff --git a/code/ATMOSPHERICS/pipes/manifold.dm b/code/ATMOSPHERICS/pipes/manifold.dm index 434a4b3c9e7..2952dbc7674 100644 --- a/code/ATMOSPHERICS/pipes/manifold.dm +++ b/code/ATMOSPHERICS/pipes/manifold.dm @@ -27,6 +27,7 @@ ..() +/obj/machinery/atmospherics/pipe/manifold/SetInitDirections() switch(dir) if(NORTH) initialize_directions = EAST|SOUTH|WEST diff --git a/code/ATMOSPHERICS/pipes/manifold4w.dm b/code/ATMOSPHERICS/pipes/manifold4w.dm index 17b6528e039..6fc3ba86629 100644 --- a/code/ATMOSPHERICS/pipes/manifold4w.dm +++ b/code/ATMOSPHERICS/pipes/manifold4w.dm @@ -25,6 +25,9 @@ color = pipe_color ..() +/obj/machinery/atmospherics/pipe/manifold4w/SetInitDirections() + return + /obj/machinery/atmospherics/pipe/manifold4w/initialize() for(var/D in cardinal) for(var/obj/machinery/atmospherics/target in get_step(src, D)) diff --git a/code/ATMOSPHERICS/pipes/simple.dm b/code/ATMOSPHERICS/pipes/simple.dm index eabf5a2badb..7bc3347ce06 100644 --- a/code/ATMOSPHERICS/pipes/simple.dm +++ b/code/ATMOSPHERICS/pipes/simple.dm @@ -33,10 +33,16 @@ The regular pipe you see everywhere, including bent ones. ..() + +/obj/machinery/atmospherics/pipe/simple/SetInitDirections() switch(dir) - if(SOUTH || NORTH) + if(NORTH) initialize_directions = SOUTH|NORTH - if(EAST || WEST) + if(SOUTH) + initialize_directions = SOUTH|NORTH + if(EAST) + initialize_directions = EAST|WEST + if(WEST) initialize_directions = EAST|WEST if(NORTHEAST) initialize_directions = NORTH|EAST diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index c1fa0980810..60c865209dd 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -50,6 +50,7 @@ Buildable meters if (make_from) src.dir = make_from.dir src.pipename = make_from.name + src.color = make_from.color var/is_bent if (make_from.initialize_directions in list(NORTH|SOUTH, WEST|EAST)) is_bent = 0 @@ -69,7 +70,7 @@ Buildable meters src.pipe_type = PIPE_MANIFOLD else if(istype(make_from, /obj/machinery/atmospherics/unary/vent_pump)) src.pipe_type = PIPE_UVENT - else if(istype(make_from, /obj/machinery/atmospherics/valve/digital)) + else if(istype(make_from, /obj/machinery/atmospherics/binary/valve/digital)) src.pipe_type = PIPE_DVALVE else if(istype(make_from, /obj/machinery/atmospherics/binary/valve)) src.pipe_type = PIPE_MVALVE @@ -313,51 +314,51 @@ var/global/list/pipeID2State = list( switch(pipe_type) if(PIPE_SIMPLE_STRAIGHT, PIPE_SIMPLE_BENT) var/obj/machinery/atmospherics/pipe/simple/P = new( src.loc ) - P.construction(dir, pipe_dir) + P.construction(dir, pipe_dir, pipe_type, color) if(PIPE_HE_STRAIGHT, PIPE_HE_BENT) var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/P = new ( src.loc ) P.initialize_directions_he = pipe_dir - P.construction(dir, pipe_dir) + P.construction(dir, pipe_dir, pipe_type, color) if(PIPE_CONNECTOR) var/obj/machinery/atmospherics/unary/portables_connector/C = new( src.loc ) if (pipename) C.name = pipename - C.construction(dir, pipe_dir) + C.construction(dir, pipe_dir, pipe_type, color) if(PIPE_MANIFOLD) var/obj/machinery/atmospherics/pipe/manifold/M = new(loc) - M.construction(dir, pipe_dir) + M.construction(dir, pipe_dir, pipe_type, color) if(PIPE_4WAYMANIFOLD) var/obj/machinery/atmospherics/pipe/manifold4w/M = new( src.loc ) - M.construction(dir, pipe_dir) + M.construction(dir, pipe_dir, pipe_type, color) if(PIPE_JUNCTION) var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/P = new ( src.loc ) P.initialize_directions_he = src.get_hdir() - P.construction(dir, get_pdir()) + P.construction(dir, get_pdir(), pipe_type, color) if(PIPE_UVENT) var/obj/machinery/atmospherics/unary/vent_pump/V = new( src.loc ) - V.construction(dir, pipe_dir) + V.construction(dir, pipe_dir, pipe_type, color) if(PIPE_MVALVE) var/obj/machinery/atmospherics/binary/valve/V = new(src.loc) if (pipename) V.name = pipename - V.construction(dir, get_pdir()) + V.construction(dir, get_pdir(), pipe_type, color) if(PIPE_DVALVE) - var/obj/machinery/atmospherics/valve/digital/V = new(src.loc) + var/obj/machinery/atmospherics/binary/valve/digital/V = new(src.loc) if (pipename) V.name = pipename - V.construction(dir, get_pdir()) + V.construction(dir, get_pdir(), pipe_type, color) if(PIPE_PUMP) var/obj/machinery/atmospherics/binary/pump/P = new(src.loc) - P.construction(dir, pipe_dir) + P.construction(dir, pipe_dir, pipe_type, color) if(PIPE_GAS_FILTER, PIPE_GAS_MIXER) var/obj/machinery/atmospherics/trinary/P @@ -368,41 +369,42 @@ var/global/list/pipeID2State = list( P.flipped = flipped if (pipename) P.name = pipename - P.construction(unflip(dir), pipe_dir) + P.construction(unflip(dir), pipe_dir, pipe_type, color) if(PIPE_SCRUBBER) var/obj/machinery/atmospherics/unary/vent_scrubber/S = new(src.loc) if (pipename) S.name = pipename - S.construction(dir, pipe_dir) + S.construction(dir, pipe_dir, pipe_type, color) if(PIPE_INSULATED_STRAIGHT, PIPE_INSULATED_BENT) var/obj/machinery/atmospherics/pipe/simple/insulated/P = new( src.loc ) - P.construction(dir, pipe_dir) + P.construction(dir, pipe_dir, pipe_type, color) if(PIPE_PASSIVE_GATE) var/obj/machinery/atmospherics/binary/passive_gate/P = new(src.loc) if (pipename) P.name = pipename - P.construction(dir, pipe_dir) + P.construction(dir, pipe_dir, pipe_type, color) if(PIPE_VOLUME_PUMP) var/obj/machinery/atmospherics/binary/volume_pump/P = new(src.loc) if (pipename) P.name = pipename - P.construction(dir, pipe_dir) + P.construction(dir, pipe_dir, pipe_type, color) if(PIPE_HEAT_EXCHANGE) var/obj/machinery/atmospherics/unary/heat_exchanger/C = new( src.loc ) if (pipename) C.name = pipename - C.construction(dir, pipe_dir) + C.construction(dir, pipe_dir, pipe_type, color) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user.visible_message( \ "[user] fastens \the [src].", \ "You have fastened \the [src].", \ "You hear ratchet.") + qdel(src) // remove the pipe item return diff --git a/icons/obj/pipes.dmi b/icons/obj/pipes.dmi index e5ad7ebb004314febf1ad46ea259092c5ce1c45e..79e6661e386212445a8fd674965ddd75cbf604c5 100644 GIT binary patch delta 9473 zcmY*fc|4R+_kS!|LiQy)EmTCMEMX9BLdjTTC_>ik`(s}#NhoV5%D(RmDHK_fb*#z0 zhcRZD`Q54B_w)YzG3GOKpL5PV_nhzfo^yxPO7!@prf%i>z{S?t&DO~g zg1l1GlD;`+OLK$`ZE)zTZab1b=K8`>ItWI=b-MQ04OLfn@h~GBhr?EDw4gYm~+M<`v+h%OT+;p1y%a;(n zBJuGnJbK>^;TQ1|jF0ZReSDExBF}~Nl`zU~dH*@)zM0DYVkPH5f+qUc$rpkZZSkZN zmrJ3*O18e*8gu!s{df8|UuyFyMwPsYiB-=-e1e_F&ojAvj{+)^9b3L zey?tF@4EISw+s1ELw0lD86zI^Cr*`cL^wDPd-7vLTjBHk*e4a-d{pOY!x@7`;>|n6 zdCoJ?gg!1u9yR3<$+l3r^hMoI6eVu7JUGco3VKD{{DM#U$fE<>CSNRV@o)Uyk;^X#PU4>Wll@cG_z4PWED%{3p#m7*89x&b?P= zLFE+5el-3BU+WV1W_CL0#S@v{h_bL2H`|Ie{B6bmtMPaJII%lO@Z-xkT<6;_$P8TErwvz{GjV( zLjuKFbf_|}>k?*UI3p$}hYt7E~#|a=_hR**9*a9Zc@U$*YGvG!fPuI+U* z9*6xd$JNew+U)t1OeeS6KDU22b9wBqSqIIk;`$A#RQzI8z$47b5KYQzO-hPKlPVWAtg zM_4B5zlaDIs-dCbV`My9GIjix;FCLSo%N+@rEQmHSRHO;N_=7Dyu1ILGlut>aO9&G zc}02t=8m;>!z(=)|9Y>U^>_97Y+^OM^kY%Mf4z2IITQDl*kG6*dc68z98I#fI&WT^ zG~ReHN%V{@$4~uUrx9A%MSHAd^pM8$b$(~P!1nM#q*zkA{GmQRq;Iu%QPW2`9LkL1 z`J(xn!<>Brp5h_*o5+}TUn+#zrm-^LM(V-J0JjA^7idOnvg%_ zMEw_j$}@{(4jOn5)hlmWsLgM(u+k z24-~(31iwrWq5R>+<^=3FemMoMxggm@*XS0c}`sA0d8jxr}-}oJj_ojxO(^Q-N6K% zu?F1F7|wpFP~9CPzORnZP53e?Yv&8m5-vlGAh<0_A2+g1AWOoVyHK#lTb3boAJ zZN>vnpFZub8#KFlG2raMeer83j}D^C6>Jh;8G7vb!E6pMws;Ye<7;ee^e{CQz^;sh zydr%;1+;VV+ImT;{Ip_9ppke^^<`OX}^xFn->MVKWpFQCt_ z4mYIy@B0yyBT#Xdokx^%Q8>^t}-h$rDb|FJqCM)A5iM8T{84m~0G?ciIY`q;7W9{lLM+ z#U*{=LdfRkCej*Wvt$3e#eb$x+mc@7scd7hqq~zZLePKv&i-aB{E5%0LG{K0+h4^E z+dDfWDVH47OicKEe0-eo+qU?+( z<@u~>EVH}xV=#8>04K<`TuAyTH!QPNcf%aFhRKUOqm}5vJ+8e@`F< zi}jF^m3=VN_H?++ieV@rmo8Y?C3Cqho|58C0YRsQVq@-GiaU0!OoBQ@)h79Bx%7#k zKU)tzckWzJEnF*4HjZ1$>{ArGn7ZtZ)9Qo_8-F!NFEcnux9QWv$h$I0j2w{$&0MUvGx(gj5D6|r4ON6l$w*yn%*om6V{I$u5w5YJ4OHJB-zy+ghxs0 zU}vpc_%o+zao^u*ewdgrOW_o)lIZk~h1=^!)E)jDB|65Dht zCOsTjb-_#x_Tw6j9Tg0UF(>F7A_rwTr={hrPmrZ(?yAexr{^UJb&jb~x z;%;bcGmM-hY?Z?zSQv{JWA+c;_~_HLw6yg0#~mc#?%0Acp40e-3W_rL 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 delta 9550 zcmaJ{cUV))w+)7()F4%nssc(?K&k`~L_tKPO9$z_H{npFsfY?F#n2Iu-a)zu7nIPe zbOCA71R){Gn{e-a@BQ8%?|dO&zA$HI&z@b@S|^o#q=Y`wmzN-p038D_Wou6>4|_K+ zdsi12%r7lH`P++BQO3xzZN|~BqdMi>><#A3+0P0EZAPb`pMGo3>6_-+nbN(q7H6aKgd3#?*Ga9x< z-=JKyco55reDzFl)kCN9ZRt66G3rHDW-Eg*3w3Jj3kwm}Bui+VuHRIgT$F;Gysh;T zD=Qhi()@*JNz&Eq*F2)01)ei66Zdw_*tjIZ&D*q+OTs!0J_=dBQ}&5&GV3 z)Lp(@oQA6Vut(38{3pgmMLntQ3Os%6~T<49oEfl zR>O#~>$KTJ1p}3Avx`15-dOQv>kCQw+P#{KJlZ|Y{XLHJ0;^pZ3~CW?ZP8{v$T{cl zGk4bOJ*T;eZHJgY!8l>0OXiqruy#|B_s+L_;g3$$J~~C>a0>cTKUgIDP&wN!PZio;Lk?^*Mv;ezk|Q{)^2I9v9WK7AJQ{B&d6bd)=h4iqfySFE?}U zzLY_4QAywGJ4U~QZ2Qt|`~3T)(E_^Gkf|Vz(yJ+a-wM*`9kqdjwXX}ImcU-6&uJXs zvK{)KkZ474TAHoLToO^UCw!#cCLC`4bqk^0v^MPgzNl1`7MFYx_KNDQXDU<8!Qm&a^nmawwGqY%;ldOXAbn$6S^O^LCYV8#A$?+sR}W=yQ|A)I56GQ4H3!5P(3%c zSL4ctnFMW_=ULk!ar*eKO#axLt77F1;6MK}RqDfu7KaPwe6bZjHjJ2)S)H?b{&T7K z2c_pJ#-+6?3kyZ5;d%D$;u;Bm@$`_M7z6#gjW<1b-9?yeOsD1B)YMzz=R3#84JPSB zKCeamw>88y{U%#747rFK?cxZeM$7F{GP%5B{$AJ=gTZ{LuIzeN9E7 zR?||J>gww4qbGK*uBt&nLEQP=g^d6By11A|Lqo%$)`k6s%lB^Yr7K}v(f77LLLNRL zl1}4u*0T&Tq+TXbdG_Lz+GkI^&Bwa9xcK(nyEdW~o0Af0Hv{#&Ugaox9WfL`n%y*L zELyi)(djok+jG@!vJHu$Q;$%%E`z9OvLx?PXrGalICDsz_aR8 z}6cA z{7R1`O_55=n=x?v5#}*rtqQ65_||VVyR7{)_0YUK!J3`)4@8R-!D4Ipd>4o4X3+lF zC>&BiCiFfoQM|eS583hhREv6}iPQNs%tY10TK}JfF;zl74%fOavYd;?0^?d_{_wTb zy3Osg?8Fncjj(@)oncZQ2P>Bc(AKFNXf(clT(b)z{XQJV5qvnGGke{cFeF0j zJ^)!ACW@fb8|6iuLpEAo;bvJ)E4tV^%uEQwo5_u)^I3#&)PbycH=bvM@TCk{)TG_Z zr^$vOy*1{|`jp#=nVfi_(9Z_i5VRmdS~L6r-GXChW?^}KdpfcMsd#C(u&LPo{My=@ z+V#tQx$4Q=W9Y7(Ik@xT`pV+A^C!*$N3*$1ArfP}(=h(Y0`ley=xFW|9^c7Qw?^1a zZc&bNz4)c{e#T;^&|&X5Q`O;(1~={L}ya`?Fru^Q`*%b1Qv>bB?1Q+ibI;^6IU| zE%_(AuD0$3+#k5X+S#S*JA;QKXPy}!GD3dXx+XNV8ge|px!5mG!x0}<1Xn)b!@`fI zQ2H}P6ZlU(u(ssp=4PgFiXv-iGhLIEPj|H#x#0uKAo3SI>R-vnaj%Qp3FdA7h~k{@ zPPiDYY}#2$4n0SH3c4UvEL7*WdOcX;&{3JEbODU8I9^j8bnk4p+;~5UW4t%?xn^_9 z97^GRAG~b;HZP_m-9%J_0o(@O|4ffPu6-zNMYeZtVDnf+mSRZl(pjJLKHghugTKZn zEg+d8Q)&uRh#rPGZ1mYULeDBn9W%(){xKx}-P5=~ADFqdpo+xMx6h;IWYKcZDLC!m zt@*nYpQlji`R6y$i|0l83MV(v(Bh2mTCW2XhLrXF^%)eKa?h2%oUM^lo(d8g4A<#O ziS=Y*N2=CyX+sHFbvXpouv| zxiH(1__Z51$YG$9Xin0>N}CQQEB1`*+_>+?Iai_|Lc0o6d6y`Dv`13az)!&%8+_-R zd}nV7G7H26Hy^C9!$C9EkHV=(emvkiEDyr^d^D=1HN#Gh!MIifs}b>Ck+ezzxxu!! zd<_i^8S65)Z{LQ&K>K=XF%HjwU2<+TF3Cx18z$u8yF{PGj-VqS@IPjka^otsx~-~8 zV%`bej_vEaFD@wwhn)&lFkMBgl1fTQaI;eLuzodO$>|O3yVgqQd?o`Vpowgw+v>t) zZIQc? zY&$`fWBy`n`zBhJyb6S_82OtGky_lD;4~@sQ=k=t&PoEqVwb^7-}MK6wfRckB9odxhZCkqye}zQK^Vg&{L2t>%y+Gq^JNDeny#>){1- zk!+a{x+%%S4JvJDj)S55T_6P5Wqr)e&0+Iye(yTgzKZp#-r(isMNpGRO1CjEFl=LS zcJ}sv9k$%_N3X#Mpi_0cpOFVunGsa1!(_VqlP%?xhYPvAH4m(;vV*>7UvN+uC42Jc zmkF^hK=n;%p0oZ;MzS33pmaDx@}o@x_E?ajbFc} z8xMbn|CwLkR3E%QVmUQS6*PwDRL3S%cACHsPL<8CuMh0>GjFWTBo3ddt6t=Gnyfm* zZX_%E#Ae)uWKs8s*#YA4x5dyQjnfZSw8$ZVP^M6G=pR2WiEDI#ci5$%QfBIo5Nku? ziryIDMh6#{FXdKUh|{D_wqG}W_-Go$G#ETRJ?~;GIxpuR{FXZyw_?gi2?V!rYHMq= zo-Y%;xc_Ka-aXYp^=?xC=a(Mx&N_CtA>ic2Mmm)>h0oDyYf zdWybH2-D_-yennd5i5eQR7uEn+4SfY?l1gf!Yq6S)x}0?3=1N1 zhixq=VB7OioF2%Q*NGP%3}B8##l*tx#2tKhYdn?Y(o-Z~zkYq}>@Rfr zKA#lJ;L=T73aNliD$u_czaJr|um;rT4pjZx_3y>$h~1UWm9rKJ89hoC4sOuo6NJf( zE!_zOz&0{6(i*ERVekl)`}TtPs0U_S)qnOD*w6xpZJMDij}p1i52W zYxAn=-Du!evu!@e`QsfNa-m>avE*87vM}_tas}#JJd`Dj&D0KZT^c>r9jEkvvz&)% zfHvAL$dFzd-mRwdC}5Y{vB!}5yBU&`7zoL_tpyA_lH%fXF?=oGZjv9yi8L$Rx&?Qc zZixKy<+gFX2if!I&q1NO0g_$x=1rRTuJF}W`{9w1347oBWZpOkvp-HWf1^>GZ#p;$ zs-1ey1~t-xVFLOkt&2NzAmO(CZ4GUMkK%5n_f57U9nDF!ffLvyxku zzkLZQx@GNKN6`#QXlRcsUFtJf8D5<$j7c;313Gp%h;Qvilv+xlST)&Cu(i1q1?E$8 z#*co3-O|8%8y=+(iD+ot|LE83C8RL%=;`=ip@&_oDiuFITfWAl7p>Rr9sOYJEYm#&e;I_|{M z_gm+pv~;Ubad1@?W^>c)^(SAaX}wox<_N1SQ5##c-?2)Aln$!3%B8T4SSYZO`d<4xLBNJTkk(m!@-mvkTCRyef!J8v@?$e4Eg?N-adB386 zbX-QT?LEk?ak8FTEyhN^l>vk1tDu@>I#czz>o3x9{(}eE@jO?m!kh_Z zvqzj2NX^}HigS1Y*Ib9~6+*CB|HHTvDdjcW27G~|(b(7+ z;OjRw{r%Qg0y*frc0)Ea4_FE`5vzbZgX>_ox?+`K!FC=|j1GS$)T%=gZJoP53uxYz z*f3jE5cB^c{`okhYf#pcm$)-w1~K#V7J)~P&h1-2m42UPWcn^xLbiQGHWW&YD3ewT z3=9-X?j_UJ-JI<3*uEq5^Qa40Y-aT?Ko!X;zC<)@I^&jASLX=-23+&j_CI{4@Ya8 zBYkIsSn}_uXDLcqfA%k~b(#oEHVZa<>=At(=rGB{q7*fZdw+9v(x#>+-1PMHc&#gE z9|{={B$&mY1KCj(ob@ul&#d~Zcm%mH4*QsxnZ+L*Kt6|0GZ@3SZZA0kNS z0aVGVsbQ8!(QR&Sekd&!DZ)GK5-4eB08L5BQylXKjqbfY&uJbw04tVzuD3y-Wu#2> z7LOpJb%1xhOlsG;CVro(FNnapRv$ttDkAzlcFJKdpO=&fEA!B+53Ah+r7K#Q2Li1* z84;vpsvIv50=8Qt_d8V7Mi3Y$xuL<3WUY%+?k3fG{Ayb>eMKx2Kx495^ z)KsPEP4LR=y|hNB6?DdmAfm-rm+%Zf3Hz!%3BfR66E5??hn9X%rX`pd+Dw_D?x(Oh zaS=cTv2B%gbq0FQdA2EeWh96bx#OM1{__t>d?#k~;PgrGW>7hLHtT|ULOEwvV+c?w zBECioLqKfUDUTvb4)j5UVsb($KSf<$9yt{9R+2u!q%|=^6LI}w!*R@L@;SZPGK}ht zzwI)j!E+`Xa`oIqJT-CC)s3VHLx5!bXC%AHm<8+8GOcamv=;cJpIBE3;OuYkuSu-} zzSNdH2_a+aOg`}FQNGjf{@!-q@v)qj36Zkq4DU=cG=Q71vb;k?~qL-`UyuT&YUUC-~74Byj}!T=@lxZK}3VGG$3YL4nzCdj_<sp;tSbAmG?l(+?0sh7R)IW(*+ zFT-F!0X(;d5@P2`pUcbRB@I`cn&=+A+Bx%9W9akvI4dlpsp+OYlxJl)#*#=FT=n(w z$to(MYABh?PH!^ZinXSJ{n_Pvgk)LRse6D;euS)+w^`~ll-C$i28KTrcx#_hv)2wC z@`M#}3fO8kr!v=^j8BpgRuxBl?u zMpe&@j*PTb2!cyNixHeM=o4}&c`c+Pb^%^a;qNOSvoEkt{1&f56!3(pjX3+gpLqa0OE# zw`ayPt*WZ313*T)bIGz;=S<9~2szkCLBSP(=}+5}>|=366j{3Q6I`G)-pjV5K5o!8)^YEl{0I| z2`^j!@g!gl6zP0t$S7tDB4C*cP*fX7NOAEu`z_@LUw=&y%V5C^bBEx{BV?n`X4vc& zdi|(3uC1-@mf&M<7Mznm#V#7T*t-Hvq(i3oE^ekEi<&oP%K(_ zUEOK{6Rk?vn}@SU7x3F1ba68J+)J7uLiHMPp-cPM*8Q(|QIk8CYp|E2`be0HQ37IO zVnF%uVS#wBOZOZdB108m;HxYYA!;`!wC~{6g9rkj;4z%P`FMi1%ue-&nXzzkKbMm! zgi(#>U<#O4S>H4F@~Zmy#}!216M3`xAA=8_t&=2+ED&GRqHBumaK?tk2Na)WnX~pi zLn9wPi;rhXpLz0PYkhs)mdI-CvmMH68BFo|M|^IJ3eD41MH(os=n>h|FS=<404{6( z7@bD)`0`bun?>yJ@%p+ltsmJ&rO!c?_b{Z~VoBC*qST))uW^TGfZp`t=eh_0o>w#R z-Y+EX(okJgqte9cSHr*FuI$azL{wy-pyl3XYTMkO{|vS{8T^`yqVCgn6$EB?3ehw% zNq<9}+zE#IzzSGn#YGH;h%Do~;IQ^}vpn?Rtv3+G-^Mr(1c3$QN{9ycS({l81K9iG z6Hw4BX_t7J<0ht2oh6Q%KhWFTqV4l#uUwq5BPAlTW~PK&VVffN%xtda;=P5hE5D%w z&v<&yY=~=w_bxrEDSRe~sQ`^SdSF0nW4s&=Oq3Ri{EKbv6jPLECizUSqkeevh7{kX znY|%2Mw~J6A)&C4GPzg9ea`x6KCWmm94HJse&0=JbZ-P%#)O8FSilhUfGpf>NhSp5&gU=0%|XbaZqm{Vt$NJGny**Zcbl zY1YZfJXQEmNZBE3o|5;nR%8GJRa|VKdQ>H^h=}+IX6~(`=|FJAa{n{y2_D;}kLwhb zl#H?yk1a31_O-7sNf+|*VYafeG5})M^73*7&1c?NRcZg-oS)(d(gX_7O!a(yB@Z^I zqV`tMiy#rD0)E>m3Jqw=?U1ev(*umBymZU?52=>56f~BRe`Wl17}seYsGEeh@WliE zVa^z33<=lSnBP%KnZfUVpG(ObV00n^LoL`37=!LzAg1sn+<`njD-k##1t{|*-~p`T z#>o>C5`e_d*(d&$=inMMg_$e}rvFeaf5uu{66c5bdip`#r*Xa;-Tj^t`gt$(V zJUF@tzKw3b(oLfG4-OiX%OTaW`EY#VY4^HV>G6t>Sq%MSWBL`+5$Qu#G_aEB}54j}ujqSUgtb+j1mQpktIGx;fXbX5eI;br2v20RI6`pjY)Lp8;D z_Wj=MK-mLysIZWSBR*N&?C9)iQp$=Ggp<+SEbrQ+7NUA$)ai3qdPtV(!|NbIFigGA za;-=2tG^Y>r8aP4>qI|$3y1RU&l8nc*wD}rQ;``zfWAl~2zl1KRFSUVAqoQTMEk4O z7x%>Tjd?|Tg{7vX0P)e8t$ZCtYa{T#{Wfz1@aDyD|~tg$4#CvM^ICb@sSx47kUYdPq;HK1SJ+0Drqr(ulJ+?s&SI_L?ROVxY#1kJ_{g*80Ay4 zJ{zsAt+4iaw?`BjRl(d5N||^#1+DqF6bT@F-d!~>uJ!iz1}zR;2T#fcIYA{A*HF&Z zf`y=0!a*f*jZtoI=8%w(c)&>Z=ht+lQG%fuY74LBF+3yFhzyTiMIZ z&AsfZVft?;brzN(Pa$tRi9tN$2CUIoSUBA61-mToa43(eTH9)FunoTlVO%{FiO7@8d;wU_jg9e!5VM$3w%p^nX?ChNj3t2D4yD9&*J#oXuS%+q|#{s From b4e3b942db5a5d046cad2c237edb8ed9dd6d4e7c Mon Sep 17 00:00:00 2001 From: Menshin Date: Wed, 31 Dec 2014 17:34:47 +0100 Subject: [PATCH 2/2] Removed a useless call to ..() in obj/pipe attack_by --- code/game/machinery/pipe/construction.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 60c865209dd..93c4799cc89 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -294,7 +294,7 @@ var/global/list/pipeID2State = list( return rotate() /obj/item/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - ..() + //* if (!istype(W, /obj/item/weapon/wrench)) return ..()