From 9a0d798c7c82657178ec19799b4f3667747cc434 Mon Sep 17 00:00:00 2001 From: c#min7 Date: Sun, 2 Aug 2026 02:24:04 +0100 Subject: [PATCH] tcaf berets fixes (#22972) remedies #22756 --- .../preference_setup/loadout/items/head.dm | 2 +- code/modules/clothing/head/berets.dm | 2 +- html/changelogs/kermit-tcaf-beret-fixes.yml | 6 ++++++ icons/obj/item/clothing/head/tcaf_hats.dmi | Bin 2843 -> 2845 bytes 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/kermit-tcaf-beret-fixes.yml diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index b04eea61870..e91bea976aa 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -200,7 +200,7 @@ tcaf["tcaf beret, dress"] = /obj/item/clothing/head/beret/tcaf tcaf["tcaf beret, field"] = /obj/item/clothing/head/beret/tcaf/field tcaf["tcaf foreign legions beret, dress"] = /obj/item/clothing/head/beret/tcaf/foreign_legion - tcaf["tcaf foreign legions, field"] = /obj/item/clothing/head/beret/tcaf/foreign_legion/field + tcaf["tcaf foreign legions beret, field"] = /obj/item/clothing/head/beret/tcaf/foreign_legion/field tcaf["tcaf elite espatier beret"] = /obj/item/clothing/head/beret/tcaf/elite_espatier tcaf["tcaf softcap"] = /obj/item/clothing/head/softcap/tcaf_cap gear_tweaks += new /datum/gear_tweak/path(tcaf) diff --git a/code/modules/clothing/head/berets.dm b/code/modules/clothing/head/berets.dm index 1799d3ac3f9..3c3a0398964 100644 --- a/code/modules/clothing/head/berets.dm +++ b/code/modules/clothing/head/berets.dm @@ -202,7 +202,7 @@ name = "\improper TCAF foreign legions dress beret" desc = "A bright blue, red-rimmed dress beret with a rubber insignia of a torch, surrounded by red stars. Worn by those of the Foreign Legions of one of the TCAF's service branches." icon_state = "tcaf_fl_dress" - item_state = "tcfl_dress" + item_state = "tcaf_fl_dress" /obj/item/clothing/head/beret/tcaf/foreign_legion/field name = "TCAF foreign legions field beret" diff --git a/html/changelogs/kermit-tcaf-beret-fixes.yml b/html/changelogs/kermit-tcaf-beret-fixes.yml new file mode 100644 index 00000000000..0396ed590d1 --- /dev/null +++ b/html/changelogs/kermit-tcaf-beret-fixes.yml @@ -0,0 +1,6 @@ +author: ChangeMe + +delete-after: True + +changes: + - bugfix: "Fixes some icon issues with the TCAF berets." diff --git a/icons/obj/item/clothing/head/tcaf_hats.dmi b/icons/obj/item/clothing/head/tcaf_hats.dmi index 72151e8a3fd4e94655d4b92656597da62d1d573a..c0c3ef27a2420790975b5ab25a2c81fb8cc9189d 100644 GIT binary patch delta 2380 zcmY+FdpOhWAIFE3rtm!G^b||!pd2fOWJu(Y(|AgfQ%PhgvefLm<{5gBFi8_bBNh{} zq2bq($f3yjyyTD(vtb+CZ}j`;_s{3L-uHE1pZmIB_vd}T3Cb^&%X%b$qjuJo?)S3h zvSg71#tOL5u!kSaBt7kAw`=}Ld0DC1KPM7}lDBDUo!i&ERfizp9xpt&FPY@!P!$`3 z1!bj_DaRV^ZD(k{(A>dM>wDvO4(fw=e;?94dtW-lOv4rYk1OQot}+D&7jNk^1tV0O zmmV(D7YZR)`7U69Y|8}$M?P`LMqVZ4f~vDi#ofU@9B`;okF#G2(bGdBeHXxbZ;uOQ#EXdRso6O9vK~ku$rOqTa<=5#r zIxM~e2t+%_1R_s8-nn=pGj~{SU|=jgNzwuXXRqwcYpYhj3l3djb8QV@BowdZIrY0@cF=rC26>} zfXK59P^nkG_AT6q9fiH7Ey#~9t+qbJYMIGex_4J%6B{vzpW3?UPzX~U8X1w>YKn8b z-408IM|3>k$Dkp@)~-JJPvUL)G?!Zjsz+0td+l=6B5LV`Unl7ZBrz#GVi8kx()T<9 zQI}Je0hlW$*)RsjgI*p{PmWDZ(X*ru{#bONOD-*aZ%WRq4ZFmrB~9juge50k3>2;E zb6~l?HdTDf|Gef<`P-#6iKl3i;hm#CQkuS7`B0?abOsJh8J&XDI)ttfKK9M8^jFI1 z2%lOtsV(_m1xm(PjHl}3$Q`mXm~rp0fUKK9)0}h9v&8$)SD)A&5}9Vr#=qsMJ}RZ^ z8oBUTG|SPtgJPTo%y-}1@hB$lI*!YBF!R#50j-#m5i>f*exWkse_&*#3U85O>-TCO zal`~EUd-$>a8mAg-qdJrqsG0Qgqr$z+$lu%x<;+~u#_rq6C&u9vTa#i5?~Vb-C7F% z&KGg(R$Ppw+|H)7+S=MjXw3KK^>w;78W#Pf5n8YkfyMIB;a#(Lw>dHrw|`8VVc;R> z)-;*B?Jd4Gcu7PV-Z5rH)_N+o2HwQB1@dXn9u}SscR)7{vm8sGl_z%>;V=$6)o3D@9*7|gt*#>z%5Kq9+l{)Wj+x3lKQ$9wg2 zi5W_yq4XZbjNt1P%~J5NpJepIGb9hs9u4RDr|4Juh6!bO+}K25^6^IHgts?3Z5B!0B)L3YEbb%kOID76ij~ zL$y^%GnJ0d$sfwO_DKBX3R+J6H?Lij35_U3y#A*h31`c`1o}4VDRUNo1lCcGtD|xb za|so|pGs0ho0}XQs-vSTbru<{7-L%R9wr2|j6=5_^%r0$oM!c|zw!*(ZKo;e3M5v? zA=DkF$L){{l;*vYg^Yx&Z@?R-Jqnd$oPDqUbIj?E@WhkMy+{WLM?GB}9JaW3bkyIFW*6;5Y+Vomzp)Ot)r>7JhWduEn*p1oA#(u!yNv;Tey{ zkM0STCEbSyP155Xo!_^tdalQ@F2QyyQ13~9Fg`mZncm?PWu@yrh&zF{5o!A9%Kd^T zbf>avm{}&9~}6Q<>p0?Xpil!ZOfsA{`jLficksNZ`gVJFF=rvD|uUB$a%EcTO6 zq+7wrtXHwR-(HTlqImdDgwQb*Cd>lBJ`qG?CtpvN`v>z1yq%2=a1N^^7LFR#L06^{PctriYaZi@|Av1 mm=W7s>n%gB-DIO9#%%%Cn{tGf_IkczL))EovM#mq#r_w2Qm`%n delta 2399 zcmV-l3840!7Mm8Z)&YMoNkl z^$ON_Jfai`qbSrjU?G;Ex(bF&y>E?3tDw-YPASOrp%ngBkLrIFR*>meyJ|MCue2?$ zuA9xPnqHxe!ulyJ5?obPz#1`m?b_AqTs~tKyVH~q+kp{_WX&ue004mU!nOkBW&@Cf z{82Zuc+>zYqxpa6N45PaG(%g+(^+l7X=5MjdREa%ku4*h7DWaTPw-eBm$44wH zv7hagmqJY~>~7pLJDtZzjx;$;X{;}CZ|5oi000000Kk8pxYdedL%c<1XtjctHUm4h z)uN9tH?4M~(QfM%jCs64DbQ*(TKWbo#1d3j!4^}m(`{%K6#BI(1(`mS!rgYGU10^8 zezArBFxD%yQCL5PrT?(10>;GTwQCo*xqQYfcBd&JwgV#;$=EC(000ySdy>^Z=>iii z{-oBhxKn=u6;i$iz1;v>;>H#Tm;t^|fPmTA>euexb{i1T6}HXVEPw4zx6_7w&K15- zmHNeTr|qTvD;G6OZB{NKWOaY z*P@Jiu0}pju&l&>w$C+}Xop=nopT>owszn-2P;Z$*8A^5154VKZkQ2krp2#(e;+4 z1}dK&H|X2)U^b zlQ&K@FvSbz?(S~T@8{5PG`_#TAL|D=8b3TdnBotUM_v4J@<1mjnD4i@-EODPG|ZS_ zG@d+8NP)y3BF>=%6b-x;kQXBdgHETDHNkYsCfIbUkBb>-ijSu1StlA^m&QkZfNl5x>pDJ383F`j>*pgX(zLBI@*pQLsI2K8avT9sw((fHw*-8oFpm~uR0}7L;V6# zt9EJ6tJ@Ag-=4(1Ydgnt@x1(%Shim2j?(9ht%6ctNE3|)6SU-hD`sb<&I3p&nUAx(W%V*4DcbXDnJ1}CAoSEeV z0DuBvPqO+aU0`C)pVXEXcS@i_%D1Gq8$io!xdj4dfbSC|H#ZQ_ovnUszdN~sfUdA@ z)@J!zEZ7w|DY`$UgYQ$Nelzw@qGABlh>gCG@8xAua{W$iVo>Lo3eJC?1*h#mMr5~7s-6@^buyee+(>NQ!!{B(Gc%$Gqx|FU2Qg-=fU?`+RT3+Q6x z^955W`+$9)oRj~~W{>tY_-N#%xkDcesGXMYp0001mlHY%L+2r>hUN+o+ z`1(7K|M0TO??1e7^80@eFP;4ULjVBq9QY4&0smnx;6Ka<{D=AY^dCaNEPVP8|NQ;~ z0iD_LAHM#1h5yi*UH{=L{DKwzFd%f7jX*|dDJJ=c8`DTgoBaqWJouc>ZjB= zS=>7NULN%cbx`k|yBhgUg!*Ei8OF)tme~*TxXdnUC!5L0cScO(w65vqS&ir(z{m#x z00000ir})pua}?8{=Qy*4Byv#t@iiz@^j(e*UQhPe_t;@sAT{E000000002sj5xf& zQbGS=eyqQ*S5bfeVJ_TkdGH_Z<7mr+|L`!cn=KFi!-K@fDP_Zd2mk;8001gUlBP+L zBOU~48l>752@lf8mz#98UawaA5hg6YUQ-IB>vg(LbcJfCYF;+-!55k`HWerDxmei zh($7~^gRLqP=5YpV4cbg6OTWLV5!drmv1Gg?6cTONj~I*fSK5;2LUsYq#xqF{r84N z(3vEa0X#(%f3L5K?oa7RQc03Do7d1U15&}{N>FrXlsMek zR5iy$TZezNiyPY|p4Uob?tP$V$xFOa($`z zFi*KeG?lXVn=9+u{5hBUl?#hoc81R5BbKG?&-Tj2NN%*KaaB&5?*avM@oSOqoI4r$s)LJPi~6vJtC8;_p&fQ`&H(@b005MN{{c>{E>Ji< Ro7DgS002ovPDHLkV1l>-rxXAH