From 784ce2b3a0d3a403ef8b034f43191278c6e631c1 Mon Sep 17 00:00:00 2001 From: BLUNTFORCE420 <65368125+BLUNTFORCE420@users.noreply.github.com> Date: Tue, 1 Mar 2022 11:09:30 -0500 Subject: [PATCH] Resprites the Scout Rifle. (#13255) --- .../projectiles/guns/projectile/sniper.dm | 13 +++++- html/changelogs/bluntforce420-scoutrifle.yml | 43 ++++++++++++++++++ icons/obj/guns/w556.dmi | Bin 5183 -> 2079 bytes 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/bluntforce420-scoutrifle.yml diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index b269563dfe6..acc4997b369 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -226,7 +226,9 @@ /obj/item/gun/projectile/automatic/rifle/w556 name = "scout rifle" - desc = "A lightweight Neyland 556mi 'Ranger' used within the Sol Navy and Nanotrasen Emergency Response Teams. Equipped with a scope and designed for medium to long range combat, with moderate stopping power. Chambered in 5.56 rounds." + desc = "The Z8M variant of the Bulldog carbine, made by the now defunct Zendai Foundries. \ + Features a longer, heavier barrel and low-power fixed-magnification optic in lieu of the grenade launcher. \ + A vertical grip has been attached under the forend to help offset the change in balance and improve handling. Uses 5.56mm rounds." icon = 'icons/obj/guns/w556.dmi' icon_state = "w556rifle" item_state = "w556rifle" @@ -247,12 +249,21 @@ recoil_wielded = 2 accuracy_wielded = 1 multi_aim = 0 //Definitely a fuck no. Being able to target one person at this range is plenty. + auto_eject = 1 + auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' firemodes = list( list(mode_name="semiauto", burst=1, fire_delay=0), list(mode_name="2-round bursts", burst=2, burst_accuracy=list(0,-1,-1), dispersion=list(0, 8)) ) +/obj/item/gun/projectile/automatic/rifle/w556/update_icon() + ..() + if(ammo_magazine) + icon_state = "w556rifle" + else + icon_state = "w556rifle-empty" + /obj/item/gun/projectile/automatic/rifle/w556/verb/scope() set category = "Object" set name = "Use Scope" diff --git a/html/changelogs/bluntforce420-scoutrifle.yml b/html/changelogs/bluntforce420-scoutrifle.yml new file mode 100644 index 00000000000..9bdeb6a903b --- /dev/null +++ b/html/changelogs/bluntforce420-scoutrifle.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: BLUNTFORCE420 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Resprited and rewrote the Scout Rifle to be a variant of the existing bullpup carbine. Also fixed the icon states so the empty rifle works properly." + - balance: "Gave the scout rifle automatic magazine ejection on empty, like the bullpup carbine." + diff --git a/icons/obj/guns/w556.dmi b/icons/obj/guns/w556.dmi index c6d61a28da96cc2e24d66f9975ec3050ce2b4f41..94c132236bbb6e193d4b88c90308b64fc6893d39 100644 GIT binary patch delta 2057 zcmV+k2=@2CD4!6J8CL@U003?FlWzb305(ueR7JqRz(Pk^+aMr}mboK2HgbEGA_)LY zQfORbd{$j`LOnfUm@cCARhKBoBZpG%^00001bW%=J06^y0W|1Km ze^XX)a&`CgQ*iP1vi~_>SXl5JA+0_m9k=j4^Hsxcolt zF8^73sKD}nwG`khuz!C{bOn$b+(i)VoL$qp2@u)w&~dvz@3|PaB z0PO$n5x}m_8?lD_pnAzKe{fX$3<7~bAP@)y0)gP4#=UEBm#t^8al$H`ui)~pWqP`* z0wxYDi&*|$E>4}y$|?Ifky@rKj(hK9e6_rY1uTF^GgpcM^4CoQO(xK0v648rxZxHd z)ZBVxVEt^W0QGE^j7C<0w~v6ED?%{U=^P>ELgL*#d~Rx?O8|&3guR z_y!z>M*fx%t$QxhAdO@E()r>>^6wGA?a8E*>1Q*{t^9#eZbKZZADsNWwx9~=6Tnjj zV9Qr_S~hFMw0d5Of1{O&{j!$50{ET*mJdA|H$4W0IJ*MKhMfX<%%ETYr$zE&oKp83 z5Wr&w{pHgl`H^*m(6U-LvP`&pdM?-5?3AJ>-n0}nlDdOp4vfA$%dLc3~yN@gK%z0e`* z?kq^8QR6Cb?#*`M9f5??~cS}GP&r95>(MJ+}XdYyH6+-P=>)2y;sb$Pq z`TGa*`~zsGwYwhLHO|)Z z38*lK$o!eJQkj?+Qy78__?oyV|SDz(FO~k7f(BHV?(pW%CeoR1n zwk=^aco8lwvG2W2Kp+qZ1OkCTAb4MNJg4ODN18C=NpuKKmGa=jYhc`R3 z(=P{Tf9gA3Eq)KE4Z22GGU&0rfH4nLjo*RU5F2#yksPHBx%#1-wr5)(=h_{=UA(va zhkV~7DpsXF2G@VpJwfQ838IDgRee8+WXSEs2EaI_m+fVk$VZM)WT*lP@vHiN3x6jW z%(y9;+nVkRsE+_s03Scq_uVo6Y+?DkS?YG~f8`s)_XU*sdk3-rE`Fx(`=W~c8P#YG zPu`#_fU&)RkuHFYpXvMV;KV4ch5p|%*gm52`-^*90kpQq#oz1u$e-ECUgqy+Dd6^J zdKIkwD$cl;;&1vs2A~V5@W)4l81~5<=L;ytU*z#{MIvW;jem&5JbB~v??UDHYXMHX ze<$>Pd-&PLpL_brMFp_&H|3p@$8lqGQ*!s1B&v^~uK>=KjURz1K;g#bw(QHc>a^aD zr~Z{(+4vhM6~1$0GxhY7iwa=l-;Rzhc+YL%zrFy0Kp+qZ1cHAA^uE~dcusj6s!YhQ zd>vofZ$?4J4$u9i_51opt#1SSfDU+Je+iU+Papglkovy|URURs9X%tqZ8~9~k*N6wvm3@B7fgzf{1Hd-|_LN&nwK>i4MszX$&+*w2Aq!k_&l z{w@630)ASKYUNMM-#=VHv;IH4X93OnKRQ!fJM{k>(4qf3kn;DD|MllO^y&X^Cs;rq n=>GxY7ir?Zz5szh@ILq-=BHP!4l>P~00000NkvXXu0mjfpC|l^ literal 5183 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