From 8fa0dc26fa8198febd240eaf8dad94c088392404 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 2 Oct 2020 17:57:35 -0300 Subject: [PATCH] Fixes the sawn-off improvised shotgun having no sprite (#10154) --- .../projectiles/guns/projectile/improvised.dm | 1 - html/changelogs/alberyk-shotgunfix.yml | 6 ++++++ icons/obj/guns/ishotgun.dmi | Bin 1195 -> 1412 bytes icons/obj/guns/ishotgunsawn.dmi | Bin 607 -> 0 bytes 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/alberyk-shotgunfix.yml delete mode 100644 icons/obj/guns/ishotgunsawn.dmi diff --git a/code/modules/projectiles/guns/projectile/improvised.dm b/code/modules/projectiles/guns/projectile/improvised.dm index 2d381c0a264..5e3a36b98f3 100644 --- a/code/modules/projectiles/guns/projectile/improvised.dm +++ b/code/modules/projectiles/guns/projectile/improvised.dm @@ -64,7 +64,6 @@ /obj/item/gun/projectile/shotgun/improvised/sawn name = "sawn-off improvised shotgun" desc = "An improvised pipe assembly that can fire shotgun shells." - icon = 'icons/obj/guns/ishotgunsawn.dmi' icon_state = "ishotgunsawn" item_state = "ishotgunsawn" slot_flags = SLOT_BELT|SLOT_HOLSTER diff --git a/html/changelogs/alberyk-shotgunfix.yml b/html/changelogs/alberyk-shotgunfix.yml new file mode 100644 index 00000000000..a5e86033c3d --- /dev/null +++ b/html/changelogs/alberyk-shotgunfix.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed the sawn-off improvised shotgun having no sprite." diff --git a/icons/obj/guns/ishotgun.dmi b/icons/obj/guns/ishotgun.dmi index 04f667c24b07a76092a97ab592af6b616c0241cb..b7432c2f4ad82a8763882c4b6ae1a35265dedbbd 100644 GIT binary patch delta 1201 zcmV;i1Wx;_34{wFiBL{Q4GJ0x0000DNk~Le0002M0001>2m=5B0B!b@Z;>H!CuRTu z{{R3gNKE764Q1d|}|{!#V%}1R6<1K~#90?VRa$n=lZCX%q)AT~eI3!nlUW z!g>EUtgz#hMau|u0y(+gkEFKH%v>WNy|NTV000000HDv8r3>)jj@`4(=I-GkPU1}x z-*3|GcDr;@KHO!0?CZDhKOTQRDh2Uls_IX-dAxL4bapIzdfNTk?RHAQ@Al*WlWyaL z=XsW}JYTvz3M~8o@9mX@7ex_gY`^~)3RwTOx&(Nc$1G#Tn}9>8WadC#DFz4kBwR1y zGG;t`6Y%$V^aitg_lLezfsAEHBD85Gpop>jO>r8v|= z=v#)xN0<72V!vWi5a|@C`n}_u6pWZwzn6ju_0tuIdP4AP2E%or8u|*3(^Awm^&9{I z0001hPt62>b7RzHNslM@w`cgM3r~2Ua{S5nBhSFWN%En9lPrT3#Sth^nnXK;f)<=b1fR{UObpJ{72!?YYl>lqM z)9A_2O>bGa?;qs) zR{!ev4|4Qg{r*9Yucxnm{~*WuhSl#}ALLjcu=@RjT=lPg|DcKM8vpOyAyi0001h2m=5B0K2`CDUl&@C;tEd zW&i+5Nl5?z05dZ)z`($Bm4b}`0004WQchC~n7 z(;^|~A&KzIzYPL{AP9mWmdBU51sXiCN48o$JUxXxT=DR66|L9nxuu#s#O&+0?>{y_ zH((fUBJhjWNjSHE){QNTpP#qCw%aWT{;r1aPqYrXNRpVdB$->Ug2lJr*EL+EX&T0C zw_AoGYahcB6j>6on5FN6dtb%O9ob5>6zi`@7BUgP3%=y}K#>>y$9Zlz;VQwp!x%7F zhjDrlER6jc$P1H(;RKX$_1RX0Bavm7tg7MfQh(QZE7}+?~ci^XC;Q%VB=| zU|$vn!%{nyd5$g7m8<=R*j+Fg20BCV8&TrIIKM%L_xY7$FD?!15KgoW^U);;f*=Tj zAeO-*HjfsPWo&QFB)i_8ZCNCWsYQ<=V=CohZVMYK#BWeiu zrIfd$qA2%6mgU_cAclrvF>nBb2|_?!jjQ1ZKkp%+zDD_GSd2^WC6RbX1}%cvKmG?%GTpooyIv2@1p|EtKM_dsBiV zH`U5Lf}KE6KskJ-5LNT5j*53amr|fQQT^4?MetNL_rDy(ugq@FM7%fk0Ru^Ki;yUkjoz3p)K^7LA7RoU=Y)JqV(*KOywr6a|9T3yN_U%}`$xAlp?Y1&v%9Rj$p!nfY_cvs zRFEJDf*=Uu^Wi!F^N-*BZvwpLe^cNy|CPx#07*qoM6N;t FV1nPu$gThY diff --git a/icons/obj/guns/ishotgunsawn.dmi b/icons/obj/guns/ishotgunsawn.dmi deleted file mode 100644 index fd601ca5acf495ed1f12a0a962922689918f0d5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 607 zcmV-l0-*hgP)P)t-sz`(#x zPEL%BjLNl_-N~+lgM)^Kh8`Xs6ciM=xVUIQ3tnDcVq#(@CMLe9etb*~ky#K?F$gLt zDR*~wARr(jA|gy40KmY&EiElypP88e0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pS zoZ^zil2jm5DYG~uza+ghuQ;(hPl<~&C9|j)C~U~ZnO2mTn+joLRUBWGflzNkg!&wu z>Xj8-{anDV2LN>{J2%K&s=@#O0XRuSK~!jg?U})nf-n$7qroNOE-{#l`TsB70WYk} z0F#PUR@v{s1?UIlGEIyD0DyPo@Pf>vZS1MBU#HeN_kw(LJhQ=`Th4D?XX^_t7Z!Yv zkN?v;+w@&G9cpXbgQoZ1v*3EIZkQ~_^kIAf@BavfdihNFC%DC^OuDU~9+$w+1SxLZ z@Jvh_7xW>7Sw7vh--xyhb8;qK{$K`5`wg70ihr=*P?o>nkf|)64XSkj00000_%!4p zR5hN87e{eUS5<_y7-`%~nhGMv40l=%;)2z tL{h$hQI?2;d{v1^rPF_v5&^&)@C%iK5$t(tjXMAU002ovPDHLkV1l{$1Bn0t