From 861d5b8c6f723409cc4410491252abfead4180f0 Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Fri, 23 Feb 2024 19:56:39 +0000 Subject: [PATCH] Fixes the 88 Mod 4's holster sprite (#5785) # About the pull request **no actual sprite changes, I just renamed a couple** Fixes the 88 Mod 4 pistol not having a holster sprite, and showing as a bunch of orange question marks. This was happening because #5729 changed its `icon_state` from `"88m4"` to `"_88m4"` in order to make it actually work with CSS, but the sprite in `icons/obj/items/clothing/belts.dmi` wasn't renamed with it. I also changed the `item_state` to be the same and renamed the inhand sprites, just to reduce any future confusion. # Explain why it's good for the game Fixes the gun not being a gun. # Testing Photographs and Procedure
Screenshots & Videos **Before:** ![before](https://github.com/cmss13-devs/cmss13/assets/57483089/44ca7d17-440a-4ae2-8fbe-1df38a80e6f3) **After:** ![after](https://github.com/cmss13-devs/cmss13/assets/57483089/ad27fe53-4d36-4101-9122-135dad0bf620)
# Changelog :cl: fix: Fixed the 88 Mod 4 pistol's holster sprite. /:cl: --- code/modules/projectiles/guns/pistols.dm | 2 +- icons/mob/humans/onmob/items_lefthand_1.dmi | Bin 116608 -> 116608 bytes icons/mob/humans/onmob/items_righthand_1.dmi | Bin 113169 -> 113170 bytes icons/obj/items/clothing/belts.dmi | Bin 69149 -> 69150 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index 5794e861a63c..362841651b2d 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -587,7 +587,7 @@ desc = "Standard issue USCM firearm. Also found in the hands of Weyland-Yutani PMC teams. Fires 9mm armor shredding rounds and is capable of 3-round burst." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "_88m4" // to comply with css standards - item_state = "88m4" + item_state = "_88m4" fire_sound = "88m4" firesound_volume = 20 reload_sound = 'sound/weapons/gun_88m4_reload.ogg' diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index 357a94f60cf72d236039b884b4c700197e6307cd..91dc908a8293f2ec154979e208d70f6f18acd7f9 100644 GIT binary patch delta 944 zcmV;h15f;bj|YH{2e6U?fAZy0XBY*j1x-FW6{78?uz+%;fSgq*FyxOVkPk~J8?AIxkiT11R}S?p}O`bV8?B7w_vS$s_$3e|fCABR_}K=Ahak zq;`m?HNA<-)NgTnp0~pEo zF=mDwW5@%QnmkmffBPqeFo04=PdTDCa!A1ljg82J;u!=qi&eUobEa6OYb1VyWAY7? zoHs8dpxVYvj^H+CNc=Xot86cCp(6(l?F zsvBpwz_H|ooT8e`*9@=NNy?Gr!{~1`p#J^t?p-^iaVt4Xe~eopSz_E1B=!WUMLFFf zl4&u@o{SOk;8SDTg}lH4LoC}lUdZRj0fY7A*cv%hQ63Nt7^s(GdMT>6l!q|`2I?Kj z^Oykx^ppt{dJscu$fGBuFMIR^^<_UFcR)b@eB43tTzfWDao#)mLiO(YG`YCEKR>y@ zewcca%u-~Sf0sg2#`&rM=E3t-fqZ~*w{}{#?-vT*1z=YJP?-)jkb@@FPzrL8^MwPF zEZ3J0?~jSY1<7{k!v!Ih=p$enaD=pFj+E&*$i4D2h@@E#&H$c4q(MV9OI(xsXyy48 z_0b{|ta2gyq+B3A2|aQF9D0Y%vNPlY1<52sszZ9@f04sh>RDT4N0{y4cxu21eSZ_eM_x=@dd{i&A? zr@qcht1-2_v>M`c%R5j~w=72t^>topB-2Jxb{N$Ga4XfJPCi{F+rJy~25HJP)d6wN z$R(eyM6{r;Qz5D{G>U;;!7CdzN8lpWD=TN=9j5PM5A5?J_x9R9Cg(S2$=UVg{=Yhw S!Fgv#^tyv62Dc~%0a(F)Ai>N4 delta 944 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 W_%GQI#X;w|9x{U{2Dc~%0qV1MMRJt@ diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi index 946fbfd23cda99f06da92d248c3158ed7758f40b..2506ee0eb48d81a753bee07a6c2155fb5d599e41 100644 GIT binary patch delta 441 zcmV;q0Y?6voCKbn1dt>Fez7I!1b-y9TT^nDNa^RgmNoD*B@&>}lJYvNnRyZ-i#Ka>e7BS((N1-&v!gVQ)v46Zumd03S zd4NPBgGsQd6pu<}P$@nY@u(<+iuhFKfnL?FMbw|D*a?V}fS3u0pMcm2yd8rT1~}sNEPGMOUfHhI zPTVo|>3y8JKE2wU>(eWRxqm*r@|o+?n*&Y`gYHBlU9UZ`MPN-O!|^A3K+ncIj} zte|HW;D06?8&^*jqEOiss^{J1_5&i*&E=& delta 440 zcmV;p0Z0CxoCKYm1dt>FeX%9z1b?*Mnv%0ZNI+k$7Uk3#g=_m*+WS_zoqEQKdKEE12CcqWPGkq}NoOcG+YNeymo)toOL zHDi~phClSctb#`?SiAxzRxq*R5i1t4!ifncCLS@dhzTb?3Z*d?u1jf*<$qPOG{!Q^ z10)g|OoC0NcvLEbO7W?PM@1P_#HTV3^s06(vdoFp=prY!U`W;l@WBZ(;pI#}<^?&J=&s?A08*p+MbSE0=dhLN70&6N6j=$IgdN!7$)iCp5 z1wFGMkGaiGNM|g(J9gH?M|Gt$7FZacFAN+vGX%aEPfGNx*hvnBbB08%d+mUYpPNX` zfH^r}p5sqiv8x}&44#t%<^i`JCMi<1ks3!o8X)qYO@H{1euVYI&mbM50z@JG{t4mD iZLRmk=Wm~iPhY=W{|{Dz$z3^qex-w}2DhsQ0doh-&deVG