From 9677bfb5a36bd7b2b5fa230df02b1245cfc2454b Mon Sep 17 00:00:00 2001 From: X0-11 Date: Sat, 17 Jun 2023 09:40:06 +0100 Subject: [PATCH 01/12] parries don't cut npcs in half --- code/game/objects/weapons.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index 44d582249f9f6..265863023012c 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -63,6 +63,10 @@ if(isnull(item_to_disintegrate)) return 1 + //Once we have all the references, let's make sure we're not cutting an npc in half. + if(item_to_disintegrate == mob_holding_disintegrate) + return 1 + if(!isnull(item_to_disintegrate) && istype(item_to_disintegrate,/obj/item/weapon/gun) && !prob(BASE_PARRY_PLASMA_DESTROY)) force_half_damage = 1 From a7814787fd92148876b7b48e6ae8e4c3c634e579 Mon Sep 17 00:00:00 2001 From: X0-11 Date: Sat, 17 Jun 2023 09:46:27 +0100 Subject: [PATCH 02/12] typo --- code/game/objects/weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/weapons.dm b/code/game/objects/weapons.dm index 265863023012c..649d9efa24b98 100644 --- a/code/game/objects/weapons.dm +++ b/code/game/objects/weapons.dm @@ -64,7 +64,7 @@ return 1 //Once we have all the references, let's make sure we're not cutting an npc in half. - if(item_to_disintegrate == mob_holding_disintegrate) + if(item_to_disintegrate == mob_holding_disintegrated) return 1 if(!isnull(item_to_disintegrate) && istype(item_to_disintegrate,/obj/item/weapon/gun) && !prob(BASE_PARRY_PLASMA_DESTROY)) From dec82b56f94f8ec8a156e26507186e5706975be8 Mon Sep 17 00:00:00 2001 From: YourPalHolidays <95097796+YourPalHolidays@users.noreply.github.com> Date: Sat, 17 Jun 2023 05:48:17 -0400 Subject: [PATCH 03/12] New Chaingun Sfx Gives the Chaingun Confetti Maker a new fire sound effect. --- code/modules/halo/sounds/chaingun_fire.ogg | Bin 0 -> 10068 bytes code/modules/halo/weapons/turrets/chaingun.dm | 1 + 2 files changed, 1 insertion(+) create mode 100644 code/modules/halo/sounds/chaingun_fire.ogg diff --git a/code/modules/halo/sounds/chaingun_fire.ogg b/code/modules/halo/sounds/chaingun_fire.ogg new file mode 100644 index 0000000000000000000000000000000000000000..5f6a78f203dd19761f9696c37b4236bd97d6c797 GIT binary patch literal 10068 zcmeHscT`i&x9ABqK}5QMD4}_hDAGa)r7EC^A|N77 zx>!M)D56wF;GKZqcfb34zjg0h>#q0Toi%6H%-(xupV?(*&&(x9M+8VU(gm^phn zNnG-Fgu6N0nH(~JYr_$e2uVp&&czt z?{!;moRXfc|5X`z32A8wDM?925Myj+X7-<<5XvK-!YZmJ5C96&Na?}5@x#ej0H6ne zD}2IqX;-y{iRnc`0omzVq*}LRY<7BVH=BKeRL@@p9O=LU02BaT2$oc`pzSg!@5m;Y z(-r;bB^kcU0p6tMRwYbtZ~7!>A*9yg~11qPtBxFeY{q{1$SJBke~qB*^v zbC>6N(}+|QhSMOP!*A&!mP^wN6qYMWk`z7*H4UpA6K{H@qbD_PVqf=&$~xF*P<}D* zPXRle2ORtt6)JWIdKD;X_!!}`Y;SO=qiMkbJUC52Glf~Zp1HrCb6|w;(ho5-lgx;; zx{3RbjdMEx;0!i%vfRf_uzQ)-HN&_Q4>MdjHqcrKGKM9J0B$59*g&o=pI1%pr ztC=o%sC2UJp;++Xuxv$8RoWv?AVEygCpcl4us$G9N0=|HWX>IZ5^J0**jkyLd#FLT zLH0RNm%=Y{x(joL2|k0`v;^W&Er2nXy0-Ea2xDK&qw8U}1?ik$5vVJt&A`6q!-R#3 zR%Wmko1QD!+-iI@-XF85yqq`qME)b#BldN!Yb(qeto?MzTOELrVE<}9C{S;ILQ&KwQ^5%h;v{8w>k%12gQ zni?naLa6a2qF;Cc`a9B^Mr*cF&(2LOg!=^ zP^oZ-WMwM$Lnn#K_I@E;4tm8u6}QGW#Bh4#A9?6ICz_ET%p(YKBWWe9G1k=I-8{>0 z=6DQk<%wH#LaquOH1(X#^Cg zulmVkV)juFQiEB)6V17gRK`lCotuo(cr4gjA@%f(Dgz%^~pJP$wAK}CGAl_pBXa1MA~)0)H#AgF)5*#)Q_6~vl3*4L{otI z&oCgP5o5>*@((YNOQ*Ct3JLBc|MT>3c%fw=m;S*Eh15qG>;KO={qG3>D}n!30-%XQ z=)jLvrHEUU3@--(qUTVlaP2iD-rjso@dk$;(+4wF#S;YT(Z9R{++cqoZ=6v)Q3gv! zo+zLmy5;-EV=9AXXx}?2Y~Ydogd{g z=L3p`;=uT+>cus&{&h7pv%V45I&01>b1}A9h)`D5CIK=UI^3eb;LeHgHyEkU46ef9 zYHWRyunwnSsMQ zgZq0#Ljn8%qdog{yO;8dd@4Fp3wb__+(b4oys2ciC&f7FsZwB^Y@pMZ z4Z;M84j^4#8b$$x(SZSnFGy0Fj!{|4^8w?Je2@eJppK*+=VlpQ`Xj*PTlMo2-0!I+DR zyOdr64gnL21Wo11GTOkBelero~on6qLLsl#GjFA5m&1cBLyXvj#;=#u@1>o7nP=4 z#0j^|f(im*;8ZNEj&T#yE#k#n*mB*tL9MxhFnej8W)KEW#Z^qF6@=Ayv$-a!3*}mp zu&%W-!t*}5_2U-yHO&Gg38^GlP4fg#ItJ0hYy{Q_5t2RIZ1y!$ixz2&Pj}83iG#$h zpe^t^Bv$rVfQAFZB_xWEr~3?20w^Up0L9OyEXa;!wJm|2JcB<}Oe=VX1Wm7pWML$` z!j!W4fMy1dAf3cYp@#@%FuVkH#%})?q9`I2^8)NaLV)b}iDO4Sgh-LFPUYVSVtP8} zurKs5L~aTGg)0-*tU93phUBP+8C>eJM<5a-u=!`aLq_Qsk)tNK{F0MaKVA{> zX9m)Bie#G12tCxH&w?j3dg}V735)6k?-$zIwW=B%3x%aq+SJ_5X1X}I@(XR9{BWo+ zRb^y?2r)Y?Q>8x}Lu)50<(nX-DL-$l(#r-e+2H^{&VXQoGNZ!6XaPBtRx%ktbBy+M zmpTe1!Clf>=%pton12oclw)4f$HsKSrHVL&M9RqV-IP(m!1LiLt@a0a33999Zfj~4 zs0w|!87B$?lau=xCHQVF;#6Ltk@05~$Oiz<03X2RYZ~C;DbAT&TH66&4D8&(Qu4|S zhv@Ub4ghFj@G&t?3vvpI7f>o{8d^Gf28Q7B207dbQ2+!AJvwlb+ED1x4GD_xus=Y$ zAt7yx$ZRPmUI;>4Ur$%hz}D8n%*4z>%gVvS`Rc)ogXV*T1KWdh2gn0y;1lP!3H5-7 zad+u{%U__B^{-5{on?)R0EaNW1NUN^QO$qTE`Vwhe0cr(9oPEqT;Nx>pTt>3^zcr(LYtjz?w<@4FODrh@z@n+83&m+qiD88tDZma#~ ziCn$1EP;Wa=hJuRdyx-w1n6yo>luKS+Rc=k$|j6_oOGu`93UICMNN+Ox_q6K8TFPYd`uxG4b8`Qi%;h}clr$K`@MdkMXVoh|z9t06$tPzz79YnF8c!@izu6<# zWFl2*KIrS>*K`3f1_+gQBTN11cSYRp31;=zZ>_F`emA*zuz zFS|gsn9e!>r1vv|bnCK(DlP{$z*NDAZo!92Y$9duK`(+9rtXw5;^pY3q$++KO_s_W z#%#@9u{(R`_vm~A{3C`OungR2-y0s~8LbyYtkrMN*j(^gAe?=c?6*xGJk64uHhhbl zV$yc1xQb(gezQX9ykQr`Tlb;ip)YJV`jUo2-k-gA^CzdHC#6*S7=X{7n2N9>x-s6E zNGLpr4m7(U$U1*FB-^h3oGb7nEyb+yj_K6YZJC9MOpy)RO1q&OT6^|1$|o3{??#6R zJmcf~x;nbsc-Awr89D&0Rc^Wni*?V-1l3)vz;CA^P_K%hr*lrR_8`qXz zJXusZlhigVNo(K!+4z1be+=JrBN^bvT1iHz_4ZiZR6;xoG)Q@8$@=Yp+N=(K8vkv2 zM(wVBqE2h0--C0<__H!t6RXBpvFd1_Ygl`zZPa!&s=9=TBmG$O`9l`F`}y_BD}t)V~*5B z*F)V;7OQU)jaea7LNvyv6J-GY(+ej^jb$xa#D$QG)2At{R+vR%{EZW77uyy`S zhx3(^=iasFDlb7f5;x~NHZ2%Tbnl#egr2NX3HgSu4H9?WcvZ@Q9ucP*NT|8Q6K}H8 z4O108KfoAvJm-l9qzOZ*!;4pSF(oRf@sdY=I$v%Oi&0x(rEH~w+c%_!GDihBozi$d zDp*^BuyfFtP8ASdu8VFC9^rmb&P+F^=BtZyX)cb#Ha@K}fi48HM%6S+8x@YR#=DFe zpgSKtC1^8xltA$!wgXqXsSCq>5|m+AzQ~w8_7cClC?}9CoMNOa#4y?#LBs#LU)4FZ zJhpEJiWQ0Z1e4mLx#ybu&=wfG3=zbPM0_N^w-Tq2%zSC*ynpOo%M%?##tOeKVU>Ur zyxCOEmwHcL7Pr9GzN`@HGs@3&3AeJ*l+iTew<8jSR%f)TD^*R5*u2~&de?u%ZhgYV zX7K#rn0X4bLi9V4$1X>e&Kvk8WJnq~zFF^7d+jxGFUr5ys-a9BH^4S zU5tCnFCEhdJG}w*`VIb%I|L^NPR!$05x;IPX5as*c-cw4>XF^2=$o_B!7m+j!Uvh& z{9?`W1m5VV7w1}{A?D}v1A%0K!s#q3%O|Gv)}<-?E~bk?yFb$cMZeA5p0{T#7>d7t zzDqaP@}#bG{l&7ou3L|Hho<6$L-w9N{j|TbPX74G^JU(Hn)t7mHgbD+_WOI|PuU-s zEHhpV4VuV_58ms%CG^ICQtWn=ANtbPR@GuBOOabC7rb1aB@%U3cE{=SsjgF&)|ACVrHzkVeBAt7wRfw3Xs*B4rg-my!Oemet{|8xBxLjF zm#%MjGB+mBA9vQim)l$+&oepJ$_;@sEp1}d$tcn&R~`Z4toigijqY9>uU}5dBvMj+ ziJB2gvla|3%y?91(OMICViFw-3)#$ zIZ)+q(-O4%u}dSx2RJwv7_XkMjEE2Gi3xqP`BW7pz_sxjk9mJ#VE%FFV*C32P|SAX zcJ%K0wePdtqm$mD?>nALoZV_8Q0J62GFd;wf-%H zP4(Wu<_(tx{Mn%9jymgHuGN)2+l{Lsj3SMJt4m5sj_(gD%f0*eG(+{zWIi_jcIUP6 zdeQPn=xUnhx2^-*b)RpRLtEY!5@qM`OAFqN%OU1ZWs4_*nOK%z>~qO}T&H-J*cwp% zU9oQHb@lnnlZ*m67w$i7%r*%8l{yt`G8-2x#k6et^w^eV+{WEU1v@_RL8PUJh2p857WyrH3cKWBd5yIHbM z4qTY|%>{@99V_`7JUouT&aK`Ricv%t4b4sm1R#`Cn?&|^Bue#EOuueHS8G(zkm1c0 z0I%yw->A=eKCHOee&=$iOKieo!GrZdnlM8gown7`Z$e1)JiDvSPXBu)1p{^uZGpMm z{DkP+N*z`c?q@^4F?0pDFKv!)AvPc8M^-ve{d~l5I%seDZK9*-&)|S)H%{uI>x=u- z1Pu1wIKf^`?$^@G`2=L;+`0UVo`PNKv#!@a{jqfNV5rPnb zrzKf5FAAT|x(I2@^5?sgWOuzPx29i4_U&|K@P;J8uC)?Ul7Ea$7A`F zm-dt)&x9b{(SVhywv;9$S}Q^-7zmvOhefOjQZb9aTXYF=t6-2SSPg$~V#;c%Q{@II#%#(y>m z8K&J9j&gk+&(z=@#biBdk^6-Jr!{L>N*a8&`J0RE=H>2Yeg;*)8EWNO#ji{JlrcWn z6gi8cHEdq+h4ifoRH%(gQOZA03sqU-)IZ<8`SiVY1g{JJq3j0!bKGsy%z9U$>>=^% z9f_>;W8pZSl4f%%-D~=zi+V}5O>t_M<&O~(fqbHy2q(ffbH!>}6ajm00W|q6LvC(;*{KHKvH;$MO8Ih1->KpgKwRWjnj8MJ50*V%LBj= zf2Td#a}|6v1VTCAab4BeCx4MxogvD~WjSK9Pu?1=tyTN!bmiH;_an^t%_EL1u~A$s zallQhtBS@zM8#)pb|OFv04DA;X2pXupLUu)yCPGgRmu1E$M)O5_`h`(J82(emcxIc zCa*@e;3Suo7vUmZ(q~$|0mjlt$oo+|aa7va_tT1IchBg^M++FU*_fYF39`^ZMTJdx z!Cbmee{~K}AGc=pRv1Yq-YW?I#hKAl#mIeCt$?RC@H9ww0f7y;-qtsG@HtuP} zxi4*$rF_R&O`rsUQe=ua;$;N-OGQkDhMQG5h3D#6 z`C2`cezB8_E%Iwi?Z2Y0*0R4U2^{(4&A75Vla3{j;z0(k&F$0H4f;wRa z_?AnDRQzIw3AGC9_ILz_?79m-i~_r^E{k|x8-r(9i?ptS@orl<8t zhcees5t;*LMeNM4en3yMk4^gxNmjfPZE)@Wgdh{ELDbvZm!M>dJbt##LWyc}^5w}? zM6@bxa!)w(E&I=}U^Ab;)7v+9hu^q`)#`b1=H&HDel^KG0YD5RZCKTPxt!F!oS>6_ zQtA2E&%e!FJ0|HJ(NN|lPHcivgmK)(#I%_VAX2ch&AM3WuvLraeKL5l!YkCkes2C< z38~+Zc`ml@d6(UfOw+d^7q2kybWG#2!*to%N*V_~C)`cu)NC=J1?Xno6{tX|0c<;5 zNPdYy{ncL0pDzLpo2TDxzlst$xIE$8u(*A9CMI4*uR(B{UIg~^V;as~01?g;iGO`l z8>gI+lcA(Q`)HH(8NI8EwHmjdLS9wJIL_RhLsnNd>@-&X%M>DkS=2BvChbAz6`0j$ zeQp2+)1j8exdJw%==49X^oneW5A6^*Iol-8& z>hzuu@#CxZq8?7698u)%0?eEwmExMhEI zm`2~%thUQmSATWg+Mp=eco?~KoWAdZ&6?Wl_qyyI*3-%Xi@e_y&)DeK7{5pAK$7BNsXxyjaY7* zG`n}-Q?@ah1M5*0hvEqrY0$zxz2N|fu%nG+8L5s@hE=Nz5c!K4DRa~aPPG`<@6Tx7 zH<0n(^$QYC59{flF=LHry3vhdqh=^bwW#1BRzUjX^UCJN6*A+kIVe&xCyu39Wm7s# zNLs1grKPQAtj*UQtcmBSQ5tL?Wdk@%pCrE|$Ma@4*n7F%KPKGO&QxYRoUMW-6FEmy z0e^RoBWiqUaN-_}c^JPIgW`#4q?w9$F{13}P&YZ(BMaVRA6|V>;H5}{01mG{NY8e) z9QWZc@OI;x9`?XZ=!|Y+d*6%w^Kcmxrk~T!=6YLS9+S%;>y~#;GRWloL?W33fLCmd zJm}F4)!Pf6hfno%8lp1OC}?xi5X@rkYL3Iw(tI zS`T-aVBuTDmE63sxTdk=H%jZ+AI^%1_1}AbZ2iXgQ?`$2HXRyWECkK8rQxCTAf`_> zwODA;`(}X!U1B^y7Wac zpq)kJ$tkZ;9}#^zBALvnzz7E>B)}-5dj9rtW|P+fm0QiPI(4dVCCvFTpzuT!v@x-2 z)bHis3@x~~Y_SvD<8u$_KKY7e<28s2k_^j_$+M0NL~sF}ZdXsN6fYREz9x!NnmyVs z5lG*{=W7|V^d7TgxlS)B4d6w1)%m8*e|d~qz52WV@@^y6{t9{Smw2Pk)?JClu1slP z)Pl9zN4jG43>j;|niMRBp|L=6)_bS}z#sbwP5`g2Aq zLNzvdHUX#+jG^OEjna8ifefJuk`$xM!C@SprQ6^7rQTZOsb6=dC#-0iXyOV}!ij47 zjDJSOI3uNK@#s|gYH_HTy}qW@ppexY^9?oRxUqbef}KPlMa#V= zvIZz?*%`j403f;C6@2qxZDD_|tLtF$=Li+*_su(ZH*;@K-psjhVd>Ez6L4^V?UWXk z-#^&BDn@qtL^&0tpWX$giYV|Ya+RUu}$`ph^d$GH-am#3PM3Gq$DqBSJiHqfkD z<>D-8w6(IBJrZC+X@fi?t6--(XhJ=}nMVsJ;R+*}Su&oURpPv1l_>Zn#2N!pjh9q*8 z?)+jiikCyrY?W5aDcV&(nh0+?8<)VFjicm@cwYEgpZhi@HgK8PR(gek+|E>=HB-_{ zg};Pb97wk{)F=x{NX&Wj-uH{nMd8L0IT32AfN;a)41Uh>_A#%J_x!F7tqx?>9MwEi zztE9#8kQ#GMBezgj#BU&GmU$O#ioYd*$xmL>bSdDTfLQ2aQS>(niw{-#`_9&6w*7E zd)K`atsh%iQ=@3Uu7}gVWSy~%-3`i>jHCq0COeZ0JTrICH0pF&gX{4ZOfLA_4W0Y^_{Y6PnQ}V(|5;KYI`jk z9GsIB@=KDBJ^SiDXb$PX{l0$IQwN})LhJ{n%ktyN!AClwqZ?n+%7mA(KMnw#!2bcg CbgNYW literal 0 HcmV?d00001 diff --git a/code/modules/halo/weapons/turrets/chaingun.dm b/code/modules/halo/weapons/turrets/chaingun.dm index 03ba68a2a43f0..6d9daa7640b46 100644 --- a/code/modules/halo/weapons/turrets/chaingun.dm +++ b/code/modules/halo/weapons/turrets/chaingun.dm @@ -11,6 +11,7 @@ name = "Confetti Maker Chaingun Turret" desc = "A lead-spewing gun, usually found mounted to a turret. It is known for it's inaccuracy and extraordinary rate of fire.." + fire_sound = 'code/modules/halo/sounds/chaingun_fire.ogg' icon_state = "chaingun_obj" item_state = "chaingun_obj" From caeb1c7dbba2e5a2da89e0339f5b69061690a5ca Mon Sep 17 00:00:00 2001 From: Spookerton Date: Wed, 29 Jul 2020 20:07:47 +0100 Subject: [PATCH 04/12] Merge pull request #28879 from NullSnapshot/eckffgoonchat2020 Until it is done --- baystation12.dme | 4 + code/__defines/colors.dm | 7 +- code/__defines/misc.dm | 9 +- code/__defines/subsystems.dm | 2 + code/_helpers/game.dm | 13 + code/_helpers/icons.dm | 1 - code/_helpers/text.dm | 2 +- code/_macros.dm | 23 +- code/controllers/subsystems/chat.dm | 78 ++ code/datums/communication/aooc.dm | 4 +- code/datums/communication/dsay.dm | 6 +- code/datums/communication/ooc.dm | 2 +- code/datums/communication/pray.dm | 6 +- code/datums/wires/camera.dm | 2 +- code/datums/wires/particle_accelerator.dm | 2 +- code/game/atoms.dm | 2 +- code/game/machinery/hologram.dm | 2 +- code/game/machinery/kitchen/icecream.dm | 2 +- code/game/machinery/requests_console.dm | 4 +- code/game/machinery/vending.dm | 2 +- code/game/objects/effects/mines.dm | 2 +- code/game/objects/items.dm | 56 + code/game/objects/items/devices/geiger.dm | 2 +- code/game/objects/items/devices/hacktool.dm | 2 +- code/game/objects/items/weapons/cards_ids.dm | 6 +- .../objects/items/weapons/extinguisher.dm | 11 +- .../game/objects/items/weapons/tanks/tanks.dm | 4 +- .../objects/items/weapons/weldbackpack.dm | 8 +- code/game/objects/structures/janicart.dm | 11 +- code/game/objects/structures/mop_bucket.dm | 8 +- code/game/verbs/ooc.dm | 81 ++ code/modules/admin/verbs/adminpm.dm | 14 +- code/modules/admin/verbs/adminsay.dm | 4 +- code/modules/assembly/holder.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/signaler.dm | 2 +- code/modules/assembly/timer.dm | 2 +- code/modules/assembly/voice.dm | 4 +- code/modules/client/asset_cache.dm | 53 + code/modules/client/client_defines.dm | 16 +- code/modules/client/client_procs.dm | 110 +- code/modules/client/darkmode.dm | 132 ++ code/modules/clothing/rings/rings.dm | 2 +- .../clothing/spacesuits/rig/modules/combat.dm | 4 +- .../spacesuits/rig/modules/computer.dm | 8 +- .../spacesuits/rig/modules/utility.dm | 8 +- .../clothing/spacesuits/rig/modules/vision.dm | 6 +- code/modules/clothing/spacesuits/rig/rig.dm | 42 +- .../clothing/spacesuits/rig/rig_verbs.dm | 11 +- .../detectivework/microscope/dnascanner.dm | 2 +- code/modules/economy/ATM.dm | 23 +- code/modules/economy/EFTPOS.dm | 41 +- code/modules/goonchat/_helpers.dm | 112 ++ code/modules/goonchat/browserOutput.dm | 295 +++++ .../browserassets/css/browserOutput.css | 381 ++++++ .../browserassets/css/browserOutput_white.css | 378 ++++++ .../browserassets/css/styles_template.css | 363 ++++++ .../browserassets/html/browserOutput.html | 71 ++ .../browserassets/js/browserOutput.js | 1107 +++++++++++++++++ .../goonchat/browserassets/js/jquery.min.js | 4 + .../goonchat/browserassets/js/json2.min.js | 1 + code/modules/hydroponics/seed_machines.dm | 14 +- code/modules/mob/living/bot/remotebot.dm | 2 +- .../mob/living/carbon/human/examine.dm | 2 +- .../simple_animal/constructs/constructs.dm | 2 +- .../living/simple_animal/friendly/mouse.dm | 2 +- .../simple_animal/hostile/retaliate/drone.dm | 10 +- code/modules/mob/login.dm | 4 +- code/modules/mob/mob_helpers.dm | 2 +- code/modules/mob/new_player/login.dm | 3 +- code/modules/recycling/disposal.dm | 2 +- code/modules/research/circuitprinter.dm | 2 +- code/modules/research/protolathe.dm | 2 +- code/modules/shieldgen/emergency_shield.dm | 8 +- .../modules/spells/general/contract_spells.dm | 2 +- .../xenoarcheaology/artifacts/autocloner.dm | 8 +- .../xenoarcheaology/artifacts/replicator.dm | 10 +- code/modules/xenoarcheaology/effect.dm | 2 +- .../xenoarcheaology/effects/goodfeeling.dm | 12 +- code/modules/xenoarcheaology/finds/fossils.dm | 2 +- code/modules/xenoarcheaology/finds/special.dm | 2 +- code/modules/xenoarcheaology/finds/talking.dm | 4 +- .../tools/ano_device_battery.dm | 12 +- .../tools/geosample_scanner.dm | 8 +- .../tools/suspension_generator.dm | 8 +- code/modules/xenoarcheaology/tools/tools.dm | 11 +- code/stylesheet.dm | 2 +- html/font-awesome/README.MD | 6 + html/font-awesome/css/all.min.css | 5 + html/font-awesome/css/v4-shims.min.css | 5 + html/font-awesome/webfonts/fa-regular-400.eot | Bin 0 -> 34388 bytes .../font-awesome/webfonts/fa-regular-400.woff | Bin 0 -> 16804 bytes html/font-awesome/webfonts/fa-solid-900.eot | Bin 0 -> 192116 bytes html/font-awesome/webfonts/fa-solid-900.woff | Bin 0 -> 98020 bytes interface/skin.dmf | 379 ++---- tmp/iconCache.sav | 0 96 files changed, 3600 insertions(+), 497 deletions(-) create mode 100644 code/controllers/subsystems/chat.dm create mode 100644 code/modules/client/darkmode.dm create mode 100644 code/modules/goonchat/_helpers.dm create mode 100644 code/modules/goonchat/browserOutput.dm create mode 100644 code/modules/goonchat/browserassets/css/browserOutput.css create mode 100644 code/modules/goonchat/browserassets/css/browserOutput_white.css create mode 100644 code/modules/goonchat/browserassets/css/styles_template.css create mode 100644 code/modules/goonchat/browserassets/html/browserOutput.html create mode 100644 code/modules/goonchat/browserassets/js/browserOutput.js create mode 100644 code/modules/goonchat/browserassets/js/jquery.min.js create mode 100644 code/modules/goonchat/browserassets/js/json2.min.js create mode 100644 html/font-awesome/README.MD create mode 100644 html/font-awesome/css/all.min.css create mode 100644 html/font-awesome/css/v4-shims.min.css create mode 100644 html/font-awesome/webfonts/fa-regular-400.eot create mode 100644 html/font-awesome/webfonts/fa-regular-400.woff create mode 100644 html/font-awesome/webfonts/fa-solid-900.eot create mode 100644 html/font-awesome/webfonts/fa-solid-900.woff create mode 100644 tmp/iconCache.sav diff --git a/baystation12.dme b/baystation12.dme index 0c2e13805a8a3..da32a24a0e68c 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -180,6 +180,7 @@ #include "code\controllers\ProcessScheduler\core\process.dm" #include "code\controllers\ProcessScheduler\core\processScheduler.dm" #include "code\controllers\subsystems\atoms.dm" +#include "code\controllers\subsystems\chat.dm" #include "code\controllers\subsystems\event.dm" #include "code\controllers\subsystems\garbage.dm" #include "code\controllers\subsystems\inactivity.dm" @@ -1195,6 +1196,7 @@ #include "code\modules\client\client_defines.dm" #include "code\modules\client\client_helpers.dm" #include "code\modules\client\client_procs.dm" +#include "code\modules\client\darkmode.dm" #include "code\modules\client\movement.dm" #include "code\modules\client\preferences.dm" #include "code\modules\client\preferences_factions.dm" @@ -1426,6 +1428,8 @@ #include "code\modules\games\tarot.dm" #include "code\modules\genetics\side_effects.dm" #include "code\modules\ghosttrap\trap.dm" +#include "code\modules\goonchat\_helpers.dm" +#include "code\modules\goonchat\browserOutput.dm" #include "code\modules\halo\_defs_radio_speech_sizes.dm" #include "code\modules\halo\difficulty_setting.dm" #include "code\modules\halo\languages.dm" diff --git a/code/__defines/colors.dm b/code/__defines/colors.dm index 9f8685b2a24ca..6f96417667d7f 100644 --- a/code/__defines/colors.dm +++ b/code/__defines/colors.dm @@ -160,4 +160,9 @@ #define CODEX_COLOR_MECHANICS "#9ebcd8" #define CODEX_COLOR_ANTAG "#e5a2a2" -#define COLOR_WEBHOOK_DEFAULT 0x8bbbd5 \ No newline at end of file + +#define COLOR_WEBHOOK_DEFAULT 0x8bbbd5 + +#define COLOR_DARKMODE_BACKGROUND "#202020" +#define COLOR_DARKMODE_DARKBACKGROUND "#171717" +#define COLOR_DARKMODE_TEXT "#a4bad6" diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index a49ead149916b..1e9db4c02a26f 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -207,4 +207,11 @@ #define REQUEST_LIBRARY_LOCATION (world.system_type == MS_WINDOWS ? "lib/gotbyond.dll" : "lib/gotbyond.so") //Elevation Defines// -#define BASE_ELEVATION 0 \ No newline at end of file +#define BASE_ELEVATION 0 +#ifndef HTTP_POST_DLL_LOCATION +#define HTTP_POST_DLL_LOCATION (world.system_type == MS_WINDOWS ? WINDOWS_HTTP_POST_DLL_LOCATION : UNIX_HTTP_POST_DLL_LOCATION) +#endif + +//Misc text define. Does 4 spaces. Used as a makeshift tabulator. +#define FOURSPACES "    " +#define CLIENT_FROM_VAR(I) (ismob(I) ? I:client : (isclient(I) ? I : (istype(I, /datum/mind) ? I:current?:client : null))) diff --git a/code/__defines/subsystems.dm b/code/__defines/subsystems.dm index 22cdb478bea2e..fcb76eb0da20f 100644 --- a/code/__defines/subsystems.dm +++ b/code/__defines/subsystems.dm @@ -86,6 +86,8 @@ #define SS_INIT_TICKER -20 #define SS_INIT_AI -21 #define SS_INIT_AIFAST -22 + + #define SS_INIT_CHAT -90 // Should be lower to ensure chat remains smooth during init. #define SS_INIT_UNIT_TESTS -100 diff --git a/code/_helpers/game.dm b/code/_helpers/game.dm index 8b82e6d179825..4ce5729c41990 100644 --- a/code/_helpers/game.dm +++ b/code/_helpers/game.dm @@ -573,3 +573,16 @@ datum/projectile_data /proc/round_is_spooky(var/spookiness_threshold = config.cult_ghostwriter_req_cultists) return (cult.current_antagonists.len > spookiness_threshold) + +/proc/getviewsize(view) + var/viewX + var/viewY + if(isnum(view)) + var/totalviewrange = 1 + 2 * view + viewX = totalviewrange + viewY = totalviewrange + else + var/list/viewrangelist = splittext(view,"x") + viewX = text2num(viewrangelist[1]) + viewY = text2num(viewrangelist[2]) + return list(viewX, viewY) diff --git a/code/_helpers/icons.dm b/code/_helpers/icons.dm index 62649f7181bd1..94221581c6d5a 100644 --- a/code/_helpers/icons.dm +++ b/code/_helpers/icons.dm @@ -920,4 +920,3 @@ proc/generate_image(var/tx as num, var/ty as num, var/tz as num, var/range as nu cap.Blend(img, blendMode2iconMode(A.blend_mode), A.pixel_x + xoff, A.pixel_y + yoff) return cap - diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index a0bee74087573..55092c36a5f75 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -320,7 +320,7 @@ proc/TextPreview(var/string,var/len=40) /proc/create_text_tag(var/tagname, var/tagdesc = tagname, var/client/C = null) if(!(C && C.is_preference_enabled(/datum/client_preference/chat_tags))) return tagdesc - return "[tagdesc]" + return icon2html(icon('./icons/chattags.dmi', tagname), world, realsize=TRUE, class="text_tag") /proc/contains_az09(var/input) for(var/i=1, i<=length(input), i++) diff --git a/code/_macros.dm b/code/_macros.dm index 76849bb0634d2..58103094a33a9 100644 --- a/code/_macros.dm +++ b/code/_macros.dm @@ -79,15 +79,20 @@ #define to_target(target, payload) target << (payload) #define from_target(target, receiver) target >> (receiver) -#define to_chat(target, message) target << message -#define to_world(message) world << message -#define to_world_log(message) world.log << message -#define sound_to(target, sound) target << sound -#define to_file(file_entry, source_var) file_entry << source_var -#define from_file(file_entry, target_var) file_entry >> target_var -#define show_browser(target, browser_content, browser_name) target << browse(browser_content, browser_name) -#define show_image(target, image) target << image -#define send_rsc(target, rsc_content, rsc_name) target << browse_rsc(rsc_content, rsc_name) +/// Common use +#define legacy_chat(target, message) to_target(target, message) +#define to_world(message) to_chat(world, message) +#define to_world_log(message) to_target(world.log, message) +#define sound_to(target, sound) to_target(target, sound) +#define image_to(target, image) to_target(target, image) +#define show_browser(target, content, title) to_target(target, browse(content, title)) +#define close_browser(target, title) to_target(target, browse(null, title)) +#define send_rsc(target, content, title) to_target(target, browse_rsc(content, title)) +#define send_link(target, url) to_target(target, link(url)) +#define send_output(target, msg, control) to_target(target, output(msg, control)) +#define to_file(handle, value) to_target(handle, value) +#define to_save(handle, value) to_target(handle, value) //semantics +#define from_save(handle, target_var) from_target(handle, target_var) #define MAP_IMAGE_PATH "nano/images/[GLOB.using_map.path]/" diff --git a/code/controllers/subsystems/chat.dm b/code/controllers/subsystems/chat.dm new file mode 100644 index 0000000000000..409698c6259c6 --- /dev/null +++ b/code/controllers/subsystems/chat.dm @@ -0,0 +1,78 @@ +SUBSYSTEM_DEF(chat) + name = "Chat" + wait = 1 + runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY + priority = SS_PRIORITY_CHAT + init_order = SS_INIT_CHAT + var/list/payload = list() + +/datum/controller/subsystem/chat/fire() + for(var/i in payload) + var/client/C = i + to_target(C, output(payload[C], "browseroutput:output")) + payload -= C + + if(MC_TICK_CHECK) + return + +/datum/controller/subsystem/chat/proc/queue(target, message, handle_whitespace = TRUE, trailing_newline = TRUE) + if(!target || !message) + return + + if(!istext(message)) + CRASH("to_chat called with invalid input type") + + if(target == world) + target = GLOB.clients + + //Some macros remain in the string even after parsing and fuck up the eventual output + var/original_message = message + message = replacetext(message, "\improper", "") + message = replacetext(message, "\proper", "") + if(handle_whitespace) + message = replacetext(message, "\n", "
") + message = replacetext(message, "\t", "[FOURSPACES][FOURSPACES]") + if (trailing_newline) + message += "
" + + + //url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript. + //Do the double-encoding here to save nanoseconds + var/twiceEncoded = url_encode(url_encode(message)) + + if(islist(target)) + for(var/I in target) + var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible + + if(!C) + return + + //Send it to the old style output window. + legacy_chat(C, original_message) + + if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file. + continue + + if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue + C.chatOutput.messageQueue += message + continue + + payload[C] += twiceEncoded + + else + var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible + + if(!C) + return + + //Send it to the old style output window. + legacy_chat(C, original_message) + + if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file. + return + + if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue + C.chatOutput.messageQueue += message + return + + payload[C] += twiceEncoded diff --git a/code/datums/communication/aooc.dm b/code/datums/communication/aooc.dm index d01cd42b899b2..6bb708d8dd725 100644 --- a/code/datums/communication/aooc.dm +++ b/code/datums/communication/aooc.dm @@ -25,8 +25,8 @@ for(var/client/target in GLOB.clients) if(target.holder) - receive_communication(C, target, "[create_text_tag("aooc", "Antag-OOC:", target)] [get_options_bar(C, 0, 1, 1)]: [message]") + receive_communication(C, target, "[create_text_tag("aooc", "Antag-OOC:", target)] [get_options_bar(C, 0, 1, 1)]: [message]") else if(target.mob && target.mob.mind && target.mob.mind.special_role) var/display_name = C.key var/player_display = holder ? "[display_name]([usr.client.holder.rank])" : display_name - receive_communication(C, target, "[create_text_tag("aooc", "Antag-OOC:", target)] [player_display]: [message]") \ No newline at end of file + receive_communication(C, target, "[create_text_tag("aooc", "Antag-OOC:", target)] [player_display]: [message]") \ No newline at end of file diff --git a/code/datums/communication/dsay.dm b/code/datums/communication/dsay.dm index e5ea6cfc1b904..51c4742fd7006 100644 --- a/code/datums/communication/dsay.dm +++ b/code/datums/communication/dsay.dm @@ -89,10 +89,10 @@ /decl/dsay_communication/proc/get_message(var/client/C, var/mob/M, var/message) var say_verb = pick("complains","moans","whines","laments","blubbers","copes","seethes","malds") - return "[get_name(C, M)] [say_verb], \"[message]\"" + return "[get_name(C, M)] [say_verb], \"[message]\"" /decl/dsay_communication/emote/get_message(var/client/C, var/mob/M, var/message) - return "[get_name(C, M)] [message]" + return "[get_name(C, M)] [message]" /decl/dsay_communication/proc/adjust_channel(var/decl/communication_channel/dsay) dsay.flags |= COMMUNICATION_ADMIN_FOLLOW|COMMUNICATION_GHOST_FOLLOW // Add admin and ghost follow @@ -115,7 +115,7 @@ /decl/dsay_communication/admin/get_message(var/client/communicator, var/mob/M, var/message) var/stafftype = uppertext(communicator.holder.rank) - return "[stafftype]([communicator.key]) says, \"[message]\"" + return "[stafftype]([communicator.key]) says, \"[message]\"" /decl/dsay_communication/admin/adjust_channel(var/decl/communication_channel/dsay) dsay.log_proc = /proc/log_say diff --git a/code/datums/communication/ooc.dm b/code/datums/communication/ooc.dm index 576c9446be929..605d8f480c2b6 100644 --- a/code/datums/communication/ooc.dm +++ b/code/datums/communication/ooc.dm @@ -41,7 +41,7 @@ for(var/client/target in GLOB.clients) if(target.is_key_ignored(C.key)) // If we're ignored by this person, then do nothing. continue - var/sent_message = "[create_text_tag("ooc", "OOC:", target)] [C.key]: [message]" + var/sent_message = "[create_text_tag("ooc", "OOC:", target)] [C.key]: [message]" if(can_badmin) receive_communication(C, target, "[sent_message]") else diff --git a/code/datums/communication/pray.dm b/code/datums/communication/pray.dm index 21ef30cb2a314..0dfb890c1fab9 100644 --- a/code/datums/communication/pray.dm +++ b/code/datums/communication/pray.dm @@ -11,10 +11,10 @@ var/mob/M = m if(!M.client) continue - if(M.client.holder && M.client.is_preference_enabled(/datum/client_preference/admin/show_chat_prayers)) - receive_communication(communicator, M, "\[SC\] \[TAKE\]\icon[cross] PRAY: [key_name(communicator, 1)]: [message]") + if(M.client.holder && M.client.get_preference_value(/datum/client_preference/staff/show_chat_prayers) == GLOB.PREF_SHOW) + receive_communication(communicator, M, "\[SC\] \[DN\][icon2html(cross, M)] PRAY: [key_name(communicator, 1)]: [message]") else if(communicator == M) //Give it to ourselves - receive_communication(communicator, M, "\icon[cross] You send the prayer, \"[message]\" out into the heavens.") + receive_communication(communicator, M, "[icon2html(cross, M)] You send the prayer, \"[message]\" out into the heavens.") /decl/communication_channel/pray/receive_communication(var/mob/communicator, var/mob/receiver, var/message) ..() diff --git a/code/datums/wires/camera.dm b/code/datums/wires/camera.dm index 1724b9469cb9f..d50864435e963 100644 --- a/code/datums/wires/camera.dm +++ b/code/datums/wires/camera.dm @@ -61,7 +61,7 @@ var/const/CAMERA_WIRE_NOTHING2 = 32 C.light_disabled = !C.light_disabled if(CAMERA_WIRE_ALARM) - C.visible_message("\icon[C] *beep*", "\icon[C] *beep*") + C.visible_message("[icon2html(C,viewers(C))] *beep*", "[icon2html(C,viewers(C))] *beep*") return /datum/wires/camera/proc/CanDeconstruct() diff --git a/code/datums/wires/particle_accelerator.dm b/code/datums/wires/particle_accelerator.dm index 83562386922df..2eb3589c312a6 100644 --- a/code/datums/wires/particle_accelerator.dm +++ b/code/datums/wires/particle_accelerator.dm @@ -28,7 +28,7 @@ var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be. C.interface_control = !C.interface_control if(PARTICLE_LIMIT_POWER_WIRE) - C.visible_message("\icon[C][C] makes a large whirring noise.") + C.visible_message("[icon2html(C,viewers(C))][C] makes a large whirring noise.") /datum/wires/particle_acc/control_box/UpdateCut(var/index, var/mended) var/obj/machinery/particle_accelerator/control_box/C = holder diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 6262d6017d76c..387830af07e3a 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -252,7 +252,7 @@ its easier to just keep the beam vertical. else f_name += "oil-stained [name][infix]." - to_chat(user, "\icon[src] That's [f_name] [suffix]") + to_chat(user, "[icon2html(src, user)] That's [f_name] [suffix]") to_chat(user, desc) return distance == -1 || (get_dist(src, user) <= distance) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index ace3322caa86d..894b3a95128ce 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -290,7 +290,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ end_call() if (caller_id&&sourcepad) if(caller_id.loc!=sourcepad.loc) - sourcepad.to_chat(caller_id, "Severing connection to distant holopad.") + to_chat(sourcepad.caller_id, "Severing connection to distant holopad.") end_call() audible_message("The connection has been terminated by the caller.") return 1 diff --git a/code/game/machinery/kitchen/icecream.dm b/code/game/machinery/kitchen/icecream.dm index a63720c1ecc9b..3c3a288dfe645 100644 --- a/code/game/machinery/kitchen/icecream.dm +++ b/code/game/machinery/kitchen/icecream.dm @@ -104,7 +104,7 @@ var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = O if(!I.ice_creamed) if(product_types[dispense_flavour] > 0) - src.visible_message("\icon[src] [user] scoops delicious [flavour_name] icecream into [I].") + src.visible_message("[icon2html(src, viewers(src))] [user] scoops delicious [flavour_name] icecream into [I].") product_types[dispense_flavour] -= 1 I.add_ice_cream(flavour_name) // if(beaker) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index af30de08d578f..70a8911d100f1 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -169,7 +169,9 @@ var/list/obj/machinery/requests_console/allConsoles = list() screen = RCS_SENTPASS message_log += "Message sent to [recipient]
[message]" else - audible_message(text("\icon[src] *The Requests Console beeps: 'NOTICE: No server detected!'"),,4) + audible_message(text("[icon2html(src, viewers(src))] *The Requests Console beeps: 'NOTICE: No server detected!'"),,4) + return TOPIC_REFRESH + //Handle screen switching if(href_list["setScreen"]) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 1797ddc726edb..305628ebac0cc 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -235,7 +235,7 @@ if(currently_vending.price > cashmoney.worth) // This is not a status display message, since it's something the character // themselves is meant to see BEFORE putting the money in - to_chat(usr, "\icon[cashmoney] That is not enough money.") + to_chat(usr, "[icon2html(cashmoney, usr)] That is not enough money.") return 0 visible_message("\The [usr] inserts some cash into \the [src].") diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 6eee1b8c93b4d..ca263b1bc90cd 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -22,7 +22,7 @@ if(istype(M, /mob/living/carbon/human)) for(var/mob/O in viewers(world.view, src.loc)) - to_chat(O, "\The [M] triggered the \icon[src] [src]") + to_chat(O, "\The [M] triggered the [icon2html(src, O)] [src]") triggered = 1 call(src,triggerproc)(M) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index dcd5a7b79603f..c1e9b4fae69bb 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -705,5 +705,61 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. /obj/item/proc/can_use_when_prone() return (w_class <= ITEM_SIZE_NORMAL) + /obj/item/proc/can_embed() return 1 + +/obj/item/proc/get_examine_line() + if(blood_color) + . = SPAN_WARNING("[icon2html(src, viewers(src))] [gender==PLURAL?"some":"a"] stained [src]") + else + . = "[icon2html(src, viewers(src))] \a [src]" + var/ID = GetIdCard() + if(ID) + . += " \[Look at ID\]" + +/obj/item/proc/on_active_hand() + +/obj/item/is_burnable() + return simulated + +/obj/item/lava_act() + . = (!throwing) ? ..() : FALSE + +/obj/item/proc/has_embedded() + return + +/obj/item/proc/get_pressure_weakness(pressure,zone) + . = 1 + if(pressure > ONE_ATMOSPHERE) + if(max_pressure_protection != null) + if(max_pressure_protection < pressure) + return min(1, round((pressure - max_pressure_protection) / max_pressure_protection, 0.01)) + else + return 0 + if(pressure < ONE_ATMOSPHERE) + if(min_pressure_protection != null) + if(min_pressure_protection > pressure) + return min(1, round((min_pressure_protection - pressure) / min_pressure_protection, 0.01)) + else + return 0 + +/obj/item/do_simple_ranged_interaction(var/mob/user) + if(user) + attack_self(user) + return TRUE + +/obj/item/proc/inherit_custom_item_data(var/datum/custom_item/citem) + . = src + if(citem.item_name) + SetName(citem.item_name) + if(citem.item_desc) + desc = citem.item_desc + if(citem.item_icon_state) + item_state_slots = null + item_icons = null + icon = CUSTOM_ITEM_OBJ + set_icon_state(citem.item_icon_state) + item_state = null + icon_override = CUSTOM_ITEM_MOB + diff --git a/code/game/objects/items/devices/geiger.dm b/code/game/objects/items/devices/geiger.dm index 31a6853a471cd..4d81cd905f74c 100644 --- a/code/game/objects/items/devices/geiger.dm +++ b/code/game/objects/items/devices/geiger.dm @@ -33,7 +33,7 @@ /obj/item/device/geiger/attack_self(var/mob/user) scanning = !scanning update_icon() - to_chat(user, "\icon[src] You switch [scanning ? "on" : "off"] [src].") + to_chat(user, "[icon2html(src, user)] You switch [scanning ? "on" : "off"] [src].") /obj/item/device/geiger/update_icon() if(!scanning) diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm index eb7d5012c3489..6207699cba6e2 100644 --- a/code/game/objects/items/devices/hacktool.dm +++ b/code/game/objects/items/devices/hacktool.dm @@ -44,7 +44,7 @@ to_chat(user, "You are already hacking!") return 1 if(!is_type_in_list(target, supported_types)) - to_chat(user, "\icon[src] Unable to hack this target.") + to_chat(user, "[icon2html(src, user)] Unable to hack this target.") return 0 var/found = known_targets.Find(target) if(found) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index dde46cb72e7d8..b95ebf8875b9e 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -211,8 +211,8 @@ var/const/NO_EMAG_ACT = -50 return jointext(dat,null) /obj/item/weapon/card/id/attack_self(mob/user as mob) - user.visible_message("\The [user] shows you: \icon[src] [src.name]. The assignment on the card: [src.assignment]",\ - "You flash your ID card: \icon[src] [src.name]. The assignment on the card: [src.assignment]") + user.visible_message("\The [user] shows you: [icon2html(src, viewers(src))] [src.name]. The assignment on the card: [src.assignment]",\ + "You flash your ID card: [icon2html(src, viewers(src))] [src.name]. The assignment on the card: [src.assignment]") src.add_fingerprint(user) return @@ -228,7 +228,7 @@ var/const/NO_EMAG_ACT = -50 set category = "Object" set src in usr - to_chat(usr, text("\icon[] []: The current assignment on the card is [].", src, src.name, src.assignment)) + to_chat(usr, text("[icon2html(src, usr)] []: The current assignment on the card is [].", src.name, src.assignment)) to_chat(usr, "The blood type on the card is [blood_type].") to_chat(usr, "The DNA hash on the card is [dna_hash].") to_chat(usr, "The fingerprint hash on the card is [fingerprint_hash].") diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 1283f8d379798..06de7cefdc300 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -39,10 +39,13 @@ reagents.add_reagent(/datum/reagent/water, max_water) ..() -/obj/item/weapon/extinguisher/examine(mob/user) - if(..(user, 0)) - to_chat(user, text("\icon[] [] contains [] units of water left!", src, src.name, src.reagents.total_volume)) - return +/obj/item/weapon/extinguisher/empty + starting_water = 0 + +/obj/item/weapon/extinguisher/examine(mob/user, distance) + . = ..() + if(distance <= 0) + to_chat(user, text("[icon2html(src, viewers(src))] [] contains [] units of water left!", src, src.reagents.total_volume)) /obj/item/weapon/extinguisher/attack_self(mob/user as mob) safety = !safety diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index a3ec570e987aa..bd74ff5511980 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -459,7 +459,7 @@ var/list/global/tank_gauge_cache = list() return T.assume_air(air_contents) playsound(get_turf(src), 'sound/weapons/gunshot/shotgun.ogg', 20, 1) - visible_message("\icon[src] \The [src] flies apart!", "You hear a bang!") + visible_message("[icon2html(src, viewers(src))] \The [src] flies apart!", "You hear a bang!") T.hotspot_expose(air_contents.temperature, 70, 1) @@ -496,10 +496,12 @@ var/list/global/tank_gauge_cache = list() //dynamic air release based on ambient pressure T.assume_air(leaked_gas) + if(!leaking) visible_message("\icon[src] \The [src] relief valve flips open with a hiss!", "You hear hissing.") playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3) leaking = 1 + #ifdef FIREDBG log_debug("[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]") #endif diff --git a/code/game/objects/items/weapons/weldbackpack.dm b/code/game/objects/items/weapons/weldbackpack.dm index cdc3526543e17..85b88e6ac643d 100644 --- a/code/game/objects/items/weapons/weldbackpack.dm +++ b/code/game/objects/items/weapons/weldbackpack.dm @@ -50,6 +50,8 @@ return /obj/item/weapon/weldpack/examine(mob/user) - . = ..(user) - to_chat(user, text("\icon[] [] units of fuel left!", src, src.reagents.total_volume)) - return + . = ..() + to_chat(user, text("[icon2html(src, user)] [] units of fuel left!", src.reagents.total_volume)) + + if(welder) + to_chat(user, "\The [welder] is attached.") diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 672f4d85a13cf..ad20648a27c02 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -18,11 +18,10 @@ /obj/structure/janitorialcart/New() create_reagents(180) - -/obj/structure/janitorialcart/examine(mob/user) - if(..(user, 1)) - to_chat(user, "[src] \icon[src] contains [reagents.total_volume] unit\s of liquid!") - //everything else is visible, so doesn't need to be mentioned +/obj/structure/janitorialcart/examine(mob/user, distance) + . = ..() + if(distance <= 1) + to_chat(user, "[src] [icon2html(src, viewers(src))] contains [reagents.total_volume] unit\s of liquid!") /obj/structure/janitorialcart/attackby(obj/item/I, mob/user) @@ -184,7 +183,7 @@ if(!..(user, 1)) return - to_chat(user, "\icon[src] This [callme] contains [reagents.total_volume] unit\s of water!") + to_chat(user, "[icon2html(src, user)] This [callme] contains [reagents.total_volume] unit\s of water!") if(mybag) to_chat(user, "\A [mybag] is hanging on the [callme].") diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 6c98097d96cb8..d3994deb1b31b 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -13,9 +13,11 @@ create_reagents(180) ..() -/obj/structure/mopbucket/examine(mob/user) - if(..(user, 1)) - to_chat(user, "[src] \icon[src] contains [reagents.total_volume] unit\s of water!") +/obj/structure/mopbucket/examine(mob/user, distance) + . = ..() + if(distance <= 1) + to_chat(user, "[src] [icon2html(src, user)] contains [reagents.total_volume] unit\s of water!") + /obj/structure/mopbucket/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/weapon/mop)) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index c3267e7d23dad..e5500d99c0471 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -10,3 +10,84 @@ set category = "OOC" sanitize_and_communicate(/decl/communication_channel/ooc/looc, src, message) + +/client/verb/fix_chat() + set name = "Fix Chat" + set category = "OOC" + if (!chatOutput || !istype(chatOutput)) + var/action = alert(src, "Invalid Chat Output data found!\nRecreate data?", "Wot?", "Recreate Chat Output data", "Cancel") + if (action != "Recreate Chat Output data") + return + chatOutput = new /datum/chatOutput(src) + chatOutput.start() + action = alert(src, "Goon chat reloading, wait a bit and tell me if it's fixed", "", "Fixed", "Nope") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by re-creating the chatOutput datum") + else + chatOutput.load() + action = alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by re-creating the chatOutput datum and forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.\nWe could also disable fancy chat and re-enable oldchat", "", "Thanks anyways", "Switch to old chat") + if (action == "Switch to old chat") + winset(src, "output", "is-visible=true;is-disabled=false") + winset(src, "browseroutput", "is-visible=false") + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window after recreating the chatOutput and forcing a load()") + + else if (chatOutput.loaded) + var/action = alert(src, "ChatOutput seems to be loaded\nDo you want me to force a reload, wiping the chat log or just refresh the chat window because it broke/went away?", "Hmmm", "Force Reload", "Refresh", "Cancel") + switch (action) + if ("Force Reload") + chatOutput.loaded = FALSE + chatOutput.start() //this is likely to fail since it asks , but we should try it anyways so we know. + action = alert(src, "Goon chat reloading, wait a bit and tell me if it's fixed", "", "Fixed", "Nope") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a start()") + else + chatOutput.load() + action = alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.\nWe could also disable fancy chat and re-enable oldchat", "", "Thanks anyways", "Switch to old chat") + if (action == "Switch to old chat") + winset(src, "output", "is-visible=true;is-disabled=false") + winset(src, "browseroutput", "is-visible=false") + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window forcing a start() and forcing a load()") + + if ("Refresh") + chatOutput.showChat() + action = alert(src, "Goon chat refreshing, wait a bit and tell me if it's fixed", "", "Fixed", "Nope, force a reload") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a show()") + else + chatOutput.loaded = FALSE + chatOutput.load() + action = alert(src, "How about now? (give it a moment)", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.\nWe could also disable fancy chat and re-enable oldchat", "", "Thanks anyways", "Switch to old chat") + if (action == "Switch to old chat") + winset(src, "output", "is-visible=true;is-disabled=false") + winset(src, "browseroutput", "is-visible=false") + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window forcing a show() and forcing a load()") + return + + else + chatOutput.start() + var/action = alert(src, "Manually loading Chat, wait a bit and tell me if it's fixed", "", "Fixed", "Nope") + if (action == "Fixed") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by manually calling start()") + else + chatOutput.load() + alert(src, "How about now? (give it a moment (it may also try to load twice))", "", "Yes", "No") + if (action == "Yes") + log_game("GOONCHAT: [key_name(src)] Had to fix their goonchat by manually calling start() and forcing a load()") + else + action = alert(src, "Welp, I'm all out of ideas. Try closing byond and reconnecting.\nWe could also disable fancy chat and re-enable oldchat", "", "Thanks anyways", "Switch to old chat") + if (action == "Switch to old chat") + winset(src, "output", list2params(list("on-show" = "", "is-disabled" = "false", "is-visible" = "true"))) + winset(src, "browseroutput", "is-disabled=true;is-visible=false") + log_game("GOONCHAT: [key_name(src)] Failed to fix their goonchat window after manually calling start() and forcing a load()") diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 75e4299a830b0..8dd9bac66ab36 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -125,13 +125,17 @@ var/sender_message = "" + create_text_tag("pm_out_alt", "PM", src) + " to [get_options_bar(C, holder ? 1 : 0, holder ? 1 : 0, 1)]" if(holder) sender_message += " ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE)" + sender_message += ": [msg]" + to_chat(src, sender_message) var/receiver_message = "" + create_text_tag("pm_in", "", C) + " \[[recieve_pm_type] PM\] [get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]" if(C.holder) receiver_message += " ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE)" + receiver_message += ": [msg]" + to_chat(C, receiver_message) //play the recieving admin the adminhelp sound (if they have them enabled) @@ -150,8 +154,10 @@ //check client/X is an admin and isn't the sender or recipient if(X == C || X == src) continue - if(X.key != key && X.key != C.key && (X.holder.rights & R_ADMIN|R_MOD|R_MENTOR)) - to_chat(X, "" + create_text_tag("pm_other", "PM:", X) + " [key_name(src, X, 0, ticket)] to [key_name(C, X, 0, ticket)] ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE): [msg]") + + if(X.key != key && X.key != C.key && (X.holder.rights & R_ADMIN|R_MOD)) + to_chat(X, "" + create_text_tag("pm_other", "PM:", X) + " [key_name(src, X, 0, ticket)] to [key_name(C, X, 0, ticket)] ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE): [msg]") + /client/proc/cmd_admin_irc_pm(sender) if(prefs.muted & MUTE_ADMINHELP) @@ -173,9 +179,9 @@ ahelp2discord(src, sender, html_decode(msg)) admin_pm_repository.store_pm(src, "IRC-[sender]", msg) - to_chat(src, "" + create_text_tag("pm_out_alt", "PM", src) + " to [sender]: [msg]") + to_chat(src, "" + create_text_tag("pm_out_alt", "PM", src) + " to [sender]: [msg]") for(var/client/X in GLOB.admins) if(X == src) continue if(X.holder.rights & R_ADMIN|R_MOD) - to_chat(X, "" + create_text_tag("pm_other", "PM:", X) + " [key_name(src, X, 0)] to [sender]: [msg]") + to_chat(X, "" + create_text_tag("pm_other", "PM:", X) + " [key_name(src, X, 0)] to [sender]: [msg]") diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 932c0b74c8c8d..0705723a2a471 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -12,7 +12,7 @@ if(check_rights(R_ADMIN,0)) for(var/client/C in GLOB.admins) if(R_ADMIN & C.holder.rights) - to_chat(C, "" + create_text_tag("admin", "ADMIN:", C) + " [key_name(usr, 1)]([admin_jump_link(mob, src)]): [msg]") + to_chat(C, "" + create_text_tag("admin", "ADMIN:", C) + " [key_name(usr, 1)]([admin_jump_link(mob, src)]): [msg]") feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -33,6 +33,6 @@ if(check_rights(R_ADMIN, 0)) sender_name = "[sender_name]" for(var/client/C in GLOB.admins) - to_chat(C, "" + create_text_tag("mod", "MOD:", C) + " [sender_name]([admin_jump_link(mob, C.holder)]): [msg]") + to_chat(C, "" + create_text_tag("mod", "MOD:", C) + " [sender_name]([admin_jump_link(mob, C.holder)]): [msg]") feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 0480be4b625fb..d3b80559b4f06 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -197,7 +197,7 @@ process_activation(var/obj/D, var/normal = 1, var/special = 1) if(!D) return 0 if(!secured) - visible_message("\icon[src] *beep* *beep*", "*beep* *beep*") + visible_message("[icon2html(src, viewers(src))] *beep* *beep*", "*beep* *beep*") if((normal) && (a_right) && (a_left)) if(a_right != D) a_right.pulsed(0) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 9d73160bcd6d4..5a36878ffd912 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -112,7 +112,7 @@ pulse(0) if(!holder) - visible_message("\icon[src] *beep* *beep*") + visible_message("[icon2html(src, viewers(src))] *beep* *beep*") cooldown = 2 spawn(10) process_cooldown() diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index f7d4c649e801f..1a13dd646f104 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -136,7 +136,7 @@ if(!holder) for(var/mob/O in hearers(1, src.loc)) - O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2) + O.show_message(text("[icon2html(src, O)] *beep* *beep*"), 3, "*beep* *beep*", 2) return diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 4c41ef31bd552..4e72f68feab93 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -39,7 +39,7 @@ if(!secured) return 0 pulse(0) if(!holder) - visible_message("\icon[src] *beep* *beep*", "*beep* *beep*") + visible_message("[icon2html(src, viewers(src))] *beep* *beep*", "*beep* *beep*") cooldown = 2 spawn(10) process_cooldown() diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index d2416545ed75f..998fd604c5d8a 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -20,7 +20,7 @@ recorded = msg listening = 0 var/turf/T = get_turf(src) //otherwise it won't work in hand - T.visible_message("\icon[src] beeps, \"Activation message is '[recorded]'.\"") + T.visible_message("[icon2html(src, viewers(src))] beeps, \"Activation message is '[recorded]'.\"") else if(findtext(msg, recorded)) pulse(0) @@ -30,7 +30,7 @@ if(!holder) listening = !listening var/turf/T = get_turf(src) - T.visible_message("\icon[src] beeps, \"[listening ? "Now" : "No longer"] recording input.\"") + T.visible_message("[icon2html(src, viewers(src))] beeps, \"[listening ? "Now" : "No longer"] recording input.\"") /obj/item/device/assembly/voice/attack_self(mob/user) diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 0433b833da6cf..51acb1538bd05 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -138,6 +138,12 @@ You can set verify to TRUE if you want send() to sleep until the client has the /proc/register_asset(var/asset_name, var/asset) asset_cache.cache[asset_name] = asset +//Generated names do not include file extention. +//Used mainly for code that deals with assets in a generic way +//The same asset will always lead to the same asset name +/proc/generate_asset_name(file) + return "asset.[md5(fcopy_rsc(file))]" + //These datums are used to populate the asset cache, the proc "register()" does this. //all of our asset datums, used for referring to these later @@ -151,6 +157,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the /datum/asset/New() asset_datums[type] = src + register() /datum/asset/proc/register() return @@ -166,9 +173,22 @@ You can set verify to TRUE if you want send() to sleep until the client has the /datum/asset/simple/register() for(var/asset_name in assets) register_asset(asset_name, assets[asset_name]) + /datum/asset/simple/send(client) send_asset_list(client,assets,verify) +// For registering or sending multiple others at once +/datum/asset/group + var/list/children + +/datum/asset/group/register() + for(var/type in children) + get_asset_datum(type) + +/datum/asset/group/send(client/C) + for(var/type in children) + var/datum/asset/A = get_asset_datum(type) + A.send(C) //DEFINITIONS FOR ASSET DATUMS START HERE. @@ -257,6 +277,39 @@ You can set verify to TRUE if you want send() to sleep until the client has the send_asset_list(client, uncommon, FALSE) send_asset_list(client, common, TRUE) +/datum/asset/group/goonchat + children = list( + /datum/asset/simple/jquery, + /datum/asset/simple/goonchat, + /datum/asset/simple/fontawesome + ) + +/datum/asset/simple/jquery + verify = FALSE + assets = list( + "jquery.min.js" = 'code/modules/goonchat/browserassets/js/jquery.min.js', + ) + +/datum/asset/simple/goonchat + verify = TRUE + assets = list( + "json2.min.js" = 'code/modules/goonchat/browserassets/js/json2.min.js', + "browserOutput.js" = 'code/modules/goonchat/browserassets/js/browserOutput.js', + "browserOutput.css" = 'code/modules/goonchat/browserassets/css/browserOutput.css', + "browserOutput_white.css" = 'code/modules/goonchat/browserassets/css/browserOutput_white.css' + ) + +/datum/asset/simple/fontawesome + verify = FALSE + assets = list( + "fa-regular-400.eot" = 'html/font-awesome/webfonts/fa-regular-400.eot', + "fa-regular-400.woff" = 'html/font-awesome/webfonts/fa-regular-400.woff', + "fa-solid-900.eot" = 'html/font-awesome/webfonts/fa-solid-900.eot', + "fa-solid-900.woff" = 'html/font-awesome/webfonts/fa-solid-900.woff', + "font-awesome.css" = 'html/font-awesome/css/all.min.css', + "v4shim.css" = 'html/font-awesome/css/v4-shims.min.css' + ) + /* Asset cache */ diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index 7eda267d0897a..82922c8cf12bd 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -45,5 +45,19 @@ var/related_accounts_ip = "Requires database" //So admins know why it isn't working - Used to determine what other accounts previously logged in from this ip var/related_accounts_cid = "Requires database" //So admins know why it isn't working - Used to determine what other accounts previously logged in from this computer id - preload_rsc = 0 // This is 0 so we can set it to an URL once the player logs in and have them download the resources from a different server. + var/static/obj/screen/click_catcher/void + + /* + As of byond 512, due to how broken preloading is, preload_rsc MUST be set to 1 at compile time if resource URLs are *not* in use, + BUT you still want resource preloading enabled (from the server itself). If using resource URLs, it should be set to 0 and + changed to a URL at runtime (see client_procs.dm for procs that do this automatically). More information about how goofy this broken setting works at + http://www.byond.com/forum/post/1906517?page=2#comment23727144 + */ + preload_rsc = 0 + + ///goonchat chatoutput of the client + var/datum/chatOutput/chatOutput + + var/fullscreen = FALSE + diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 6cc83a7dc2a5c..d32093f13c128 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -143,6 +143,11 @@ if("usr") hsrc = mob if("prefs") return prefs.process_link(usr,href_list) if("vars") return view_var_Topic(href,href_list,hsrc) + if("chat") return chatOutput.Topic(href, href_list) + + switch(href_list["action"]) + if("openLink") + send_link(src, href_list["link"]) ..() //redirect to hsrc.Topic() @@ -167,10 +172,27 @@ /client/New(TopicData) TopicData = null //Prevent calls to client.Topic from connect - if(!(connection in list("seeker", "web"))) //Invalid connection type. - return null - if(byond_version < MIN_CLIENT_VERSION) //Out of date client. - return null + // Load goonchat + chatOutput = new(src) + + switch (connection) + if ("seeker", "web") // check for invalid connection type. do nothing if valid + else return null + #if DM_VERSION >= 512 + var/bad_version = config.minimum_byond_version && byond_version < config.minimum_byond_version + var/bad_build = config.minimum_byond_build && byond_build < config.minimum_byond_build + if (bad_build || bad_version) + to_chat(src, "You are attempting to connect with a out of date version of BYOND. Please update to the latest version at http://www.byond.com/ before trying again.") + qdel(src) + return + + /*if("[byond_version].[byond_build]" in config.forbidden_versions) + _DB_staffwarn_record(ckey, "Tried to connect with broken and possibly exploitable BYOND build.") + to_chat(src, "You are attempting to connect with a broken and possibly exploitable BYOND build. Please update to the latest version at http://www.byond.com/ before trying again.") + qdel(src) + return*/ + + #endif if(!config.guests_allowed && IsGuestKey(key)) alert(src,"This server doesn't allow guest accounts to play. Please go to http://www.byond.com/ and register for a key.","Guest","OK") @@ -254,8 +276,12 @@ if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.") + if(get_preference_value(/datum/client_preference/goonchat) == GLOB.PREF_YES) + chatOutput.start() + if(holder) src.control_freak = 0 //Devs need 0 for profiler access + ////////////// //DISCONNECT// ////////////// @@ -428,3 +454,79 @@ client/verb/character_setup() /client/proc/apply_fps(var/client_fps) if(world.byond_version >= 511 && byond_version >= 511 && client_fps >= CLIENT_MIN_FPS && client_fps <= CLIENT_MAX_FPS) vars["fps"] = prefs.clientfps + + +/client/MouseDrag(src_object, over_object, src_location, over_location, src_control, over_control, params) + . = ..() + var/mob/living/M = mob + if(istype(M)) + M.OnMouseDrag(src_object, over_object, src_location, over_location, src_control, over_control, params) + +/client/verb/toggle_fullscreen() + set name = "Toggle Fullscreen" + set category = "OOC" + + fullscreen = !fullscreen + + if (fullscreen) + winset(usr, "mainwindow", "titlebar=false") + winset(usr, "mainwindow", "can-resize=false") + winset(usr, "mainwindow", "is-maximized=false") + winset(usr, "mainwindow", "is-maximized=true") + winset(usr, "mainwindow", "statusbar=false") + winset(usr, "mainwindow", "menu=") +// winset(usr, "mainwindow.mainvsplit", "size=0x0") + else + winset(usr, "mainwindow", "is-maximized=false") + winset(usr, "mainwindow", "titlebar=true") + winset(usr, "mainwindow", "can-resize=true") + winset(usr, "mainwindow", "statusbar=true") + winset(usr, "mainwindow", "menu=menu") + + fit_viewport() + +/client/verb/fit_viewport() + set name = "Fit Viewport" + set category = "OOC" + set desc = "Fit the width of the map window to match the viewport" + + // Fetch aspect ratio + var/view_size = getviewsize(view) + var/aspect_ratio = view_size[1] / view_size[2] + + // Calculate desired pixel width using window size and aspect ratio + var/sizes = params2list(winget(src, "mainwindow.mainvsplit;mapwindow", "size")) + var/map_size = splittext(sizes["mapwindow.size"], "x") + var/height = text2num(map_size[2]) + var/desired_width = round(height * aspect_ratio) + if (text2num(map_size[1]) == desired_width) + // Nothing to do + return + + var/split_size = splittext(sizes["mainwindow.mainvsplit.size"], "x") + var/split_width = text2num(split_size[1]) + + // Calculate and apply a best estimate + // +4 pixels are for the width of the splitter's handle + var/pct = 100 * (desired_width + 4) / split_width + winset(src, "mainwindow.mainvsplit", "splitter=[pct]") + + // Apply an ever-lowering offset until we finish or fail + var/delta + for(var/safety in 1 to 10) + var/after_size = winget(src, "mapwindow", "size") + map_size = splittext(after_size, "x") + var/got_width = text2num(map_size[1]) + + if (got_width == desired_width) + // success + return + else if (isnull(delta)) + // calculate a probable delta value based on the difference + delta = 100 * (desired_width - got_width) / split_width + else if ((delta > 0 && got_width > desired_width) || (delta < 0 && got_width < desired_width)) + // if we overshot, halve the delta and reverse direction + delta = -delta/2 + + pct += delta + winset(src, "mainwindow.mainvsplit", "splitter=[pct]") diff --git a/code/modules/client/darkmode.dm b/code/modules/client/darkmode.dm new file mode 100644 index 0000000000000..4edd5c0112050 --- /dev/null +++ b/code/modules/client/darkmode.dm @@ -0,0 +1,132 @@ +//Darkmode preference by Kmc2000// + +/* +This lets you switch chat themes by using winset and CSS loading, you must relog to see this change (or rebuild your browseroutput datum) +Things to note: +If you change ANYTHING in interface/skin.dmf you need to change it here: +Format: +winset(src, "window as appears in skin.dmf after elem", "var to change = currentvalue;var to change = desired value") +How this works: +I've added a function to browseroutput.js which registers a cookie for darkmode and swaps the chat accordingly. You can find the button to do this under the "cog" icon next to the ping button (top right of chat) +This then swaps the window theme automatically +Thanks to spacemaniac and mcdonald for help with the JS side of this. +*/ + +/client/proc/force_white_theme() //There's no way round it. We're essentially changing the skin by hand. It's painful but it works, and is the way Lummox suggested. + //Main windows + winset(src, "infowindow", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = none") + winset(src, "infowindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "rpane", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = none") + winset(src, "rpane", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "info", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "info", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "browseroutput", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "browseroutput", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "outputwindow", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "outputwindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "rpanewindow", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "rpanewindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "mainwindow", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = none") + winset(src, "split", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "mainvsplit", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + //Buttons + winset(src, "textb", "background-color = #494949;background-color = none") + winset(src, "textb", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "infob", "background-color = #494949;background-color = none") + winset(src, "infob", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "rulesb", "background-color = #494949;background-color = none") + winset(src, "rulesb", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "Lore", "background-color = #494949;background-color = none") + winset(src, "Lore", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "wikib", "background-color = #494949;background-color = none") + winset(src, "wikib", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "forumb", "background-color = #494949;background-color = none") + winset(src, "forumb", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "changelog", "background-color = #494949;background-color = none") + winset(src, "changelog", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "github", "background-color = #494949;background-color = none") + winset(src, "github", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "BugReport", "background-color = #494949;background-color = none") + winset(src, "BugReport", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "hotkey_toggle", "background-color = #494949;background-color = none") + winset(src, "hotkey_toggle", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + //Status and verb tabs + winset(src, "output", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "output", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "outputwindow", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "outputwindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "statwindow", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "statwindow", "text-color = #eaeaea;text-color = #000000") + winset(src, "info", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = #FFFFFF") + winset(src, "info", "tab-background-color = [COLOR_DARKMODE_BACKGROUND];tab-background-color = none") + winset(src, "info", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "info", "tab-text-color = [COLOR_DARKMODE_TEXT];tab-text-color = #000000") + winset(src, "info", "prefix-color = [COLOR_DARKMODE_TEXT];prefix-color = #000000") + winset(src, "info", "suffix-color = [COLOR_DARKMODE_TEXT];suffix-color = #000000") + //Say, OOC, me Buttons etc. + winset(src, "saybutton", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "saybutton", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "asset_cache_browser", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "asset_cache_browser", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + //winset(src, "input", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + //winset(src, "input", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + +/client/proc/force_dark_theme() //Inversely, if theyre using white theme and want to swap to the superior dark theme, let's get WINSET() ing + //Main windows + winset(src, "infowindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "infowindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "rpane", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "rpane", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "info", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "info", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "browseroutput", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "browseroutput", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "outputwindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "outputwindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "rpanewindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "rpanewindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "mainwindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "split", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "mainvsplit", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + //Buttons + winset(src, "textb", "background-color = none;background-color = #494949") + winset(src, "textb", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "infob", "background-color = none;background-color = #494949") + winset(src, "infob", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "rulesb", "background-color = none;background-color = #494949") + winset(src, "rulesb", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "Lore", "background-color = none;background-color = #494949") + winset(src, "Lore", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "wikib", "background-color = none;background-color = #494949") + winset(src, "wikib", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "forumb", "background-color = none;background-color = #494949") + winset(src, "forumb", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "changelog", "background-color = none;background-color = #494949") + winset(src, "changelog", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "github", "background-color = none;background-color = #494949") + winset(src, "github", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "BugReport", "background-color = none;background-color = #494949") + winset(src, "BugReport", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "hotkey_toggle", "background-color = none;background-color = #494949") + winset(src, "hotkey_toggle", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + //Status and verb tabs + winset(src, "output", "background-color = none;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "output", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "outputwindow", "background-color = none;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "outputwindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "statwindow", "background-color = none;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "statwindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "info", "background-color = #FFFFFF;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "info", "tab-background-color = none;tab-background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "info", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "info", "tab-text-color = #000000;tab-text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "info", "prefix-color = #000000;prefix-color = [COLOR_DARKMODE_TEXT]") + winset(src, "info", "suffix-color = #000000;suffix-color = [COLOR_DARKMODE_TEXT]") + //Say, OOC, me Buttons etc. + winset(src, "saybutton", "background-color = none;background-color = #494949") + winset(src, "saybutton", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "asset_cache_browser", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "asset_cache_browser", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + + //winset(src, "input", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + //winset(src, "input", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") diff --git a/code/modules/clothing/rings/rings.dm b/code/modules/clothing/rings/rings.dm index 33b8a3ec26028..f2cbda971e227 100644 --- a/code/modules/clothing/rings/rings.dm +++ b/code/modules/clothing/rings/rings.dm @@ -56,7 +56,7 @@ /obj/item/clothing/ring/reagent/equipped(var/mob/living/carbon/human/H) ..() if(istype(H) && H.gloves==src) - to_chat(H, "You feel a prick as you slip on the ring.") + to_chat(H, "You feel a prick as you slip on the ring.") if(reagents.total_volume) if(H.reagents) diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index e65a37a13bfa5..802eb998a838a 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -58,7 +58,7 @@ to_chat(user, "Another grenade of that type will not fit into the module.") return 0 - to_chat(user, "You slot \the [input_device] into the suit module.") + to_chat(user, "You slot \the [input_device] into the suit module.") user.drop_from_inventory(input_device) qdel(input_device) accepted_item.charges++ @@ -257,7 +257,7 @@ else var/obj/item/new_weapon = new fabrication_type() new_weapon.forceMove(H) - to_chat(H, "You quickly fabricate \a [new_weapon].") + to_chat(H, "You quickly fabricate \a [new_weapon].") H.put_in_hands(new_weapon) return 1 diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index 4c6c761909026..cc2506b5a8bd8 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -265,7 +265,7 @@ var/obj/item/weapon/disk/tech_disk/disk = input_device if(disk.stored) if(load_data(disk.stored)) - to_chat(user, "Download successful; disk erased.") + to_chat(user, "Download successful; disk erased.") disk.stored = null else to_chat(user, "The disk is corrupt. It is useless to you.") @@ -291,7 +291,7 @@ else // Maybe consider a way to drop all your data into a target repo in the future. if(load_data(incoming_files.known_tech)) - to_chat(user, "Download successful; local and remote repositories synchronized.") + to_chat(user, "Download successful; local and remote repositories synchronized.") else to_chat(user, "Scan complete. There is nothing useful stored on this terminal.") return 1 @@ -467,9 +467,9 @@ /obj/item/rig_module/power_sink/proc/drain_complete(var/mob/living/M) if(!interfaced_with) - if(M) to_chat(M, "Total power drained: [round(total_power_drained*CELLRATE)] Wh.") + if(M) to_chat(M, "Total power drained: [round(total_power_drained*CELLRATE)] Wh.") else - if(M) to_chat(M, "Total power drained from [interfaced_with]: [round(total_power_drained*CELLRATE)] Wh.") + if(M) to_chat(M, "Total power drained from [interfaced_with]: [round(total_power_drained*CELLRATE)] Wh.") interfaced_with.drain_power(0,1,0) // Damage the victim. drain_loc = null diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 2eacec16ccfef..e5d0a15be3e03 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -215,7 +215,7 @@ break if(total_transferred) - to_chat(user, "You transfer [total_transferred] units into the suit reservoir.") + to_chat(user, "You transfer [total_transferred] units into the suit reservoir.") else to_chat(user, "None of the reagents seem suitable.") return 1 @@ -330,17 +330,17 @@ if("Enable") active = 1 voice_holder.active = 1 - to_chat(usr, "You enable the speech synthesiser.") + to_chat(usr, "You enable the speech synthesiser.") if("Disable") active = 0 voice_holder.active = 0 - to_chat(usr, "You disable the speech synthesiser.") + to_chat(usr, "You disable the speech synthesiser.") if("Set Name") var/raw_choice = sanitize(input(usr, "Please enter a new name.") as text|null, MAX_NAME_LEN) if(!raw_choice) return 0 voice_holder.voice = raw_choice - to_chat(usr, "You are now mimicking [voice_holder.voice].") + to_chat(usr, "You are now mimicking [voice_holder.voice].") return 1 /obj/item/rig_module/maneuvering_jets diff --git a/code/modules/clothing/spacesuits/rig/modules/vision.dm b/code/modules/clothing/spacesuits/rig/modules/vision.dm index 8bd4dcc0a88c6..aa9312617b8b9 100644 --- a/code/modules/clothing/spacesuits/rig/modules/vision.dm +++ b/code/modules/clothing/spacesuits/rig/modules/vision.dm @@ -162,7 +162,7 @@ // Don't cycle if this engage() is being called by activate(). if(starting_up) - to_chat(holder.wearer, "You activate your visual sensors.") + to_chat(holder.wearer, "You activate your visual sensors.") return 1 if(vision_modes.len > 1) @@ -171,9 +171,9 @@ vision_index = 1 vision = vision_modes[vision_index] - to_chat(holder.wearer, "You cycle your sensors to [vision.mode] mode.") + to_chat(holder.wearer, "You cycle your sensors to [vision.mode] mode.") else - to_chat(holder.wearer, "Your sensors only have one mode.") + to_chat(holder.wearer, "Your sensors only have one mode.") return 1 /obj/item/rig_module/vision/New() diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 18f70376ffac4..e77874de368a8 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -18,7 +18,9 @@ center_of_mass = null // These values are passed on to all component pieces. + armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20) + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE siemens_coefficient = 0.2 @@ -92,7 +94,9 @@ for(var/obj/item/piece in list(helmet,gloves,chest,boots)) if(!piece || piece.loc != wearer) continue - to_chat(usr, "\icon[piece] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed.") + + to_chat(user, "[icon2html(piece, user)] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed.") + if(src.loc == usr) to_chat(usr, "The access panel is [locked? "locked" : "unlocked"].") @@ -233,13 +237,19 @@ sealing = 1 if(!seal_target && !suit_is_deployed()) - wearer.visible_message("[wearer]'s suit flashes an error light.","Your suit flashes an error light. It can't function properly without being fully deployed.") + wearer.visible_message(\ + "[wearer]'s suit flashes an error light.", \ + "Your suit flashes an error light. It can't function properly without being fully deployed.") + failed_to_seal = 1 if(!failed_to_seal) if(!instant) - wearer.visible_message("[wearer]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.") + wearer.visible_message(\ + "[wearer]'s suit emits a quiet hum as it begins to adjust its seals.", \ + "With a quiet hum, the suit begins running checks and adjusting components.") + if(seal_delay && !do_after(wearer,seal_delay, src)) if(wearer) to_chat(wearer, "You must remain still while the suit is adjusting the components.") failed_to_seal = 1 @@ -271,16 +281,16 @@ //piece.icon_state = "[initial(icon_state)][!seal_target ? "_sealed" : ""]" switch(msg_type) if("boots") - to_chat(wearer, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") + to_chat(wearer, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") wearer.update_inv_shoes() if("gloves") - to_chat(wearer, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") + to_chat(wearer, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") wearer.update_inv_gloves() if("chest") - to_chat(wearer, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].") + to_chat(wearer, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].") wearer.update_inv_wear_suit() if("helmet") - to_chat(wearer, "\The [piece] hisses [!seal_target ? "closed" : "open"].") + to_chat(wearer, "\The [piece] hisses [!seal_target ? "closed" : "open"].") wearer.update_inv_head() if(helmet) helmet.update_light(wearer) @@ -311,10 +321,12 @@ // Success! canremove = seal_target - to_chat(wearer, "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].") + + to_chat(wearer, "Your entire suit [canremove ? "loosens as the components relax" : "tightens around you as the components lock into place"].") + if(wearer != initiator) - to_chat(initiator, "Suit adjustment complete. Suit is now [canremove ? "unsealed" : "sealed"].") + to_chat(initiator, "Suit adjustment complete. Suit is now [canremove ? "unsealed" : "sealed"].") if(canremove) for(var/obj/item/rig_module/module in installed_modules) @@ -616,7 +628,10 @@ ..() if(seal_delay > 0 && istype(M) && M.back == src) - M.visible_message("[M] starts putting on \the [src]...", "You start putting on \the [src]...") + M.visible_message(\ + "[M] starts putting on \the [src]...", \ + "You start putting on \the [src]...") + if(!do_after(M,seal_delay,src)) if(M && M.back == src) if(!M.unEquip(src)) @@ -625,7 +640,10 @@ return if(istype(M) && M.back == src) - M.visible_message("[M] struggles into \the [src].", "You struggle into \the [src].") + M.visible_message(\ + "[M] struggles into \the [src].", \ + "You struggle into \the [src].") + wearer = M wearer.wearing_rig = src update_icon() @@ -675,7 +693,7 @@ holder = use_obj.loc if(istype(holder)) if(use_obj && check_slot == use_obj) - to_chat(wearer, "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") + to_chat(wearer, "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") use_obj.canremove = 1 holder.drop_from_inventory(use_obj) use_obj.canremove = 0 diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm index 3e27ae5340a92..d38421f25fe40 100644 --- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm +++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm @@ -197,7 +197,7 @@ if(malfunction_check(usr)) return - + if(!check_power_cost(usr, 0, 0, 0, 0)) return @@ -222,7 +222,8 @@ return selected_module = module - to_chat(usr, "Primary system is now: [selected_module.interface_name].") + to_chat(usr, "Primary system is now: [selected_module.interface_name].") + /obj/item/weapon/rig/verb/toggle_module() @@ -256,10 +257,10 @@ return if(module.active) - to_chat(usr, "You attempt to deactivate \the [module.interface_name].") + to_chat(usr, "You attempt to deactivate \the [module.interface_name].") module.deactivate() else - to_chat(usr, "You attempt to activate \the [module.interface_name].") + to_chat(usr, "You attempt to activate \the [module.interface_name].") module.activate() /obj/item/weapon/rig/verb/engage_module() @@ -293,5 +294,5 @@ if(!istype(module)) return - to_chat(usr, "You attempt to engage the [module.interface_name].") + to_chat(usr, "You attempt to engage the [module.interface_name].") module.engage() \ No newline at end of file diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 79d9d02bdef28..792fcd521d1ed 100644 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -99,7 +99,7 @@ last_process_worldtime = world.time /obj/machinery/dnaforensics/proc/complete_scan() - src.visible_message("\icon[src] makes an insistent chime.", 2) + src.visible_message("[icon2html(src, viewers(src))] makes an insistent chime.", 2) update_icon() if(bloodsamp) var/obj/item/weapon/paper/P = new(src) diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 934a90b2e1aa5..7e509c2885134 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -65,14 +65,15 @@ //display a message to the user var/response = pick("Initiating withdraw. Have a nice day!", "CRITICAL ERROR: Activating cash chamber panic siphon.","PIN Code accepted! Emptying account balance.", "Jackpot!") - to_chat(user, "\icon[src] The [src] beeps: \"[response]\"") + + to_chat(user, "[icon2html(src, user)] [src] beeps: \"[response]\"") return 1 /obj/machinery/atm/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/card)) if(emagged > 0) //prevent inserting id into an emagged ATM - to_chat(user, "\icon[src] CARD READER ERROR. This system has been compromised!") + to_chat(user, "[icon2html(src, user)] CARD READER ERROR. This system has been compromised!") return var/obj/item/weapon/card/id/idcard = I @@ -109,7 +110,7 @@ /obj/machinery/atm/interact(mob/user) if(istype(user, /mob/living/silicon)) - to_chat(user, "\icon[src] Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per system banking regulation #1005.") + to_chat(user, "[icon2html(src, user)] Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per system banking regulation #1005.") return if(get_dist(src,user) <= 1) @@ -244,10 +245,10 @@ var/datum/transaction/T = new("Account #[target_account_number]", transfer_purpose, -transfer_amount, machine_id) authenticated_account.do_transaction(T) else - to_chat(usr, "\icon[src]Funds transfer failed.") + to_chat(usr, "[icon2html(src, usr)]Funds transfer failed.") else - to_chat(usr, "\icon[src]You don't have enough funds to do that!") + to_chat(usr, "[icon2html(src, usr)]You don't have enough funds to do that!") if("view_screen") view_screen = text2num(href_list["view_screen"]) if("change_security_level") @@ -294,11 +295,11 @@ var/datum/transaction/T = new(failed_account.owner_name, "Unauthorised login attempt", 0, machine_id) failed_account.do_transaction(T) else - to_chat(usr, "\icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining.") + to_chat(usr, "[icon2html(src, usr)] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining.") previous_account_number = tried_account_num playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1) else - to_chat(usr, "\icon[src] Unable to log in to account, additional information may be required.") + to_chat(usr, "[icon2html(src, usr)] Unable to log in to account, additional information may be required.") number_incorrect_tries = 0 else playsound(src, 'sound/machines/twobeep.ogg', 50, 1) @@ -309,7 +310,7 @@ var/datum/transaction/T = new(authenticated_account.owner_name, "Remote terminal access", 0, machine_id) authenticated_account.do_transaction(T) - to_chat(usr, "\icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'") + to_chat(usr, "[icon2html(src, usr)] Access granted. Welcome user '[authenticated_account.owner_name].'") previous_account_number = tried_account_num if("e_withdrawal") @@ -326,7 +327,7 @@ var/datum/transaction/T = new(authenticated_account.owner_name, "Credit withdrawal", -amount, machine_id) authenticated_account.do_transaction(T) else - to_chat(usr, "\icon[src]You don't have enough funds to do that!") + to_chat(usr, "[icon2html(src, usr)]You don't have enough funds to do that!") if("withdrawal") var/amount = max(text2num(href_list["funds_amount"]),0) amount = round(amount, 0.01) @@ -341,7 +342,7 @@ var/datum/transaction/T = new(authenticated_account.owner_name, "Credit withdrawal", -amount, machine_id) authenticated_account.do_transaction(T) else - to_chat(usr, "\icon[src]You don't have enough funds to do that!") + to_chat(usr, "[icon2html(src, usr)]You don't have enough funds to do that!") if("balance_statement") if(authenticated_account) var/obj/item/weapon/paper/R = new(src.loc) @@ -413,7 +414,7 @@ if(!held_card) //this might happen if the user had the browser window open when somebody emagged it if(emagged > 0) - to_chat(usr, "\icon[src] The ATM card reader rejected your ID because this machine has been sabotaged!") + to_chat(usr, "[icon2html(src, usr)] The ATM card reader rejected your ID because this machine has been sabotaged!") else var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/weapon/card/id)) diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 403818542dede..7ec114316c6ce 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -118,7 +118,7 @@ if(linked_account) scan_card(I, O) else - to_chat(usr, "\icon[src]Unable to connect to linked account.") + to_chat(usr, "[icon2html(src, usr)]Unable to connect to linked account.") else if (istype(O, /obj/item/weapon/spacecash/ewallet)) var/obj/item/weapon/spacecash/ewallet/E = O if (linked_account) @@ -126,7 +126,7 @@ if(transaction_locked && !transaction_paid) if(transaction_amount <= E.worth) playsound(src, 'sound/machines/chime.ogg', 50, 1) - src.visible_message("\icon[src] \The [src] chimes.") + src.visible_message("[icon2html(src, viewers(src))] \The [src] chimes.") transaction_paid = 1 //transfer the money @@ -134,11 +134,12 @@ var/datum/transaction/T = new(E.owner_name, (transaction_purpose ? transaction_purpose : "None supplied."), transaction_amount, machine_id) linked_account.do_transaction(T) else - to_chat(usr, "\icon[src]\The [O] doesn't have that much money!") + to_chat(usr, "[icon2html(src,usr)]\The [O] doesn't have that much money!") else - to_chat(usr, "\icon[src]Connected account has been suspended.") + to_chat(usr, "[icon2html(src,sr)]Connected account has been suspended.") + else - to_chat(usr, "\icon[src]EFTPOS is not connected to an account.") + to_chat(usr, "[icon2html(src, usr)]EFTPOS is not connected to an account.") else ..() @@ -156,14 +157,14 @@ alert("That is not a valid code!") print_reference() else - to_chat(usr, "\icon[src]Incorrect code entered.") + to_chat(usr, "[icon2html(src, usr)]Incorrect code entered.") if("change_id") var/attempt_code = text2num(input("Re-enter the current EFTPOS access code", "Confirm EFTPOS code")) if(attempt_code == access_code) eftpos_name = sanitize(input("Enter a new terminal ID for this device", "Enter new EFTPOS ID"), MAX_NAME_LEN) + " EFTPOS scanner" print_reference() else - to_chat(usr, "\icon[src]Incorrect code entered.") + to_chat(usr, "[icon2html(src, usr)]Incorrect code entered.") if("link_account") var/attempt_account_num = input("Enter account number to pay EFTPOS charges into", "New account number") as num var/attempt_pin = input("Enter pin code", "Account pin") as num @@ -171,9 +172,9 @@ if(linked_account) if(linked_account.suspended) linked_account = null - to_chat(usr, "\icon[src]Account has been suspended.") + to_chat(usr, "[icon2html(src, usr)]Account has been suspended.") else - to_chat(usr, "\icon[src]Account not found.") + to_chat(usr, "[icon2html(src, usr)]Account not found.") if("trans_purpose") var/choice = sanitize(input("Enter reason for EFTPOS transaction", "Transaction purpose")) if(choice) transaction_purpose = choice @@ -196,14 +197,14 @@ else if(linked_account) transaction_locked = 1 else - to_chat(usr, "\icon[src]No account connected to send transactions to.") + to_chat(usr, "[icon2html(src, usr)]No account connected to send transactions to.") if("scan_card") if(linked_account) var/obj/item/I = usr.get_active_hand() if (istype(I, /obj/item/weapon/card)) scan_card(I) else - to_chat(usr, "\icon[src]Unable to link accounts.") + to_chat(usr, "[icon2html(src, usr)]Unable to link accounts.") if("reset") //reset the access code - requires HoP/captain access var/obj/item/I = usr.get_active_hand() @@ -211,10 +212,10 @@ var/obj/item/weapon/card/id/C = I if(access_cent_captain in C.access || access_hop in C.access || access_captain in C.access) access_code = 0 - to_chat(usr, "\icon[src]Access code reset to 0.") + to_chat(usr, "[icon2html(src, usr)]Access code reset to 0.") else if (istype(I, /obj/item/weapon/card/emag)) access_code = 0 - to_chat(usr, "\icon[src]Access code reset to 0.") + to_chat(usr, "[icon2html(src, usr)]Access code reset to 0.") src.attack_self(usr) @@ -248,25 +249,25 @@ T = new(D.owner_name, transaction_purpose, transaction_amount, machine_id) linked_account.do_transaction(T) else - to_chat(usr, "\icon[src]You don't have that much money!") + to_chat(usr, "[icon2html(src,usr)]You don't have that much money!") else - to_chat(usr, "\icon[src]Your account has been suspended.") + to_chat(usr, "[icon2html(src,usr)]Your account has been suspended.") else - to_chat(usr, "\icon[src]Unable to access account. Check security settings and try again.") + to_chat(usr, "[icon2html(src, usr)]Unable to access account. Check security settings and try again.") else - to_chat(usr, "\icon[src]Connected account has been suspended.") + to_chat(usr, "[icon2html(src, usr)]Connected account has been suspended.") else - to_chat(usr, "\icon[src]EFTPOS is not connected to an account.") + to_chat(usr, "[icon2html(src, usr)]EFTPOS is not connected to an account.") else if (istype(I, /obj/item/weapon/card/emag)) if(transaction_locked) if(transaction_paid) - to_chat(usr, "\icon[src]You stealthily swipe \the [I] through \the [src].") + to_chat(usr, "[icon2html(src, usr)]You stealthily swipe \the [I] through \the [src].") transaction_locked = 0 transaction_paid = 0 else usr.visible_message("\The [usr] swipes a card through \the [src].") playsound(src, 'sound/machines/chime.ogg', 50, 1) - src.visible_message("\icon[src] \The [src] chimes.") + src.visible_message("[icon2html(src, usr)] \The [src] chimes.") transaction_paid = 1 else ..() diff --git a/code/modules/goonchat/_helpers.dm b/code/modules/goonchat/_helpers.dm new file mode 100644 index 0000000000000..af6a7fbc4e067 --- /dev/null +++ b/code/modules/goonchat/_helpers.dm @@ -0,0 +1,112 @@ +GLOBAL_DATUM_INIT(is_http_protocol, /regex, regex("^https?://")) + + +//Converts an icon to base64. Operates by putting the icon in the iconCache savefile, +// exporting it as text, and then parsing the base64 from that. +// (This relies on byond automatically storing icons in savefiles as base64) +/proc/icon2base64(icon/icon, iconKey = "misc") + if (!isicon(icon)) + return FALSE + to_save(GLOB.iconCache[iconKey], icon) + var/iconData = GLOB.iconCache.ExportText(iconKey) + var/list/partial = splittext(iconData, "{") + return replacetext(copytext(partial[2], 3, -5), "\n", "") + +/proc/icon2html(thing, target, icon_state, dir, frame = 1, moving = FALSE, realsize = FALSE, class = null) + if (!thing) + return + + var/key + var/icon/I = thing + if (!target) + return + if (target == world) + target = GLOB.clients + + var/list/targets + if (!islist(target)) + targets = list(target) + else + targets = target + if (!targets.len) + return + if (!isicon(I)) + if (isfile(thing)) //special snowflake + var/name = "[generate_asset_name(thing)].png" + register_asset(name, thing) + for (var/thing2 in targets) + send_asset(thing2, key, FALSE) + return "" + var/atom/A = thing + if (isnull(dir)) + dir = A.dir + if (isnull(icon_state)) + icon_state = A.icon_state + I = A.icon + if (ishuman(thing)) // Shitty workaround for a BYOND issue. + var/icon/temp = I + I = icon() + I.Insert(temp, dir = SOUTH) + dir = SOUTH + else + if (isnull(dir)) + dir = SOUTH + if (isnull(icon_state)) + icon_state = "" + + I = icon(I, icon_state, dir, frame, moving) + + key = "[generate_asset_name(I)].png" + register_asset(key, I) + for (var/thing2 in targets) + send_asset(thing2, key, FALSE) + + if(realsize) + return "" + + + return "" + +/proc/icon2base64html(thing) + if (!thing) + return + var/static/list/bicon_cache = list() + if (isicon(thing)) + var/icon/I = thing + var/icon_base64 = icon2base64(I) + + if (I.Height() > world.icon_size || I.Width() > world.icon_size) + var/icon_md5 = md5(icon_base64) + icon_base64 = bicon_cache[icon_md5] + if (!icon_base64) // Doesn't exist yet, make it. + bicon_cache[icon_md5] = icon_base64 = icon2base64(I) + + + return "" + + // Either an atom or somebody fucked up and is gonna get a runtime, which I'm fine with. + var/atom/A = thing + var/key = "[istype(A.icon, /icon) ? "\ref[A.icon]" : A.icon]:[A.icon_state]" + + + if (!bicon_cache[key]) // Doesn't exist, make it. + var/icon/I = icon(A.icon, A.icon_state, SOUTH, 1) + if (ishuman(thing)) // Shitty workaround for a BYOND issue. + var/icon/temp = I + I = icon() + I.Insert(temp, dir = SOUTH) + + bicon_cache[key] = icon2base64(I, key) + + return "" + +//Costlier version of icon2html() that uses getFlatIcon() to account for overlays, underlays, etc. Use with extreme moderation, ESPECIALLY on mobs. +/proc/costly_icon2html(thing, target) + if (!thing) + return + + if (isicon(thing)) + return icon2html(thing, target) + + var/icon/I = getFlatIcon(thing) + return icon2html(I, target) diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm new file mode 100644 index 0000000000000..2a464806ac0b8 --- /dev/null +++ b/code/modules/goonchat/browserOutput.dm @@ -0,0 +1,295 @@ +/********************************* +For the main html chat area +*********************************/ + +//Precaching a bunch of shit +GLOBAL_DATUM_INIT(iconCache, /savefile, new("tmp/iconCache.sav")) //Cache of icons for the browser output + +//Should match the value set in the browser js +#define MAX_COOKIE_LENGTH 5 +#define SPAM_TRIGGER_AUTOMUTE 10 + +//On client, created on login +/datum/chatOutput + var/client/owner //client ref + // How many times client data has been checked + var/total_checks = 0 + // When to next clear the client data checks counter + var/next_time_to_clear = 0 + var/loaded = FALSE // Has the client loaded the browser output area? + var/list/messageQueue //If they haven't loaded chat, this is where messages will go until they do + var/cookieSent = FALSE // Has the client sent a cookie for analysis + var/broken = FALSE + var/list/connectionHistory //Contains the connection history passed from chat cookie + +/datum/chatOutput/New(client/C) + owner = C + messageQueue = list() + connectionHistory = list() + +/datum/chatOutput/proc/start() + //Check for existing chat + if(!owner) + return FALSE + + if(!winexists(owner, "browseroutput")) // Oh goddamnit. + set waitfor = FALSE + broken = TRUE + message_admins("Couldn't start chat for [key_name_admin(owner)]!") + . = FALSE + alert(owner.mob, "Updated chat window does not exist. If you are using a custom skin file please allow the game to update.") + return + + if(winget(owner, "browseroutput", "is-visible") == "true") //Already setup + doneLoading() + + else //Not setup + load() + + return TRUE + +/datum/chatOutput/proc/load() + set waitfor = FALSE + if(!owner) + return + + var/datum/asset/stuff = get_asset_datum(/datum/asset/group/goonchat) + stuff.send(owner) + + show_browser(owner, file('code/modules/goonchat/browserassets/html/browserOutput.html'), "window=browseroutput") + +/datum/chatOutput/Topic(href, list/href_list) + if(usr.client != owner) + return TRUE + + // Build arguments. + // Arguments are in the form "param[paramname]=thing" + var/list/params = list() + for(var/key in href_list) + if(length(key) > 7 && findtext(key, "param")) // 7 is the amount of characters in the basic param key template. + var/param_name = copytext(key, 7, -1) + var/item = href_list[key] + + params[param_name] = item + + var/data // Data to be sent back to the chat. + switch(href_list["proc"]) + if("doneLoading") + data = doneLoading(arglist(params)) + + if("debug") + data = debug(arglist(params)) + + if("ping") + data = ping(arglist(params)) + + if("analyzeClientData") + data = analyzeClientData(arglist(params)) + + if("swaptodarkmode") + swaptodarkmode() + + if("swaptolightmode") + swaptolightmode() + + if(data) + ehjax_send(data = data) + + +//Called on chat output done-loading by JS. +/datum/chatOutput/proc/doneLoading() + if(loaded) + return + + testing("Chat loaded for [owner.ckey]") + loaded = TRUE + showChat() + + + for(var/message in messageQueue) + // whitespace has already been handled by the original to_chat + to_chat(owner, message, handle_whitespace=FALSE) + + messageQueue = null + sendClientData() + + syncRegex() + + //do not convert to to_chat() + legacy_chat(owner, "Failed to load fancy chat, reverting to old chat. Certain features won't work.") + + pingLoop() + +/datum/chatOutput/proc/showChat() + winset(owner, "output", "is-visible=false") + winset(owner, "browseroutput", "is-disabled=false;is-visible=true") + +/datum/chatOutput/proc/pingLoop() + set waitfor = FALSE + + while (owner) + ehjax_send(data = owner.is_afk(29) ? "softPang" : "pang") // SoftPang isn't handled anywhere but it'll always reset the opts.lastPang. + sleep(30) + +/proc/syncChatRegexes() + for (var/user in GLOB.clients) + var/client/C = user + var/datum/chatOutput/Cchat = C.chatOutput + if (Cchat && !Cchat.broken && Cchat.loaded) + Cchat.syncRegex() + +/datum/chatOutput/proc/syncRegex() + var/list/regexes = list() + + if (regexes.len) + ehjax_send(data = list("syncRegex" = regexes)) + +/datum/chatOutput/proc/ehjax_send(client/C = owner, window = "browseroutput", data) + if(islist(data)) + data = json_encode(data) + send_output(C, "[data]", "[window]:ehjaxCallback") + +//Sends client connection details to the chat to handle and save +/datum/chatOutput/proc/sendClientData() + //Get dem deets + var/list/deets = list("clientData" = list()) + deets["clientData"]["ckey"] = owner.ckey + deets["clientData"]["ip"] = owner.address + deets["clientData"]["compid"] = owner.computer_id + var/data = json_encode(deets) + ehjax_send(data = data) + +//Called by client, sent data to investigate (cookie history so far) +/datum/chatOutput/proc/analyzeClientData(cookie = "") + //Spam check + if(world.time > next_time_to_clear) + next_time_to_clear = world.time + (3 SECONDS) + total_checks = 0 + + total_checks += 1 + + if(total_checks > SPAM_TRIGGER_AUTOMUTE) + message_admins("[key_name(owner)] kicked for goonchat topic spam") + qdel(owner) + return + + if(!cookie) + return + + if(cookie != "none") + var/list/connData = json_decode(cookie) + if (connData && islist(connData) && connData.len > 0 && connData["connData"]) + connectionHistory = connData["connData"] //lol fuck + var/list/found = new() + + if(connectionHistory.len > MAX_COOKIE_LENGTH) + message_admins("[key_name(src.owner)] was kicked for an invalid ban cookie)") + qdel(owner) + return + + for(var/i in connectionHistory.len to 1 step -1) + if(QDELETED(owner)) + //he got cleaned up before we were done + return + var/list/row = src.connectionHistory[i] + if (!row || row.len < 3 || (!row["ckey"] || !row["compid"] || !row["ip"])) //Passed malformed history object + return + if (world.IsBanned(row["ckey"], row["ip"], row["compid"])) + found = row + break + CHECK_TICK + + //Uh oh this fucker has a history of playing on a banned account!! + if (found.len > 0) + var/msg = "[key_name(src.owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])" + //TODO: add a new evasion ban for the CURRENT client details, using the matched row details + message_admins(msg) + log_admin(msg) + + cookieSent = TRUE + +//Called by js client every 60 seconds +/datum/chatOutput/proc/ping() + return "pong" + +//Called by js client on js error +/datum/chatOutput/proc/debug(error) + log_world("\[[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]\] Client: [(src.owner.key ? src.owner.key : src.owner)] triggered JS error: [error]") + +//Global chat procs +/proc/to_chat_immediate(target, message, handle_whitespace = TRUE, trailing_newline = TRUE) + if(!target || !message) + return + + if(target == world) + target = GLOB.clients + + var/original_message = message + if(handle_whitespace) + message = replacetext(message, "\n", "
") + message = replacetext(message, "\t", "[FOURSPACES][FOURSPACES]") + + //Replace expanded \icon macro with icon2html + //regex/Replace with a proc won't work here because icon2html takes target as an argument and there is no way to pass it to the replacement proc + //not even hacks with reassigning usr work + var/regex/i = new(@//, "g") + while(i.Find(message)) + message = copytext(message,1,i.index)+icon2html(locate(i.group[1]), target, icon_state=i.group[2])+copytext(message,i.next) + + if(trailing_newline) + message += "
" + + if(islist(target)) + // Do the double-encoding outside the loop to save nanoseconds + var/twiceEncoded = url_encode(url_encode(message)) + for(var/I in target) + var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible + + if (!C) + continue + + //Send it to the old style output window. + legacy_chat(C, original_message) + + if(!C.chatOutput || C.chatOutput.broken) // A player who hasn't updated his skin file. + continue + + if(!C.chatOutput.loaded) + //Client still loading, put their messages in a queue + C.chatOutput.messageQueue += message + continue + + send_output(C, twiceEncoded, "browseroutput:output") + else + var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible + + if (!C) + return + + //Send it to the old style output window. + legacy_chat(C, original_message) + + if(!C.chatOutput || C.chatOutput.broken) // A player who hasn't updated his skin file. + return + + if(!C.chatOutput.loaded) + //Client still loading, put their messages in a queue + C.chatOutput.messageQueue += message + return + + // url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript. + send_output(C, url_encode(url_encode(message)), "browseroutput:output") + +/proc/to_chat(target, message, handle_whitespace = TRUE, trailing_newline = TRUE) + if(Master.current_runlevel == RUNLEVEL_INIT || !SSchat?.initialized) + to_chat_immediate(target, message, handle_whitespace, trailing_newline) + return + SSchat.queue(target, message, handle_whitespace, trailing_newline) + +/datum/chatOutput/proc/swaptolightmode() //Dark mode light mode stuff. Yell at KMC if this breaks! (See darkmode.dm for documentation) + owner.force_white_theme() + +/datum/chatOutput/proc/swaptodarkmode() + owner.force_dark_theme() + +#undef MAX_COOKIE_LENGTH diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css new file mode 100644 index 0000000000000..f9b020e29d88d --- /dev/null +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -0,0 +1,381 @@ +/***************************************** +* +* GLOBAL STYLES +* +******************************************/ +html, body { + padding: 0; + margin: 0; + height: 100%; + color: #a4bad6; +} +body { + background: #171717; + font-family: Verdana, sans-serif; + font-size: 13px; + color: #a4bad6; + line-height: 1.2; + overflow-x: hidden; + overflow-y: scroll; + word-wrap: break-word; + scrollbar-face-color:#1A1A1A; + scrollbar-track-color:#171717; + scrollbar-highlight-color:#171717; +} + +em { + font-style: normal; + font-weight: bold; +} + +img { + margin: 0; + padding: 0; + line-height: 1; + -ms-interpolation-mode: nearest-neighbor; + image-rendering: pixelated; +} +img.icon { + height: 1em; + min-height: 1em; + width: auto; + vertical-align: bottom; +} + +.r:before { /* "repeated" badge class for combined messages */ + content: 'x'; +} +.r { + display: inline-block; + min-width: 0.5em; + font-size: 0.7em; + padding: 0.2em 0.3em; + line-height: 1; + color: white; + text-align: center; + white-space: nowrap; + vertical-align: middle; + background-color: crimson; + border-radius: 10px; +} + +a {color: #397ea5;} +a.visited {color: #7c00e6;} +a:visited {color: #7c00e6;} +a.popt {text-decoration: none;} + +/***************************************** +* +* OUTPUT NOT RELATED TO ACTUAL MESSAGES +* +******************************************/ +#loading { + position: fixed; + width: 300px; + height: 150px; + text-align: center; + left: 50%; + top: 50%; + margin: -75px 0 0 -150px; +} +#loading i {display: block; padding-bottom: 3px;} + +#messages { + font-size: 13px; + padding: 3px; + margin: 0; + word-wrap: break-word; +} +#newMessages { + position: fixed; + display: block; + bottom: 0; + right: 0; + padding: 8px; + background: #202020; + text-decoration: none; + font-variant: small-caps; + font-size: 1.1em; + font-weight: bold; + color: #a4bad6; +} +#newMessages:hover {background: #171717;} +#newMessages i {vertical-align: middle; padding-left: 3px;} +#ping { + position: fixed; + top: 0; + right: 135px; + width: 45px; + background: #202020; + height: 30px; + padding: 8px 0 2px 0; +} +#ping i {display: block; text-align: center;} +#ping .ms { + display: block; + text-align: center; + font-size: 8pt; + padding-top: 2px; +} +#userBar { + position: fixed; + top: 0; + right: 0; +} +#userBar .subCell { + background: #202020; + height: 30px; + padding: 5px 0; + display: block; + color: #a4bad6; + text-decoration: none; + line-height: 28px; + border-top: 1px solid #171717; +} +#userBar .subCell:hover {background: #202020;} +#userBar .toggle { + width: 45px; + background: #202020; + border-top: 0; + float: right; + text-align: center; +} +#userBar .sub {clear: both; display: none; width: 180px;} +#userBar .sub.scroll {overflow-y: scroll;} +#userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;} +#userBar .sub span { + display: block; + line-height: 30px; + float: left; +} +#userBar .sub i { + display: block; + padding: 0 5px; + font-size: 1.1em; + width: 22px; + text-align: center; + line-height: 30px; + float: right; +} +#userBar .sub input { + position: absolute; + padding: 7px 5px; + width: 121px; + line-height: 30px; + float: left; +} +#userBar .topCell {border-top: 0;} + +/* POPUPS */ +.popup { + position: fixed; + top: 50%; + left: 50%; + background: #ddd; +} +.popup .close { + position: absolute; + background: #aaa; + top: 0; + right: 0; + color: #333; + text-decoration: none; + z-index: 2; + padding: 0 10px; + height: 30px; + line-height: 30px; +} +.popup .close:hover {background: #999;} +.popup .head { + background: #999; + color: #ddd; + padding: 0 10px; + height: 30px; + line-height: 30px; + text-transform: uppercase; + font-size: 0.9em; + font-weight: bold; + border-bottom: 2px solid green; +} +.popup input {border: 1px solid #999; background: #fff; margin: 0; padding: 5px; outline: none; color: #333;} +.popup input[type=text]:hover, .popup input[type=text]:active, .popup input[type=text]:focus {border-color: green;} +.popup input[type=submit] {padding: 5px 10px; background: #999; color: #ddd; text-transform: uppercase; font-size: 0.9em; font-weight: bold;} +.popup input[type=submit]:hover, .popup input[type=submit]:focus, .popup input[type=submit]:active {background: #aaa; cursor: pointer;} + +.changeFont {padding: 10px;} +.changeFont a {display: block; text-decoration: none; padding: 3px; color: #333;} +.changeFont a:hover {background: #ccc;} + +.highlightPopup {padding: 10px; text-align: center;} +.highlightPopup input[type=text] {display: block; width: 215px; text-align: left; margin-top: 5px;} +.highlightPopup input.highlightColor {background-color: #FFFF00;} +.highlightPopup input.highlightTermSubmit {margin-top: 5px;} + +/* ADMIN CONTEXT MENU */ +.contextMenu { + background-color: #ddd; + position: fixed; + margin: 2px; + width: 150px; +} +.contextMenu a { + display: block; + padding: 2px 5px; + text-decoration: none; + color: #333; +} + +.contextMenu a:hover { + background-color: #ccc; +} + +/* ADMIN FILTER MESSAGES MENU */ +.filterMessages {padding: 5px;} +.filterMessages div {padding: 2px 0;} +.filterMessages input {} +.filterMessages label {} + +.icon-stack {height: 1em; line-height: 1em; width: 1em; vertical-align: middle; margin-top: -2px;} + + +/***************************************** +* +* OUTPUT ACTUALLY RELATED TO MESSAGES +* +******************************************/ + +/* MOTD */ +.motd {color: #a4bad6; font-family: Verdana, sans-serif;} +.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #a4bad6; text-decoration: underline;} +.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #a4bad6;} + +/* ADD HERE FOR BOLD */ +.bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;} + +/* ADD HERE FOR ITALIC */ +.italic, .italics, .emote {font-style: italic;} + +/* OUTPUT COLORS */ +.highlight {background: yellow;} + +h1, h2, h3, h4, h5, h6 {color: #a4bad6;font-family: Georgia, Verdana, sans-serif;} + +em {font-style: normal; font-weight: bold;} + +/* LOG */ +.log_message {color: #386aff; font-weight: bold;} + +/* OOC */ +.ooc {font-weight: bold;} +.ooc img.text_tag {width: 32px; height: 10px;} + +.ooc .everyone {color: #5353ff;} +.ooc .looc {color: #3a9696;} +.ooc .elevated {color: #2e78d9;} +.ooc .moderator {color: #184880;} +.ooc .developer {color: #1b521f;} +.ooc .admin {color: #b82e00;} +.ooc .aooc {color: #960018;} + +/* Admin: Private Messages */ +.pm .howto {color: #ff0000; font-weight: bold; font-size: 200%;} +.pm .in {color: #ff0000;} +.pm .out {color: #ff0000;} +.pm .other {color: #5353ff;} + +/* Admin: Channels */ +.mod_channel {color: #735638; font-weight: bold;} +.mod_channel .admin {color: #b82e00; font-weight: bold;} +.admin_channel {color: #9611d4; font-weight: bold;} + +/* Radio: Misc */ +.deadsay {color: #e2c1ff} +.radio {color: #1ecc43;} +.deptradio {color: #ff00ff;} /* when all other department colors fail */ +.newscaster {color: #750000;} + +/* Radio Channels */ +.comradio {color: #193a7a;} +.syndradio {color: #6d3f40;} +.centradio {color: #5c5c8a;} +.airadio {color: #ff00ff;} +.entradio {color: #339966;} + +.secradio {color: #b41c1c;} +.engradio {color: #a66300;} +.medradio {color: #008160;} +.sciradio {color: #993399;} +.supradio {color: #5f4519;} +.srvradio {color: #6eaa2c;} +.expradio {color: #a3a332;} + +/* Miscellaneous */ +.name {font-weight: bold;} +.alert {color: #d82020;} +h1.alert, h2.alert {color: #a4bad6;} + +.emote {font-style: italic;} + +/* Game Messages */ +.attack {color: #ff0000;} +.moderate {color: #cc0000;} +.disarm {color: #990000;} +.passive {color: #660000;} + +.danger {color: #c51e1e;} +.warning {color: #c51e1e; font-style: italic;} +.boldannounce {color: #c51e1e; font-weight: bold;} +.rose {color: #ff5050;} +.info {color: #6685f5;} +.notice {color: #6685f5;} +.alium {color: #00ff00;} +.cult {color: #aa1c1c;} + +/* Languages */ +.alien {color: #855d85;} +.changeling {color: #059223; font-style: italic;} +.tajaran {color: #803b56;} +.tajaran_signlang {color: #941c1c;} +.skrell {color: #00ced1;} +.soghun {color: #228b22;} +.nabber_lang {color: #525252;} +.solcom {color: #22228b;} +.vox {color: #aa00aa;} +.rough {font-family: "Trebuchet MS", cursive, sans-serif;} +.say_quote {font-family: Georgia, Verdana, sans-serif;} +.terran {color: #9c250b;} +.moon {color: #422863;} +.spacer {color: #ff6600;} + +.interface {color: #750e75;} + +.good {color: #4f7529; font-weight: bold;} +.bad {color: #ee0000; font-weight: bold;} + +@keyframes hypnocolor { + 0% {color: #202020;} + 25% {color: #4b02ac;} + 50% {color: #9f41f1;} + 75% {color: #541c9c;} + 100% {color: #7adbf3;} +} + +.phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;} +@keyframes phobia { + 0% {color: #f75a5a;} + 50% {color: #dd0000;} + 100% {color: #f75a5a;} +} + +.icon {height: 1em; width: auto;} + +.connectionClosed, .fatalError {background: red; color: white; padding: 5px;} +.connectionClosed.restored {background: green;} +.internal.boldnshit {color: #3d5bc3; font-weight: bold;} + +/* HELPER CLASSES */ +.text-normal {font-weight: normal; font-style: normal;} +.hidden {display: none; visibility: hidden;} +.ml-1 {margin-left: 1em;} +.ml-2 {margin-left: 2em;} +.ml-3 {margin-left: 3em;} diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css new file mode 100644 index 0000000000000..bd0b1eba47417 --- /dev/null +++ b/code/modules/goonchat/browserassets/css/browserOutput_white.css @@ -0,0 +1,378 @@ +/***************************************** +* +* GLOBAL STYLES for white theme normies +* +******************************************/ +html, body { + padding: 0; + margin: 0; + height: 100%; + color: #000000; +} +body { + background: #fff; + font-family: Verdana, sans-serif; + font-size: 13px; + line-height: 1.2; + overflow-x: hidden; + overflow-y: scroll; + word-wrap: break-word; +} + +em { + font-style: normal; + font-weight: bold; +} + +img { + margin: 0; + padding: 0; + line-height: 1; + -ms-interpolation-mode: nearest-neighbor; + image-rendering: pixelated; +} +img.icon { + height: 1em; + min-height: 1em; + width: auto; + vertical-align: bottom; +} + + +.r:before { /* "repeated" badge class for combined messages */ + content: 'x'; +} +.r { + display: inline-block; + min-width: 0.5em; + font-size: 0.7em; + padding: 0.2em 0.3em; + line-height: 1; + color: white; + text-align: center; + white-space: nowrap; + vertical-align: middle; + background-color: crimson; + border-radius: 10px; +} + +a {color: #0000ff;} +a.visited {color: #ff00ff;} +a:visited {color: #ff00ff;} +a.popt {text-decoration: none;} + +/***************************************** +* +* OUTPUT NOT RELATED TO ACTUAL MESSAGES +* +******************************************/ +#loading { + position: fixed; + width: 300px; + height: 150px; + text-align: center; + left: 50%; + top: 50%; + margin: -75px 0 0 -150px; +} +#loading i {display: block; padding-bottom: 3px;} + +#messages { + font-size: 13px; + padding: 3px; + margin: 0; + word-wrap: break-word; +} +#newMessages { + position: fixed; + display: block; + bottom: 0; + right: 0; + padding: 8px; + background: #ddd; + text-decoration: none; + font-variant: small-caps; + font-size: 1.1em; + font-weight: bold; + color: #333; +} +#newMessages:hover {background: #ccc;} +#newMessages i {vertical-align: middle; padding-left: 3px;} +#ping { + position: fixed; + top: 0; + right: 135px; + width: 45px; + background: #ddd; + height: 30px; + padding: 8px 0 2px 0; +} +#ping i {display: block; text-align: center;} +#ping .ms { + display: block; + text-align: center; + font-size: 8pt; + padding-top: 2px; +} +#userBar { + position: fixed; + top: 0; + right: 0; +} +#userBar .subCell { + background: #ddd; + height: 30px; + padding: 5px 0; + display: block; + color: #333; + text-decoration: none; + line-height: 28px; + border-top: 1px solid #b4b4b4; +} +#userBar .subCell:hover {background: #ccc;} +#userBar .toggle { + width: 45px; + background: #ccc; + border-top: 0; + float: right; + text-align: center; +} +#userBar .sub {clear: both; display: none; width: 180px;} +#userBar .sub.scroll {overflow-y: scroll;} +#userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;} +#userBar .sub span { + display: block; + line-height: 30px; + float: left; +} +#userBar .sub i { + display: block; + padding: 0 5px; + font-size: 1.1em; + width: 22px; + text-align: center; + line-height: 30px; + float: right; +} +#userBar .sub input { + position: absolute; + padding: 7px 5px; + width: 121px; + line-height: 30px; + float: left; +} +#userBar .topCell {border-top: 0;} + +/* POPUPS */ +.popup { + position: fixed; + top: 50%; + left: 50%; + background: #ddd; +} +.popup .close { + position: absolute; + background: #aaa; + top: 0; + right: 0; + color: #333; + text-decoration: none; + z-index: 2; + padding: 0 10px; + height: 30px; + line-height: 30px; +} +.popup .close:hover {background: #999;} +.popup .head { + background: #999; + color: #ddd; + padding: 0 10px; + height: 30px; + line-height: 30px; + text-transform: uppercase; + font-size: 0.9em; + font-weight: bold; + border-bottom: 2px solid green; +} +.popup input {border: 1px solid #999; background: #fff; margin: 0; padding: 5px; outline: none; color: #333;} +.popup input[type=text]:hover, .popup input[type=text]:active, .popup input[type=text]:focus {border-color: green;} +.popup input[type=submit] {padding: 5px 10px; background: #999; color: #ddd; text-transform: uppercase; font-size: 0.9em; font-weight: bold;} +.popup input[type=submit]:hover, .popup input[type=submit]:focus, .popup input[type=submit]:active {background: #aaa; cursor: pointer;} + +.changeFont {padding: 10px;} +.changeFont a {display: block; text-decoration: none; padding: 3px; color: #333;} +.changeFont a:hover {background: #ccc;} + +.highlightPopup {padding: 10px; text-align: center;} +.highlightPopup input[type=text] {display: block; width: 215px; text-align: left; margin-top: 5px;} +.highlightPopup input.highlightColor {background-color: #FFFF00;} +.highlightPopup input.highlightTermSubmit {margin-top: 5px;} + +/* ADMIN CONTEXT MENU */ +.contextMenu { + background-color: #ddd; + position: fixed; + margin: 2px; + width: 150px; +} +.contextMenu a { + display: block; + padding: 2px 5px; + text-decoration: none; + color: #333; +} + +.contextMenu a:hover { + background-color: #ccc; +} + +/* ADMIN FILTER MESSAGES MENU */ +.filterMessages {padding: 5px;} +.filterMessages div {padding: 2px 0;} +.filterMessages input {} +.filterMessages label {} + +.icon-stack {height: 1em; line-height: 1em; width: 1em; vertical-align: middle; margin-top: -2px;} + + +/***************************************** +* +* OUTPUT ACTUALLY RELATED TO MESSAGES +* +******************************************/ + +/* MOTD */ +.motd {color: #638500; font-family: Verdana, sans-serif;} +.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #638500; text-decoration: underline;} +.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #638500;} + +/* ADD HERE FOR BOLD */ +.bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;} + +/* ADD HERE FOR ITALIC */ +.italic, .italics, .emote {font-style: italic;} + +/* OUTPUT COLORS */ +.highlight {background: yellow;} + +h1, h2, h3, h4, h5, h6 {color: #0000ff;font-family: Georgia, Verdana, sans-serif;} + +em {font-style: normal;font-weight: bold;} + +/* LOG */ +.log_message {color: #386aff;font-weight: bold;} + +/* OOC */ +.ooc {font-weight: bold;} +.ooc img.text_tag {width: 32px; height: 10px;} + +.ooc .everyone {color: #002eb8;} +.ooc .looc {color: #3a9696;} +.ooc .elevated {color: #2e78d9;} +.ooc .moderator {color: #184880;} +.ooc .developer {color: #1b521f;} +.ooc .admin {color: #b82e00;} +.ooc .aooc {color: #960018;} + +/* Admin: Private Messages */ +.pm .howto {color: #ff0000;font-weight: bold;font-size: 200%;} +.pm .in {color: #ff0000;} +.pm .out {color: #ff0000;} +.pm .other {color: #0000ff;} + +/* Admin: Channels */ +.mod_channel {color: #735638;font-weight: bold;} +.mod_channel .admin {color: #b82e00;font-weight: bold;} +.admin_channel {color: #9611d4;font-weight: bold;} + +/* Radio: Misc */ +.deadsay {color: #530fad;} +.radio {color: #008000;} +.deptradio {color: #ff00ff;} /* when all other department colors fail */ +.newscaster {color: #750000;} + +/* Radio Channels */ +.comradio {color: #193a7a;} +.syndradio {color: #6d3f40;} +.centradio {color: #5c5c8a;} +.airadio {color: #ff00ff;} +.entradio {color: #339966;} + +.secradio {color: #a30000;} +.engradio {color: #a66300;} +.medradio {color: #008160;} +.sciradio {color: #993399;} +.supradio {color: #5f4519;} +.srvradio {color: #6eaa2c;} +.expradio {color: #a3a332;} + +/* Miscellaneous */ +.name {font-weight: bold;} +.alert {color: #ff0000;} +h1.alert, h2.alert {color: #000080;} + +.emote {font-style: italic;} + +/* Game Messages */ +.attack {color: #ff0000;} +.moderate {color: #cc0000;} +.disarm {color: #990000;} +.passive {color: #660000;} + +.danger {color: #ff0000;} +.warning {color: #ff0000; font-style: italic;} +.boldannounce {color: #ff0000; font-weight: bold;} +.rose {color: #ff5050;} +.info {color: #0000CC;} +.notice {color: #000099;} +.alium {color: #00ff00;} +.cult {color: #800080; font-weight: bold; font-style: italic;} + +/* Languages */ +.alien {color: #855d85;} +.changeling {color: #059223; font-style: italic;} +.tajaran {color: #803b56;} +.tajaran_signlang {color: #941c1c;} +.skrell {color: #00ced1;} +.soghun {color: #228b22;} +.nabber_lang {color: #525252;} +.solcom {color: #22228b;} +.vox {color: #aa00aa;} +.rough {font-family: "Trebuchet MS", cursive, sans-serif;} +.say_quote {font-family: Georgia, Verdana, sans-serif;} +.terran {color: #9c250b;} +.moon {color: #422863;} +.spacer {color: #ff6600;} + +.interface {color: #750e75;} + +.good {color: #4f7529; font-weight: bold;} +.bad {color: #ee0000; font-weight: bold;} + +@keyframes hypnocolor { + 0% {color: #0d0d0d;} + 25% {color: #410194;} + 50% {color: #7f17d8;} + 75% {color: #410194;} + 100% {color: #3bb5d3;} +} + +.phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;} +@keyframes phobia { + 0% {color: #0d0d0d;} + 50% {color: #dd0000;} + 100% {color: #0d0d0d;} +} + +.icon {height: 1em; width: auto;} + +.connectionClosed, .fatalError {background: red; color: white; padding: 5px;} +.connectionClosed.restored {background: green;} +.internal.boldnshit {color: blue; font-weight: bold;} + +/* HELPER CLASSES */ +.text-normal {font-weight: normal; font-style: normal;} +.hidden {display: none; visibility: hidden;} +.ml-1 {margin-left: 1em;} +.ml-2 {margin-left: 2em;} +.ml-3 {margin-left: 3em;} diff --git a/code/modules/goonchat/browserassets/css/styles_template.css b/code/modules/goonchat/browserassets/css/styles_template.css new file mode 100644 index 0000000000000..5bd2c2affec60 --- /dev/null +++ b/code/modules/goonchat/browserassets/css/styles_template.css @@ -0,0 +1,363 @@ +/***************************************** +* +* GLOBAL STYLES +* +******************************************/ +html, body { + padding: 0; + margin: 0; + height: 100%; + color: #a4bad6; +} +body { + background: #171717; + font-family: Verdana, sans-serif; + font-size: 13px; + font-color: #a4bad6; + line-height: 1.2; + overflow-x: hidden; + overflow-y: scroll; + word-wrap: break-word; + scrollbar-face-color:#1A1A1A; + scrollbar-track-color:#171717; + scrollbar-highlight-color:#171717; +} + +em { + font-style: normal; + font-weight: bold; +} + +img { + margin: 0; + padding: 0; + line-height: 1; + -ms-interpolation-mode: nearest-neighbor; + image-rendering: pixelated; +} + +img.icon { + height: 1em; + min-height: 1em; + width: auto; + vertical-align: bottom; +} + +.r:before { /* "repeated" badge class for combined messages */ + content: 'x'; +} +.r { + display: inline-block; + min-width: 0.5em; + font-size: 0.7em; + padding: 0.2em 0.3em; + line-height: 1; + color: white; + text-align: center; + white-space: nowrap; + vertical-align: middle; + background-color: crimson; + border-radius: 10px; +} + +a {color: #397ea5;} +a.visited {color: #7c00e6;} +a:visited {color: #7c00e6;} +a.popt {text-decoration: none;} + +/***************************************** +* +* OUTPUT NOT RELATED TO ACTUAL MESSAGES +* +******************************************/ +#loading { + position: fixed; + width: 300px; + height: 150px; + text-align: center; + left: 50%; + top: 50%; + margin: -75px 0 0 -150px; +} +#loading i {display: block; padding-bottom: 3px;} + +#messages { + font-size: 13px; + padding: 3px; + margin: 0; + word-wrap: break-word; +} +#newMessages { + position: fixed; + display: block; + bottom: 0; + right: 0; + padding: 8px; + background: #202020; + text-decoration: none; + font-variant: small-caps; + font-size: 1.1em; + font-weight: bold; + color: #a4bad6; +} +#newMessages:hover {background: #171717;} +#newMessages i {vertical-align: middle; padding-left: 3px;} +#userBar { + position: fixed; + top: 0; + right: 0; +} +#userBar .subCell { + background: #202020; + height: 30px; + padding: 5px 0; + display: block; + color: #a4bad6; + text-decoration: none; + line-height: 28px; + border-top: 1px solid #171717; +} +#userBar .subCell:hover {background: #202020;} +#userBar .toggle { + width: 45px; + background: #202020; + border-top: 0; + float: right; + text-align: center; +} +#userBar .sub {clear: both; display: none; width: 180px;} +#userBar .sub.scroll {overflow-y: scroll;} +#userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;} +#userBar .sub span { + display: block; + line-height: 30px; + float: left; +} +#userBar .sub i { + display: block; + padding: 0 5px; + font-size: 1.1em; + width: 22px; + text-align: center; + line-height: 30px; + float: right; +} +#userBar .sub input { + position: absolute; + padding: 7px 5px; + width: 121px; + line-height: 30px; + float: left; +} +#userBar .topCell {border-top: 0;} + +/* POPUPS */ +.popup { + position: fixed; + top: 50%; + left: 50%; + background: #ddd; +} +.popup .close { + position: absolute; + background: #aaa; + top: 0; + right: 0; + color: #333; + text-decoration: none; + z-index: 2; + padding: 0 10px; + height: 30px; + line-height: 30px; +} +.popup .close:hover {background: #999;} +.popup .head { + background: #999; + color: #ddd; + padding: 0 10px; + height: 30px; + line-height: 30px; + text-transform: uppercase; + font-size: 0.9em; + font-weight: bold; + border-bottom: 2px solid green; +} +.popup input {border: 1px solid #999; background: #fff; margin: 0; padding: 5px; outline: none; color: #333;} +.popup input[type=text]:hover, .popup input[type=text]:active, .popup input[type=text]:focus {border-color: green;} +.popup input[type=submit] {padding: 5px 10px; background: #999; color: #ddd; text-transform: uppercase; font-size: 0.9em; font-weight: bold;} +.popup input[type=submit]:hover, .popup input[type=submit]:focus, .popup input[type=submit]:active {background: #aaa; cursor: pointer;} + +.changeFont {padding: 10px;} +.changeFont a {display: block; text-decoration: none; padding: 3px; color: #333;} +.changeFont a:hover {background: #ccc;} + +.highlightPopup {padding: 10px; text-align: center;} +.highlightPopup input[type=text] {display: block; width: 215px; text-align: left; margin-top: 5px;} +.highlightPopup input.highlightColor {background-color: #FFFF00;} +.highlightPopup input.highlightTermSubmit {margin-top: 5px;} + +/* ADMIN CONTEXT MENU */ +.contextMenu { + background-color: #ddd; + position: fixed; + margin: 2px; + width: 150px; +} +.contextMenu a { + display: block; + padding: 2px 5px; + text-decoration: none; + color: #333; +} + +.contextMenu a:hover { + background-color: #ccc; +} + +/* ADMIN FILTER MESSAGES MENU */ +.filterMessages {padding: 5px;} +.filterMessages div {padding: 2px 0;} +.filterMessages input {} +.filterMessages label {} + +.icon-stack {height: 1em; line-height: 1em; width: 1em; vertical-align: middle; margin-top: -2px;} + + +/***************************************** +* +* OUTPUT ACTUALLY RELATED TO MESSAGES +* +******************************************/ + +/* MOTD */ +.motd {color: #a4bad6; font-family: Verdana, sans-serif;} +.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #a4bad6; text-decoration: underline;} +.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #a4bad6;} + +/* ADD HERE FOR BOLD */ +.bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;} + +/* ADD HERE FOR ITALIC */ +.italic, .italics, .emote {font-style: italic;} + +/* OUTPUT COLORS */ +.highlight {background: yellow;} + +h1, h2, h3, h4, h5, h6 {color: #a4bad6;font-family: Georgia, Verdana, sans-serif;} + +em {font-style: normal; font-weight: bold;} + +/* LOG */ +.log_message {color: #386aff; font-weight: bold;} + +/* OOC */ +.ooc img.text_tag {width: 32px; height: 10px;} + +.ooc .everyone {color: #002eb8;} +.ooc .looc {color: #3a9696;} +.ooc .elevated {color: #2e78d9;} +.ooc .moderator {color: #184880;} +.ooc .developer {color: #1b521f;} +.ooc .admin {color: #b82e00;} +.ooc .aooc {color: #960018;} + +/* Admin: Private Messages */ +.pm .howto {color: #ff0000; font-weight: bold; font-size: 200%;} +.pm .in {color: #ff0000;} +.pm .out {color: #ff0000;} +.pm .other {color: #0000ff;} + +/* Admin: Channels */ +.mod_channel {color: #735638; font-weight: bold;} +.mod_channel .admin {color: #b82e00; font-weight: bold;} +.admin_channel {color: #9611d4; font-weight: bold;} + +/* Radio: Misc */ +.deadsay {color: #530fad;} +.radio {color: #008000;} +.deptradio {color: #ff00ff;} /* when all other department colors fail */ +.newscaster {color: #750000;} + +/* Radio Channels */ +.comradio {color: #193a7a;} +.syndradio {color: #6d3f40;} +.centradio {color: #5c5c8a;} +.airadio {color: #ff00ff;} +.entradio {color: #339966;} + +.secradio {color: #a30000;} +.engradio {color: #a66300;} +.medradio {color: #008160;} +.sciradio {color: #993399;} +.supradio {color: #5f4519;} +.srvradio {color: #6eaa2c;} +.expradio {color: #a3a332;} + +/* Miscellaneous */ +.name {font-weight: bold;} +.alert {color: #ff0000;} +h1.alert, h2.alert {color: #000080;} + +.emote {font-style: italic;} + +/* Game Messages */ +.attack {color: #ff0000;} +.moderate {color: #cc0000;} +.disarm {color: #990000;} +.passive {color: #660000;} + +.danger {color: #ff0000; font-weight: bold;} +.warning {color: #ff0000; font-style: italic;} +.boldannounce {color: #ff0000; font-weight: bold;} +.rose {color: #ff5050;} +.info {color: #0000cc;} +.notice {color: #000099;} +.alium {color: #00ff00;} +.cult {color: #800080; font-weight: bold; font-style: italic;} + + +/* Languages */ +.alien {color: #855d85;} +.changeling {color: #059223; font-style: italic;} +.tajaran {color: #803b56;} +.tajaran_signlang {color: #941c1c;} +.skrell {color: #00ced1;} +.soghun {color: #228b22;} +.nabber_lang {color: #525252;} +.solcom {color: #22228b;} +.vox {color: #aa00aa;} +.rough {font-family: "Trebuchet MS", cursive, sans-serif;} +.say_quote {font-family: Georgia, Verdana, sans-serif;} +.terran {color: #9c250b;} +.moon {color: #422863;} +.spacer {color: #ff6600;} + +.interface {color: #750e75;} + +.good {color: #4f7529; font-weight: bold;} +.bad {color: #ee0000; font-weight: bold;} + +@keyframes hypnocolor { + 0% {color: #202020;} + 25% {color: #4b02ac;} + 50% {color: #9f41f1;} + 75% {color: #541c9c;} + 100% {color: #7adbf3;} +} + +.phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;} +@keyframes phobia { + 0% {color: #f75a5a;} + 50% {color: #dd0000;} + 100% {color: #f75a5a;} +} + +.icon {height: 1em; width: auto;} + +.connectionClosed, .fatalError {background: red; color: white; padding: 5px;} +.connectionClosed.restored {background: green;} +.internal.boldnshit {color: #3d5bc3; font-weight: bold;} + +/* HELPER CLASSES */ +.text-normal {font-weight: normal; font-style: normal;} +.hidden {display: none; visibility: hidden;} diff --git a/code/modules/goonchat/browserassets/html/browserOutput.html b/code/modules/goonchat/browserassets/html/browserOutput.html new file mode 100644 index 0000000000000..11840cc9a78a1 --- /dev/null +++ b/code/modules/goonchat/browserassets/html/browserOutput.html @@ -0,0 +1,71 @@ + + + + Chat + + + + + + + + + +
+ +
+ Loading...

+ If this takes longer than 30 seconds, it will automatically reload a maximum of 5 times.
+ If it still doesn't work, use the bug report button at the top right of the window. +
+
+
+ +
+ + + + diff --git a/code/modules/goonchat/browserassets/js/browserOutput.js b/code/modules/goonchat/browserassets/js/browserOutput.js new file mode 100644 index 0000000000000..844538a542582 --- /dev/null +++ b/code/modules/goonchat/browserassets/js/browserOutput.js @@ -0,0 +1,1107 @@ + +/***************************************** +* +* FUNCTION AND VAR DECLARATIONS +* +******************************************/ + +//DEBUG STUFF +var escaper = encodeURIComponent || escape; +var decoder = decodeURIComponent || unescape; +window.onerror = function(msg, url, line, col, error) { + if (document.location.href.indexOf("proc=debug") <= 0) { + var extra = !col ? '' : ' | column: ' + col; + extra += !error ? '' : ' | error: ' + error; + extra += !navigator.userAgent ? '' : ' | user agent: ' + navigator.userAgent; + var debugLine = 'Error: ' + msg + ' | url: ' + url + ' | line: ' + line + extra; + window.location = '?_src_=chat&proc=debug¶m[error]='+escaper(debugLine); + } + return true; +}; + +//Globals +window.status = 'Output'; +var $messages, $subTheme, $subOptions, $subFont, $selectedSub, $contextMenu, $filterMessages, $last_message; +var opts = { + //General + 'messageCount': 0, //A count...of messages... + 'messageLimit': 2053, //A limit...for the messages... + 'scrollSnapTolerance': 10, //If within x pixels of bottom + 'clickTolerance': 10, //Keep focus if outside x pixels of mousedown position on mouseup + 'imageRetryDelay': 50, //how long between attempts to reload images (in ms) + 'imageRetryLimit': 50, //how many attempts should we make? + 'popups': 0, //Amount of popups opened ever + 'wasd': false, //Is the user in wasd mode? + 'priorChatHeight': 0, //Thing for height-resizing detection + 'restarting': false, //Is the round restarting? + 'iconsize': 12, + + //Options menu + 'selectedSubLoop': null, //Contains the interval loop for closing the selected sub menu + 'suppressSubClose': false, //Whether or not we should be hiding the selected sub menu + 'highlightTerms': [], + 'highlightLimit': 5, + 'highlightColor': '#FFFF00', //The color of the highlighted message + 'pingDisabled': false, //Has the user disabled the ping counter + + //Ping display + 'lastPang': 0, //Timestamp of the last response from the server. + 'pangLimit': 35000, + 'pingTime': 0, //Timestamp of when ping sent + 'pongTime': 0, //Timestamp of when ping received + 'noResponse': false, //Tracks the state of the previous ping request + 'noResponseCount': 0, //How many failed pings? + + //Clicks + 'mouseDownX': null, + 'mouseDownY': null, + 'preventFocus': false, //Prevents switching focus to the game window + + //Client Connection Data + 'clientDataLimit': 5, + 'clientData': [], + + 'font': 'Arial', + 'messageCombining': true, + +}; +var replaceRegexes = {}; + +function clamp(val, min, max) { + return Math.max(min, Math.min(val, max)) +} + +function outerHTML(el) { + var wrap = document.createElement('div'); + wrap.appendChild(el.cloneNode(true)); + return wrap.innerHTML; +} + +//Polyfill for fucking date now because of course IE8 and below don't support it +if (!Date.now) { + Date.now = function now() { + return new Date().getTime(); + }; +} +//Polyfill for trim() (IE8 and below) +if (typeof String.prototype.trim !== 'function') { + String.prototype.trim = function () { + return this.replace(/^\s+|\s+$/g, ''); + }; +} + +// Linkify the contents of a node, within its parent. +function linkify(parent, insertBefore, text) { + var start = 0; + var match; + var regex = /(?:(?:https?:\/\/)|(?:www\.))(?:[^ ]*?\.[^ ]*?)+[-A-Za-z0-9+&@#\/%?=~_|$!:,.;()]+/ig; + while ((match = regex.exec(text)) !== null) { + // add the unmatched text + parent.insertBefore(document.createTextNode(text.substring(start, match.index)), insertBefore); + + var href = match[0]; + if (!/^https?:\/\//i.test(match[0])) { + href = "http://" + match[0]; + } + + // add the link + var link = document.createElement("a"); + link.href = href; + link.textContent = match[0]; + parent.insertBefore(link, insertBefore); + + start = regex.lastIndex; + } + if (start !== 0) { + // add the remaining text and remove the original text node + parent.insertBefore(document.createTextNode(text.substring(start)), insertBefore); + parent.removeChild(insertBefore); + } +} + +// Recursively linkify the children of a given node. +function linkify_node(node) { + var children = node.childNodes; + // work backwards to avoid the risk of looping forever on our own output + for (var i = children.length - 1; i >= 0; --i) { + var child = children[i]; + if (child.nodeType == Node.TEXT_NODE) { + // text is to be linkified + linkify(node, child, child.textContent); + } else if (child.nodeName != "A" && child.nodeName != "a") { + // do not linkify existing links + linkify_node(child); + } + } +} + +//Shit fucking piece of crap that doesn't work god fuckin damn it +function linkify_fallback(text) { + var rex = /((?:'+$0+''; + } + else { + return $1 ? $0: ''+$0+''; + } + }); +} + +function byondDecode(message) { + // Basically we url_encode twice server side so we can manually read the encoded version and actually do UTF-8. + // The replace for + is because FOR SOME REASON, BYOND replaces spaces with a + instead of %20, and a plus with %2b. + // Marvelous. + message = message.replace(/\+/g, "%20"); + try { + // This is a workaround for the above not always working when BYOND's shitty url encoding breaks. (byond bug id:2399401) + if (decodeURIComponent) { + message = decodeURIComponent(message); + } else { + throw new Error("Easiest way to trigger the fallback") + } + } catch (err) { + message = unescape(message); + } + return message; +} + +function replaceRegex() { + var selectedRegex = replaceRegexes[$(this).attr('replaceRegex')]; + if (selectedRegex) { + var replacedText = $(this).html().replace(selectedRegex[0], selectedRegex[1]); + $(this).html(replacedText); + } + $(this).removeAttr('replaceRegex'); +} + +//Actually turns the highlight term match into appropriate html +function addHighlightMarkup(match) { + var extra = ''; + if (opts.highlightColor) { + extra += ' style="background-color: '+opts.highlightColor+'"'; + } + return ''+match+''; +} + +//Highlights words based on user settings +function highlightTerms(el) { + if (el.children.length > 0) { + for(var h = 0; h < el.children.length; h++){ + highlightTerms(el.children[h]); + } + } + + var hasTextNode = false; + for (var node = 0; node < el.childNodes.length; node++) + { + if (el.childNodes[node].nodeType === 3) + { + hasTextNode = true; + break; + } + } + + if (hasTextNode) { //If element actually has text + var newText = ''; + for (var c = 0; c < el.childNodes.length; c++) { //Each child element + if (el.childNodes[c].nodeType === 3) { //Is it text only? + var words = el.childNodes[c].data.split(' '); + for (var w = 0; w < words.length; w++) { //Each word in the text + var newWord = null; + for (var i = 0; i < opts.highlightTerms.length; i++) { //Each highlight term + if (opts.highlightTerms[i] && words[w].toLowerCase().indexOf(opts.highlightTerms[i].toLowerCase()) > -1) { //If a match is found + newWord = words[w].replace("<", "<").replace(new RegExp(opts.highlightTerms[i], 'gi'), addHighlightMarkup); + break; + } + if (window.console) + console.log(newWord) + } + newText += newWord || words[w].replace("<", "<"); + newText += w >= words.length ? '' : ' '; + } + } else { //Every other type of element + newText += outerHTML(el.childNodes[c]); + } + } + el.innerHTML = newText; + } +} + +function iconError(E) { + var that = this; + setTimeout(function() { + var attempts = $(that).data('reload_attempts'); + if (typeof attempts === 'undefined' || !attempts) { + attempts = 1; + } + if (attempts > opts.imageRetryLimit) + return; + var src = that.src; + that.src = null; + that.src = src+'#'+attempts; + $(that).data('reload_attempts', ++attempts); + }, opts.imageRetryDelay); +} + +function updateIconsSize(html) { + $(html).find(".icon").not('.text_tag').css({'height': opts.iconsize, 'width': opts.iconsize}); +} + +//Send a message to the client +function output(message, flag) { + if (typeof message === 'undefined') { + return; + } + if (typeof flag === 'undefined') { + flag = ''; + } + + if (flag !== 'internal') + opts.lastPang = Date.now(); + + message = byondDecode(message).trim(); + + //The behemoth of filter-code (for Admin message filters) + //Note: This is proooobably hella inefficient + var filteredOut = false; + if (opts.hasOwnProperty('showMessagesFilters') && !opts.showMessagesFilters['All'].show) { + //Get this filter type (defined by class on message) + var messageHtml = $.parseHTML(message), + messageClasses; + if (opts.hasOwnProperty('filterHideAll') && opts.filterHideAll) { + var internal = false; + messageClasses = (!!$(messageHtml).attr('class') ? $(messageHtml).attr('class').split(/\s+/) : false); + if (messageClasses) { + for (var i = 0; i < messageClasses.length; i++) { //Every class + if (messageClasses[i] == 'internal') { + internal = true; + break; + } + } + } + if (!internal) { + filteredOut = 'All'; + } + } else { + //If the element or it's child have any classes + if (!!$(messageHtml).attr('class') || !!$(messageHtml).children().attr('class')) { + messageClasses = $(messageHtml).attr('class').split(/\s+/); + if (!!$(messageHtml).children().attr('class')) { + messageClasses = messageClasses.concat($(messageHtml).children().attr('class').split(/\s+/)); + } + var tempCount = 0; + for (var i = 0; i < messageClasses.length; i++) { //Every class + var thisClass = messageClasses[i]; + $.each(opts.showMessagesFilters, function(key, val) { //Every filter + if (key !== 'All' && val.show === false && typeof val.match != 'undefined') { + for (var i = 0; i < val.match.length; i++) { + var matchClass = val.match[i]; + if (matchClass == thisClass) { + filteredOut = key; + break; + } + } + } + if (filteredOut) return false; + }); + if (filteredOut) break; + tempCount++; + } + } else { + if (!opts.showMessagesFilters['Misc'].show) { + filteredOut = 'Misc'; + } + } + } + } + + //Stuff we do along with appending a message + var atBottom = false; + if (!filteredOut) { + var bodyHeight = $('body').height(); + var messagesHeight = $messages.outerHeight(); + var scrollPos = $('body,html').scrollTop(); + + //Should we snap the output to the bottom? + if (bodyHeight + scrollPos >= messagesHeight - opts.scrollSnapTolerance) { + atBottom = true; + if ($('#newMessages').length) { + $('#newMessages').remove(); + } + //If not, put the new messages box in + } else { + if ($('#newMessages').length) { + var messages = $('#newMessages .number').text(); + messages = parseInt(messages); + messages++; + $('#newMessages .number').text(messages); + if (messages == 2) { + $('#newMessages .messageWord').append('s'); + } + } else { + $messages.after('1 new message '); + } + } + } + + opts.messageCount++; + + //Pop the top message off if history limit reached + if (opts.messageCount >= opts.messageLimit) { + $messages.children('div.entry:first-child').remove(); + opts.messageCount--; //I guess the count should only ever equal the limit + } + + // Create the element - if combining is off, we use it, and if it's on, we + // might discard it bug need to check its text content. Some messages vary + // only in HTML markup, have the same text content, and should combine. + var entry = document.createElement('div'); + entry.innerHTML = message; + var trimmed_message = entry.textContent || entry.innerText || ""; + + var handled = false; + if (opts.messageCombining) { + var lastmessages = $messages.children('div.entry:last-child').last(); + if (lastmessages.length && $last_message && $last_message == trimmed_message) { + var badge = lastmessages.children('.r').last(); + if (badge.length) { + badge = badge.detach(); + badge.text(parseInt(badge.text()) + 1); + } else { + badge = $('', {'class': 'r', 'text': 2}); + } + lastmessages.html(message); + lastmessages.find('[replaceRegex]').each(replaceRegex); + lastmessages.append(badge); + badge.animate({ + "font-size": "0.9em" + }, 100, function() { + badge.animate({ + "font-size": "0.7em" + }, 100); + }); + opts.messageCount--; + handled = true; + } + } + + if (!handled) { + //Actually append the message + entry.className = 'entry'; + + if (filteredOut) { + entry.className += ' hidden'; + entry.setAttribute('data-filter', filteredOut); + } + + $(entry).find('[replaceRegex]').each(replaceRegex); + + $last_message = trimmed_message; + $messages[0].appendChild(entry); + + updateIconsSize(entry); + + $(entry).find("img.icon").error(iconError); + + var to_linkify = $(entry).find(".linkify"); + if (typeof Node === 'undefined') { + // Linkify fallback for old IE + for(var i = 0; i < to_linkify.length; ++i) { + to_linkify[i].innerHTML = linkify_fallback(to_linkify[i].innerHTML); + } + } else { + // Linkify for modern IE versions + for(var i = 0; i < to_linkify.length; ++i) { + linkify_node(to_linkify[i]); + } + } + + //Actually do the snap + //Stuff we can do after the message shows can go here, in the interests of responsiveness + if (opts.highlightTerms && opts.highlightTerms.length > 0) { + highlightTerms(entry); + } + } + + if (!filteredOut && atBottom) { + $('body,html').scrollTop($messages.outerHeight()); + } +} + +function internalOutput(message, flag) +{ + output(escaper(message), flag) +} + +//Runs a route within byond, client or server side. Consider this "ehjax" for byond. +function runByond(uri) { + window.location = uri; +} + +function setCookie(cname, cvalue, exdays) { + cvalue = escaper(cvalue); + var d = new Date(); + d.setTime(d.getTime() + (exdays*24*60*60*1000)); + var expires = 'expires='+d.toUTCString(); + document.cookie = cname + '=' + cvalue + '; ' + expires + "; path=/"; +} + +function getCookie(cname) { + var name = cname + '='; + var ca = document.cookie.split(';'); + for(var i=0; i < ca.length; i++) { + var c = ca[i]; + while (c.charAt(0)==' ') c = c.substring(1); + if (c.indexOf(name) === 0) { + return decoder(c.substring(name.length,c.length)); + } + } + return ''; +} + +function rgbToHex(R,G,B) {return toHex(R)+toHex(G)+toHex(B);} +function toHex(n) { + n = parseInt(n,10); + if (isNaN(n)) return "00"; + n = Math.max(0,Math.min(n,255)); + return "0123456789ABCDEF".charAt((n-n%16)/16) + "0123456789ABCDEF".charAt(n%16); +} + +function setTheme(theme) { + if (theme === 'white') { + document.getElementById("sheetofstyles").href = "browserOutput_white.css"; + runByond('?_src_=chat&proc=swaptolightmode'); + } else if (theme === 'dark') { + document.getElementById("sheetofstyles").href = "browserOutput.css"; + runByond('?_src_=chat&proc=swaptodarkmode'); + } + + setCookie('theme', theme, 365); + internalOutput('Set theme: '+theme+'', 'internal'); +} + +function handleClientData(ckey, ip, compid) { + //byond sends player info to here + var currentData = {'ckey': ckey, 'ip': ip, 'compid': compid}; + if (opts.clientData && !$.isEmptyObject(opts.clientData)) { + runByond('?_src_=chat&proc=analyzeClientData¶m[cookie]='+JSON.stringify({'connData': opts.clientData})); + + for (var i = 0; i < opts.clientData.length; i++) { + var saved = opts.clientData[i]; + if (currentData.ckey == saved.ckey && currentData.ip == saved.ip && currentData.compid == saved.compid) { + return; //Record already exists + } + } + //Lets make sure we obey our limit (can connect from server with higher limit) + while (opts.clientData.length >= opts.clientDataLimit) { + opts.clientData.shift(); + } + } else { + runByond('?_src_=chat&proc=analyzeClientData¶m[cookie]=none'); + } + + //Update the cookie with current details + opts.clientData.push(currentData); + setCookie('connData', JSON.stringify(opts.clientData), 365); +} + +//Server calls this on ehjax response +//Or, y'know, whenever really +function ehjaxCallback(data) { + opts.lastPang = Date.now(); + if (data == 'softPang') { + return; + } else if (data == 'pang') { + opts.pingCounter = 0; //reset + opts.pingTime = Date.now(); + runByond('?_src_=chat&proc=ping'); + + } else if (data == 'pong') { + if (opts.pingDisabled) {return;} + opts.pongTime = Date.now(); + var pingDuration = Math.ceil((opts.pongTime - opts.pingTime) / 2); + $('#pingMs').text(pingDuration+'ms'); + pingDuration = Math.min(pingDuration, 255); + var red = pingDuration; + var green = 255 - pingDuration; + var blue = 0; + var hex = rgbToHex(red, green, blue); + $('#pingDot').css('color', '#'+hex); + + } else if (data == 'roundrestart') { + opts.restarting = true; + internalOutput('
The connection has been closed because the server is restarting. Please wait while you automatically reconnect.
', 'internal'); + } else { + //Oh we're actually being sent data instead of an instruction + var dataJ; + try { + dataJ = $.parseJSON(data); + } catch (e) { + //But...incorrect :sadtrombone: + window.onerror('JSON: '+e+'. '+data, 'browserOutput.html', 327); + return; + } + data = dataJ; + + if (data.clientData) { + if (opts.restarting) { + opts.restarting = false; + $('.connectionClosed.restarting:not(.restored)').addClass('restored').text('The round restarted and you successfully reconnected!'); + } + if (!data.clientData.ckey && !data.clientData.ip && !data.clientData.compid) { + //TODO: Call shutdown perhaps + return; + } else { + handleClientData(data.clientData.ckey, data.clientData.ip, data.clientData.compid); + } + } else if (data.syncRegex) { + for (var i in data.syncRegex) { + + var regexData = data.syncRegex[i]; + var regexName = regexData[0]; + var regexFlags = regexData[1]; + var regexReplaced = regexData[2]; + + replaceRegexes[i] = [new RegExp(regexName, regexFlags), regexReplaced]; + } + } + } +} + +function createPopup(contents, width) { + opts.popups++; + $('body').append(''); + + //Attach close popup event + var $popup = $('#popup'+opts.popups); + var height = $popup.outerHeight(); + $popup.css({'height': height+'px', 'margin': '-'+(height/2)+'px 0 0 -'+(width/2)+'px'}); + + $popup.on('click', '.close', function(e) { + e.preventDefault(); + $popup.remove(); + }); +} + +function toggleWasd(state) { + opts.wasd = (state == 'on' ? true : false); +} + +function subSlideUp() { + $(this).removeClass('scroll'); + $(this).css('height', ''); +} + +function startSubLoop() { + if (opts.selectedSubLoop) { + clearInterval(opts.selectedSubLoop); + } + return setInterval(function() { + if (!opts.suppressSubClose && $selectedSub.is(':visible')) { + $selectedSub.slideUp('fast', subSlideUp); + clearInterval(opts.selectedSubLoop); + } + }, 5000); //every 5 seconds +} + +function handleToggleClick($sub, $toggle) { + if ($selectedSub !== $sub && $selectedSub.is(':visible')) { + $selectedSub.slideUp('fast', subSlideUp); + } + $selectedSub = $sub + if ($selectedSub.is(':visible')) { + $selectedSub.slideUp('fast', subSlideUp); + clearInterval(opts.selectedSubLoop); + } else { + $selectedSub.slideDown('fast', function() { + var windowHeight = $(window).height(); + var toggleHeight = $toggle.outerHeight(); + var priorSubHeight = $selectedSub.outerHeight(); + var newSubHeight = windowHeight - toggleHeight; + $(this).height(newSubHeight); + if (priorSubHeight > (windowHeight - toggleHeight)) { + $(this).addClass('scroll'); + } + }); + opts.selectedSubLoop = startSubLoop(); + } +} + +/***************************************** +* +* DOM READY +* +******************************************/ + +if (typeof $ === 'undefined') { + var div = document.getElementById('loading').childNodes[1]; + div += '

ERROR: Jquery did not load.'; +} + +$(function() { + $messages = $('#messages'); + $subTheme = $('#subTheme'); + $subOptions = $('#subOptions'); + $subFont = $('#subFont'); + $selectedSub = $subOptions; + + //Hey look it's a controller loop! + setInterval(function() { + if (opts.lastPang + opts.pangLimit < Date.now() && !opts.restarting) { //Every pingLimit + if (!opts.noResponse) { //Only actually append a message if the previous ping didn't also fail (to prevent spam) + opts.noResponse = true; + opts.noResponseCount++; + internalOutput('
You are either AFK, experiencing lag or the connection has closed.
', 'internal'); + } + } else if (opts.noResponse) { //Previous ping attempt failed ohno + $('.connectionClosed[data-count="'+opts.noResponseCount+'"]:not(.restored)').addClass('restored').text('Your connection has been restored (probably)!'); + opts.noResponse = false; + } + }, 2000); //2 seconds + + + /***************************************** + * + * LOAD SAVED CONFIG + * + ******************************************/ + var savedConfig = { + fontsize: getCookie('fontsize'), + iconsize: getCookie('iconsize'), + lineheight: getCookie('lineheight'), + 'spingDisabled': getCookie('pingdisabled'), + 'shighlightTerms': getCookie('highlightterms'), + 'shighlightColor': getCookie('highlightcolor'), + 'sfont': getCookie('font'), + 'smessagecombining': getCookie('messagecombining'), + 'stheme': getCookie('theme'), + }; + + if (savedConfig.fontsize) { + $messages.css('font-size', savedConfig.fontsize); + internalOutput('Loaded font size setting of: '+savedConfig.fontsize+'', 'internal'); + } + if (savedConfig.iconsize) { + opts.iconsize = savedConfig.iconsize; + updateIconsSize($messages); + internalOutput('Loaded icon size setting of: '+savedConfig.iconsize+'', 'internal'); + } + if (savedConfig.lineheight) { + $("body").css('line-height', savedConfig.lineheight); + internalOutput('Loaded line height setting of: '+savedConfig.lineheight+'', 'internal'); + } + if(savedConfig.stheme){ + setTheme(savedConfig.stheme); + } + if (savedConfig.spingDisabled) { + if (savedConfig.spingDisabled == 'true') { + opts.pingDisabled = true; + $('#ping').hide(); + } + internalOutput('Loaded ping display of: '+(opts.pingDisabled ? 'hidden' : 'visible')+'', 'internal'); + } + if (savedConfig.shighlightTerms) { + var savedTerms = $.parseJSON(savedConfig.shighlightTerms); + var actualTerms = ''; + for (var i = 0; i < savedTerms.length; i++) { + if (savedTerms[i]) { + actualTerms += savedTerms[i] + ', '; + } + } + if (actualTerms) { + actualTerms = actualTerms.substring(0, actualTerms.length - 2); + internalOutput('Loaded highlight strings of: ' + actualTerms+'', 'internal'); + opts.highlightTerms = savedTerms; + } + } + if (savedConfig.shighlightColor) { + opts.highlightColor = savedConfig.shighlightColor; + internalOutput('Loaded highlight color of: '+savedConfig.shighlightColor+'', 'internal'); + } + if (savedConfig.sfont) { + $('body').css({'font-family': savedConfig.sfont}); + internalOutput('Loaded font: '+savedConfig.sfont+'', 'internal'); + } + + if (savedConfig.smessagecombining) { + if (savedConfig.smessagecombining == 'false') { + opts.messageCombining = false; + } else { + opts.messageCombining = true; + } + } + (function() { + var dataCookie = getCookie('connData'); + if (dataCookie) { + var dataJ; + try { + dataJ = $.parseJSON(dataCookie); + } catch (e) { + window.onerror('JSON '+e+'. '+dataCookie, 'browserOutput.html', 434); + return; + } + opts.clientData = dataJ; + } + })(); + + + /***************************************** + * + * BASE CHAT OUTPUT EVENTS + * + ******************************************/ + + $('body').on('click', 'a', function(e) { + e.preventDefault(); + }); + + $('body').on('mousedown', function(e) { + var $target = $(e.target); + + if ($contextMenu && opts.hasOwnProperty('contextMenuTarget') && opts.contextMenuTarget) { + hideContextMenu(); + return false; + } + + if ($target.is('a') || $target.parent('a').length || $target.is('input') || $target.is('textarea')) { + opts.preventFocus = true; + } else { + opts.preventFocus = false; + opts.mouseDownX = e.pageX; + opts.mouseDownY = e.pageY; + } + }); + + $messages.on('mousedown', function(e) { + if ($selectedSub && $selectedSub.is(':visible')) { + $selectedSub.slideUp('fast', subSlideUp); + clearInterval(opts.selectedSubLoop); + } + }); + + $('body').on('mouseup', function(e) { + if (!opts.preventFocus && + (e.pageX >= opts.mouseDownX - opts.clickTolerance && e.pageX <= opts.mouseDownX + opts.clickTolerance) && + (e.pageY >= opts.mouseDownY - opts.clickTolerance && e.pageY <= opts.mouseDownY + opts.clickTolerance) + ) { + opts.mouseDownX = null; + opts.mouseDownY = null; + runByond('byond://winset?mapwindow.map.focus=true'); + } + }); + + $messages.on('click', 'a', function(e) { + var href = $(this).attr('href'); + $(this).addClass('visited'); + if (href[0] == '?' || (href.length >= 8 && href.substring(0,8) == 'byond://')) { + runByond(href); + } else { + href = escaper(href); + runByond('?action=openLink&link='+href); + } + }); + + //Fuck everything about this event. Will look into alternatives. + $('body').on('keydown', function(e) { + if (e.target.nodeName == 'INPUT' || e.target.nodeName == 'TEXTAREA') { + return; + } + + if (e.ctrlKey || e.altKey || e.shiftKey) { //Band-aid "fix" for allowing ctrl+c copy paste etc. Needs a proper fix. + return; + } + + e.preventDefault() + + var k = e.which; + // Hardcoded because else there would be no feedback message. + if (k == 113) { // F2 + runByond('byond://winset?screenshot=auto'); + internalOutput('Screenshot taken', 'internal'); + } + + var c = ""; + switch (k) { + case 8: + c = 'BACK'; + case 9: + c = 'TAB'; + case 13: + c = 'ENTER'; + case 19: + c = 'PAUSE'; + case 27: + c = 'ESCAPE'; + case 33: // Page up + c = 'NORTHEAST'; + case 34: // Page down + c = 'SOUTHEAST'; + case 35: // End + c = 'SOUTHWEST'; + case 36: // Home + c = 'NORTHWEST'; + case 37: + c = 'WEST'; + case 38: + c = 'NORTH'; + case 39: + c = 'EAST'; + case 40: + c = 'SOUTH'; + case 45: + c = 'INSERT'; + case 46: + c = 'DELETE'; + case 93: // That weird thing to the right of alt gr. + c = 'APPS'; + + default: + c = String.fromCharCode(k); + } + + if (c.length == 0) { + if (!e.shiftKey) { + c = c.toLowerCase(); + } + runByond('byond://winset?mapwindow.map.focus=true;mainwindow.input.text='+c); + return false; + } else { + runByond('byond://winset?mapwindow.map.focus=true'); + return false; + } + }); + + //Mildly hacky fix for scroll issues on mob change (interface gets resized sometimes, messing up snap-scroll) + $(window).on('resize', function(e) { + if ($(this).height() !== opts.priorChatHeight) { + $('body,html').scrollTop($messages.outerHeight()); + opts.priorChatHeight = $(this).height(); + } + }); + + + /***************************************** + * + * OPTIONS INTERFACE EVENTS + * + ******************************************/ + + $('body').on('click', '#newMessages', function(e) { + var messagesHeight = $messages.outerHeight(); + $('body,html').scrollTop(messagesHeight); + $('#newMessages').remove(); + runByond('byond://winset?mapwindow.map.focus=true'); + }); + + $('#toggleOptions').click(function(e) { + handleToggleClick($subOptions, $(this)); + }); + + $('#toggleTheme').click(function(e) { + handleToggleClick($subTheme, $(this)); + }); + + $('#toggleFont').click(function(e) { + handleToggleClick($subFont, $(this)); + }); + + $('.sub, .toggle').mouseenter(function() { + opts.suppressSubClose = true; + }); + + $('.sub, .toggle').mouseleave(function() { + opts.suppressSubClose = false; + }); + + $('#setWhiteTheme').click(function() { + setTheme('white'); + savedConfig.stheme = 'white'; + }) + + $('#setDarkTheme').click(function() { + setTheme('dark'); + savedConfig.stheme = 'dark'; + }) + + $('#decreaseFont').click(function(e) { + savedConfig.fontsize = Math.max(parseInt(savedConfig.fontsize || 13) - 1, 1) + 'px'; + $messages.css({'font-size': savedConfig.fontsize}); + setCookie('fontsize', savedConfig.fontsize, 365); + internalOutput('Font size set to '+savedConfig.fontsize+'', 'internal'); + }); + + $('#increaseFont').click(function(e) { + savedConfig.fontsize = (parseInt(savedConfig.fontsize || 13) + 1) + 'px'; + $messages.css({'font-size': savedConfig.fontsize}); + setCookie('fontsize', savedConfig.fontsize, 365); + internalOutput('Font size set to '+savedConfig.fontsize+'', 'internal'); + }); + + $('#decreaseIcon').click(function(e) { + savedConfig.iconsize = Math.max((parseInt(savedConfig.iconsize) || 12) - 1, 1); + updateIconsSize($messages); + setCookie('iconsize', savedConfig.iconsize, 365); + opts.iconsize = savedConfig.iconsize; + internalOutput('Icon size set to '+savedConfig.iconsize+'', 'internal'); + }) + + $('#increaseIcon').click(function(e) { + savedConfig.iconsize = (parseInt(savedConfig.iconsize || 12) + 1); + updateIconsSize($messages); + setCookie('iconsize', savedConfig.iconsize, 365); + opts.iconsize = savedConfig.iconsize; + internalOutput('Icon size set to '+savedConfig.iconsize+'', 'internal'); + }) + + $('#decreaseLineHeight').click(function(e) { + savedConfig.lineheight = Math.max(parseFloat(savedConfig.lineheight || 1.2) - 0.1, 0.1).toFixed(1); + $("body").css({'line-height': savedConfig.lineheight}); + setCookie('lineheight', savedConfig.lineheight, 365); + internalOutput('Line height set to '+savedConfig.lineheight+'', 'internal'); + }); + + $('#increaseLineHeight').click(function(e) { + savedConfig.lineheight = (parseFloat(savedConfig.lineheight || 1.2) + 0.1).toFixed(1); + $("body").css({'line-height': savedConfig.lineheight}); + setCookie('lineheight', savedConfig.lineheight, 365); + internalOutput('Line height set to '+savedConfig.lineheight+'', 'internal'); + }); + + $('#togglePing').click(function(e) { + if (opts.pingDisabled) { + $('#ping').slideDown('fast'); + opts.pingDisabled = false; + } else { + $('#ping').slideUp('fast'); + opts.pingDisabled = true; + } + setCookie('pingdisabled', (opts.pingDisabled ? 'true' : 'false'), 365); + }); + + $('#saveLog').click(function(e) { + // Requires IE 10+ to issue download commands. Just opening a popup + // window will cause Ctrl+S to save a blank page, ignoring innerHTML. + if (!window.Blob) { + output('This function is only supported on IE 10 and up. Upgrade if possible.', 'internal'); + return; + } + + $.ajax({ + type: 'GET', + url: 'browserOutput_white.css', + success: function(styleData) { + var blob = new Blob(['Chat Log', $messages.html(), '']); + + var fname = 'SS13 Chat Log'; + var date = new Date(), month = date.getMonth(), day = date.getDay(), hours = date.getHours(), mins = date.getMinutes(), secs = date.getSeconds(); + fname += ' ' + date.getFullYear() + '-' + (month < 10 ? '0' : '') + month + '-' + (day < 10 ? '0' : '') + day; + fname += ' ' + (hours < 10 ? '0' : '') + hours + (mins < 10 ? '0' : '') + mins + (secs < 10 ? '0' : '') + secs; + fname += '.html'; + + window.navigator.msSaveBlob(blob, fname); + } + }); + }); + + $('#highlightTerm').click(function(e) { + if ($('.popup .highlightTerm').is(':visible')) {return;} + var termInputs = ''; + for (var i = 0; i < opts.highlightLimit; i++) { + termInputs += '
'; + } + var popupContent = '
String Highlighting
' + + '
' + + '
Choose up to '+opts.highlightLimit+' strings that will highlight the line when they appear in chat.
' + + '
' + + termInputs + + '
' + + '
' + + '
' + + '
'; + createPopup(popupContent, 250); + }); + + $('body').on('keyup', '#highlightColor', function() { + var color = $('#highlightColor').val(); + color = color.trim(); + if (!color || color.charAt(0) != '#') return; + $('#highlightColor').css('background-color', color); + }); + + $('body').on('submit', '#highlightTermForm', function(e) { + e.preventDefault(); + + var count = 0; + while (count < opts.highlightLimit) { + var term = $('#highlightTermInput'+count).val(); + if (term) { + term = term.trim(); + if (term === '') { + opts.highlightTerms[count] = null; + } else { + opts.highlightTerms[count] = term.toLowerCase(); + } + } else { + opts.highlightTerms[count] = null; + } + count++; + } + + var color = $('#highlightColor').val(); + color = color.trim(); + if (color == '' || color.charAt(0) != '#') { + opts.highlightColor = '#FFFF00'; + } else { + opts.highlightColor = color; + } + var $popup = $('#highlightPopup').closest('.popup'); + $popup.remove(); + + setCookie('highlightterms', JSON.stringify(opts.highlightTerms), 365); + setCookie('highlightcolor', opts.highlightColor, 365); + }); + + $('#clearMessages').click(function() { + $messages.empty(); + opts.messageCount = 0; + }); + + $('#fontInputSpan').hover(function() { + $('#fontInput').removeClass('hidden'); + }, function() { + $('#fontInput').addClass('hidden'); + }); + + $('#fontInput').change(function() { + var newFont = $('#fontInput').val() || 'Verdana, sans-serif'; + $('body').css({'font-family': newFont}); + setCookie('font', newFont, 365); + opts.font = newFont; + internalOutput('Font set to: '+newFont+'', 'internal'); + }); + + $('#toggleCombine').click(function(e) { + opts.messageCombining = !opts.messageCombining; + setCookie('messagecombining', (opts.messageCombining ? 'true' : 'false'), 365); + }); + + $('img.icon').error(iconError); + + + + + /***************************************** + * + * KICK EVERYTHING OFF + * + ******************************************/ + + runByond('?_src_=chat&proc=doneLoading'); + if ($('#loading').is(':visible')) { + $('#loading').remove(); + } + $('#userBar').show(); + opts.priorChatHeight = $(window).height(); +}); diff --git a/code/modules/goonchat/browserassets/js/jquery.min.js b/code/modules/goonchat/browserassets/js/jquery.min.js new file mode 100644 index 0000000000000..ab28a24729b32 --- /dev/null +++ b/code/modules/goonchat/browserassets/js/jquery.min.js @@ -0,0 +1,4 @@ +/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h; +if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/\s*$/g,rb={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:k.htmlSerialize?[0,"",""]:[1,"X
","
"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?""!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("