From 39005d1bda5eb36e99e3718f1f3e5ea24a8255d9 Mon Sep 17 00:00:00 2001 From: Theos Date: Sat, 23 Nov 2024 14:47:51 -0500 Subject: [PATCH] Fixes the switchblade letter opener and machete becoming invisible (#3767) ## About The Pull Request switchblade now uses on/off sprite & has no world icon because it doesnt have a world icon letter opener now doesn't use world icons because it's stored in a completely seperate file and doesn't have one either machete now doesn't try to change its sprite on wielding because it doesnt need to do that and also doesn't have the required sprite ## Why It's Good For The Game ## Changelog :cl: fix: some weapons are now more visible than they weren't supposed to be (which is none) /:cl: --- code/game/objects/items/melee/knife.dm | 2 ++ code/game/objects/items/melee/sword.dm | 2 +- icons/obj/weapon/knives/knife.dmi | Bin 3434 -> 3196 bytes 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/melee/knife.dm b/code/game/objects/items/melee/knife.dm index 70ada48ed452..b671018d6540 100644 --- a/code/game/objects/items/melee/knife.dm +++ b/code/game/objects/items/melee/knife.dm @@ -161,6 +161,7 @@ icon_state = "switchblade" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + world_file = null desc = "A sharp, concealable, spring-loaded knife." flags_1 = CONDUCT_1 force = 3 @@ -190,6 +191,7 @@ /obj/item/melee/knife/letter_opener name = "letter opener" icon = 'icons/obj/items.dmi' + world_file = null icon_state = "letter_opener" desc = "A military combat utility survival knife." embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE) diff --git a/code/game/objects/items/melee/sword.dm b/code/game/objects/items/melee/sword.dm index 0b64e22ed67c..223a6c17f328 100644 --- a/code/game/objects/items/melee/sword.dm +++ b/code/game/objects/items/melee/sword.dm @@ -67,7 +67,7 @@ /obj/item/melee/sword/mass/ComponentInitialize() . = ..() - AddComponent(/datum/component/two_handed, force_unwielded=20, force_wielded=22, icon_wielded="[base_icon_state]1") + AddComponent(/datum/component/two_handed, force_unwielded=20, force_wielded=22) /obj/item/melee/sword/katana name = "katana" diff --git a/icons/obj/weapon/knives/knife.dmi b/icons/obj/weapon/knives/knife.dmi index c77119f5df6f10fdf16032509b0cd5dbd1dc8370..f8a7929c54bf527f1e8a8d40b802c940a969d7ea 100644 GIT binary patch delta 3191 zcmV--42bjU8vGcLB!9hnR9JLGWpiV4X>fFDZ*Bkpc$}4yJr08~429?96cOxI|JE)Q zRmD)Q5Sb8&1tcgjAaVNAB6X{pZtq#2Y(F~{*V{cWME1z}qwkdXoa;-VxSnD36Hd^@ z(Pp%SwuyrWTo#aOB#PL%bXLm>nkIrBItYYHMkbtJH!eG<{$i!G-|$r2itPRFCs8t$ z!L2sVr~m*9dPzhSj+qx;=tzt$zXV^Vg2>6WF?WLqu0wy4p(y z#Q(%SmCQr{knn_f4%z|$f_!@YO7^>s6WZDm_e}-CqdUK9Ra7o!5FeR0eEEvj_MPJ6 z97L1{0A(Tx(tYA>XKQUuUYa&}sW$-}?lsT)BM0F$95)awkCM!}19d z|LBo7A%=1na*A)C&kYJb>iiMX1HdT+fcTV&Dt~aciS|n774ZP1Z32P86b1ox_J|;h z52TiWc;W-peidK3Tbs_d2?PQfdLuPXZ!iSLBO$L~}BK<2pwCG*kC zN4-x)d>|zN;#n|&_$snLQJZc+`~{_Rl!zas%m>ul2Z_W7zDt0c5QI+g<3X7Z@l|v} z(Iysb(-lR(;)6*$KoD#{8M19(6yId#_eamO`yZ&W=(C}BIuSd3vU~d%`u@q+@1A*sXC4;aH6NJ|@xhX%%UH*6 zU*|!9_PvS^QVIYPqUpKaZ1$`|R#CMo_A`~4k2Zm`O(&{*`&UNZXBX_?n_v1dc7Nc7 zef&$;DgM?kKE}l#9=^=?u`Veq=Rx4N{iFdP3bD2RDR!o}i*F;#RA)Xw(19i8Rjl@r z&)xF7Vuw$K_@7*Tw{>UUZL$6P?k#3L=Z|a6eA-43{Q20Md^>usm#=GT>wQgWC+q}@ zLiAr8;NlMr^zuL2{-Tv!V|TWRpnn5m;Ei9<;i#PCLFaG&`0V15j#JzL00II*pc-U8 z*2s8r0AxPIzxZBX#IN`u?iVK7K4m_MuL@`8i{guIBk&Les>R0|0dQfw??HV50;Qq9 z=RGCgiCFUiGG7#5Ry(c^;AZVRVmEByDEc0cybxQywvVB#gn)xCW1gbKh*s|>_tnFuG!9d~@Dze|L=BpAPO!z<( zwlB7efFpFZE#j>C5Fa1_oZ_p1Y+uZLph|q;S^{*653c^}ic#^=(--$?$QLj3Re(t* z%=7^rnNLg@20Dc>!R3Dp8GmVa!}@!8hYy)AqCVZ5LQI>yNBWd z@gY2xq5f%Hd}Mv~12+XiFknF-_;rFnI)Kj12gqpA_DOs?<_rb|i|o6X<7GXBKl(-= zKjzGK8D&6)1NaI6x86R`_0)`;__#xO{AEx|Sf86~k??@B9t*^eXY+pTAHV@dMn-99$yU#oKN4^iszu0$`3l9>BFN?r9fa%N!qTrPIKxOuGu}e3x z!(aL-ySj8;tk&xg9|XbyOlLlN^cd$mkH-^U)}w0}&%^#7UO9uE`_Bya@Q0`Eqovx! z2gXMMx_kR>tS>0AQnhuNZzn?u*weO|otRd^%5MLFjenG_VW;-nPH`0t5bh*g=R}0!I{| zex|GLyCEz4LDB$#`14Bg*fZNc%j%wfmLG%Ycp0H?@du-J?X#D^M?bLla=7?7uHqH6 z$nsLVqj$UA>vxJjRsu$4H<>bX=8QRBcXxM^-+xR_!T@M|aH$3H!Me4@to?<3?6w7~ z`Kw5ch(8XppTt)IGXJW*&a<=sH{Wb!9iyWY+H&rj04^|V)-2zj6E^@v@vFBtvzBi( zuz5vyu&%d%$=LEojER5dog2!*bNtld13EJwnC#)FigX9y;unqGyg)S{IK@{@ z$MA6ET6>PQWZ4wn+gIJ;ONQwle>|i+0Dr`%>=$dkPVosY_&ax5;!w{NLFnz}g z>o+AnVOsbggUqk2td#2j1B3dfHbcCD%vb9GVK4-m+S=MkOG}IV(Md&7jzx>~4-W|> zXuC z%$cmYxp|+T&uVCBkaSk*Nm@EUTU(n2@nyI`wmX2*7euILczD?KDWpAV9RMNz2?HR@ z2?HR@2?HR@2?HR@2?HR@NjU&8^{VnjLd=lz!=V^+cXf4H1qB7J<8K_7F*hHgmq`hR zIe6TP)Y;h?J62X!#@F<)LRD3j@_!)Mzkh$sjS343*_JI^!kIviOsWsCapT4a1cvC* zXq1Z&;psSBKow#MI&|m|7ar|nN;t$jo-zk>@#4Op3``Z2AFO4Uplo*lPj3imYHE^w z9!Y`2pafyttpouCiH;JKNq8CtE?Tr`!lDb4B`8zzlr81u<<{Q4d)dN;3x8RCeLd^# z)%#z*WR{??1b6^hKQuHH+qMHh>PaQTL(K-wi+XsGzq1iqR^l&{9R8mqR`!eGvd-m+nKKCxO1Z8^(@cjP*ObAbiwr`>YWfDsNbEqmzm!M1{Edu}-f2aiM dxECRl`9FY?OJ@ZPPT2qe002ovPDHLkV1iuJEpGq- delta 3431 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 JPDHLkV1oSSwWR<6