From fba99e154d45dfe657de6d94c17dd5f0a2ca281d Mon Sep 17 00:00:00 2001 From: Markolie Date: Sun, 8 Feb 2015 14:55:32 +0100 Subject: [PATCH] Accessory fixes --- code/_onclick/hud/human.dm | 12 ++++++------ .../crates_lockers/closets/secure/security.dm | 1 + .../clothing/under/accessories/accessory.dm | 4 ++-- .../clothing/under/accessories/holster.dm | 1 + icons/obj/clothing/ties_overlay.dmi | Bin 3091 -> 3126 bytes 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index 950747a5d2c..8034c571818 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -507,7 +507,7 @@ /mob/living/carbon/human/update_action_buttons() var/num = 1 - var/to_update = list() + var/list/to_update = list() if(!hud_used) return if(!client) return @@ -521,11 +521,11 @@ if(istype(I,/obj/item/clothing/under)) var/obj/item/clothing/under/U = I if(U.accessories) - for(var/obj/item/clothing/accessory/A in U.accessories) - if(A.icon_action_button) - to_update |= A - if(I.icon_action_button) - to_update |= I + for(var/obj/item/clothing/accessory/AC in U.accessories) + if(AC.icon_action_button) + to_update += AC + if(I.icon_action_button && (!I in to_update)) + to_update += I for(var/obj/item/I in to_update) var/obj/screen/item_action/A = new(hud_used) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 95e9b538a28..282afb599e2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -248,6 +248,7 @@ new /obj/item/clothing/under/rank/centcom_officer(src) new /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield(src) new /obj/item/clothing/shoes/centcom(src) + new /obj/item/clothing/accessory/holster(src) new /obj/item/clothing/accessory/blue(src) return diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 3f1cd08a1dc..1e0682fa5f0 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -65,7 +65,7 @@ icon_state = "horribletie" _color = "horribletie" -/obj/item/clothing/accessory/waistcoat +/obj/item/clothing/accessory/waistcoat // No overlay name = "waistcoat" desc = "For some classy, murderous fun." icon_state = "waistcoat" @@ -241,7 +241,7 @@ //SCARVES// /////////// -/obj/item/clothing/accessory/scarf +/obj/item/clothing/accessory/scarf // No overlay name = "scarf" desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks." diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index 1469ca3e127..c65d29a2559 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -6,6 +6,7 @@ slot = "utility" var/holster_allow = /obj/item/weapon/gun var/obj/item/weapon/gun/holstered = null + icon_action_button = "action_holster" //subtypes can override this to specify what can be holstered /obj/item/clothing/accessory/holster/proc/can_holster(obj/item/weapon/gun/W) diff --git a/icons/obj/clothing/ties_overlay.dmi b/icons/obj/clothing/ties_overlay.dmi index 6c6a65afc12f6c01d739ab7a62190c4fb19ad272..b4876371591bb75f458fdd992e819d0057d5ff34 100644 GIT binary patch delta 2871 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 VB+T$ddp7 literal 3091 zcmb_ec{J2*8~$07A`yAXQrb*}Y(useg%MdNg(w-uHny>pY$+{-qR76FZH8h78T(e2 ziNP4tP_OL9KDIG@(|P~;&i8(QeCK?B+|Tu#`?=0_?(^Kwxt{xlg}D(QuNW@?0DLCK zhE^o+NFi4Fv`Gta{~&8|L8hT5 zW5cE?sI|m~Xs&7A3qokk%h<8v<-}5Z?UnP$6;|*E0wGEj4*{ln#r7l z9)075aN;jAja2&b*t+BJ=(tZ6)mc5HEL5h~c-k+S%e6!Ht|tDx9jR8^U%NkR_U3 z3wFo8V%|X{Rtxq4CSZ&Cq5Te3&s7?i1(%Ok`3(1|6AC?fzeiy=<)%>8-Gdt)buo)C zbzAogq0%1`*1rd2Z!Ki6 zhe{F&TeZuKo$w|?4IzIgOh>?Es56yhqLoGArJI;>QZ&nb(L03k)@g=tdQRL6N+8}N|` zrt=p4_{E2txci{MJvuj%6+K1HQF?k@>`?^^%7BUHP<~lme|K3LlBCo0=fY?(ke~(a zn=|JHSNH(&6Js;#1!gk}4X#Kt_*T?Kq$nU5Z!Ikt&n7+ad;9+c?^d>p^24_9k~$pE&Gr_WEu3^-S;8?p zJo`mj_@|Y=nDK~CswDn%TN%)7pO$b0s@{2qsW4lbcN`2y8psXi1()p9xgKUV2}!c? zOKrkqj};U6?jHmw#l(u-XsPPY>9)){;BrhU=P=KDy@wm7DN)epE(}q(|5&QCiV?wI zT4E5o(#sI^wNFDJmF4pBB6af*NCJw0tZ%vUb5v1facY!@)EBn9JWnO7cdBU^@4D^r^^KMCyc?jc0Gd@YV6WZV+wE=pX9Z62$IhvHe!wrwc#~>+R-Q)N?fS*e(VbR;+>f}O z{HyC&{pwz8ko|c1JPghKL|uD?y!&z2ex~Ugd3UW=Kie4bGOv2xi`bv#L0hC{Ct93b!SFaHs>|1v%z zj$9X9O_K;-`2&EA5+gJMiTpuYIp{;}=2ll=v^)N-;ma9T^Hta;ia%cICr~}>2pYJs zW(j+xs$Woc_|T6B{cs@iYoE#X&vwJPGv{zd2-dsvpKzcQWSd zqeu#GQTunbJ74gZ4X=i|7-WL#NUk2tLy{o?i}ZDJ6;)aaQjORTvtDp}Q^1~sSc4CI zYDBz6ZNU_Hl^c$X&m~57KGU=fBhW;7j^4NYBB!D@RC4XyCq)5K!&Plu z+blehv|t-B)8A2O`d(2>EAG-QwDbwy)1pW7P$-_B_X_H+Vnb-kvZb-Qa;|J5I(^rI z6KLL$x* zZ^rFRPlUTAK%45X&(-S?P`eXHIfWjo>f73;faK)b)0EwO513n%LnYR}bq=!&3kH6E zO1lh(rJdb#*PeHOe29i*-z?kOsfJ|l5S?U3LBMJeIJAzuvJ+M!E`?Z0a5?Dgo!e1z zidO-HdCZ83DJfiLL`4-9PQX_)(-(ZIyRYwQ$}#RL8H$!v4y)B`$s#Uo0hflKHuj`y z%|U-n!CZcPm1e(%`H78|wbP7Ho4-Xu={8hdnsO_Sx5vTb`H=HN4_BiiT)}7V`%%BO3wtEX%5V#vw(=~&M_%+sMw-Cuk zsIVEByndJyb6TK*+j%3cu`1X6n!+ow!ioyBG8D?fyjaN5(a{}ou&LoJnP4Pa_>D@9 z$6~Q@sp;t*(BRnD>UbrOT_IuZ&k3r1FOYGA?qUmD2s#-18IuroG-H#fImEfu@Or_G&n> zG^(3CvAm_5GzjhRGYT^Q`uH|0qGJnQhpr040DZ zRn(y%V@$S**CXMJn#(mF`88O2H(vXRKYZM3ZVfN_)Oc+ZVs`hQ zh>9yS7PrPn3iHvpVtb}|f^`^{x4By(EC~9@mi(GF*6)E4Tc|yLIU*@``u#gpVEM$} zpdfPRm6lA8+gXZP6pJ@3LDmoroth*H-z-sn@~5b_1Uwx6qMkmxm58Qes9U<_do-g- zk0%?li8OZSl>Pj^dFm#=ii$+#gZ^w|W`%foZWc