From e26e6d49ccc1c19c90b197149f6b86bf09eb7035 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Sat, 25 May 2024 17:21:40 -0400 Subject: [PATCH] Digitigrade Clothing should show up correctly now Fixes an issue introduced with https://github.com/TS-Rogue-Star/Rogue-Star/pull/256 where digitigrade clothing states would be overwritten by a defined default state. This just makes that check use the digitigrade state if the system has otherwise determined that it should use that. --- code/modules/clothing/clothing.dm | 8 ++++++++ icons/inventory/feet/mob_digi.dmi | Bin 41135 -> 41538 bytes 2 files changed, 8 insertions(+) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 48bc5586c43..1f60a4e3274 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -1117,3 +1117,11 @@ /obj/item/clothing/under/equipped(var/mob/user, var/slot) . = ..() handle_digitigrade(user) + +//RS ADD START +/obj/item/clothing/get_worn_icon_file(body_type, slot_name, default_icon, inhands) + if(fit_for_digi && update_icon_define) + return update_icon_define + + return ..() +//RS ADD END diff --git a/icons/inventory/feet/mob_digi.dmi b/icons/inventory/feet/mob_digi.dmi index c2a1a9ab823d8ae7cc808822bea054d5ac6df6bf..614efe14b407fe51c66803a56d4fb277f06a5a54 100644 GIT binary patch delta 4177 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 delta 4129 zcmcguXH-D%u_6kwU(Fi#IK<5${!P5!*rUDZaY2;=LeL*GeFM zy?8l2PQu>Tc_4x+6CCWU0V1D8P{cQZ>loP2qKM)GQXsA({ANdM1kt9I&Y(|Rp_ZAb5{84 zbIP@(6eAvtIz7HjqEht$D@_oj<341*A1J;2B4izAw>9dtP1~ct~#+0B5$8hzp{pFz6cX<~~yHnhD^bd%1+w*=*_TG3p) zUR?ZvRfu6({r;E=@+MEu0ZUR$0Q0t$Q^P!FUK+KP{g$1Snxy(IKdCtA(OUG;QFHxOsVo*|s79nF!2Lb^kIidanoQ3~ z?gpF)ar=wK0suRprue9Klaw!vlqIH?;iUu&^svt>-4_g#Ey6~4xH*oek#Z?Xxs0K{ zb(>iVmf5?fyNr50z3gatfrp8Seysf?A{lO(SZbqaq@Sk?hrxetrvLr7HT=4&0`RB@ z#bG`pFZM32gT#y%F(Gkk`(SBDaDt(w!EpCLBVF`dYHn>#>catcFn@2gi}5d#I~*Jw zU@jloIZTw6mNv1c3b+RCrdO!g|9e;P|La(D(dE1&k&G3$X4*gk_+xO_<{SKNR{f^r zWd{bHQQD_c=1*^X>wPfiw@ZYiyGWho5ta}Qa^SW_JJ_?*3z~PCI3kak zQUt8|i!{?nf%VPJ7xNeuOUo>iI+w({*_}}~^R`eTeJYzLwSBTQ+U?C*qtCAlOjSEE z|Hsjpx$t>PhUPg=1dZGKE@(8}Rv-pT6jE*>d(ebYs+%0?0MVH*OVi^5Y|iXxr9~7} zw$vV`w_SFAagC*dr`j6_P5@!a1KG+DKa*1Zj|k#x4ai=9r?6UP?-ZEx+aoxniXPG* zK_9>~CyJuh)283ItQkVue*`piXzDerE5~!ENJa$W{8Oz$4CRvHQhE6=z(^LJoX)uY*$lZ+dt}>?W3DQN8!IhT9k4I`4JIvlPyq^Z0MWg7Bw*!Rev{2?o5c zq>04BmDCivfu`X@J0ovlaY#GznGD@nZCX~SNG^HW^hR%CA0sL`GZxawt;;v@2v}2q zK$krJ(pcZQcF?s@)%$SQ>&LJR#(@iW{zlR3X&Y44sLagFfn8U1 z_2_%Nyf+(yEOm6)_4V}l2axqf_@_*MB+V6robkSvGDtCzba-H?3lIjEQ%F|G>*;6H z@C3Ij;w73|eqEZFf8Gdfv;y<)rOPW^+>0N578sVGAK?%XqJ`8s9l7sx4~}TwY(h@( z%LIzA4wmni6h)t?es>Tx+&35l0K>3I_-o~uWZ9J9)`6JTv=!sW^m~creVU~wvBo4! zTfvo6%(W&^oy84E^YZd0SX!pGt%GaJ%c_-AQr`y}7aJ}3DFKfL^HPlckg}UWrP+uq zww184c+qi=!g zp}NkU6|ixgepsBXz=Ez*>c7^4bmm8S z4V+FtUMp{K%eGKTv1XI77!vNPIGp!`xiu5W1kfiEUF4p0ADpU zMG*lp|u zyc$?Z3YP=KGpKjDVjTJiV>_+Lzky8+^z~U`-P0An)Z{ilt+bQV_^ql%w0>SwjqNrB z$f{%|k}gZ4_CR-U?iwK1@O3haj`qFWr6FSBnW|$Z~c@EfJn@{N44O7_-}3d zjgW}M&JyoG8Tw4_w7P`}|9oCbD8Y@_1oF023f4$HdG`kuX(8H8#E)aWBricJX5bIO z6x>;WS`$L1Fhi%);4IMwRwRFWTU~<%OTegWh>5XLU_@IT8x-helJ%kdU3GF^O3tTz zxvIRjmHpBAie|CB$ zdb3L(?L4&r?!Tr%F$77LKFhyQr7&^9);FKK7x6)l#~SrZmtGAdob3!R#4~5nTp<#mC_NGQ z%z%UWAby~Z(4<+Kbn$=J_Xa3jU&ePpU2L> zxq|<<_&+WM|2)F}O~sGrTm= zos6<37Hh1o{-jJy02nXZ+V(K%LJX@QVio`-vIBRktL)-jr)YqTDI;|X62>GTEdE?9 zZ<7r9qxq8_SXy7tMmaKQK~76clx%Y$A6@ZQYnVlRJKl40xRpAfvcn0J^PGO`04l7JTH&$rm9w?|k1Z%wGV5Et;Mb_pX=qx9Jmv7#L7U=E( zDT4wj##-vHhny7HVPViHVnwRFgLuPfQ^3uzLf69Pld=QJEbUtlya3=AG_BywI2_K! z&5aBQ-tXgyY=gx=YrRHs!KQXP$2EO&tt>4Kw@KK<(Oe+?9q>?oLbSxmNw>+f1EeCV zW}qxCvIlI80$~@StjYvEd$}z$A9Hb_pStag#_c^O5k}t;)A6lOEvgTYPra%|ngA`q zt-Ql;NXsi$!KalYM9%5;VD{!yr|gIHK$YK;B<}Y(y_BYmnDG# zp%f=A7#4|{$X~eKry2VLE*37%mmdUv9z~Tr~2h+!!}0uiU?HQOpxI=qU-@}4<}hVd2RGImmp?LY?cCg`o10DM z7XnQqvw9HwmxRz=N