From ba26b074071458807e623bcc5bf67ab082edc6fe Mon Sep 17 00:00:00 2001 From: Geeves Date: Thu, 7 Oct 2021 00:12:34 +0200 Subject: [PATCH] Backpack Inhand Fix (#12591) --- code/game/objects/items/items_icon.dm | 5 ++++- html/changelogs/geeves-backpack_inhand.yml | 6 ++++++ icons/mob/human_races/vaurca/r_vaurcae.dmi | Bin 4996 -> 4996 bytes 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/geeves-backpack_inhand.yml diff --git a/code/game/objects/items/items_icon.dm b/code/game/objects/items/items_icon.dm index 726ea39fb9e..e18b8fe18f7 100644 --- a/code/game/objects/items/items_icon.dm +++ b/code/game/objects/items/items_icon.dm @@ -4,7 +4,10 @@ var/list/mob_icon_icon_states = list() // If we don't actually need to offset this, don't bother with any of the generation/caching. if(!mob_icon_icon_states[mob_icon]) mob_icon_icon_states[mob_icon] = icon_states(mob_icon) - if(LAZYLEN(H.species.equip_adjust) && H.species.equip_adjust[slot] && length(H.species.equip_adjust[slot]) && (mob_state in mob_icon_icon_states[mob_icon]) && !(H.species.bodytype in sprite_sheets)) + var/needs_shift = !(H.species.bodytype in sprite_sheets) + if(!needs_shift && length(item_icons)) + needs_shift = (slot in item_icons) + if(LAZYLEN(H.species.equip_adjust) && H.species.equip_adjust[slot] && length(H.species.equip_adjust[slot]) && (mob_state in mob_icon_icon_states[mob_icon]) && needs_shift) // Check the cache for previously made icons. var/image_key_mod = get_image_key_mod() var/image_key = "[mob_icon]-[mob_state]-[color]-[slot][!isnull(image_key_mod) ? "-[image_key_mod]" : ""]" diff --git a/html/changelogs/geeves-backpack_inhand.yml b/html/changelogs/geeves-backpack_inhand.yml new file mode 100644 index 00000000000..6aa849b0c68 --- /dev/null +++ b/html/changelogs/geeves-backpack_inhand.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Backpacks now properly spriteshift into the hand position." \ No newline at end of file diff --git a/icons/mob/human_races/vaurca/r_vaurcae.dmi b/icons/mob/human_races/vaurca/r_vaurcae.dmi index 9767c453cd4423f0c2a531a566df2424451211ec..a3a8677a5eb83dda2df90e54a4d51cedbe76901a 100644 GIT binary patch delta 4355 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 delta 4344 zcmX|^c|4R|*vIoID$5janNU+nvPII^jZ&d36;jAxlE{)}#E6?L6A2mF#=gs5Lbi#q zOJhk$4B1UXW(>w`@92G>=l<*Wxz6`03bl2mYQ|vUL^z0bd6eTU={deC$IqU%Y~%f&hkx7Yq;%U2$s+*DQJ3&}Qeu3oTMT zT%%E2#GJvZ9uzR=0*m z*A#?#*uiKiysOsLva+JirprMG$L`}%ij|YH>O;Pd{~@QDLgWEb$py~=_hH^d_p#}S zENBVP3DTt%eOA8APy4L+k={RI4xgG1IZN^zqc?@MPWNn?kg^W99E?7i;#W2sjS{qZ zVCEhW#yjJ;9lXpFmUBtG01l!ZWjCk3w;B+u?Y{PstSYyjgb zJ=uo^ef_0ioTu3z6t!siYoWLm_~eFlFhQBlHx5l^z7~17)TLtbO;E`Ft$B}|5ZhvmFQkga;KbS6vDtrIYk2pIu8WzsF z6Z$qN?!$h;Sb;d@Vy=s71xB~gwvSk>Qo)>y(UO+adBNw$#FQ?Cx^AS zF@If)KeIr+REl%l_(vYOC-=53UUK3n%B)Fyn@R=M9>enRV_ z&Da9}so7IZRLr7HF8jvv#~bC!?AMmA7h>RX>(8I{E8kvi(48T)L0gQ~AP%%~C6i$j7DO6I%&`bQIVL_&;ccxwhlT8~y}HcQ zt2%yTk^cqx78G{KEh>Q?YHySH1+>@3X;frdkEiibio?~1seAixlr#m0wYN}0xA`<) z1UXb;>mQz$@)UEr(_dPd1@K{p4)*;#=X}Wez{MqO{@re~eaUx7CQouRs{Brg&bp7@ zf#K4ufbagcj*>#C4h6XhU8{7+Gi7ve&m@_5?;Z8~-bz;QH+2!@2YCpT8Ra%B0W2)Mg#Zsp9QJcmn z0v*+!9cLmCN+Jw7hG{T;3y3XAFVtO{NONR)C)(L%7JchkE;E#5d>9rj&<4Hwy)TLN z>?0gOzW1ormH))XO?>o5-|g|08_qHZ=<|z>hq`n%lG48nb;w=J7<3TLa^Y2JWUl-F zR#G%)kN3Ss4L}GV5vxpfIPT<2BsFS0hDo7#LQM_yz1^TTF^04DKnDG|B$+<`*e_GD za@{{)QL5{!bKZx5Mm<0~Zqh&4HXB~`=T&S}b*;Rj=9$7D?^9x53Uu`nR`*0L);xT) zSX0xPH%Nb+52$AizDTXS=a9-)?CHK>4c`c2LJe@>L{p$}lmBvBg4oWD3t16zLjSzq zUX+y#H2$fJjjeH*1qKHPl?)8#z{j9zndS9=`Zhd2w*I(47F#A(e0R<-86tyz>IE(w zv6|OOD0K{zh_F+cyQkjrQdMj=p4od}*&1MzJmq|hIXS@$nl=zxFubf_GKtV!-xu12 zvg!RS@Q)9MzfeSPbU9yF+V3f;q4pP$#> zN{HKVt@kx%T(Y3=SPW9_$;pQti|Zpxj4O_7WypRN!5UXgl6u1H=$E#OpC!r+SUy)J zRv59ebRWcWo&(ewJQ~aGIVD(-+yDlV_vHdW9(~E|wJbH4KPCs4IJuWtWvsg~qFily z1kujG_ASr%2ktJ5dW3w=OwZCb2uiHD&q4$o4ju>>OYr%jYp0$>N7`l=cz|#NuK8@O z-^tTPO9OkvH=R=4b5jPdnqF@zuf#77j-1&N8uRwPB~ z^tS3Rl}y^(99F{!pL+C2;Cn+SiVYd;8ScbFZi-no2#@CdGzVw2Umq=ix><0DD$(uy zhp$mQlY-BGM9d{W+Oz#*GaAi*(XXIheNNET;dbETZd$hl)pMkBX$0MRbGt)eiSgLNQuvwmxFXUBL$kY#G6Z^~w<|}i)cU4bsIv2^@ z2(XhndS8c*KFcC(q&6=9K69!$Ywe08WA2`}%1yD-GJg`o`0w!O-f9os3)nYym3>XG zfxr_QP^{whe6L$Iw4lOFrhXpVxv^)X<}5TwpuHNgXJn5l@?g8Phe&9kARLiV7OWZS2~-c&--{R*`YQH zU)amUtFT6QY}`ZgQkt#gFhtibf2qy1Xey|mQOUm)mVW2cOgixmcP6|)?`AsJ{+i+W zCR6(sMc&*qsDEw_{Oofkx8ONm9M*)Ebb-aGEy<&gD2<)qyIi9SN0DRt(*^wrxAu2m z0NI8A+HVfLY}DFRDmJ?AE#5xKZZSu)a~wEgQsK85Mqjs{{An}8ezP(g*^LXX>87k# zsa)Z&4A!Q%xai2z7&5lC&Acq^bZk#v&M&6^EPHrAeil2;a9aKjDnHf8O4U^z-YVCH zd!8c{LpcNWoVORnv6D*&T5oX>SuJuHUhYm313vGWgB-o%!p=zr)6s%KNIJTZWx$^C zqjF0a$HbEtAZeQrI(niXrn(BFfavj2{z?~fyhspq=VAsrKPzEhNs>>bqTr5!6pDpwKecvWY8M62M^Z#b6Nps?@0mX(Lv!vbY@XSs7JFFLGTf&Kj#t3`yMGl^NBRESaI7~1_h{6~noP7o-vC1_MU2PdW6? z3Rt#z<~UEqfnA?}O;Lh8d3S;h(MW-dWdTpmZgFP3! zymng&o^=(pbFOEUNG014y;`b)KnSJ*m`;8!J=nauW17g4_GYe9h?EVZjcge_g$CMi zA75;FI>QKZ*$Vj4IXJXt(cozc#}&wO-d^6p-F}3L1io9pVe>Su1;nWBe{48b7cg{o z==D5HikR#*xO~n>mcA8tZGTsCLZFg_Y!JUeyCwITaqZbvf^!oRV~ZO2Ae8rNe^0Pt za`@2rr+eg#Q09AJX!0;@eC}S3uF;8Q(M*RcW3h_#NTURN^^v80NykH$%nBWdG-JG^ z4ad&f8xX?mSWQ4HNLE9nWqI`7IApWc6*ID$-FfLqRkWSF%>~6;he*_9&_c(Yjv}}= z?VdsfiSc6V8}x7wW=+ry+qlk%cC#I;ywa=ut#U%BEgm_eh~W=vYq|vqkL{S)4!V{k zy4qWw?ibrC|D+5UHv^h}srFdl;;r4hYSHrm_`hrYo;|{GtbPf%ql_%IF@;T-XVv}R zz?A(5^^m64>t2Tf!c2ZCQ}`s>L+6B`X#E}uH(_*w+89_^+OtYS(s0T?Og*NlmCp+t z5Y|7VN8!Wb{{s*1g8w6Y*0V}h(s;^VU%j}g_3YDIT#wV1Ra{apkIJ_tGAFbu(Jk>) zEncnO^Q7m~HNC0n%+RJ*9o~SjKt2lJ7KjTR;{r-t0L}#ndQ