From 180a9c081d570e990fa17ef2216d374c6131dea0 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 7 Jan 2024 08:26:17 -0300 Subject: [PATCH] Fixes the dpra brooch, some pistols and a trader item (#18170) * Fixes * changelog --- code/datums/trading/weaponry.dm | 3 ++- .../projectiles/guns/projectile/pistol.dm | 2 ++ html/changelogs/alberyk-iconfgixes.yml | 8 ++++++++ icons/obj/guns/dominia_pistol.dmi | Bin 1611 -> 779 bytes icons/obj/tajara_items.dmi | Bin 222306 -> 222304 bytes 5 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/alberyk-iconfgixes.yml diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm index 65d99337e2c..c01ad823fe0 100644 --- a/code/datums/trading/weaponry.dm +++ b/code/datums/trading/weaponry.dm @@ -130,7 +130,8 @@ /obj/item/gun/projectile/shotgun/foldable = TRADER_THIS_TYPE, /obj/item/gun/projectile/automatic/rifle/adhomian = TRADER_THIS_TYPE, /obj/item/gun/projectile/automatic/rifle/dpra = TRADER_ALL, - /obj/item/gun/projectile/revolver/knife = TRADER_THIS_TYPE + /obj/item/gun/projectile/revolver/knife = TRADER_THIS_TYPE, + /obj/item/gun/projectile/shotgun/pump/rifle/dominia = TRADER_BLACKLIST ) diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 3fede267071..a75efab3e21 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -344,6 +344,8 @@ ..() if(!(ammo_magazine && ammo_magazine.stored_ammo.len)) icon_state = "[icon_state]-e" + else + icon_state = "pistol" /obj/item/gun/projectile/pirate name = "zip gun" diff --git a/html/changelogs/alberyk-iconfgixes.yml b/html/changelogs/alberyk-iconfgixes.yml new file mode 100644 index 00000000000..5f79fd37b5a --- /dev/null +++ b/html/changelogs/alberyk-iconfgixes.yml @@ -0,0 +1,8 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed the dpra brooch having no icon." + - bugfix: "Fixed the dominian service pistol and the 9mm pistol icons breaking." + - bugfix: "The dominian sniper rifle should no longer spawn in the tajara weapons trader." diff --git a/icons/obj/guns/dominia_pistol.dmi b/icons/obj/guns/dominia_pistol.dmi index 3862bd9cd3b5f94312cf4f3c0757d5de9007bef3..98f7e6f8c4874541620f4762bf66169bf165ee86 100644 GIT binary patch delta 666 zcmV;L0%iTn42uSk7)=BN0000dRA+hs001XYOjJd{z`#8}M00a<`W+o5B{iX~u!loJ zEENt?DJVA|A08ea&$BCraSk;PZXW;u00DGTPE!Ct=GbNc004}UC1`(}N`m6}q6~y; z6N0L9NK&1fm`;jQfXa0ZaA{ChaP@Nm2Ok00H_*L_t(oh3%L@Z<{a_ z$L)#89EkJa|fCE2)kjL{r;6;CP_^BT!0DxkI?vf;l<9>7#tW&`@*EEyRRX2)-t6DXnl+EX? zW_5|IjZ+#hu>_z(p(c=3A_l=@$$Z)b0NX841*mwP!sqQ*v6S#hBLI4+s&AmEBO>3c zmz~O!>LuiKb%+9O;qj^Zg{D?t3aSIv8<11=GkRNtV`p4)I_!U-Npoktx}Z5x8)9A- zLq!OQX8+Tnvqe6WV-sfVhLi&h!UC}`%>{p$6SWN~l;PmqWeCgqD0n;{JEv~W=cd7o ze;h1V+-LO&0oiwNa<$*L0|+!u{5rzQSl8cZ5Lp^vv(n@7cs!nW0!Q|IVO$gldgh%9 zoZTW*3P_mM-${SzpXRx+AX%y}W81(?3RjV*|ROku5t(cpBNV ziw`+n+p-h9VYw~48|2yAmYsf(F1xpEX440HzL2oZ!j?i!AL#jl>m~Gj!0-j6*wN@e`#JD1I46WQDcN639sIUg(Xy;KTLzJU2 zBIh#5XLF5?Htk3)O?1%mIKF|Ap`#rzs&5?R7M?}cOr2qgJxqaJi zH*yOCLnQ0Sm(u48{yYq3Y62z20Vg3rcLo7K5@%;+;dZN3NOsCPWUba8u6_Nark%6V zGylR2Wr=C+*#_bVm*T5VKWlR`v?vXO7&t;X8fIy#FDoM`e5f1s<0fA#$5LSct75^@ z3t<)JXsHn3FXw(@hflqWTZ(&=5Wn_iJB9TAk@*g`b89|6F#=>fD9O#0w-Kzk-H^8R zISNcW1O4Ry;Q|Da2{lrX^gpzx+qee0xmolH+sYH(4}~)ynkOaj0{R=nOZJ00%U?x` znd!|f2{Dl#;SfO@nSEET|-^OwZcO!t;%q9XuGW*QM z)kyj@6PpOy@STih(CZK^?3ORs@>bNNf1-47;{7=NelmNBP%HTTvln%5pOL>6prR#H znu^a&p~0_0S&a)k!?y;}ktA`t1S0gZ3Cvp%{N4~RiCS5uyJxhnC zXiPSO$rY7A;wU{yhUd<{0EJ`B9jbXuQ%ejTeBm<3v;LKV-(k+UIp0;hGC+qHqx8vM zb7ZsIgOd~716vaZV`CRz^BykJ@U$89DTBE#UyQq%=XEO}lmdIiX`1S6oo z=9tMme#Q|Ik9_>8dbTQ8kAn$Lf4&ODx6u@Yy=}5pPl)SfBR;C2MP>VPHtKuUsij7L zU&sF%bg)R^RegDWgt=n;#&c(>p*38!sdb6+{JgW5wmcO&o{ky6r`Vx6O4A^uZ8j8v z2)lz#dA@t^qEp|MJ^tW)%;_vy95$5ZhdThRnUS=U7gK;ngZQr|jzzC*TU}Hu@OQ&u zfqinFhNtHm(ZSVmB(L5jkt@kHQfOa*h#2cv5+1KIb_*K{3{`)&$t~Q zv~LMnd3E&SL3^sg=)yvAiOd7H-ZFLYv1i1IwKGbNy|_~qgHj(nF>}d8_1$u23+Vr7 zMf@KKcA*KX(JXXMPEIF>v#-$4zY<>>TV+gx}*2?U;;Q@=2;eCKHVH zzIggwrOp&AqJ@_M)l>>h!gp-BYGid}(oC`eR!OiY=9TDd`yeSO%q6jZg`85I8AD+~ zbM9M73Y2TJ?BUz(uY0f2*<`~k_~@v?823#__Zo!In~l=_w|S)?kZ;>~Q@QO- R^zK&!cGiwo^_KqW{{R8&z=;3= diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index c6ead2b284aefa78cfd7c49f3d8753243f72a5ad..49c264a2308f358afc8aa63918055ee8eb685b9a 100644 GIT binary patch delta 2969 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