From c5c75c0870fe05b2d550934ff1bc34beb2a98b90 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Fri, 17 Apr 2020 18:32:11 +0200 Subject: [PATCH 1/3] Fixing some more mistakes I did to clothing. --- code/modules/clothing/suits/miscellaneous.dm | 2 +- code/modules/clothing/suits/toggles.dm | 17 +++++++++-------- .../mob/living/carbon/human/update_icons.dm | 2 +- icons/obj/clothing/uniforms.dmi | Bin 113086 -> 113083 bytes 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index c133ea7c88..23e20427d0 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -975,7 +975,7 @@ item_state = "coatpoly" hoodtype = /obj/item/clothing/head/hooded/winterhood/polychromic -/obj/item/clothing/suit/hooded/wintercoat/ComponentInitialize() +/obj/item/clothing/suit/hooded/wintercoat/polychromic/ComponentInitialize() . = ..() AddElement(/datum/element/polychromic, list("#6A6964", "#C4B8A6", "#0000FF"), 3) diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 4f29eab6ab..c1aaa7e7b0 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -37,7 +37,6 @@ ..() /obj/item/clothing/suit/hooded/proc/RemoveHood() - src.icon_state = "[initial(icon_state)]" suittoggled = FALSE if(ishuman(hood.loc)) var/mob/living/carbon/H = hood.loc @@ -45,9 +44,14 @@ H.update_inv_wear_suit() else hood.forceMove(src) - for(var/X in actions) - var/datum/action/A = X - A.UpdateButtonIcon() + update_icon() + +/obj/item/clothing/suit/hooded/update_icon_state() + icon_state = "[initial(icon_state)]" + if(ishuman(hood.loc)) + var/mob/living/human/H = hood.loc + if(H.head == hood) + icon_state += "_t" /obj/item/clothing/suit/hooded/dropped(mob/user) ..() @@ -65,11 +69,8 @@ return else if(H.equip_to_slot_if_possible(hood,SLOT_HEAD,0,0,1)) suittoggled = TRUE - src.icon_state = "[initial(icon_state)]_t" + update_icon() H.update_inv_wear_suit() - for(var/X in actions) - var/datum/action/A = X - A.UpdateButtonIcon() else RemoveHood() diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 63e772e07c..9a3b3cc4eb 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -283,7 +283,7 @@ There are several things that need to be remembered: alt_icon = 'icons/mob/clothing/feet_digi.dmi' variation_flag |= STYLE_DIGITIGRADE - overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(SHOES_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, variation_flag, FALSE) + overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(SHOES_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, S.icon_state, variation_flag, FALSE) var/mutable_appearance/shoes_overlay = overlays_standing[SHOES_LAYER] if(OFFSET_SHOES in dna.species.offset_features) shoes_overlay.pixel_x += dna.species.offset_features[OFFSET_SHOES][1] diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index dfebe3815511ac769eec289436d3d340c2bfa981..e43fc666c5ae3310e9228ce7f92ac6a65e33a463 100644 GIT binary patch delta 1335 zcmV-71<3lo^9H-~29P8H0I?;@0ZoQ_=J2KNq{o>(FE#_altS3Lh6p+Y@>qps5lsJ9!Q(am&FS3tu9O{yFfXM!{E5& zLTSKY?Amu>N_o>I4QCA#;J>33o+)8j$qokgf!u_lg%SuFyyk@oxS>uXO#;M&s0}aO z6-vPQZtOe0a*{N31CrNdlAzXMfioAAnLS8Hl6r;ULP;RdGP}j3)FZ9!Cr6zdfy?}; znSexc4kR8biIXk^BnoCR5~DJF-GDBQlUxH~f4Ck+3CMK@mOK)2aiikKy3;HM-7l{a zpc?v?5vT4UYCmo3QHPS(*j<)5LrLj63Q+MIjO+f4<$|7Uf{rk(^3OnMz+#&xn=o?Y z5P-@$c!nVdX(UqxLb)WM2P4B+&?1H*iC~anEEsyPMR!hPPxbw|AIsm@Ewsc~-=f)( zf3Y**A17r^G;$Sr|@q&8>|r5N7M#{6$IQubtplLr>g?7)mi2Tfi>{m2}ctQ*M^a$Tbm zHFwzFx;3CdeDBPo@X-rERXOTvC~bp+f9!ow05%GradhuZ!@S^YNAv~vyDe&sqxlQs zd-oTFZ#{h!zc+z#0o2k*?GCo!43beIYK>?8a8TkHQ~~Md!yc_73;Ghzx=3vj#vV24 zK2ZbGx0WS{-=>p5{7XdDIBLEyzPA@p{J;Bgu$*tgNBE@p+QCHE-YW_qeILj`e|de9 zgzA2q3xW@>28X(5+YP58iZ(2JyT~=*NAzup)R@OfYO>y*-=VRBOcm8+&+tHaPaRwQ ztYKrfxEOXRn91=B4A$I7aL|SCcfyuw9NckVcH&WU?@2Yfxfi1{8dLom;uoVvyY!T~ zrvOyvkJ4+$=_;mJ0cekz4H9mof4Pn4a|@rHa4M2Zi_nn=HcB1Ibc@Il*&C(2x}w%1 zaU>m$&$*>@EjAznl}G|268}GdNwUuwwar(+eXKx zFLArTwrnfkLXT}9ZPcc~5GA%*C+OPrvV{W=M)eUD>iq(aC!6FFDMt#(fA0^TiQ+4)1n<1;xA08M>Cmcp!eoE33~H( zBhC24c83ix>?}A4V4QOY_0sbsR=T|M47``=T!0Z^rU;4d;0@S_cxNkJR!EYeDK tBP%envSYwclYIw50gIEs2T1`JlL`nP2r@K#M;Ul+-GeX)w=f6+j3H_kvP)_{CWMSR};I!es-{PDQSbTb+G`p%=AC4U!6r8}!d z;O;PLKGyCc0bBbSk8JJz1cidpNahsHl@eVyFjZS@Sds^6H?o@;&I1d9ndPYUs5lsJ z9!QI4QCA#;J>33o+)7o4+i#u+=QWp z5(pZ+=7kBkrA{MF0>p!;4L~p56-qHj+0pfVSl_H zg$c-Y29`V$a&e;qTyfoE(Eai%0ji^K8FA_!qW06a9(5>rjooF5GnACBqX1RE!MN_v zST5+vCg=#ms{agx1}wIDvI!$M4gsjHgJ&3WkVZ09Ae2i2`YSL0Y|Q^gBV|uk zIC)^<%nr;*R*7I&??91C+bR)EGx91CPF`1uQ1(0+a{@bFi_L*Cb`J&^yGI0!J?dQm zd35_Qc+liE)Q`-8$-0p&A=fo3QFDjwty>cs#P{wz3LpIdRF$KyhSD}D$ba641z@A_ z8Atd2G|UUWc0^xrzuThLI2ynpzIT8@_}14)@p~f}7eFn2)b3yl&L9~jqSkoU69*-Z zVHJ>mKJd{hvY;>Vtc%npVeC2g~^; ze1uPmuU$-Z?Y*J^()XbZlz-PJNvQ6(*&z7fYH+A~w%u?lqG-diw~Jf@enj7vNR4@% zq$ca_`5hW7$W&2H_6!e%_tde)&l)y%i;H2Gf|(r8z;Mld3AxAmCMW)w6 zscG{cXdnl4rDxNkWt+Llx@~l9`VzMbY|FOtE%ey-(MD|w3{hg6b%L%fBdcPDH=9(+ctYN z5YV!GLBpH<#y4sM?6!aY`uVRvz5C@~^&7qp)L|Zd4!SZrO?M6yIl1~!-^#hLrLJEx zIxX6PA^yUYI!BXv26}Ivlb| Date: Fri, 17 Apr 2020 19:58:57 +0200 Subject: [PATCH 2/3] Update toggles.dm --- code/modules/clothing/suits/toggles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index c1aaa7e7b0..639f2d3bfb 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -49,7 +49,7 @@ /obj/item/clothing/suit/hooded/update_icon_state() icon_state = "[initial(icon_state)]" if(ishuman(hood.loc)) - var/mob/living/human/H = hood.loc + var/mob/living/carbon/human/H = hood.loc if(H.head == hood) icon_state += "_t" From 6a0af190ea0996c6545268a2207b1ce10f245591 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Fri, 17 Apr 2020 20:47:02 +0200 Subject: [PATCH 3/3] I'm a bit busy handling multiple issues. --- code/modules/clothing/under/jobs/cargo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm index 92afe238ef..aa4db2fd30 100644 --- a/code/modules/clothing/under/jobs/cargo.dm +++ b/code/modules/clothing/under/jobs/cargo.dm @@ -18,7 +18,7 @@ /obj/item/clothing/under/rank/cargo/tech name = "cargo technician's jumpsuit" desc = "Shooooorts! They're comfy and easy to wear!" - icon_state = "cargotech" + icon_state = "cargo" item_state = "lb_suit" body_parts_covered = CHEST|GROIN|ARMS alt_covers_chest = TRUE