From 0a33bd523412e2716660e99a684793962363ae6d Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Tue, 9 May 2017 11:08:48 -0400 Subject: [PATCH] More tweaks to new head guns --- code/datums/autolathe/arms_vr.dm | 22 +++++++++++++- .../modules/vore/fluffstuff/custom_guns_vr.dm | 28 +++++++++++++----- icons/obj/ammo_vr.dmi | Bin 1809 -> 1920 bytes 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/code/datums/autolathe/arms_vr.dm b/code/datums/autolathe/arms_vr.dm index fb0816876dc..9db276b6784 100644 --- a/code/datums/autolathe/arms_vr.dm +++ b/code/datums/autolathe/arms_vr.dm @@ -11,4 +11,24 @@ /datum/category_item/autolathe/arms/speedloader_357_rubber name = "speedloader (.357 rubber)" path =/obj/item/ammo_magazine/a357/rubber - hidden = 1 \ No newline at end of file + hidden = 1 + +/datum/category_item/autolathe/arms/speedloader_44 + name = "speedloader (.44)" + path =/obj/item/ammo_magazine/a44sl + hidden = 1 + +/datum/category_item/autolathe/arms/speedloader_44_rubber + name = "speedloader (.44 rubber)" + path =/obj/item/ammo_magazine/a44sl/rubber + hidden = 1 + +/datum/category_item/autolathe/arms/mag_44 + name = "magazine (.44)" + path =/obj/item/ammo_magazine/a44 + hidden = 1 + +/datum/category_item/autolathe/arms/mag_44_rubber + name = "magazine (.44 rubber)" + path =/obj/item/ammo_magazine/a44/rubber + hidden = 1 diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 6c19db6426c..f3d9e71dad2 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -575,10 +575,12 @@ fire_sound = 'sound/weapons/Gunshot.ogg' caliber = ".44" - ammo_type = /obj/item/ammo_casing/a44 - magazine_type = /obj/item/ammo_magazine/a44 - allowed_magazines = list(/obj/item/ammo_magazine/a44) + ammo_type = /obj/item/ammo_casing/a44/rubber + magazine_type = /obj/item/ammo_magazine/a44/rubber + allowed_magazines = list(/obj/item/ammo_magazine/a44,/obj/item/ammo_magazine/a44/rubber) load_method = MAGAZINE + auto_eject = 1 + auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 4) @@ -995,20 +997,32 @@ //.44 /obj/item/ammo_casing/a44 + icon = 'icons/obj/ammo_vr.dmi' + icon_state = "a357" desc = "A .44 bullet casing." caliber = ".44" projectile_type = /obj/item/projectile/bullet/pistol/strong +/obj/item/ammo_casing/a44/rubber + icon = 'icons/obj/ammo_vr.dmi' + icon_state = "rubber357" + desc = "A .44 rubber bullet casing." + projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong + /obj/item/ammo_magazine/a44 - icon_state = "a762" + desc = "A magazine for .44 ammo." + icon = 'icons/obj/ammo_vr.dmi' + icon_state = "44lethal" caliber = ".44" + matter = list(DEFAULT_WALL_MATERIAL = 1680) ammo_type = /obj/item/ammo_casing/a44 max_ammo = 8 mag_type = MAGAZINE -/obj/item/ammo_casing/a44/rubber - desc = "A .44 rubber bullet casing." - projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong +/obj/item/ammo_magazine/a44/rubber + desc = "A magazine for .44 less-than-lethal ammo." + icon_state = "44rubber" + ammo_type = /obj/item/ammo_casing/a44/rubber //.44 speedloaders /obj/item/ammo_magazine/a44sl diff --git a/icons/obj/ammo_vr.dmi b/icons/obj/ammo_vr.dmi index 1c0cefdae10a21f0fe844578504b5fa3ef089a90..066d95333eb31daf960201c7da144debf17be589 100644 GIT binary patch delta 1779 zcmV0002j-(Z4_ zGEP)jhK-T8bPbs^0KC4w|NsC0>gxah%)r3Flv*Un00001bW%=J06^y0W&i*I33^mm zbVOxyV{&P5bZKvH004NLmDRCM!!QuW@i~49tDS?=IE9G?wW>PMS3r*9i!HeU`L5;l z2@NnI?qh$mqn{j||Btr8och{KeJq;4)jcZL6LmHzj8x}8N zUaopCl0!+9!^%`cDm*{kn2L%&hh_bnt=r~bT-Pk)i)+d>sIu#Fkmxf2%cbu_(cgU@ z5mP&0jG5`myX`~GZ($OMs%V)LKlI1z^7BxApc{YNV64TM!&ry0EynI427Jty39s>` zb%(WJtOa8&7;C{;3&vV7)`F2+qwG22F}}GDu^NQcAgl&qH3+LgSPjBz&>y$9w)@lW z_JjHWMc>LScar@0000GFNkl~V$i)71|6VAAIox$_7vtueiGw&U+y&1eXKRh})$;y+)nyFHX znnH33GQJN1r#c`$g>=8h_&zMre1R4}c)%^+W%T^%MVkMbWe*Rw-l>3#iF){24aoFs zoKKJ5L-jsd%;48*K(1e7eR9lz6DVM_T_!!|5>+#2iEjT%XrF`5CPVgXK0bdv^kstV z*Svgk=nFmFule}&khf|~zvki7L)~l_aKrC;yo`KY5(GgI1VIo4K@eUu+ympbdZXL` zU$On(sHcDzY`d?#zeqiT4-GKXR|go=mjRf54e{U-3-rzsi|FA1P``$F3*%QPkyUb4v^{B>iX0-+vW&&+Y5pq z2!bF8f*=S&Egl~qXUp*lec(*!H;?@AapTqM|E~nFx8A(J0{?<>d=h_Ou=&yk$+uj- ze5peQR7wGVz&bvGj~4Jz2Xy~}J%H}LCdLxY7ijSVeZ=Jwa{YMKu8)SEzjBc}U!5b~ z{`}+nHUh2`RDK{H7+_Q%F<`NW>U~t@pP*Y`VcyyUTktIeTq!zWn0Et&`FH`1bBtc1 zK^{EE0(=_*^HYG_WP*P@5Fp4$O^943ntA&oknl2rUg+EQUKjc(Ah&95d#_uyC}20+ zZF`@a?Kt%KaY+yaK@bE%5ClPZ&Gh|&bG=^Ao}RyTt2?%XP^+vsMo|;qWJE9{=f_w`B75M(B_vzp4eKO2P3s~%-dLLE! z47u-*dY}Hy4iM&B2&kBVmiOu3oO3L|#|v04!F-0uC2Dz}{;d)q$hQ=b+GHxelgmV$ zgve!r^PT)7P6U6j3q9*Q`B$nKAh&9~@8X}~Vu0Oj`}*B|ToMF95ClOG1VIp9IZYoZ zQ+o`qU+cT)^U?iU-+f@f@cu2e=kwA1S{L4YMX2ZVnV*l_uXW*}Md<761ho3KE_@|G zkoQSw>`_3!)`hqC$uRE?)~^8r4EB`)M)m#y;eHKTVxd>Qy2N7ox&f(8BG>~1jOK$9 zg8iDk$#;JlXnL720@m!``hKA|64dM8dVi}{2B_J;_5EhsOwjMgA?g1FK@fy^{0H}L V$d0vCVg&#I002ovPDHLkV1iRvi4On( delta 1666 zcmV-|27UQ}50MU#BmuOMC1H`0B!2(^nYND(WJ?DC007tDV1kS?PE=Tijghx>4Q4X{ z%rgL)GXT84zW@LK|LW@h|IEO^z^RwB;s5{u0d!JMQvg8b*k%9#0Q7oPSad{Xb7OL8 zaCB*JZU6vyoR!qO4#FT9hT$2mg4DUD77vq)X=5Dp77R`KTasE0Kh@i}o_{tYpBpq! zpy4G<)TZ3-4yxGiDufA#~O|>TDuK z?L3cPXHt+iC;J+IvuU3F#p9YobJUsd>$p5Mh)FfD>B!>B4^?HoUaV5S*goJsE+2~m zKk#5PjO7^97@K2kfw3jTfPbqp^mvW8jytRcV=WkK!B`8%S}@jvu@;P+8g+(SJjRE| zAy$L18ids#tOj8<2&+L@4f=6v6IC9H=ktFDe4w3?RF}&4000FGNkls@i?JpY;$vSYisNAQrT>(^;KV+XstdvCPYAC2Gcyfrj1)Mx0y!-Ip}3Ie9a+BqC1BEru!bJY60lqkzOe)d^u>FSjV#k( zpqF~!_&B;}?42!O+F7RC1ILqz(!x;B*!z={llS`erG5xkJ@DbfWTLh()Vl=S-!b>l zaDUq6crxj?Fw{E*6kT8$gG2r4#|{%BK%f_V`uzEe=@}GVV1Ih!3Gt_2JA7-A=ZR47 z7;t-J-i!r!d5{UBdMAv{kKh3S00000004l2OsCV?+4+1{q5m%UK_7R1c6RT%?$r0^ z=j0VS#~1M}KmVf1H=p18U&e$}&N*=b>G%RZTEM9Ys9r&CKz=WXF+`gI+Wt_tcr}Dn ze}0zMM?>_V7=NVAuNk|zaP#v0kMENNJfHK6--du)Pc<;6j~K9>L&ZGW-of8$K#iB? zzyv-?z_}%$kEa6o_;>+3Ly*tRL)62QL(s#g2{`A*Nyf)(o-t=1HKAsi2=nqHP;i;h zF7&Cr(?TBw%~mb7ciO5&LATjX?Oit8aj5up2><{90Dk}g0Kh}0_7~2@VllhCT58X) z^BL-M#^TP^a_LlmTr4=5pmRLwbJXWd<+-cn<)uq`jx9LnL;&e{d%!gHxflT#BA}W; z4ybyU`djxee7zvX5N!r%`$Ki%YKW@drT*3%gkC-xqW@NdR5`!SyVT$M0epOdfJ;sl zSG3-x{(mOVlYTy0z;+H5^C)k6NIk#SQw{9b-$H!+fJ<%;D0^~<_3CdSK3>4iGiDy5 zve!IA#!1A-CkWU)0mezD=R=nPr)45eLd`N^^I858Cjz>K-s-dbD^(0MTQ$4S@y~EE z&~3I|{rbKx0RR9100000c;JM-P?q*OZ1uI;J%9UG+|lMU*Vk(IEq}FBK>zw%X>SX7 zwKUh)a`^6F_AR)_{j^|c(n7r@KAB<##lM13uXm*+`8?~Ja# zrZzCXmjn2D_keVLjeLe8d*vDP@IwMh^);e_(S0v~m-k9Y*4N}ozS3pFE#ScVTMY}n zV}HV7^|u!0*5@>yXn#Of?-8(_L&ZGGn>(bIuXJ9T;|lm80l6ih zmnRzN?d64nzP>%+Y6v!W$T&oOJT=68eQ%+lukRVqG|6~*O#m-X1RPR7)GiZYUY_KK zEfd|p7`#kq7y8sbe4%$vNN?3r`{1pbGrG-oY9G4UcBj_YAy*Fo00000007{DvU9F4 zl=(ghlp)_ookHaMELR5Ghtqf;R?9$q`c~?1CSN_&xBY(o&E)HcC_gFnH