From a6d82f3fb1941b57271fe2d75d4ddf096997253e Mon Sep 17 00:00:00 2001 From: PatienceStPim <108203559+PatienceStPim@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:10:57 +0100 Subject: [PATCH] fixes bandanas (#11370) the game doesn't like missing sprites --- code/modules/clothing/masks/miscellaneous.dm | 4 ++++ code/modules/clothing/neck/_neck.dm | 2 +- icons/mob/clothing/neck.dmi | Bin 60392 -> 60406 bytes icons/obj/clothing/neck.dmi | Bin 7206 -> 4494 bytes 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 36de595d0c701..e0b62d5464f53 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -266,6 +266,10 @@ /obj/item/clothing/mask/bandana/attack_self(mob/user) adjustmask(user) + if (mask_adjusted) + worn_icon = 'icons/mob/clothing/head/costume.dmi' + else + worn_icon = 'icons/mob/clothing/mask.dmi' /obj/item/clothing/mask/bandana/AltClick(mob/user) if(!user.canUseTopic(src, BE_CLOSE)) diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 41058548c6a8a..55505bbae412a 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -199,7 +199,7 @@ icon_state = "cross" /obj/item/clothing/neck/neckerchief - icon = 'icons/obj/clothing/masks.dmi' //In order to reuse the bandana sprite + worn_icon = "empty_bandana" w_class = WEIGHT_CLASS_TINY var/sourceBandanaType diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi index 3632d93fa2e2b6b87127b9129c86496a9743f43d..a84bf30679431458212005253b4fd5cb9f7aea88 100644 GIT binary patch delta 693 zcmV;m0!sbp*8}#~1CS(tnR--MbVOxyV{&P5bZKvH004NLt(ePh+b|GC*Vb1U$<`|fH=I97KQ=IIQNQ=nc>Kn^RKtx?pE`g z?|01;g{Zxof1ZDM_r95JwMu=yxn4H2o^;oz=_V$TC|_Q*Wf!KncW9r zX@7ln-;o5UZeo{lxfVw1oJX~mucQ`0lt8bmgNiJg|noz z6o%!EYNmzDq1iIi5!Fm9Xt?=^DW<7v%L_k9a0pbFI~d-sqM8E7(J7>1KJf=7(^xhp zy-en7MMjMI@_MmcXm}>pFF49Cps;;8wQJH{wauhf1V+u)>w}&2Cde4HeJ0Ju_B|6fVd^2f=;q8bdL0T ze%2pOHdp?7r$8gE^XZ&lQa$jBN&(>2I$<-(t zr)W<-v`7%-P+!`f4T{`IL?}@q=@|0UcTKsq3&i1US{Mc-_JIp>)^MtmB$nr z%Vv1?1wv&Y)Bsc_W&mD|xS5ZxdRUR>DKQ4?b&ZKn3SzevQ@Jq$ng!b0 z-n>#!{*&ia`&47Kbi-hg=AVKp_vZ{bv&MRKHCVIe*)-)|q*ILc1jH>l6Kv9Lra98f z`B{EAbzJ$&odS)t=F^#9Qa$jBO3Dna@2NcbBf35rXZ-2KXyJIdoZqf)@?S{509mAW N@u;W9TC>IiFzNr{Q{4an diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index e5dad321329b4f8b26ab5da2b923deeab1929d98..31e40497477f13179b6aa840598b194093a247b8 100644 GIT binary patch literal 4494 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 literal 7206 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 (B-)#clbZ^9U7_-$* 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 PKY-~KGs6n~`?3EA%{=Y;