From 8a6bedd0280ad5db596100084f39e060ece69cbd Mon Sep 17 00:00:00 2001 From: Regen Date: Sun, 21 Feb 2016 14:19:18 +0100 Subject: [PATCH] Fixes Fixes typo in the gun sprite, adds origin_tech and tweaks charge cost --- code/modules/projectiles/guns/energy/laser.dm | 3 ++- icons/obj/gun.dmi | Bin 80366 -> 80363 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 08f0a90b29a..6a9e15282b6 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -104,7 +104,8 @@ obj/item/weapon/gun/energy/laser/retro icon_state = "immolator" fire_sound = 'sound/weapons/laser3.ogg' projectile_type = "/obj/item/projectile/beam/immolator" - charge_cost = 1400 + origin_tech = "combat=4;materials=4;magnets=3;plasma=2" + charge_cost = 1520 ////////Laser Tag//////////////////// diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 8a5cc15671aab65e5f02ee2e171d1a5c8b0e2995..d410be0da53fa86531754aac2388018a87bbddd5 100644 GIT binary patch delta 2226 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 AlmGw# delta 2229 zcmV;m2uk578E1JHqApJ$fgCpLy?D9mlS{eb@}(te}4VD z{PFwO;*DyrHE7vXf;l!-V1`W<34R&d%b6Y++shOKjO}GY>y7PYLeq`yCDLx)AWXgn zo~)aEUE~x3QTBDj&#i~TP^rBx-F1hFu zG`mbUM*`|+& zWlgkgdI<~*o?O9XJZF1y4U_S_=gD|n(z={Z!fWqa*XFvmo zm1x@&k%9bw`eAOrz9Y+PO_&7Ib4@F*WawRg9-p(yR@o}Mql_oRyRzUbg*-Eq9T9CP zT_W00{(P*pw6g3C>GXlzHHsr$=W$L|M|6s!Bht1&hMy=Xsi+`FMC3kWaWL@<*2|Er z>{(zu^(Zi&dK4H>Yo&DfMZN>#uP!{`3}9}^DNa*=Np%y?%}H2d2Rjkcy^aJr*MUIS zIuPhs2Ob&c3Fs^%j*N5Mj3eV5Hsr`ShfO&$&S7JW1tN1qXBmSoVU09w47hwX!hkUc zrfE18OvaEhE3+~yZ`y^UMqNu*;u3v`P|fll!#(j{DJ za$%Hz*I=<1MtKc4?ZPOp(Z*dE8UFT&|g;ypx3SxK;L-85CQz><(>F+(&vKxxOLh#BZ-6-)Z8^0eVh##f4tOj64# zq#7fd*ejzD>6ek-^(kv0_y=dtl$laq(?su_~Jb zSl$6F&w%9_sJ!iJm3JtI>_n_@R7k9U3@8vM0|~^)Kmze0%I8&l3s98Ls}-=dB(^}^ zwgu9S+ai2uCFuILK#rD(ZIQ2l2-y~S8Q-83+X6WfCbmT$Kbj)8a~h4Efe_%)2C*%m zqY{Exx+igrNtXA2fbs?qIl?nxk+Agi8VHV&O)EL=sLND1N0v~v6m(WyQZ$Nx87upy zq49W?ZUH>6;_pL|t%_UWAu8Ntn_F4n3+mB6tW?ZUa8@FfZJBJKeY*(@FVD*!`m}Rc zC=&-gaw=q88&F_e8%SVW8%SVW8_0@N67b^rDt@x-C>l!8ED)-jJ9EbyIkd7kun+cC zCeQko4SzR!L2K3rj-*Wrc+Q4@zncP}6~2KzwKR}ez6IvgV-Z~uAAP&xJN9MQG5UCp ze+P}vc)%5XhXE+2urIacfvR@pxYP-}MhTKfkcwhGN&6L^+UPKx{Fc-SU~!!9`-FiDe+)#jp^Y@qFH zO>5-(jl<%#bsXZFBLTl02sq_H#3O2T{3xrYRx9MGRx7N*Rx7BzRx7BvRx7BrZ|n^_ zK(o%)*@stQ)WW%3(>KL`-+(b%Gi<*|GiA}er3s5|FKJaBf$ud#_CSja*;9=yn0OGF zT#abTWa(X%tU+ruqdKVqZ0X04J;m<7ph099r?R3oI@B1+IwU$I>yS;0a{2-~5t3dU z3FH?C0tv=}K!!0LJ5t+fbwXy_Q#$^!GNt1yTvIxJQ^QztIH&`EkxUTFfc1?*P_;w? zH)lp#85FLS0wT$=EhW&V_<#=!E&$$3IEhbTpz9|z6w?zPiR=lE#P6E>j=2`Dyq@H8}iu z2BWsunp*5k##xhi)SWd+z14Eo1iI65)&#lHa@GX7&vMoTxy>?UdUUFIQd+c%(_N?4 zf3&hHoULD`Gs4a7Li24=JEe(yaOpO^#E=2A>-KpChPrTncGW(wz)%p*uG;4n_}Qk- zEzfR3c887voa|;(1b?RDu`0Cb9#I88Hy*13yFZUbfs+`IMTu7IP1DOAv<)_*(68vc z)5wqByu-+E>Ab_pPxQRQfH6gOql9)dM-+DkyoxZwuruHliV;qAh6$lKvA`D(6N2zy zehD6M_vJ$)C)_=Z9C7z7a>m`W;ZFLx{Q2*X<&WRL7XJhL;l7TlufIrxvk14d2mv@T D8Z#!a