From 997623c2dab69d1fc88333611cf360aec2a369da Mon Sep 17 00:00:00 2001 From: JoanRisu Date: Sun, 5 Mar 2017 15:43:41 -0800 Subject: [PATCH] Adds some 64x32 two-handed gun sprites to the code. --- .../modules/vore/fluffstuff/custom_guns_vr.dm | 56 +++++++++++++++++- icons/obj/gun64_vr.dmi | Bin 0 -> 1407 bytes icons/vore/custom_guns_vr.dmi | Bin 23717 -> 24184 bytes 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 icons/obj/gun64_vr.dmi diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index c828d78f1c..f0c8e31078 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -307,11 +307,61 @@ return 1 return 0 +//-----------------------Tranq Gun---------------------------------- +/obj/item/weapon/gun/projectile/dartgun/tranq + name = "Tranquilizer Gun" + desc = "A gas-powered dart gun designed by the National Armory of Gaia. This gun is used primarily by United Federation special forces for Tactical Espionage missions. Don't forget your bandana." + icon_state = "tranqgun" + item_state = null + + caliber = "dart" + fire_sound = 'sound/weapons/empty.ogg' + fire_sound_text = "a metallic click" + recoil = 0 + silenced = 1 + load_method = MAGAZINE + magazine_type = /obj/item/ammo_magazine/chemdart + allowed_magazines = list(/obj/item/ammo_magazine/chemdart) + auto_eject = 0 + +/obj/item/weapon/gun/projectile/dartgun/tranq/update_icon() + if(!ammo_magazine) + icon_state = "tranqgun" + return 1 + + if(!ammo_magazine.stored_ammo || ammo_magazine.stored_ammo.len) + icon_state = "tranqgun" + else if(ammo_magazine.stored_ammo.len > 5) + icon_state = "tranqgun" + else + icon_state = "tranqgun" + return 1 + +//-----------------------UF-ARC---------------------------------- +/obj/item/weapon/gun/projectile/automatic/carbine/fluff/ufarc + name = "UF-ARC" + desc = "The UF-ARC is a lightweight assault rifle manufactured by the National Armory of Gaia and sold almost exclusively to the United Federation's standing army, the Military Assault Command Operations Department (MACOs)." + icon = 'icons/obj/gun64_vr.dmi' + icon_state = "ufarc" + icon_override = 'icons/obj/gun_vr.dmi' + item_state = "battlerifle_i" + item_icons = null + +/obj/item/weapon/gun/projectile/automatic/carbine/fluff/ufarc/update_icon(var/ignore_inhands) + ..() + if(istype(ammo_magazine,/obj/item/ammo_magazine/a556m)) + icon_state = "ufarc" + else + icon_state = (ammo_magazine)? "ufarc" : "ufarc-empty" + item_state = (ammo_magazine)? "bullpup" : "bullpup-empty" + if(!ignore_inhands) update_held_icon() + + //-----------------------G44---------------------------------- /obj/item/weapon/gun/projectile/automatic/carbine/fluff/g44 name = "G44 Rifle" desc = "The G44 is a lightweight assault rifle manufactured by the National Armory of Gaia and sold almost exclusively to the United Federation's standing army, the Military Assault Command Operations Department (MACOs)." - icon = 'icons/vore/custom_guns_vr.dmi' + icon = 'icons/obj/gun64_vr.dmi' icon_state = "g44" item_state = "bullpup" @@ -328,7 +378,7 @@ /obj/item/weapon/gun/energy/gun/burst/g44e name = "G44 Energy Rifle" desc = "The G44 Energy is a laser variant of the G44 lightweight assault rifle manufactured by the National Armory of Gaia. Though almost exclusively to the United Federation's Military Assault Command Operations Department (MACOs) and Starfleet, it is occassionally sold to security departments for their stun capabilities." - icon = 'icons/vore/custom_guns_vr.dmi' + icon = 'icons/obj/gun64_vr.dmi' icon_state = "g44estun100" item_state = "energystun100" //This is temporary. fire_sound = 'sound/weapons/Taser.ogg' @@ -342,7 +392,7 @@ modifystate = "g44estun" // requires_two_hands = 1 - one_handed_penalty = 2 + one_handed_penalty = 4 firemodes = list( list(mode_name="stun", burst=1, projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="g44estun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 100), diff --git a/icons/obj/gun64_vr.dmi b/icons/obj/gun64_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4e005cb700025270d1fa8e266cd0779279c28211 GIT binary patch literal 1407 zcmV-_1%UdAP)nF%0qwhR6jPe$y6>Z*QxMlYZO% zl9SWqq@g(F=b{wZrQmncM$MBr3b~Cqd#KuWZtNvz9jUgnZtN0nY-P!vK`UjzS*^5j zE9R`x)kvTFo7vE~*ymqzZ7O}kDA4HMCS%trjv|;nq%fM|)&#fW((Am?1kt@31~h_a z!3Z7&BX|^y;89%qGeRixGJAjR7Xf3>5^+NsQUCx18A(JzRCt{2o$XqqFcgFVLqh9r ztJ~`8{om*&;WL1gf*k6ED@78b6 z$`2pbH7cZ8TmmzY89-fs?xg3qhBe%4vJoO5H9O(skc{Lce}8A z^ZA@TE>u5^RKJ+s1;6HmHzs##2db9-;cx#fw|DZ7Pv?%Na9bAre0D8QN$-6%gL5=8tD&nbmY-{x~aWtcRF8O{k8$W0@fRtt`4QnOO79~I%N`l_2?__ zE7NANdJg4v#-f0B($2M|sXfQ;;;`78U_H*;Y6B8|^*EVWSDl^M;92Z&^Y5Xdfbml8 zj^mc2v4=emzq{E$l3ouDT!$NGdE+j+U4T2$W+=cIcR|GJi~V}t4E0Y&wAa7wBe?PI zD4@McjeQ2yV*%0nX>mLBT?5xi{jIJnN^SI>C-1(1{=CQCDkE_2hOu?F<9$X<)uiN0~`@4bqLVzkrQF67>_AzYU8@ z5Xr@QLI@#*5GX(1p9kV!j!OM`V7`#cpNHiO4v{}!!1IL^e|`j>FGTtCJxV=kzp25l zj?5QcMfyqkQU3fSANXthwy-zV&V1o5MZX}{pAYhZky!yd^MwTcVs=%eKOf`+Gotf_ z1bvIZp9kj)a(^D1FJ$oNvH3yHpN{e9*G%m*O(K)gRc>R+_qlJ%D)z0{wd=r6`^$@=#cJ>1`CK7jW3 znGc}-edYtQ&j^(>`}@oXm=An;K5)?& zp}+4(5b7_H`oN!m7yA2t1fl*tP7n9@nGc}-edYsbf1mjP+TZ8<2hjdL^8vKK&wOBO z2<8KX5JCtc1clU}N7D%Xc{J{2p5ICI_n}DreGIAoJQ}e-k0$r$|9?4oKK~y`mj5q| zMC{L_5&QFK#Qr=Qu|JPS?9ZbS`}1hT{ydsb^XJjreFOC82_fYF=O0H#`qJWaMh*Y~ N002ovPDHLkV1lqsz19E# literal 0 HcmV?d00001 diff --git a/icons/vore/custom_guns_vr.dmi b/icons/vore/custom_guns_vr.dmi index e6a960d6be2db4d791c02e1a03a8f1cf1fa23f06..3335487d74631b242deb18156072a5404b59600f 100644 GIT binary patch delta 3780 zcmYjTc{tSH_a9`-+7LnwiJ`JDDGZIQgQ>SnyQ@FpUYDvT#-1ZuD?mf=8Was+K*x--& zleafcb_i63>cFbuqvBazVNXze`t>w(7b9)MRmw%8$cjau@!3q zKf|^KTR*>;XX{SZOzLn{dcE@U@|U;@P4_XOkjU=Y=m)8*^iKn0D_ zY&ENU;+Q20G`iCXcnHs|O+0{&~KOWwODvbU78+U*m=v z;>#zW2>bkq>({>8Y;@GuZe2Ed!*=JIW>s5gL`z*z^~4h7El*L^92GzSYH_~atZ_Vw zM0~wzU>C9a+E1dw(MZV@kCQ&_R@oUYe;K_V|4@%JW3=XUBX~}%Y zF7xKRxY(^GU*!{LkC`i+vD93SRt#_CN%ug`f@>8YYA0Qk(NM;%raG)3w^_@hld9xQ z?U`n91M5@{qJOeH-S z+9We8X~<4ipT|6<7UH_Px?W)=RBTAkiZQL^d?xVCzO`p*DQ}pZoSm693gm0-3=J*$MD%hzfxln^!}~VL!`BvFTwEUHX!$s-@cb;f&QV@oe!JPte2{*@rY?#)aS5S& zkIe%JFrPP_!_3GF-TKzD+o=@)`4e;EGcSdi_ZtNC@y^Nt6zOr>JA*^VfX=}L9UZ?9 zW`U!of(Ft283^g%t%b=2S~x5_Cr47mtSHpn-25K>U_XAguC6Z6zpB1oc%lMhOZ7vu zys@?-4oZ(J=t6Y9Npy)$zT$e({E@{9e;x!h6!!}$6Unz~@(bJ5>Q*m!3O?{%{wrKm zm3m^FpooWVWAPWK*u%O+t^7z%u|cV-4}{B(zG&%A?^>7C+&J0JM!ELVzYRB(tdLtt zMYZURD|4Mkr7vqNyiDH#j(RrIs_>=Hn~UT+;)b zp*=2vX3K)n;pYzLs<&A~BN0vO<;V`t&Jw%U#&!Btg%f&6D;NW&r$8;OttI`_&T<1%Qug~mCXIwUSRp=*Sisl} zWsszZe{$5{GfaMG6QFk3(Pd+s;=dQ^1kw%FE)6zVtWmAE5}Bq;u_QEv2g=uxgMY*d zK;^MNt-hmf%*@PyB$k6RnEJ+|1?ty!KXh%<=1d7U7)SrS2^VCz)X2DF$i};hvLE!1 zY_AXEI?Myizrrdk3U88zhqrcJzV|<20N7VkoH1VzGq`zqk9W_fR#($9^3-7KUvclL zr%#`L|KpFr1bToPe`-m%w>L=*lguPe|Kjr8KQfbHds20E>8?XS1OqDH=)=kcdm}bp zrjWa&x;4w{Xqz8G*~Q@?kDw}NMFdzi+WF47> z8fKfH2BR8xsy7&MhmPI5za$i#HS6lglfPMsR+WfIy~%t zfjHwc*%#zKxWYG0Q2jjKj^);F({d^7w(10mzLOgQX3J}8xTr+vNPQQA@)VWEHTBbV z?J}+GC#rc|L8V`#>qg%?5FkoV!!1Y862?r?w{3OLOyGe-5%!S3-n4hA^zYftZ&N6g z^F);x-_uR*ain(|or@ax3X#av`*RM41W2uWpfivE1|hSO4z6(n^iYs>oTCPAD5#>* zLFSz56^jZ1eSLk^oDsy~+M8IaKSI};XZtojwDI8QwG`qAAUq(JcHBL=i4pfjNC*oq zY|K5tXaQ5?P(Ga#!gFKe&7HfPhlS}?;QB*yrEO1{Qtlcq1(myc2?}ll&Xe0!h*X(L zDo!e=STFORRlFGkIq#|DO@Fzo5gYg<%ui4n`K550gJw*@g4}?KTj0Qj=DrZ1-nUKm zQmVyBSpyiO%!A+-Fl1;&RE|=KxN#ev-Dlkib$UilmGu=p!3w z#dD8h)>9Z-KHIxSx@nzhCXdXyp8=_LXq+d?*uqXZNQ4UV#uZw|dM>AIWRG%cbl9E2I7>A z6FkQW@aOWwA0<{-yP=uoobs5!0Gvb4_&=usQE~k6R)6)Gd6oMNK<0$gfqI98kZKimfT+gTz7Iz~4cugMY$${h;QSmRZ-cx6$D+$Nqkn z=qL&-$HX{d!*WqOqEE9X8Mimc@g9}4x3|LuimJtHmlLw?j4TQzG;HQ>%d=+%%e4N^ zhgJwxaMn+86EHL&rY;2$! zsBip@X;enX38l8Sw)#C$^?SIkX$~JX3|+}Ex+W|5S*Dnu*`fZD3{_lA3{e9th3=e% zD04r7%gW0Sy-@c&OL6Rc#5z#{BYzzC@%B#ji_%(%L|nY176ZYZZ$#Z#kseo6JoagR zCmI~VX&GtJ7GLRj#KJ(5zZ_ftcm;pPGUcE7?wQAEd_q%`%CXqDuUIYqmzRuKJ31=< z8_qJHL4p{-L|T+(muL@jp5m~)i%$-UjLS1`#Q)MaG2tA>;iTwGJNqrNO)V{gkyzbw z=8B3625;bLH@uE!Fes!W9!uZf%KKe=V8iD$U3$XoU|RyT#D1%En4AeJ_9Ab6K;?Km zQcRRx?)|zg3N3^*iVnfh$YdpHMg)GS@)xB8kyyz5{QPlHOIzE+*hNCng})4QjbL>} zOUs}%@QKHNGXLx68h;cmIOe_9WwafJe>V7t38eIAKpGYH%QFR;(kHuF1B6zD)CY=~ z|0B&|PX>WR(d;v0+gg{NlJkN$Cgcosry0~oNWuQ;b=kPoR9;uV{j*+wOaL}^_9ye+ zMpjliZAc4D0FuEB+nXYdj1p9G$z=NjirC+kJ$+vNS1`>Gg1D0pzRQC-|l(a#J&IbnXhj<)9rOjp`79JPR3>` zS#e8nls_>?mJN*TTC3C&W~9J+63sLE70qL<8zgpUQ@SN9J!r2&)zM2BD0$Nprhob?B4-S^{{+c79ke z!*DqG>wWRCa;4dH7s~a7C>;!MnBmn8lNXWm`vZ-t;(#kjrxE#qZE`K>n8QS&-cdPW znsvs*z!iSobyI#uD_r(LLtBYL<3~sJNlUlM8m~Tuel%3D&{g>~2CC5xQ|Wv0(X)0R|a-L!&I!eXk(YN4j(C%4PRIoTs08EIaN zLqpkmwa(Xh^DDM@nn#yh%{^^0z;0(R$L=3~A{KU#&Et2sSrkA1ND8BFE|{5%$FJNr z+X0*1a*uyxbnnl|DT52_BhU*ERh%EFy}K6Ej}=qvOwt^REL>8B*w_Q?>69m~oQgJx zk2iErR~X&zNyHKDeaAIJhJDiNVT_x-gs%5}1)R@3{CVyb;NvznLiRaL5?I=H} zo@a0}D%2qA4U*p=%q~F7@O+ISPS){`=);a}jokOSP~lq0_1X%n`(#0(adJZEG8k){ z+~w1fzvzh?s~!klJYgBk94ljpzk5)}&MKnEDiT~L0ZZToY(0f2m%G}Ww9@%sjTvE6 z)2x3*oG&#FgXxQvjyO%p@q{dWw&8#D^VFp57VKq8{I7SR*DPG}z4@Um>}S*Rq~ksH zU7`huva9pb=GuDF`5my_c9*;fORnJJ*qR`?c)Du;8VS*oG5%%~QV|#wh;G$9@jK3_ zQ=L}+D|=l5P*8YWbs8KoQWQ$uZDN(`SiE$@TaQE{*=$DhEv>Gm_Vx88G87Tbvi^3b zX2t$^p=KJI7D(t04-an+;(IED(J0=0j;REJsmgn^d2${gYinyg6bkj2I2B>pvU;-o zMb~?`uk9yMBQ%S86g!O^H97eoCE4?TRh6H&%7`p%HNE_s~ z_3)B*@K`rBCr+t8ryIoU8!!&n%|daJYRQ9$tH zSOWIm{GD;Y6x8&0-S-!ESo>mDg(R&p%XUjdBOqy>%R72u-}fQ*xJ~qI9~>f6+wgcP z+k#6{qTsiAZ{A&eIVHxyetm*yB(+`Dd|p_%=GmwmWzk(N)8{(Vm=xMbRaz+dgl%m| z?eNRLLTp-e{m@2+`_Dq)?v`0ae^2v)fNG}R9|wUi>c1u0a!?XYF))rP&t_lK97T(6 zoIky6?lEmMBS(}?Yp5kt+YjAyvny?^bA5BI7mjPOirW~SZ&|*R=%l#c9ISCE-4012 zkcfjTq`=~ktO1BnjDwyr_7ty}HQreT{8`C9Q^sUi-_}-?d0t8Gp<5#m0EuRTSwWf3 z1aOSyJ$;muQiNYJLxsk5|JvN!?4E8x)wnEbRN_WN z)#VHTz$ZpNGuI`A0FDcj2OYhj+4^U}px21G%W&9?fjpc~-1QOopQJZhDtugT%U1767e>Hq7}VP1rKMtP z3RP`a)S8*F1B>f2=3C5fIj4I(<<|=zswsiHXUaI?%T`spW9K(`NjBX#H889n=_(CA z#yg-*m*=u~>7XqK>(sk4D)I*ag1`nS#n@898>e;5(|_Lzq*w8lcfCMI+EQ3hZO#2| z1dPmvsd$PiweM9{>zP?b?z(R);|S$94B0~4cTBj7+cJH`eizR^=a$IZs}Sx5D(~u_ zJG4p+p)Pks{V~HOtL{O<+*IGiI+&)$#(z~c6|AVJAk+O8NnlW%VV(d8C=?g|R7$f{ z)6if8t%Vo8TA5s>#eeiG(W4IyIgNNJVJPhGysdhrwWjdv2x-Oz%Be4+QEReU*_t|1 zpS6(H{yDttmibPNZF1Uyu_~z_tU`RVOMW|aPDqR3+I3EZc1MFcB_D5u@J}DI$|y1> zjT?SdCzMuyR}|ukhE)Q9AikR)tN%qs20op4uG9*6ZS*ABM%k`lg42DLou z5%!0@<8yU&wUjfi3UC~Hyox3zUj+OWQ{5|@wSu<$3hA62ENdjD2;Wluf^s`)#~+_u^Pp)b*F1dyRQ%)cAH|M}q1XMbQn#`FcQ-v9B`TRrvMT zEiWlo@8KGSP{4PF(;z4)NLsoW&L~~71#hi&oIBiZEb_KO`Uj{~ok9?~`}abaV4WHj zrZVqKQ`mt7p1{L3B>X+@jt*UT0)SQ>`#xMbk}s4kHsAKM#c)L4epp%6)?B&Cxhs07 z4eZTH2-3+Z|1g`|lfgc77+m}8UiF1HuythBCuH)#G49)m?_ir_e6F!n+w0dC`}_MP z1h6AgW1}_%H61ed9~|Nur}kdVUK27M&gX{7ze@t7tUasyT!6Q&T@toedR$J>j4EMY z=}(ReNM(bk1(u=22iin31P2!cory*ns6)z%KAxVhY7aN}72)2mEQTMZ%*Os`kF-;y zv+Zhd>TUQKH3F^2Y`ZRzFw2POe%-XA7{7W8oL^{^n%qUJ@Io!G7WT_pO_kgVkUgoT zJwP`C6n|{2$rxL`wpCRxg$KIvNt{lo3~D=pkr&U~gw z9@qPE(Yc8&)2x7I@xptHOkbQ6O)d$GPf8p93QppKarGLKXIQ19_+TOzW%OWNlC4sU zJU(Da9Io&wQHLG&jMFNNNkoGMB_x3;K4d$)5tn2~h7yYajEgF5@_)4dN0Me-J!-|! zpLh*!Z~gcT;c3jzMA+E0LkQ?cWbusxo!t_o76vB5(T#VI@BS8Wt892}vJuXmOzTnl zD;o#>pH}Y!TQMWhMn@N+pZIi#Spm?gvzLgvdblI%1ZZGL;Z)@d<87|Lx&VG&yR z3Q|&1O4>g=Gg8E?qDAmHB>!ZiS7SEZA{|s+T^+W!x7W<07IY$@g`A9FwsU7~NMUQ> z+Ui1m;3CxEWOjY>fL=HFlTufAaqud%)moJ?Syy*Z!%1s&bE7))?5qQSkB%UN=z%en zgdM9D;0cR>?y!okF7L->bef~Rz23%H&F2~%jX9pI@33qgNl+Dj7Gxk&dY!-d>Rpre zw;L?h*_>%ZntwJmC7m`&?UkCCn5cd}souSprQsFv58v}02n6yPg!OvL@@TZ^CCQ8f zFLtXIAsQ1-^q^b;l8xq{d;9qCmswW$ViFDWE|S!5+>kASV^%1JfUmELR~8dE3Na3E ziNtffV%pwlduH1)Xdn_lsSQMkJV77~uOxe80we!pBABYmd~1EK5Jm~;MoIiiDtzjQ zMn3_4{P8)qBIREK*f=rMRAi^4qo=3I-u}Mu5kTbLErBy8mIZ&hWhy>-FR?~)&6FXR zKaONhEJH&NYbxiS_8kfZZA>MH>w)a-?8xfB(4AtS-I7fg29rM2LyJ0ieO}_1|38Jb zi&