From 8cffc2298c0a83e961f262559e24e07b646b236c Mon Sep 17 00:00:00 2001 From: Verkister Date: Wed, 7 Mar 2018 11:29:46 +0200 Subject: [PATCH 1/2] Readies our borg stuff for next sync fixes. -Fixes the default module icon missing from our _vr.dmi -Makes our custom modules enable ui_style_vr to pull the hud icon from our dmi instead. -Makes relogging etc not revert to default ui file if ui_style_vr is enabled for the borg. -Moves the clumsy VS edit borg reset stuff to a more appropriate place. -Adds the recently fixed attack anim offset fix and the ui_style_vr to the reset module. --- code/_onclick/hud/robot.dm | 4 +++- .../objects/items/robot/robot_upgrades.dm | 6 +----- .../silicon/robot/robot_modules/station_vr.dm | 14 ++++++++++++++ .../mob/living/silicon/robot/robot_vr.dm | 1 + icons/mob/screen1_robot_vr.dmi | Bin 137916 -> 138303 bytes 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index daaa52e827..230df89655 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -276,6 +276,8 @@ var/obj/screen/robot_inventory r.client.screen -= r.robot_modules_background /mob/living/silicon/robot/update_hud() - ..() + if(ui_style_vr) //VOREStation Edit + hands.icon = 'icons/mob/screen1_robot_vr.dmi' if(modtype) hands.icon_state = lowertext(modtype) + ..() \ No newline at end of file diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 57888db514..7cf1ffa141 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -26,14 +26,10 @@ /obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R) if(..()) return 0 - R.pixel_x = initial(pixel_x) //VOREStation Edit - R.pixel_y = initial(pixel_y) //VOREStation Edit - R.dogborg = FALSE //VOREStation Edit - R.wideborg = FALSE //VOREStation Edit R.uneq_all() R.modtype = initial(R.modtype) R.hands.icon_state = initial(R.hands.icon_state) - R.icon = initial(R.icon) //VOREStation Edit - Dogborg reset tweak since separate file. + R.notify_ai(ROBOT_NOTIFICATION_MODULE_RESET, R.module.name) R.module.Reset(R) qdel(R.module) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index 393e167b87..92c53171b3 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -120,6 +120,7 @@ src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) //Emag. Not a big problem. R.icon = 'icons/mob/widerobot_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' + R.ui_style_vr = TRUE //R.icon_state = "k9" R.pixel_x = -16 R.old_x = -16 @@ -173,6 +174,7 @@ src.emag = new /obj/item/weapon/dogborg/pounce(src) //Pounce R.icon = 'icons/mob/widerobot_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' + R.ui_style_vr = TRUE //R.icon_state = "medihound" R.pixel_x = -16 R.old_x = -16 @@ -202,6 +204,7 @@ src.emag = new /obj/item/weapon/gun/energy/laser/mounted(src) R.icon = 'icons/mob/64x64robot_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' + R.ui_style_vr = TRUE R.pixel_x = -16 R.old_x = -16 R.default_pixel_x = -16 @@ -226,6 +229,7 @@ src.emag = new /obj/item/weapon/dogborg/pounce(src) //Pounce R.icon = 'icons/mob/widerobot_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' + R.ui_style_vr = TRUE //R.icon_state = "scrubpup" R.pixel_x = -16 R.old_x = -16 @@ -260,6 +264,7 @@ src.emag = new /obj/item/weapon/hand_tele(src) R.icon = 'icons/mob/widerobot_vr.dmi' R.hands.icon = 'icons/mob/screen1_robot_vr.dmi' + R.ui_style_vr = TRUE //R.icon_state = "science" R.pixel_x = -16 R.old_x = -16 @@ -268,3 +273,12 @@ R.wideborg = TRUE ..() +/obj/item/weapon/robot_module/Reset(var/mob/living/silicon/robot/R) + R.pixel_x = initial(pixel_x) + R.pixel_y = initial(pixel_y) + R.icon = initial(R.icon) + R.dogborg = FALSE + R.wideborg = FALSE + R.ui_style_vr = FALSE + R.default_pixel_x = initial(pixel_x) + ..() \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index 630643dbd6..bcec8d6431 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -8,6 +8,7 @@ var/dogborg = FALSE //Dogborg special features (overlays etc.) var/wideborg = FALSE //When the borg simply doesn't use standard 32p size. var/original_icon = 'icons/mob/robots.dmi' + var/ui_style_vr = FALSE //Do we use our hud icons? var/vr_icons = list( "handy-hydro", "handy-service", diff --git a/icons/mob/screen1_robot_vr.dmi b/icons/mob/screen1_robot_vr.dmi index c173ff82fda6f2a00ac92916457b4ad3104824e3..01647f02cfaafcfd70a703b9c34d67ad1bb2b54f 100644 GIT binary patch delta 16690 zcmYjYbyO68v|kz&M354Y?vzd`>F$(J1QAK;96*$kPNhpa1QC$#?vn0Cx?}f!`MvYb zdHlg)*_yfWi92`dt1z2tFr(;@NTcbWLtOl1A>2&UPcL@s9Q=R1fAW#*u(x?6SK7pM zcf{N4x)I{4+w>8FF@Al^Qh8Ow6vp#s?t5>sp2Y|t*AV2rj)SuXpJ4np5m4k%=g2W715eKctEO`1Ub#4ib|bg-nGVyFj`6M*+yQ zn&lzJLc|a5+39o7=(+BYSTZ3;GJ1iaVT)Q6xwjoxk=+kA+p9GaLhZAQ6$Gy&hgV|^xD@2zt^Ivdg#WX7v>Zyr>YSq4*Ety9FTr1xxtzrDIM%-4oOyh zgI+`#7i;TWOeNcH4_ZU6)@+}m@j-)4b?Jr4>xB`=J(|}g>7^TVX9{u#t!5|TP0JfG z&x-!NagC>xZ|n6gXNmk!V|J%;w*9_+w1vCtA(uh)Z)QaC4AZDPQmraULDTFMDhHk`lrItxmd+0uhDITAPu$NDzX9eWRW^n zl0o_X1GK!d!Yw;AHz?ky2HKuzGm+7lq*!xN4q-wYG^WmkBBzx_3wL_ z!jT6zGyi7kaFxSgR4@f;Np1I(PfEzuO2|kWv(U0e{CflMS2w@M~!5y^nhsNwCo)D8*Gb2UBbR{hl4SD*W|} z*95wAk&=???(fgZ&kqiH!uWBwr22SM9Pv#}>?%;V#IRt!O43ymIvEhCzgY09N5F5e zpK_ySkL2rOnEbNB%Tr7Lk&)r|jptoVVq%^(RKcGdZae$?s2K&f+;*0KrrLg}{~OQt zXzs%yafE1XZS9t`uxh%PN|W!Mw`VlUt9q+dsm5@vcQ)iA@3U`|LQ)1R9pM4w8a&18 zp76~hlO@-aj+;8B0ta(91wk1>FG;b3fK7@`j_!+XxF$`PYVQH3``*S`OEMxaobN{* zG-!*TJg`XpTlN_K-rO+zRv3vz(FR*j&~BlaB6)M0eK-y?{l_J0eWvNpHy!rS)jBac z4r%+vBBZ9O`e=E1S@d-HWq+!OUU-qX!xD@r3@xawMUK)(daBg8r>~EelT(e)md)t* zSH2IE`96lTzipLvCrh|Uu-{r(M90LmLQ|%Yik)34>8j07{qCWmJhy{|!Yhld;mpGC zAQq;Dg@yV*-+cb=JzAi}XjpBh0@7z(=W21XG4S;%&liuAje@EmVdt$3#oH3YD$Rjs zO?Ut7nK?LgZyx33<(&+_#Kohe9ICMB8((?Tm&mDCX@Y``Tt01cx;66Y-)!{>1YV(` zuP+})#6G-xwl`fFl)!Ej6Ca=J$}qO=?7Thtd1=Y)`r=?H*}ky{1y|IMP9Y~JCn_qc zdDgyZ;QZh0Q$A|~M@L6GI=aINJyR}+B?(1EMXQ7DW|y^YJlU@#Et4fi3i9&mA4*t% z-h|?~{hO&0J#0oPtZb;SPgz@o-cFVpD|JOY^FZ8POamZ%`2|~}=*5EozX3~HTG~%` z^M4A?4$vgcdSd9?+uO}}Neya0(tpCh-RR?N(jG8CLPByrSV(nS^hspa`r!b+b98LX zW62-GJ4-P%EDQviBwY57%WmiG)k#lpFU^Y=#CB{7za^HA*WREzI*350-yqv3JhQnwsRD@m}u*gqpDChp3R{PefN z;$hSEMA`G?fwlGZpYO*QD7^N#9#M+*@6Xru3=Ue3=0FPGXA^p-I}>4PFT6&pKIr|n zn=eE+XXDa$KT6O+66JNdH8TR+@Uttdzl0OC30*zAtYih|k0z&D?e67>%#hA#&q2+XsHbMQ- zh-Bri$MldOC%xJ8Dd)Qfm{EwY2@=X_cStIG-Bkzj;cN5aTxT&?#P08r#}qjaEpAYo zZj}<*yo9)ULtRUxEF$vM3T`j3pDD1OaLwVrio$>H>BxJom(H-1jTD@f|Al73Y3Rkm z(J=1+!LBu}dxJ@ta8?|porwuWy7w`b)(=RTnu{yi_wM>=TuV*Ez(4`?SM|Ir*^t;x z@t|}^KZ#|9_yJnJ$q_EhZt0fn94h9`X>}O=(5T7dI#%(oB zW%$cV5=2e>?(~UjUMwN2E|mg4IJDgI@~DX-y`t5W=dY2Yqocjgr{5{33dgUkys6Uv zUcG33yw-Djdotv_Kld$&(l<#ajOYm9#Ioys{W0+JLfSYlQQfb%^Bjd!`;)j{vZIJW zaPJ?=-&!}*AypZf&)J4F6#a`dEmaYzX{k= zFvNyL)5;ZkU_BFdR*yyH;pPT}1-`D}b&1#cp5$Xx!{0UvLuoHOHom<&8Zv&HrG|?ItzB(q)yqfEgsCu*9};tD^JVIpc*yXXvSbb?^V>?r(4Ftk z_uV6Aqt8u}h#N;1)97zoBTY?B2%O73V)Vo^o?Na*Y8e{#e!>;&zBy>Z?IumfXIlPP z>mW$(eS6eJ$H1Vet}fA+z`i|IM)@-6kqm)M6%kSQ{P}*(>Z3V30n5s7nJNjfWAhm%h592&v8K?o{9Pr0}X>Ooz&o>8Bwqa#2VBC+|2` zoKcVoh-a8M;zTS7-CfRmhZ0R2Xf1a>4OpHyX8o>XKB~C7Q&_3WL{UbU+_=p8q3v^^ z+Mx5OB{@6e%c>?Xl06BCPG{wiSdr`1&U7WCIQ)`ULqp>pngA(~KMEq9KI-QgdJfXt z+SZ2k;6c`(Ki`j_)vhNbB;6R4-V(~n*Z|E7jiJRxAM3w4BUWo0$@V`$O&6LjmqB-| zm6iiBl!0AuSDb|vl$5lZsC;hDEe5{x)nD%vd0#FEY3u49F9%U_f0$&Gdim1e=NmNL zqWEmN$m74}kp*XJ&ce^^o9_5QD_~QI>hmdpK8lKofdZI91yfZ$&-X&+?KT0HiB!*h ze29gGbsxxMx7jD#qM zI>Lx+4;pXufjDYuX{mX|A?&)>4VYMGYzS0~yoyS$X_GG?b5QXYhm%J3T-M`EE32zI zn;8|s_icqMcIgMWFaL!@{A1msiO|`98=yML#eGwXi`mjVHlChA`KO-=QT@TgIW z!*;L7sJe>8f#9)OY)oCe+jqPF62Oj5OU+1)cjrbX?#pN(%tpU$UaxgW-xJFmgt)V& z{*|A9f5bunWk5yrCkv?kBVi29vbH1>gdC{uDU#4A*I^zsUU1*~o4f0?_KuE`pXPEz zZ2Epwn4;%@&ELLz7aJ9ovBAKU+UvSMr||J3w|Q5D&TO98)mkh8At4uFKh;#>4xou@ z+>f$m?n;2h#G{pc{%(*Q0C=ga-@MmB!`ruSqterdK(RHSZjVj$UzZv~b)(sGxc8zq z4T5`Y^nd%r6e@bs&*Kfh+Whr?>`OoZ^6~NU)GY02eEgPZ?FU1aeEhtMnH4HWcAzSw+YI-^=lo(pF2q^|&Ka^j<3XVx z^A_)PiwFmM4sK4B>31F+UHtq}_%Lk3`mB$0!kU!Fvs+%OkmHWWGn?9X8JyrQ5vNH% z04Jq7*MGy?&NhF`{qGU&@nZ=9yfn{HPz|ZXChje}E%Mf_5u?L*;{{sx9}TQPh3A zPWR`HN*Z^J+0WzkOqQeNC^7-x7H(_y$X`V8&j6|HT9+CZM^F_V0XiOVi^W`x#{g8Gp6!XSLKz%20nyP;MSTTd{GMb}sdyT@zwDRu|w z;ze+lv`1BY1xiB{T{+3}l<|6gqBSF%cob8$sg0SdjVj+Tgn{^5#~^QO{>Ln5E!2@0 zHJvG=yu5s|@v!xww5%-haU`I0)w>qRW}*HY01D8e?}pOof#U$uxboxry?&ntr>dZ! zP^|w`>feTrzJB*yt&@VP>JR(HMr=wkat(s%YWsA<8+uS#Ai-R3+A;ZU{x%=@UWiQK z>1k_A1K;ei96cfn^Ou5W?xxUZPCwYU8C3;p-%Oj;V% zcIH=RO-&LJyWub>Gd?n%Z_TsS_GNG@!m&v1?ft($Uk*s^kLBUA>Xp6)1!O%5YW&^& z9~W!>cR&fxl>dN$-^C{74F+h=Wjn*0z-G`2^iO^Qi7vM^E`?|}d-YuFbmhB({Cu;+ zr52Ei03d3M&@OE9#24k2)fwAOMdjpI(DjHhB3%uUm-tO-1481ZF z;Dz%&&;i=ZfbIj|jf{+}O-&2<6c{)SAmIRFjYo}|BCegwvPrDaS^OxF2OX<;D^Gjm8Rqgo-J9S}zJqM|84wg*4u zu>@*dNJvQeJ8uXm82EX0Q-N6e)yd|4004_-=u!dx2Sqvp%p*59x1iTKTcqeQCLSJy z7nhJQn)woAV=%SIweiDZ;|qXqU&#a_#`4rS4UY#Z5?NUuV&aB(Se1`ojcpHL3O~en zFzb*}&W;f_L%q$mbxMTV@R_#bpP=?!L>v9T$Ie8j!Vl5KFErpBe;*-TUcyS55i1s) ziMj-j$;rJs1WB(?Hi$v`e(!?@?|{Gz3UIVt>5ir?43Q4e z)nIrL)*%Jz1pHHj?~%pp(cLp(ZZNB7OJtGQ4Jrb+pe-wGbQBPobv5Yv31|HwvW$$( zy}36ol2A1``1>=P^hwzq7=>^{@LS;?0mYWG`|un3k2e z3Ru9s%+0+5X&y%_2EJcgTl)}L%IEJ#=@xu%Y<*9X7u5|6dcf2S%!oF@ug3ewVn z*TsZP=ZF%cYHkQvy9W;*Tmk~)A`KUXU#h*~*}|K!gu3~hrG{AT3YK z);!doTAIo1>sx>n;z}N{MscSvN2_6MJOJ=v;)oeJ zm`0GvT(_bX>8#rMa7hwOG;dDYfO4E}g2Z2Voon09_9l+J<>mr#!}m$+Dqz9qV%~Zrztp&{ z&>9ZJ`aKbo3D~^_N`TGyPaNo|3g>N28-6l1(IZr+&B68UymZTsP{LaP20A>!YAJ#( zHIA$Ioez*>9gJ(*ySj?LLBaPDMbuqAzWsh;1?qifmr6t=*=xTx=)OLDZ{1l~Sik@Y zc$P0fN))}n0XXx^e$nJEOAVk6fVAk86lG=QuRHnZ@~W!31I+h>BE$jWPFz|;``KGC zWZVP;T|nrChF^fi0wP(LF&oU;0IT)>wuNTLrE35fJO?VHwY3#+C8z>nw|!-Kc}#!< zKv*J$b+iH{4(bg+z|G%^_znvo#{f9TfFUHPNk>6)kYJ3&zFas$nIYCN&A@Tgs6;oN z0@mAlKP7_$0O1CG1me^Nc(@%X&;tG_A+Pgd;h*qb$P@t@1zCe2Hhm68?=#S^_u0Rloa^RO zUU=#9iLg{v5|9ghl(t<=N=)30Wpi0>MXRc>ypS$b4poe<1G$F*mk>?f`h62xa(oGxb zFl7w6fwA@ja2isedG05k*2nj<2Q)1$D{B}K6ku)%h&vmMzxHOT!uV}x@^j_m3|}fT zN8VS%&?<1;8*RAaYbDhSE5PsOfDw{dm7ld*Fv9ND2lxS$zpO^duS}AV=KD>{dyI-n z<_E9UaE4@CINAitc+>;PnQxe!u%9fz;c90H;zq;=bV5EyABG*+sqTfiDLg?J;o54s zsC{Lv1b-P%z!+Ff+(_-)f&OExhpQ4F{$lAt8Iz}t#o28RV(cr;UfQ>oDm!q& z2?GzQr_!`G?~#HSE|w&+!ea;8{4UrWrhLE>PsGeEDeo)Re27#+>4T_bOK0DoZ>o$L zQ$4Y{bc%(Qt^cmhS)aU7TA84f)Vg#L79wC7rn!)REaULUJC!Z~=9yY={0~<5WG)M# za48<%R8V6$gfKj+E@C>L7JEuy^3L?rW9!nBW$Qpw*lCQs->giAQpC5?NisaN=fU`@ zYTGEWOf>TNmLpKOg0uM)S^jX}1*Svaln$w~_Rd*wfT}U-?GXy_J12`-pX*NsMSO`V z!V#UT7tH3<>Io_0qA$!MuT37Cz1HOn7!X!QM^cD$2*Fpamack2&VkiK8;z#ldb==W zSy>RjSI_hJD|#?yAoL;`MOGqk)ykL5rU{bH zBM*FZ@BP`wP2#VxeC>G?5sKNhLkPu;+M%Y{>=XsG#_+PmuRB|n2Lt&L{e@LHmwQ_0 zlw4>(a`k zpv)?|v%C*U$G0fgszz=ZMBg5hX@9JbB90A zT=j${kUuNkAKOKHW3;V*p^2oADt7J78H_*S8dCM{i-sos>kBqym7aDH7mgsY7g~6z z&!0AvK1f==Sp325=1uyuq{J*>(spg?@1*YY)@%q;vpAs~t2w*VR%Bgc6FxZIzve#L zxw+K~XyX6g2JsE2Y(n%7%tPYEtuVAh$5$%Z;m?;=%jp=N^{uVe(6z!Im|3t2Wm!&6 ze>%QO^VwuS&M_q?h`5Ng{kq8XC*-%@@oDs{$?7ebymF8DATC9kZj0nG8hNfuYlJ{NY>Pn5u$5 z&Z)YgRdzY~qx4c8vRTUy38)vz4Melc1Xu=BXYaaIY zjd;OZeite_t6s_NI>+bFq&Kc0$Hz;?h001R_Ieh5(We*Q^Xpt?suBn6C{XF8=M#9JMobrn>8+qAVl=e`Xr| zPfSuHSW+~fu&^rH&`1cJ5@Od&mPD}+yhC?J>H166=VD4tdD!RI5WnsZoa;@OawKUb| zCLq4CTZE&qsrb+8_Qqb%)GfiKLLh9y8rxja3TOdL3o_fq4~Uppj+-v|6j0nfn<*m4 z?PIekP!~TN#I1Ee8SVM28_bVw_Wf5=*}kG91!=wMNkdgEv?;{OXU5N{ru#$B8lJ-u zqK@X)ukd!@V2tEQmqu_o8)LK?>)p`bW+V>}euviYD(}TET6Y%)&XKlSG$bo8htjJx z4B17(KCBwPhbdxya7styS|P*f5F3ZAq<-10osLRWak}_g(7w74EH=WTkRP(Q&B#eW zhgA>_%P=Bnb;(-E)&&%4VvI_Edo(Z0GIopSuevfG$aZqwIdj15Wn8lIi}Ayll+Z0o zxjl{4xR*}S4#mB!x(puSBIP}0>3hgr?7ZZ>OF9l~PZepgVc??)K%l{=Dk1JdwdChi zot1a>n?CkX25!aV<4Nil*&< zf@ZK5Lu6!7De_OmU$!;8O*$g`@C#X{RgVtgNM;84tEykH4`aFfLbm74N5TwXyF#pP zIT*@Li7J1hQ1%pBX=4wVr!UwkmBfuvHCqqK+;XP+(?Wupxk1Y4pha(HufTg^_NZ-9 zN#=R;p+^BG5eXkBVKzmS#Phb2gS-GV_wHQ^lbF1K4aFtl)M7N=c^b9c z{y7=jn_PE_F+(}8*XzIucKyKhi;hW7bwgm(@MGP{F-^7QDFuAbk&ao7=&f)Xe_6)# z&U4w1$qqHx^~Ch=8vkH3C=0(3R(PxGOo#Ux(y8fZ#IpJD8sWgyrkK(5Wfn6N@AY4l zR>zQQhWD_@bn&6pD%Yt=n9aC+GGbL|pFK4Km1u>vg#XLjtLcS+p9bAFTGu4hE6*ZFaiZg(vedc-Q&#l51lkB z8#>9Dxd6i_iQJcOdlpQzYbB0v%j0T14#U6cDN_$b`!&#yoEeP;e@M-b7|Ks%w9Gb< zh*^`*Zs^)oOsjHa#;;MmQcfGvp=_FGhd4tOIsC+5JwSY=zDa^hA-+F@rn^%hm$D1* zPhGdJ^y!FG`_w2OrBAmDG0-a;8qLg->Dv|t3?w3vJm=>Ovil+BdV6h0qne@Q9KFvN znx>|LluzSo*@{Pv^ohS;^K zsi~-5Plg0{TDKFKg+5=wMCIXsB^-sy#L1bP(LSG#4x?&sci^cYxMFzzaNIVEzMsS_ zVw11q1Y;O)+7prg?&dMyD9dm@YN2*zaKt$wdYr1R?gs)54V(oj8LeDjQ#eI<`WjB; zTT{%aw20?6NkgxDw6-$}Nd1<6-ayc{^YQoDffLUcWgg_^p|TEq>5#j-`zJA&J*9%r zC>%MpxjLH9Q1WHI9*TNz#uv2a?u2bj;>H&$HY0K2=fgA=mt5wAZF z|K3cQU&hd`kCgP3G7y4T7- zRNXRz2@UwnOQUH&|F!O$26^dFeBu@Pz7P}oxHF*b`%{5r@3{c$Sq#1S?{ zRi?h|Oja{FjZW{zKnBt*P2#>4%phX-8|(Iu>JAv3)_WOlkm%ILpiF~qeuVD$UpV5~ zP*Y9K-?9PI>2nhpxQPA=uejkMoaVAid)X&f69Fzay z+^jDy&$~19REgob?P9^BF|fq#-HTbgMD(reF+l58LgtM&@I9lo z9?Ef<<{MIoAF*+)mzYN1{DzT*KLyp82=+eRmilZ&5~eKf5_pum9;YptG^ZAfUzB zRv8R)Mjr6xi3w+nRwS9B zk`km>;m{@}1x4x1C87HVlqzCS^AayfC45HIeEDEV(+QMBRAyYQGwWWpcP%D?7!O3p zKX5)_JX^VQbE`a`b6}&U(SI8&r=?e`6yMyy=fC>yV~x+SJR5^I10otl4&Rtwt@$i` zQ_%`0o4R?Gw6sa+MZ(8{7mH;0tNcxE?`@*j0F-;&; zx=|T@E4AW_tz=NYSr=FIGboNY&G@cQK?IqIn2!8Q7e(^G0k=uVN`PC?;Kpp3sSdIK zgg{TY0RfJg)H+&xo(82K6`oc36EcqUn!B3r^XaE+LL&I&_z`^sYjP+Kc=(!yc8KK( z$jII2x9I+flxPbzp7c``vT$Tgx?wh`OSFu>8-D})E%Pa5w`Tt6^}C!YKGvgAid$Zr zLL3>`MII6X0YSc$^I{{PX5$KR)MuN6i^hxJ`hS+5>F%T>@Ofc=r_R`IU;I}vBz_}M zcFt?(=49>jL=isl2oIC8jgzwc{N`H8gK<6Q6%3h(Fd1j5`da%zrgCQ85L8bdYYSoQNNAt|Tw$sek3 zk@@bDzqvK}-zv}Q#5QNjUgPp&CCv*XvwQaTt{)O5D$$4|c8*O$K5&FBDm_VpLnX1> z8WnwXima>-VaTqD zx7nk+sMx}IVMPyUUTm&>K%UW<{06m-DyFE6!w8ZQjLkvKPR;H^LZPVEGOl8!k`cU5 zgZ6kXJDvVfugTlUctwTQTgH11M@5kn(#yf7ZP3IHkkT=!6s)FZW}PEv!y{>ElUHiVfVuPVfs=v{|gQ1P>!rBZ{T}cqu`bwx|2H z;~gSPZoo!REUp|AFZQH&X6eI;(N|;*N#Xsia(}tBeH2gqQ#c3zU)fhKa8}2G_2U~W zWC~uHWBae-+%z$dwa{Xy)S%;qb4cdl7I9v-X-WhIM3F-wGGR|Li+v-gQ@T3ga3#0@ zBEeQ4>&OZwZnpl83tvcnm>67yZlS%a#wojc(rB$`lwW~nKjVs~m>wonko*e9l;-`s`WQ!L6h=^RL~m^~68f!0WE5KC?AF}!cv~VV zvNU=M8gorN)8eL(Hr}v^`khE=GJ_G$(Ao_Ux15}Nbm5wlixG-%YGJXYP zEcnq;t+KDMf(g5$DIOd-xkQr3(Dnw>>hjjPY#KNenoM!z%|U{KDR3kVP$hiJ%x)Yb z4J=*J15m}uLtictL~6@v>~l{P`LkvIsC)HNLjpZDSS-3L$pUL)bT+glY;cwM-JFY`g2^0-JFvXmZiW2$E ztL|uK4zt+Jzh$9N==YRB)Uz8H2Qe`xe|!^`7!2BUXUJ+bBz^gohcW-!8@BAXGy*H# zIKjoj%4B-hh^6y8lgZduCxiSVVei1yRN#sJblzMSr8l3S6|3bZKR*4gXO3hZ&YG0N zSj7lC;!Gl98G4#*k&W_=Jxt^xdh&4Ty78b+I(7P9Su9#eQxFx24ZXWtvB>FP8|0?$ zjj)?cd8VomPaYF8^@7ftsHkr}^3li>at8?$9Mq5l@mUq;ns%Rgj#%-TnXQ1GCl7iF zCt=@v7e%rM;TvzUr@HL1Y(J}-4s@Pm=Cr@PQND$d4PA6HljggAd#X#Vc1kPS<@>-^ z=EaF;>{W>_#EPDpY^7u@H_so|{)0qbjPr(qh{HSHR2hl967?jzid{qUHOU#r^LT1v zq-Zfjmm-FBSlc^L^^yjZuSNUj{D zeP%=&Etc8oYC4PIz#L@@H{5)@3DIRq8^ z&<52AwbNzL;yBjFVq5od3o}ivG#%Ctl>>zyviEEYW3kqoxh_BK<&pJzS&~mHO6IrG z6K5eU1F5LgrU#7>L()%NMv1Z#nDX6Z_+6Tdcl1~+OOSViX5;j7Df5uG&@DBQ|555k zkJBD8Z^W5hr&x;L5)pItLuH@e#OG6-siq-SrQt$|okvx42scE<{F5M4rvaeqy~_$P z5<3p~u2`pA7M`{#R{YI91p1}p&Cl3TT`1xX(N|NHD!pLh^b?N%eZU$lDfc<)5F` z`S+KP3scl})SqCjx!jD)VHBii7G_0djar{}$~WDDtNGw!D*oTN%Z82S4=eBGTOr-c zecqY^Y!{74iAg^mw{_c4^OPwg*LHAM2Z6!MQ zBuw1Wv{0 zwBl3&R+$W>-6F)zl&vpcmXozHbCld=+upD>3S48S0sqweza?0>n7eW}i^Z?oN51w-j!ET#E@_{V@2H?^1W4kROKJ z)^+~&ZiTIooW^u$UgobBy6>5P3QoNR6hWTx0U7o0sT3HSKq|TQ4-}P>d+dWUPqZ9s zsoJwnq<>s35#vWQ#GPz^=N765oj3!}h`#%hBs;@$ntl6IY&3Af2 zs!Q9E=kps)3zG9s45M@XC&!yVF$pmqbl5nUk zTy^0(HAA%T&gmfgpcGJG$g=E%fL{eEdw_X57{$!_W(Z_K$bHKmpV5-j2NrgEgDS^U&DSWFnR&!!sP=jrTiK_MF zDm-iNwhFb?P3?!{VwcLQeIfcGfTa6qV9%tOW&E&)ompJ+cP{FS`*$A02$;V8de8|u z3w3s$G%!1L8~TZhGzkD5&gswYb1ratrQ%7vYy!j{7hSc;r!n^@9T8@8F=bB+&#M-O zjj}MQk)3EgV03&9c6apDV~}iqC%BeS^w3Y$FBG4wO=R;}JaQ4+PQcVVNku0&{|oPo z4S#Q0GxBg0s^zdhEo}7nxP02Y2t>ESQI2PoKpW@Xskhv@oZt}Za2^o;pl&Z|e?ctT zhjGn|?WT#>Za+o-eSC3)et-DM>NmYm8-B&YwV^q3-!Qya{(KiqY(+pvVWBMix@7^k1L^v#^v_K zh^rmUH*9?7`D~my<#Q2Z#;dSNEPQH9Vkz~3s?by1in~Q!junSpvVPRT`fIUn^vt70 z{af_I@!umaXOpwAp7$6uQ4aOJo}Yd#m|}-6cN@Ueqrr{jD#UhdZ3P<{(M47+e=irl z=5bI`@T&wlQHiRZ=CRqixR?y|66-Y36y0!XDpk|qD9pReILJwUKT$CrrFZ9N3+rt( zb@_1*FU1v2yzbA(t|7P7NQd1k+M_1&tNTs4n)+W%ed*oS4P8)+1{UXL#LhCsRGKNF zsGp?$B_w0iDmZnh!^r`MgEKlb{siLxCHVGP$-&JOjc`nUv!Y$Z9JI;v<)d585J_vB zl*6|+$B-}IDV_=oXduO(hRo#2;>K^AV>aWWz9Uc^kG%3G;sDX|eD= zV?aV(U41_FEQyjAP8Pce``GXxR?;lrEt2tzXLIQsG%&JR8%9J+G*pV4=pJD z=0DHOt!t{6p;}ft_Cu_L=?AZCU+&kq^qG3{{1`ByNPdO5R1CGz7G5KPe@%31#uml- z8gF0yUXIl9X9&q|7;?olCYGNHk5e-y1o7gKzoKaB!m2+G;l)QJ$r}*5ToMW$8=j$_ zZ`iBq4E<TrBDe{sEst^4e2+xFy0kJ9wvB#eXb>;nWtLk*sIY|QgzZuIvW z@t^IrGb0vG_RRAB@Ofi%WbSR502&{@pa6Vg>a@A!y=h*mcoqQN11rYb{f_W-fnJ#)bk0UOf9yQKkx})El7v!)$gqf8s))w1cz$W zn!Xv+4FCqN+7B+r5yBOOEh%`YXjL=!tV9gHo5ffzcUVK-)5KrThg39S$O-A|=MVkn zSYqgJ{_Xt)#c)q+29Dp?Yat2w^0K?dH-+07mf@J~7Fc;RwpsQ4YU%1`nz}@xXiFhtKI3;j^$Vsf zV9Olbf1_K?!@Xna^x;;3q6tYtdQjWALICL^SqQ9+9yIeNr0#sCYdH>(_MO*BfL720 zbAR4Stk5(1OSXN>cPx2=#r^V7seHYb*ADJP2l57 zTkGQ0TTd%DZ+F9iT^Z3hO1zX#4%&@x@=-Qw?Qg_)4|x&wAn)^*pQcnlA47t5B3|CC zL~ft-=gI;dzuOZp1mY|JlJ^^tvGRKsX41}1`m-)PI40O&vpL^wHQ}rFpMGuO)4%h` zb^@3Ifd&UO?KWL+oT(M~LSka*%-o(9IDB^qMjtd4-D|_eNk%F~w|>`VeJjAw6t!RQ z?Zr9Am0ZRNfz*?R2T9B?d_NpCk-I}znHzGLd>wyLGfT@d3s&1I7oi)91@p#*`>W(l zCYNn&c9dzO)(yRs)~+|Ai<)(f`{A6?i#Ld}C(Rj&Zx;h$S#%fP0Gfp*H{8MkW=`ci zh=h?&g%$n<{ln3SDbx71@!wv_!~BQM5Xxu}&XX^>c?cstO&n5Qt4p;GXad=RnPg*L zLJDm7lG;&ikwW4!_kZ%<3P>5j?l)tW(LZM%X~BJxgq${-I(!exD5~$DpR=m5BZ65R z+iPlV^+{-I;)AWpxL-07;LQTUw;ZsaKYyCT_FU`!l>PYwFAP(W@$m5Yq#_yL1A)7$ z{Opfg!P@Md$=EAke@xC|iooFvAEv{a9zxAPr;{Emc*j4t>?cX{++qHql8pYUHpKM5 z!@A5GM1D+0Ci0`buIiRh*4z-*40f^Z_c1;GRZW%72>y4-vT~_tONNRFb@TK4e_w)o zBEIpyAFU#f`0v!F?mvW_Ty(=4pI-(=(EX4K+)7f+>kB_*U&kdg-J?tJd>f8YD{ zUewVF z4Bu^!`+DEBK~Bw^zQX>led}nA*G+x3oLVJL!TOaaX-JW>;G`(3$&NROlDxudX~xk$lP9mKZQuuQ-!$Q ze~Jouso&ad@>GBS_QxN)lSK;$PM|iEhQRTnx?P&WJ zi9j7I=J6a>bnCIpFs`j9yK>6#sQg($Pz{kn{+i16I66U!VeBB~7q;qRa+PSLoWSn* z^Nm)tc4v;D?_UQZzkO9E7R<^p)V8_Bac!>mML|A|Np>6zDr{{|$x3=jwta1WoV3q zg0XvM!De`saeC?S*5#pVHZ<{Ibt%V>Aq+c>D&y_%$%#Z+6|b7@YqVLV9hd2pCx1R_ zrJ{b0FKvJNxh*5FdF6{;YCtp+dysSZsdkDUWbSNti?sS<;y3fnxKQif-viHV7y^fT zie{Jihfi>DRB*BqZ#6tV?`3&<;A;kIBQ$Cwz{}4=$EwNK4^Z~@_6LM`8FU;yDw(I$ zNjZ71Bg#H~TlKmxdHsz6eZb94Rr}*qy+6&jCzCy&st_U~`V0f%c_zdWf)-Jk6}+NYv%TJ59S^kY`ge5DVt?Hs&4Y>(|XTiqJZcio-{-mPpmlu$P} zGdr4)XMOhU+0Tpp`By9~7ANcd1|JvP?lxGVmHW%3uZo#Gc`ZD}N;{(>u+O|pK8cNs zUXky+Lf-RaO1dpeMiM%mtjnUIqo?z^&|hC)i$RHQZ^-QyThf~kenbvu^8U^he`+!E zS$6u{JI|exuYH4qUB+yV;2vZQVw|x^^5r|vr<-WxpWkdO_c=Wk`l7gD))rX1IT@A_ zUjePRQ|w_HvQoC!2TsVbD#d=%5Ba@0c{*}^;PmgaS2o3Hk@I@f&BNzW`$e3)>vnx3 zTRCWZf~UUc?m3<<-QnRMORj#0xSX2FpA6A!8QI;{o^6W=!{JBPG0Gj3zX+JL?k++p z{fztKsC~|-wAcUr!+rjISm^R^*Wd3hk_Pu}zPDAgc1;E>i@uldez@&Q`S}ThXY8!2 zwwvY9sx)N2scW#Ejw!2bBTej=aChgiwzh_RE@my)H#WkFEi;Fu-oAzRy*YdKFZJ0A zDHQH{2=<_%tzB!O zBP+X7KW%6V#*KO|kWx@UtEQ%Qb@p4CM9_n+u&~he$ZeV5bqgn7I@aQMkzzqXL73jI z-d>wU*SlH^Ob{=rjt$xx8f-pSkmH|nUGc9-9wCAU-Bq+8_!cucKdN4s0LhxUin{OITRY zg9)@nHDqOFQRx#=YiAX}An78I@a*iYnT16}5x?HV3>bmW`{K1WWaL|aM3R)68u{aP zu2WB4UEIc|w92y5sQnArh_dH}on5+ZK74DxqVvT=vATPEBSQqeFAwO1g$>`7ecYR& zru|#??MH+|+jU4%5yfN&R9sw1_6t9pR=ZKhNrr9eaY;$# z<{LhM9mxH7xY)TqSE|V*e6@@iU&Z6NEV{b3M#64_RBJg(Xg+`ME%cI(j@_&ehsXYJ zU!~tUQ@Ius2t&J>s(_~y9{zz(v1?p5m7JZO(>To0plrXJSFPTcMcS2yuDgGtLH>pt zV=$*H-5PFgZq~Z*>veW@$to&t1Y!#>$4gT@%lb?6;)Se|(!cMUU&Iq=AC6<8Fcx>| zSc*dZM*EhVoibW_`agq+D5&SMM?9J)F%c+hrA=&Jzp`=;JN~p>YO%luDEl8KE)2~1 zK9zUqLUd0O>l=2pWx{SO8-h)a_pz-lq`wJ;+Rz;alx!0XwRb4vd6e&wXS>Rv4z#=W z*KC@+ShHH9SKIJd4_a<_>n5JliCxxQ{+#e>Ha5ScJ%lR&4pTJ6{8_|fKt)Iu8tE+k zU+_JW%2$1pS4U|N^7619CJZ9;1=#;&ctqr*+a=hS(o#l{T}=-+yPm7zFS{A@2`UiM zgnjw#8#BRC;sDSC+0Q_Keb{!Z^hTWu)02<2{jP?gKQ1keVPd`B8CNg9863C!{+uKvA%S%H*CjTs?#IW& z5imd+uLDJRc=%%`rlk?j)!Rw~P`JN2@3P~m{dj07Cok{$FWpi`Q4xe7Mc~g406K5n z_lPNCLks0oBeqCn6J}aGIX6eLOt;2zhtk-^1udgHXpWi z?Yln$624^ayJmNM0)lFrDaPZ^9~V7eR##X1T&;u(-fZP3B_)NKSU>p1mZ*O{0krVD zP@d?Z_0o`#S+DzRwqL~bF5SzQp?!Ta&!7;LqrMlh%kItT?4}_Mh{Di=PmyBgFKJ3& z33KzpKIT`ftefloiT*ogNFK*MMAfr)fVJ#f&$TWNmtwnCj34fD+b5!s}r-1So!T#l+f#4k8Z%-70r-_S;6K!_im#EkB-`TNguwNJe z7j^-R_c$HqmCRxsMqR2lm8O+7S?LTG!}EH$-VDB0Ll0gAfEJNg<$Y;y=)KQni`ISwp;r}uU%%*sjE6s)Y#s@!Hw0{%f%NU zN;^Bn^cwAl{oxUbL9W-lj?~l1ai4EK{zZ1|)v8mWB^5>dbH8y($-sb|B~@Mnmc{2{ z;m=hnTf8}1_U=2H53Y-Kb>OoLO3&pLL!Yw?rIhu8D%cFf7n8*wJC81-qPCt>AhVyQ zxivjomLuwW9-C&3f))CrBYf_mbTaZEHhuVXFnm=SZSvaMoZ7iB|K&6C1QF@?%)P-@ z2oG!@0ENH&;vwdGy)#utwB&co?BwJG;F8nh$k>1-HEhr0?zs06gvZCngMx!q)z!NS zWD`*^ARD?d-OHUb|8G(Bn1E zD@sX)Tzxt_T*{s*(?0D)XFVDbI8@Qp>=8I@=_=Q)4U390>xm$k*>`^gV?=C0s-0|N z4CKfC2k=V5?^?_zo0O800Ji`2VABF*527OY_x3s^?CR;Xp*QoZSFg^t#sk6Nkqn_g zXd{Yai6(J#yjBHkB!)Ivg80Gb|YyrOY&0LX@cnQBu2y@VrgKRg3*iSE#T&jUaV zPsp(zN2_@u2ESr2 zh=_VyJWnNh-{__Ur++wF{;8p*6~PEK=&k&){Njlm+uIc@@*tz8hMUFjX7cmX6Pbi= zaC)LjN?71XXn5c5YBW585jN!`N=n>L0xV8jT{U?O`*6IMAo-CuN3)3*mVme<5%S`4 z`8V|b=4_h=VXtA{{sj|LHI(Bj$c&ipU%QqXgfXOtsOYX>{aCVZ>>@e$T{7J6 zen<1rcHvrGHM4(_b0?Qo#J(01O`UhsDUvTjx|XW+Mew`(@oLXs_xTTX4oi;|0bq(4 z=rU?*>h;Y{m%A$`WNeDp1#1xzXysZ^Suqjz`RYX7VNrCqy6*5m&z7XrJ6v)9(Us@9}O^7 zvbp?IP|D(`o3zUx@4Gr)la-NKKA$$S1Z>n9-{iKd^-O?eu*PaGZ#LyElx1eF3)26s z1i#g2QfB5LP)Hp^>70^ClbylnKuDSFOqPJ(Lm#EfV^X3OX=-Y|A;+3)bQtYVeEBHO zR8>`JFdTpuEhs9gaaxla&)EdYV$vCe+E=3hxSo%X@2}74FwlMzfQPDyAt2sq+H4t9;vYr$YY0sC&xRKEa1l1A($AgnBbj~t#S zW}=uzuKZbVvXs7fAMg>f7|58I(C{vL)x@)Oq;I&&=bHBg&Po5>;*ypCb>zY^X6W6OdCPNn%eIqvxR*n&NX2+)xbds zf?V*JN*|8t`f?h;>ImakZwsSp4pLVXp^Y8@8n7iibw%NoG`TfwV8o$?*qd z%_W-X(!B8a{DAUnT({N6SLD(6U$d|fa%a^Y#`dl~gC_@kYYH+3U|=MXp+^AF%Tm!0 zsidUj6CjD-pYKc+eEoX*FVg{+f3lM~9 z0v}nrLb1Ps^o=6rM$=811te8`pOBqB8i4qe7+?)}u(glvw^@$e1VluSTIUP&;Ay7& z4`^oNyQ||FJDx|Av()B$oejID1j_r7JOEb^sH#G$1%-vx4okv6T(>*psKrsx(bq!A z?5Q|75`c_U)z$4+yMMfS zTUi!GH(>K6k_SLqMfS7v^Jjo0t_Jx8Hslx3hS%F)v#+-DW5dG3b3e>C097;wK*H-{ z?^TUzJ!%WEN2}6h>3(&xAHjampnnGihH``N34k%e%HIJbc$}NZ(!?asO6T`iWlA6` zJL6wK(jI%&y^rqhoEGr9ibp zl74q2OMv8!BbBz1FZZLC=l$!5_-L#WX#H-sUjlGo^&ti6N*Emh2;yxf&xgK|5kevV z=}IGI;D>FeziqVL9svIW4Gav-e0O;%@bSP5L?8yG@Mj=PN4^Nj>*%Bv+t&Ktx(nYO ziJzRD5OZ0@71z=Za#+;ruFF0~5YREGq;mv=Wj{Pz zwxef{-d&%9xrEROU*izS(8;cXU^zQj$OJ+}DO-5h_i{m6K>@?u+}w3aP$oT~Q#->K9`WFQCrjV02ejsMxc!*h@ zQ*nXNQ@J^psyd;BpCRMMUHI$5b4z@^@cwX=9is#791A~Jv7#SlzeK;y( zB!-1gA8Z3xA_Dofu9HIFo6FVM_0t=^3cWEe`3({BxufV^3h5G`o$~aQ8rtSQoJTaCyWdR)?y3-zBGnH zXy8#MPL-ureXuo>0$w)fZJ-45*NZ2u8!7q{5^VEhPT!nar?9*m0P^(FKBR|%_}^P< zH0+Q}c74!%*tA`gDS?;{7$q|N9Ee%oEY(h_F)^;9xT@T;_E)lYt^}&d9{8P_SJ*Zp4ZRml0G8W9Phu) z&8M{T;9{kuj~Cf8^|Go=9K68#8u}bd@_#%SYI0f&a*&qy@&Qw_rz<>q~49XyPa+MgTDOfY_A-;W(Jex(PUM4RE{#Fv#Tmu3?6)UeIG< zwVbTaylaL zSnc}@j4sfcoH>Ll3#i8;(b<`>vP#=)PU)B=DGLk3b^Ikk8NK*dfM2%8oXp>P_>-y! zusqev`*bayz+!lR4J{2pB{`?Cnk%=hD?Tc7P@iRmY`q-?-bXr=`qn2e=gMW^buOVV z5w}|)auQFb=>{)TI7Vxy_%_ra`%S>+uk<72g&u&O*NapAxz!vP6|_2Ex$xUR?@Q>X z0)HA=kN9qOI9A*U+9!h2@BE(g`>~*4=F|(NS2>K51T<#J9eQ zre}=a5fW>GcHA`S(KV%B)R^H!in96n1Ka%|T^9%3fY4TF{;84Y9lZH#vcUxO5NYIn z+(SB4LW@iKzcw8v2`Xk!V#}8=7$=*4Zm6pG;Od4kGj83JV}%x*ZD#+p;CZXSaCaMS zz=p_S08?Xxc?qVTX{+_8B@dog7M@hXMxKy_JkUYO5pu=uC5db}j!VC;0$0?IZu1N8 zQc0Pg!{h@}VjxTHC+cX3WJc|{)31z|n4GfGG%d+cX1?x=n4uEQD;|@nprp1+c-nXj zeXMLW5meQ6~MCMr4DYm`G?N>R2pqA@Q??SpwVlrCbv)M+P zCu`G?-`#wp1NMzwDjFzqn*JL~ms^mP*=*;yMkMq%PWSlfX!(^AUdP!ZX~vREj<$il z>S9)`O19;8+&+%L<};eDQglI`-p_4)q>RMykE;qSzTSl|WR2Magm9}mDcfW$4+=1F zD;olze6ufWqc{BUl=Ckv*46Ju9eKJnSxL7L%8=a5UR+S2Hx$o?sU1yA%3rZQ)#G?b zMIhpMP)(+12)azLA^RW!e<*owIuO6#k~$g7;4h{#D-~Uw?&j6*)#k9Io5{bO8YHxvbgSp)fG#aXB1^ z3{o0*WAbE%_`io<_ai#$bUMoZlDe*^grZr!q!t@0E^>a8>?IIV*A)cq&o}-CFD7z& zxgP?b_TDns)+c3T+!GBiwTld|i)^h`-Vf>NocA1GIuOD}g&y?8X_$9#a4_9jklESU z&#&|g;H_|Bcf+l9Og0W?Nk>7%O~=ZRl>KgPWq#(_$ao^FBnInC0+2y#Vo2ugT7hra_G;EgKB7=N)k98nPtt* zU`a>PI&$M3bzZ+)ys^kJszFxyc*m-RSFD}clDrgeuBpPbFt}k3r*Z2)PzB@{3O0+tX2d^QD<%P;5s&~z|ckfP2% z9Ky#S`ufNEY-+xw#aS)WpTxm8hguG^c&?|F?%ch}v83PUPv2&1U-}Fi%)NoKDCMir zNgclt$l^})#dqHoqZRk$OXZqb;O+{v+mA@HO-7N0I$yCZ*xJmH;o+Tq9u#;$JCr|) zTaw0Tzzn#pyT`uyoH)06Cc-Ck}u7|Frim03l6-5R%z5>1LG=PtoeOYMyIOec=V zAl+0W4gJ?%B5?RmA7qf9x$!7dsB# z%zbUf!CV%*qRT9WpS*8-$m51X=!KbZ1^ieD2QdsJh+@R_g|y`L1H9kn(1|tj1F0y! zapfAKRm2jbcX)Y&C^h6WPfvn>HI$bc-b@S0vXWYtunI|T39zaSSj z+7+%|rnwGX;;9WJZu9#pFPdY<5ajD8pOuhvdGggpzHGdXQ>Zw-ES~HgoTDJ`2gCI%;O!fAy_Qb-80=VhSfcu&~zKZ!2C=QNwNW?V7IQ!u)1b zqO@acA0iNe|G+1+{`jj~q=b{xQBS2VX~&B|_v-?`P||a%CoDrXc`V3< z7KqadfsVGy22iD?DUWQ^Uo?65LKVGz9QvGpGX4(?jEWSnBXUcE7lX$4!nugF^{lM zSSs&hFsz^ZC!9(YSn!Y&!@tn-EVKJ8(G#wPbUJ~_LN5aKz8M@^iYD5&7&&%$>H|Z(yg$lkwyhI zye9uW!8!M65^(57T=e+Z$4r5rU!t-OxFl#Jn-SZrjSGg)mdz7dB1z(2Kk zn~gYTD;ibP!g_NuW$h@WB@$e z-;kGcwC3(umzl-B(enzaM@QPc8wM8m;4P=rF-;2Iyh#DGFaJL~O z4*&R`ZRSAAhpTL1(c$!AY1~5CU(EnR>7}=o#}LcrRccZaTlE{qtm0@%9BqkyZ)l1|s` zt-cT6bJ;bq`j48;!jLn#PU7)Qpub6PC#FhPuZN`EOnAuX@FkGPrMkFm(3yw^hxsm^y_p_P!&wqzTZ zsdtIE>Z%ds%>S?(n^3Cx_}=>;quMA3EjSy+q$I2Eov5tTAhotp+x5zP@BPIqMOIcC z6@)~zhalW8n}EvcEmJqe#&FEQ5SN}Els_a_KNwan<56gXPfLqmj!ZIZ00sUPqyz=&qT0WA8Jf=`CiY45ss^Czp0Nw9pmpEsg(>LP7isL@cH@xu?TZ zaJ1PAFucZ0qE^E%9HgG((5C+s*QY_g2k>4j`UdXKmljj@799iEsQZu2ljz*Hn4(O9 zqyz}2dX_Y@RSm}YEU{w6nlwCr`zEE;Jg$=s^m=;Lx7BtOJsxB^AFN7{_E^Iy`bP_m z4qa(GY*NDNWDQb}UdXVS>Q=PUrL9A`cW%_ONE@(~JqEe5Nvp5FpkHl;cbD$^tn@J6 zhabViGC%8jTZgA^e-H&Vxg^ ze|Z^1cZD*F1Cs@#w)Zh^PfvV$UGD7X4NzTg-KShH?k{8bZ>Od^JO3%}%r|fw?O?B4 zuSm`}qTfR8`t~KzU5frpo3nZCJzPZP_SkEUOo+_p0}K`p9kafAg=%v;-EdC?C!3I_ zg8|qCiYY#aw;~nAv&9_qN2bcn5bCVJZFHN#A{a%6gCoj+?Bwbh()I12dUhd2&vbEa zVi)@E&R)-9(d$L(#;qFS-tF+uV3`iUBNtgDt_lj8*_ER#7J^Qg7~k$U-4zsi=KES% z{vcDb2}7hJxFOS=*N)!G16guoSFp&9X?keCo^I4<{ElzBG*Ki>vICZ3%mYg~nNG^0 z@BT;2!k&RI&I3n6X-|9qKngxVxI4Ve_ThV1c$B zw%M4`BEg_}{w24(F0J!~QP6oA!I*s@NFDPhA|&mIuj$w}6fJFUfEeeKY>Vf=>r)9+ z%)u{_&Ed_H$~J??^X;X-je-CClqX-RoJ$*F3TeZbRFrMoDDtA@w#}$LMIN@}Hk>$l zPuYYLClyoBRHq?xM+#zImXuE|8rkMoYyENTx02kaIG9#m_U|y4oueRE*Se}>+oNe@ zXom&vLD>Hnmw!lJ_9q)S+)`!{Mu|>~5bnW`E?o<);aJH{UoY+HmA8lW9rnzI(^Y3^ z%&JQ0WB+|~CSnY@wMCFt-f-@UW1o4Ar0`&h982A%m*r39^+i4xJ`J<&xVqz#$(`NZ zgpm-h&c?jgJ^h;XA_IK`T8rV&=y-0i2f2F(KJIPruWsD;-)MW{h7+OhDXFleotyF{on%X7Nx?GscBc(2%zRFVi z7vR`9ClFVBY1$|rN}1JNZx(n)@hrL*mrw%n2`KuU;joL~@d*jhsDD5( zy;nx3=*40Uu-gvrdAoPV*i4us5IiZIs0Dpd{EN4zh&gjG_-bEz*2?~Q>$UcmGwe&d z8{{xh)&cJ^@gi+6uPaF&(ETAONtq3^LxiSS7u~-vD5=9Dg{>JgXf{eiORoIRn3ujb zKoY-A4l+RC1d_ zm`Y^Olr7byML~-gro*uZJ{lSeE3B~TU*6R{SHQMWQ@T>uxEAvUDSrDv9R^_bCSQi~G8-4XzMWsjFysGSvF}4(l@e*bernR|&Y|EyEfSEQ?bm z-(J;^I9eB8{D>{!K+oGh92x(QA@2d7SD!N8gO#6waig;)|=jNBlN8>V0d67Nua!v%k@}N6A^9qyGK|n%8Y-SV-1&aR(TD7*O)w{V3N6F zH1@0AJBxt|whyrV{rmUlG(J=wLy)PeXa+LSKU2+rD9^dz6mOtd40cDCP`AIl`=pwG zCE;UJFE`hZDmnAng8PH?@x}DsTzB=zb|fH8H;{<`xu8V2VEwT)@FV|4SVVkv6Ke%# z8%z7}>t{q3%fDiFn-1gKjDsW{_KmYl&&)U5@uv-5L;m#3;x4qXqAOEVlkh5yJeeKZ zLkHM&oj<%RGBPbhvUQzGy*d*P|6wv3#SEAvvqT)gQ<(m#~TTJ<{VBk|}5H%aMN)%E0P zDlpX0k*3<&q#)vYV&3`!|ag16_ArJTOr%I8( z=Q=gtXK)9vlEW^C`Rr@mdTbQ`C0N0^jm|by@L+c=p_W@Crl-%i9~OZICwhm9Xb5%Z z%0?LO0~yQVRcdM~9w+X=AhiW;)IDiiyY9lDqx)e;Z4w`Lw1d~0YqzPZwvs(69$D&hm2Z1UI-j zz92_raR*1niz*_AVU(~E$kcRRpKiV?k1KKKwNLngf0vkWnsy^2;#S}7EqjIjJVt8R z%55Ju?E7!96DFzEQJo?vZA$9D_ZzNG5^nO6w1FHtPdB%)q<(dD9zaX0%yc_{5B(kGRW5=KGCtM|D*f+PxCOq!X7$>S;N`JPmGfgV&6`9X9z_!=2By zaS>`n1T36dw&DlJdZ=fZlT9Zg`Es!j!f?zJ67zow#tgVZV1NH5Eu5h5)6@Gt^MMO&Vi$#zoMFaIhy|0`0+N=)l_=lnFD2fL?`V~u~K=H|>w z%og83QKFeEsEAgDc|Z#N#l#z0R6F{2BA$&;)--f6x zaw9gD4VR)u`5h*0aHa5HS)aPj{RP$pk;TRJPoy|#19X4jG6t7kmMuP{m|^gCJ4D(A z{?zHZsf{n7TSrp3gWDaw_{p4Ee5^yFTcUK9@7voJX(x_&>Q#Ha?=CqAB6ZB1eZ-Ld$JT@{R<5$wm2r7{Q&oM=Xr$Qd^`MO>)Ip}=A znr)0N-Lj%rV>)Iko+!Miye>PeJZNw~$ebJY;js)<=5OGp_7$txZ~KP5ES58O_Y;Kh z81>e~MyAD48MD%pPm%{*MRZqL4z;t;o5a-6DPF91KU}R7jL2ZWeBe?)-qA(eD@fAO zou9&S!9?FdC*3AT%6UAb(SJ3Okplw;1m43e%3B*WiuED=i%C(|{7_naa1X4U8` zm9GS%hyT%5WRc#&dWpUf&?hlVL*{bwgA66r&VjoafqzSt_Tn+mQkhNCtXY_7dw>)zx$hN@ETVv6R&+5_exPPT6TsMa=~rQ2)%bRgfa)AehMlE zY4tmi%d1{4mB1~v9F}$+I9jSj`iZfmS1Z2zB|sO(^l8hx*v{WQH{rHg3H)ES zC0)Ol5#*+LQj6-Bmhn>&9r|73ES9XE6~r{a8nr}K5-&m+nL)s_vWVaIK$WUbvD2ds zE%hf{x|?##)>-?$zeBCq^B~2+5?M?|hTgFbu~8n%=Ton=SDTIJRvazCDf*);YxjHLY8(ZbsIC`gFFp*}E!v~SUf z>AGEHwo@GU?rMsKrqitL#+wDt`BuEN^r2$*3Q_#WSCguatM;!a3qu$oBH411d>YL^ zO|1DK^JvC?Z!rvFenhwHuNTObo%7IOZh1F61M@!-{jnx!u0nPdSR1cRE=L7%@wFvl zNZsjyx#amI4$R-Bck5-Ub3M^jquxT{DbG3CpNi)`>UvVL(TQlObR9+5qMFO6uaC`P zH~D<&9byreJj&4@LN zO6ZWI*j#8egiJ<(Afhx1hwgJ~_Dv7hNo}9cG}N&7!vw#m$z+h>UDKOPo75pomybB- z-gxa^`oqYJO}yHeWA$*jb{_nxstyI}s+i{H%8>Z9J{_R6xJZ3^d+cnE&9Ln9v@QA_afld)@97N^;w_eCK<~T^V5|ey6YhvBS_M zVkZqvEu|~OZkHZ3 zef^(}&Sp;@H3XffRYLtF=p68FkOB0^Qi$>S896!Y|0=^E>cw;@LFlNAI5m-?tIu}_| z4$-ITZx)5oIu8 zsL-Q&kTW+`g+vk6UVt`Gnp-1PVZDaM%{9aK~Loi&pw&9p*r~;SfVVrh`AmmR0T83#Ki6np71Y$YNePm)0f7 zrI!6<$l2T5OR?;1zyU8%EU%7M_}fRYuWsRJWvrenm&qVX)gDGNGrd`ea5S9Tcei6X z@?sr2%g=pF=J@$}BK#1wVyc2?WIjR<(wt4(huaSCN*^)GX_``|Cqk%vWk51iMU*G9e%9x z+HIE=Wj@d{Xy;Cw9so85u0{$!@f2Mw%?z+_ZkU zZ#aE3I!vAyTWJxEV{eN!qahVEk2X10mdgLW6(ZN**X(tT#VXn3D_S(2g_$`jrfLk7 zYVP+~e8`|&YEj#BRMD&O`Y!?cmF*j^bRK4C0u+ep(8}xiD-I1`UmQcGcNNDDUG0sVEo+F zT90KMSb+2XoGN(AuuK*POx$w<4wlO5afRjm)TO7h46YAMkxNKzb39U3A2kK33AuMK zTRp#*3kl(-&JT{IQN|H)%h7k2gh(1%y%U+_E%SBm$p+@kGWWv_iq5qo@}=)*rA&#iAEFOo zI86>t{3Objj)P0TUopO9XisTAadAT`8(f;06UNM?R-__^(!L{?e;{6B7Y}-eK+OF9 z%5vW(UNnP}DlKb?@@EXs*}W|RrM!U^!F2Zlsz(T#gKG!GDIqPnTrIU0uUId{fnm5R zR=P#jC@q1VOokVBRGMBGA0OXTKHfw&4tLOUs&sYCLN%7FeUObjhXC5Irj};?uirkt zEmX|;QwEyTrDmY@fY95c@p%E=ghVl?DLz_!WQo#5J=ypjL`N^2;dd-Zm~zHgPo?ix z@2=5OnxV-U{pp8#?6vuWe*qUMB> zPH=0Ok=4U{o9O6`>3X5gbI0wEF4;vYN=@yI*$qt#iyP_+phdK}UfeQkCMBzB9Q15g zaKr0HalEe%$Pj;D5{hDUpeX6N&+T>%T4=|Ym0!`&tbTeP_}G&OJ{j1m25n#rdT(+@ zpp6rBytq8`mI00_CDz<{c8{S5nUESeHfp}q`b{7--hCz<%fXzn4^?lAW;H(PbY(1q za_3Ov*>MeZtZ&q!XrMpObzeJ;UZz)=B%QimY_jC$fj?QGo$UKQGEAp#MJFv8ETj_7%QJh#d)_dRkMI#2#u<_WxHLt6C zUi;ncfhl$gi7MZslw~&S(`B-OnQpGK74o3cnUt!r=X=KXgCaSnz&s9}Hi-57Q({NX zvBG3QnL28%*i~)SaX-elYk5W`B8G_W%^1U`OpiABcoH8sDgx9h-S@rO&Lk&xj09OZ z6R3-)F~}c|Hb({6NOKB^Lj*Iutgo|5p$@X{r#ZS25DR8Uw$aQE>v8SXQX}=l#01C5 z>MdIDZj-yNPs053ud@~Ie<9=vT<0qb2$!2E_X*e8J<}T_iNYT7B2HAF(J>)A?B-ZH zb(^z^=|&o?sHLvW<{#?+G+qQu+Bm&WN)JK5S7LbZo? zMx^aL564dZL~rt#yI7Ok#l-~j$^&pcN;s3`8l$h`IB3f2=~GB!NgAgml6%Dpo4;%N ze>%N|!J-os!e+(IpfJ2l)n81RPF}-(5m8giopxudnnN0%X)pzWtANe9e+<_gP3D5F$$D->$8c5nMOBY(PIF~j)A`nZw zM@zF7^4mRVC%%HNb1$S(>U(BrOWG=PzmJAGw8Mn%vag}kUoe+g7;CV|z(368S7q#I z4>D!E#y*3ef8Fr5iTc4{?QanhRaJfQaQh zmKRT3>AC#ZUV;_&WEp(-`#=3J57OFdkF76POK9r9zZw`uojEK!9;-CfU4rjiLt|jI zY!H`k1Ze&Nm$ak!!h_DD&=@BC8-yIt?)qGt;p~Yh_?!Qm3X&VbOM3d4r;hwtCPs>i zU7AFhk)SoXDD%_KfA_#pKC!@ouP7&8+Wa?|NQ@V{sENtyl^X2NNhr0C{U8$L)V6XoLH2ECRIu$EIwd|KD{H!96~8 vlUOb*+<%Qm!D2>m|GU!v&p>4VZSNhF)K@NxTXAFs2YzHFl_b828Grge8+K0C From f54383b995f486327cb5645c68ee3afda36e0561 Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 9 Mar 2018 22:59:47 +0200 Subject: [PATCH 2/2] vr --- code/_onclick/hud/robot.dm | 6 ++---- code/_onclick/hud/robot_vr.dm | 6 ++++++ vorestation.dme | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 code/_onclick/hud/robot_vr.dm diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 230df89655..ae726ec481 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -276,8 +276,6 @@ var/obj/screen/robot_inventory r.client.screen -= r.robot_modules_background /mob/living/silicon/robot/update_hud() - if(ui_style_vr) //VOREStation Edit - hands.icon = 'icons/mob/screen1_robot_vr.dmi' + ..() if(modtype) - hands.icon_state = lowertext(modtype) - ..() \ No newline at end of file + hands.icon_state = lowertext(modtype) \ No newline at end of file diff --git a/code/_onclick/hud/robot_vr.dm b/code/_onclick/hud/robot_vr.dm new file mode 100644 index 0000000000..5e376182a0 --- /dev/null +++ b/code/_onclick/hud/robot_vr.dm @@ -0,0 +1,6 @@ +/mob/living/silicon/robot/update_hud() + if(ui_style_vr) + hands.icon = 'icons/mob/screen1_robot_vr.dmi' + if(modtype) + hands.icon_state = lowertext(modtype) + ..() \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index 07176cd050..e780d3caf8 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -123,6 +123,7 @@ #include "code\_onclick\hud\movable_screen_objects.dm" #include "code\_onclick\hud\other_mobs.dm" #include "code\_onclick\hud\robot.dm" +#include "code\_onclick\hud\robot_vr.dm" #include "code\_onclick\hud\screen_objects.dm" #include "code\_onclick\hud\screen_objects_vr.dm" #include "code\_onclick\hud\spell_screen_objects.dm"