From 045cbff456e13ac75367ccdcabe3de6a0285d6ec Mon Sep 17 00:00:00 2001 From: IK3I Date: Wed, 17 May 2017 07:11:29 -0500 Subject: [PATCH] Verb -> Button Makes the lighting toggle an action button. --- code/modules/customitems/item_defines.dm | 39 +++++++++++++---------- icons/mob/species/vox/suit.dmi | Bin 218940 -> 218938 bytes icons/obj/custom_items.dmi | Bin 73556 -> 73553 bytes 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 7a38cdfb137..f92c400f0ee 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -677,27 +677,32 @@ name = "vox tactical webbing" desc = "A somewhat worn but well kept set of vox tactical webbing. It has a couple of pouches attached." icon = 'icons/obj/custom_items.dmi' - icon_state = "k3_webbing_off" + icon_state = "k3_webbing" species_fit = list("Vox") sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi') - var/mode = 0 + ignore_suitadjust = 0 + actions_types = list(/datum/action/item_action/toggle) + suit_adjusted = 0 -/obj/item/clothing/suit/storage/fluff/k3_webbing/verb/toggle() - set name = "Toggle Webbing Lights" - set category = "Object" - set src in usr +/obj/item/clothing/suit/storage/fluff/k3_webbing/adjustsuit(var/mob/user) + if(!user.incapacitated()) + var/flavour + if(suit_adjusted) + flavour = "off" + icon_state = copytext(icon_state, 1, findtext(icon_state, "_on")) + item_state = copytext(item_state, 1, findtext(item_state, "_on")) + suit_adjusted = 0 //Lights Off + else + flavour = "on" + icon_state += "_on" + item_state += "_on" + suit_adjusted = 1 //Lights On - if (usr.stat || usr.restrained()) - return 0 - - if(mode) - to_chat(usr, "You turn the lighting system off") - icon_state = "k3_webbing_off" - else - to_chat(usr, "you turn the lighting system on") - icon_state = "k3_webbing_on" - mode = !mode - usr.update_inv_wear_suit() + for(var/X in actions) + var/datum/action/A = X + A.UpdateButtonIcon() + to_chat(user, "You turn the lighting system on \the [src] [flavour].") + user.update_inv_wear_suit() //////////// Uniforms //////////// /obj/item/clothing/under/fluff/kharshai // Kharshai: Athena Castile diff --git a/icons/mob/species/vox/suit.dmi b/icons/mob/species/vox/suit.dmi index f035236c876dcca8529453edc853fd74983d09ef..afec241502d8854f3a44622ce25f9043dfb56ba5 100644 GIT binary patch delta 1204 zcmV;l1WWt8t_`}b4Ui;%uzFNjbVOxyV{&P5bZKvH004NLotjN=BR33&&-Skv>|Wzy z-3`!Qd|4zYa@cLrLyMjU9Elz=8A$_5GmiV~d$8j;?t1kqM+47G>VuRhjz2bE?tgpu z*4%x4SkA0TVrVwa?N6VUi=Ei)noaZh=jFn&^e!KMq)eHcP4nS@%kOvpw1510|JTF) z-yfC>E1H^3bGuw@l{}|r)2x>Z7jqh8ZZ^&OW_^3JewEXxFZU6TEYh@q_DtBcqw)^U9FYNal+9+vURY zK>Nczb+f*?P9eOQ=uFFMiip@T1_&-;o90=6|roYRPw%3 zHL{6gIaTKPyh@pA$gaqykqigk6+w+1uckoRmG3uCArCOknn``s*7$O~p5R9+A6+My zfmA-ho-2ldBr#Td9qcJ@2h=3uyPJlA^QbXa6i6#<#N9A)a>BqdL+YchO!OU4_H@IO zF9H^Sk)#aOaL`@2)fTL~Pb7B1chPsi(RsjXOhU2uLSlx~B>6bEZXokiEqI5UseEu> z@YPPnNk*aT#&xPTfE+d1mLxIDX4anOx30&Q@by2n9i0PN^ zJA3@g4tw;ZVgr_xClWL4C8M9_UQuj84v%us_&E%I^qb(3zoO_?dernQikS|7@SsEO zYEO(W_KC%e=Mgo1B0i+uwb zBv^uTDSy0l*>86}jPqvwKvJW|gENW5Q; zsBR8{=6#()*_H)QpIh`{@rt${*Zyqt>y@s<&3gHcg?$hPru*))Bf@2!(WdN zf4^I=tY~WPn%nhir!;VC?waj-x^ z7%T}#QX1Hb+02~E!Tpjn8_GjWIL@J$z^oE_Tr{v1L%u>Fq0WH>34QeCWjad|mru_# zymylEgX@SRqnYFL#*orT=8E~-^~$oR!||TF+1^~J2e!a}H898L&8VExq~&QW;q!ji zsn897BMMQ6T1_&-;o90=6|tFA@}W{SvWa6kRp$7-NtwxKS7g&jh6C@5pvI0jQ=sh1 z_uD`rdzfa;q(ju!4CQz|!(XXX#ou4=lIbq*RlcWsQaL`@2(-y3|&m?xicX8-|qw|Q> zn1o{Qg~SY}N%CoKohS2DE%*U9Q~BV&;H#aCla4@)q5*Iw!3r-cm)(b~JYoiSQ8^?r z30u8aT!CXX&aC8pIsXie->+J}c}zhG+xe^Lfx9w@zZ)b6^D?q@Bd}D+S3&(Jrw~MmS^v zva*xd!jIKXVmpgQANw-A=dMFKEOECJ!wRkcf(6U8=&gXp7c6)`O317xQf{$-7T2W! zYr8E}hQ>@%HL{cB2V7}i4&qBewHpq7xq)!OS37YBt5tJx2dnjSLHY`B@p=~$fY;uo zpxR9`RhyDb{hlDl_*=ZzMb(BQreC`6Jm7zJctB4oHegA4CNaZr+mx6#iQkMcG-Y-W~H-|v;p-!P}%Yvtm?df6BB8`9_C4MEHe!bFp rxY@4XHxFO#oBPj?>;C|Csqx(2e9IDp-2{i-1ObQL1Om6+1Or`C2qa%t diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index f67d9ab52ccf88bd1d78a5ff2456895347bd5bf1..64f2619b7798e5e902b2ff7fa42fede618a2d7cc 100644 GIT binary patch delta 1351 zcmV-N1-Sauz68;}1dt?u^m zZ~y!9NB8;bm+J$nk(BPP`}pha_0>YD=I*Zh@c#NLBkgj1{KqPhqap!+k;brpeopjq z6qz62B7gsXY@b!iedvK9G923R@FZ}ZWP$^wu!T~n>>Ou_=|Ck^WSp|tl*QwX$OuK$ zs+4vZVG#?E7|647%}~MutApJ#>_)Jm4a$AkgDb&q#d*#-+Dw2;smc$g@%f}Rb<<7HU zqSAgZ$M9v#E2c|W=i&$>*gG7jx_V(2NFG}rX+;(|L%%=C5+~A{QG1bp+P;*Z;5|gg z=~D_9C3+^Nn%yNKQ_VDwTlS=Io=eQ3m-{9;f2xMGp%rFO-TU`3B%m?#1V%i^f|Mq=?+hy{!^3>nrHMu#N@i6^KP)ui0I z^3;iB$4xOe<2oXmZP%l8+?Z-EE z_e2OB8l5P=WqYQdg)?NtVUG>0O|Zpmbo+vj1Z zR5Jz83QV5GjTH8wO4-fG2yM@>5tzH@3egcTF9Z&gP6Uq8)C+-Q2Vqcfw&ONoB;XLi zag$rc1BSii;+qE9JfV_kaJ6Iq(5{BT7O0-ksGw^J18rUNl!`GIiUh@T&s2iqJmaI~AkP}3erHA%yZB=?uisBtMJkNFFT65c5 zp6M*;n7%#2S;X1g90|OvO7FH>rAMD373ywoV^oG92ULcCb}xp^BsDBlQm^Q$yuO$C ztluNEgxyTl;V=u89is+UO@S*;+8!hzlVx(W0G1^|IV~m5Oayf8SKIRJsJOnN=a0)X zBTci_)f-1PfmSHK+h-?|!a_A>$1GI`Cu$X8oaW-?BZC=5C!G-()w}du3B6|L)l1^N z7wzX#yzC??m895@=yQV)TT603XsH)G=R!5+m-qc?Y+PljHc9R7y3K!XHXm+|zLOXQ zB!7R!e4&C^>2NO9fBN=%Zh!rB^Tyw!lNgY(N^w?)$F%SE`bXlT^PJv2<^{7a3B+nzjG{ delta 1329 zcmV-11z68|11dt?u_j*)VbVOxyV{&P5bZKvH004NLrJ2ueBRLL-&&g91W)5>n z590oV-96;8=)s~f=sC;_2rP-V=wgXAq{@}b)6XHvw4IJybQVT{82Ek?OGQ#7{d4!< z-~RXIkM8r=FV_cDBPrco_wm=;>#K!Q&D~x1;r;bhM%v~2_{A!bqap$Sk;brpJ|}uP zip-C1k-z^xw$Cc%KJ>s484m4ucoMiyGQojT*g`2(c8;^ebf6L{GEP}+%Hr`xWP~DW zRZ2UIu!sdn4CGn4W+-8S)xmBVb|cu(2IW5N!IfaQ;ymY_LVBQS5(sq(Tsg#f%FPfo`0yXrrmJ8_@70JgROJa)d>Z9%UA-_1B#$kRv?2?fq2Hfmi4$qfsJ%#kZC}by@E)S$ z^eKgl5Oca5GWpPw}Be8fZ!~#Ydh79Wpqr;Md#1qttYEo`p zdFn*6aY-btW;k2031gstcGw7~$NJSzx+-1aloZXpt}F^=hfY%_goq;ys28B^_TwA7 zarE2Y==Yy4fInTb^1mD_3xoCuIw80HW14kh3=cF-;(Cv#0)P2+rMOT@uPqj3?3?>4 zqTvW}!16%t#Hm;(;Rx;O?TPdhgpa7#gAEjNh`V?3ugD@yK+i{yP5^#v% zxXG>J0mEK$@lAtlo={0NxZ1IQXjj8v3sg^NRM54Afwr!BO2wE9MS|kFXDUH)o^xG8 z!8kC)_A$>7SQZF>MrN*{I{=3<79{q-6su?$V5DM$r=MPcD{AOfWbg#tf)-2|)YI56 z#7r<|hy&L4TVI5?Tc%yU1bye|YL^vib=Rm5$O)p#(nI^Uwkka+MezWw3tKr0mA?Xwd}VWAqcW0tCe6SaykPIK|{k-?0jlgRo!SgkH1r>Lu~s zi}rIVUUrfxN>c1c^tr)@ttGi1wA2fpbD?!%H1Ic6X|mzB=o-xo?} zWP4bjY7$q~9dN}7E>7GdYRph-Fkr?S4rHRC$Ah%DeN}t0>P>sK1N1{!u