From 3124122ea433b5855783f914bbe5f5d2429ca99e Mon Sep 17 00:00:00 2001 From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Date: Fri, 22 Mar 2024 14:10:34 +0100 Subject: [PATCH] More coffee cups: SCC, Zavod, Orion, EE (#18693) * a * a * c * a * huh --------- Co-authored-by: DreamySkrell <> --- .../preference_setup/loadout/items/general.dm | 15 ++++- .../reagent_containers/glass/coffeecup.dm | 59 ++++++++++++++---- html/changelogs/DreamySkrell-coffeecups.yml | 8 +++ icons/obj/drink_glasses/coffecup.dmi | Bin 9580 -> 10640 bytes 4 files changed, 67 insertions(+), 15 deletions(-) create mode 100644 html/changelogs/DreamySkrell-coffeecups.yml diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm index 3daf5ac085a..c81250b1bfc 100644 --- a/code/modules/client/preference_setup/loadout/items/general.dm +++ b/code/modules/client/preference_setup/loadout/items/general.dm @@ -73,7 +73,9 @@ /datum/gear/coffeecup/New() ..() var/list/coffeecups = list() + // plain/base coffeecups["plain coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup + // nations coffeecups["sol coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sol coffeecups["San Colette coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sancolette coffeecups["Europa coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/europa @@ -88,13 +90,21 @@ coffeecups["Hegemony coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hegemony coffeecups["Port Antillia coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/portantillia coffeecups["Nralakk coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nralakk + coffeecups["All-Xanu Republic cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/xanu + coffeecups["Galatea cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/galatea + // orgs/corpos + coffeecups["SCC coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/scc + coffeecups["SCC coffee cup, alt"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/scc/alt coffeecups["NT coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt coffeecups["Hephaestus coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/hepht coffeecups["Idris coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris coffeecups["Zeng-Hu coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zeng + coffeecups["Zavod coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zavod + coffeecups["Orion coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/orion coffeecups["TCFL coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/tcfl - coffeecups["All-Xanu Republic cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/xanu - coffeecups["Galatea cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/galatea + coffeecups["EE coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/einstein + coffeecups["EE coffee cup, alt"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/einstein/alt + // symbols, markings coffeecups["#1 coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one coffeecups["#1 monkey coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/puni coffeecups["heart coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/heart @@ -109,6 +119,7 @@ coffeecups["m'sai coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/msai coffeecups["hharar coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/hharar coffeecups["zhan coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zhan + // pure colors & other coffeecups["black coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/black coffeecups["green coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/green coffeecups["dark green coffee cup"] = /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/green/dark diff --git a/code/modules/reagents/reagent_containers/glass/coffeecup.dm b/code/modules/reagents/reagent_containers/glass/coffeecup.dm index 6341e587f1a..b9f9eefdb87 100644 --- a/code/modules/reagents/reagent_containers/glass/coffeecup.dm +++ b/code/modules/reagents/reagent_containers/glass/coffeecup.dm @@ -1,3 +1,6 @@ + +// ------------------------ base + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup name = "coffee cup" desc = "A plain white coffee cup." @@ -23,7 +26,8 @@ filling.color = reagents.get_color() add_overlay(filling) -// Nations +// ------------------------ nations + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sol name = "\improper sol coffee cup" desc = "A blue coffee cup emblazoned with the crest of the Sol Alliance." @@ -94,7 +98,26 @@ desc = "A tricolor coffee cup bearing the flag of Port Antillia." icon_state = "coffeecup_portantillia" -// Organisations +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/xanu + name = "\improper All-Xanu Republic coffee cup" + desc = "A coffee cup bearing the flag of the All-Xanu Republic." + icon_state = "coffeecup_xanu" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/galatea + name = "\improper Federal Technocracy of Galatea coffee cup" + desc = "A coffee cup bearing the flag of the Federal Technocracy of Galatea" + icon_state = "coffeecup_galatea" + +// ------------------------ orgs/corpos + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/scc + name = "\improper SCC coffee cup" + desc = "A coffee cup bearing the Stellar Corporate Conglomerate logo." + icon_state = "coffeecup_scc" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/scc/alt + icon_state = "coffeecup_scc_alt" + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt name = "\improper NT coffee cup" desc = "A blue NanoTrasen coffee cup." @@ -107,7 +130,7 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal/hepht name = "\improper Hephaestus coffee cup" - desc = "A strong coffee cup with the hephaestus logo emblazoned on it." + desc = "A strong coffee cup with the Hephaestus Industries logo emblazoned on it." icon_state = "coffeecup_hepht" /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/idris @@ -120,17 +143,26 @@ desc = "A coffee cup bearing the Zeng-Hu logo." icon_state = "coffeecup_zeng" -/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/xanu - name = "\improper All-Xanu Republic coffee cup" - desc = "A coffee cup bearing the flag of the All-Xanu Republic." - icon_state = "coffeecup_xanu" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/zavod + name = "\improper Zavodskoi coffee cup" + desc = "A coffee cup bearing the Zavodskoi Interstellar logo." + icon_state = "coffeecup_zavod" -/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/galatea - name = "\improper Federal Technocracy of Galatea coffee cup" - desc = "A coffee cup bearing the flag of the Federal Technocracy of Galatea" - icon_state = "coffeecup_galatea" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/orion + name = "\improper Orion Express coffee cup" + desc = "A coffee cup bearing the Orion Express logo." + icon_state = "coffeecup_orion" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/einstein + name = "\improper Einstein Engines coffee cup" + desc = "A coffee cup bearing the Einstein Engines logo." + icon_state = "coffeecup_einstein" + +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/einstein/alt + icon_state = "coffeecup_einstein_alt" + +// ------------------------ symbols, markings -// Symbols, markings /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one name = "#1 coffee cup" desc = "A white coffee cup, prominently featuring a #1." @@ -201,7 +233,8 @@ desc = "A coffee cup featuring the image of a Zhan miner." icon_state = "coffeecup_zhan" -// Pure colors & other +// ------------------------ pure colors & other + /obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/black name = "black coffee cup" desc = "A sleek black coffee cup." diff --git a/html/changelogs/DreamySkrell-coffeecups.yml b/html/changelogs/DreamySkrell-coffeecups.yml new file mode 100644 index 00000000000..91882138785 --- /dev/null +++ b/html/changelogs/DreamySkrell-coffeecups.yml @@ -0,0 +1,8 @@ + + +author: DreamySkrell + +delete-after: True + +changes: + - rscadd: "Adds more coffee cups: SCC, Zavod, Orion, EE." diff --git a/icons/obj/drink_glasses/coffecup.dmi b/icons/obj/drink_glasses/coffecup.dmi index b11a7ddcffb83a026cace3f783c13b6a257e7a57..e153ab858cec186b128fb9d34ad21f383e6d8c6e 100644 GIT binary patch literal 10640 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 literal 9580 zcmcI~cT|(lpYDXvlqyxED+q#AL6j~3&=jOYf>fyrQk5=B@4W^P0qN2O z383^6Kx#sg8@{`He&?Qh_w3zs_Wm*Re%^UAedhT*&rIIv>1fcLzjPh|K%;q2?GXSF zq6q<%lXwL_dfbmfoHlX635rZ7=s zA-yi3@8$7T!+(BiWICv$42{&wex3H^dhC8n)5_>CA1B46%%T|MVxy%u(wfwtCI3!p z8h`AvvlqJICrs7-quw8@nJW3=d-Qre>c(V%j1ZM@nzrp{+X^Gc6HmOBOA9u1h0q>} zl+!)9;I^0|1@({Q%961FPBv7-4Rcp?JcW9sZ7dPn7#>i{XT>^%$XU|vah8*%__W6W zh4|<8-#e8RlH^>7NLgdb76}umWvcwN5P$OQ7M8Yr^c-;29a9hJZ%Yof)n(OBo$mW} z#Gb$V{>M(2XB=HVvc*!FZJX?g$odngRMC^y-%@d8>({zz>Lg4-Z%}oRqzCP^r#18Q z-K|8ZwLn8F|L(mQ65Cn;e?L52Lq{Rl8)T57-TPbmBjt1Im3!yjz+Z(FKh`j$S9+tu zsjw2=>^uwG%nIO;*6&$t;i+^zudqk@?n}QeWAwnwD)Fd;!c)j-9^T7sJoX#_JU~&XQknAI7xIZfk`VfhY`~-TO%PDNlQ<7lo<)-&=-G1r&m`EhUZuTP zw+0>O2Cr@Lj}49ThU`4^1jn)*_T6y>Bgl4cuw%dWcz>PdF0XRLmc#}s$@87>R4fccb`&RdeDg8r3aWyoQ`N`dWvtvhx_#(yH z9l!FfEvpe~B+IeKrr`0(NyX--Qxr)r@s|*KAYbWPuhHA-;;Qd-aAYYw(^<@>Olh#*iNaA7{AUV7!I!ceVE3e+gWPEcj^PKIh-}~i%qw0K&Sqv!i2UxgAQH(1pt%t7K&-DTYw|Mq-BxYbtu zAvarw-I$Uz?|T>_rZYGOqdS+*TQq5riB|f6eWaK7sMlObI9TIKfakB`!VaUu!&#Mo z)zFVc9$v-)|#W zcc=V?w|Jk!rt_Fmy-KGDX)zA7fyLSDhlBfh@vkNw)ep9xmN*#lkXeNP-kf^Zl7p$Z z;-_A4J@okpv2rar6wA2SmcNOV@Y{}_9VtUM{FR3-^QRg)Ejdg#Y3b}T9k$dCbgMmc zjDwhnCFgk)rVYR;C$R_Kq(RrtR%slMxb4qns%Q=R6iG?>nB9w%pPe|k`p-T;YQw+# zn{nKSz3xMpHU+2in@*LV9~F=$-sjg&mwjAmp@LRaeK7IzzTdgqc`YG>B4Sz-go1|~ z+7pV@FaiII6FMnXO=^|+?Jbm~vDO1h=0}Vwp$$c`niB-+mHP=by-hbl&O*SIJSqsR z6+c;J^Um#-se$e-j##2C;!BvG)l?2u2`Y1B+1$+16Vx*|AIxhjiemLWpe=s5iy&HD z)pj{dOamFnm61!)3M@3>xcTUrw(MWh@2(cVf1pr96h;zEGTU>)-m^uvD=*iS3IU>t zyk`UeSrBo2Kc+sJgs_JiPyWQuo5DnvJ6Tqir#06!FoC-jUrnu%VG-14Lor*1Yo^wi zo1rsEA#jy95Z#QfuCA2xPbQ%E=n+Y}4h4vaj(!H-rlbh2ol7nA?eA7IV*xzV*T5Aq z7ZN~P%X$&y57oUZhCk{yqQ_&eIi-&<1Nzn@rg&M;t|=RK3G~|=P{epA@7l(Yc3j8D zBU%9FE)H{OB?Lmi#Y6u-)S8GfA<0qtG6{4c09|{x^Y44$^`2;wQ zs;ppK*^)=fQCbp;MxQ|IULNyV4)b{Q4RjTiwMITJGHjojVNX?5RQ~cjz70Pr<{$BK z0+5SUrFg6VQ>*^*`|t{xSi{M0bGIT* z)O}1#p~vFI>3V_KOC4~f(8mM*<%OwqXXf6_WIZuY8okh%{Dej7DI=J7^b}1VY8OBc z(pPS2LBI+*b$)54=Zd?8o})^>_%$KUUoYJk78hSPd7*PmTtu&`=ehgfN|`4^4n$1m zyCDIEFeTd6VB!n1W-(12=e(`LgD55aBn(*!;GZw~rdysS01@FlMZ}N;-cNy3W4vdN zhk*XF4HF3Ixkv_hCGSF%BclI@lI%u0cqZ_Mrm!P!!gsR66$h_dG!`L$80=?XSbVF2 zKY4O-W3EMxIN0H|oU+K7nGY~H3@%*tloK|lB<=>8#P`)*msnTw@@JaF2ivi`5(0LU zT;Wx1%=N940y4=p*p)V)uz~!i*42vs)?O6#{nKCb2#v2crYdZ@qcL=sq$qRm#w`A@ zC@`q}sa3VKvf@q!sgX^(ef!${))pxkcJLTp``!?W+!N7y0`KN>SexSjZY}e49M=_l zMM%j93@bm&e2)nv@QX09gd>c@!J}eb7cHE-it6+#dzJdZ1&Tlo9f$lsxZK>_Y5UB8 ztA(y}&1@qhBk@N@LW$bhdJ*gALsf`4`uZtnpNH)3I#SjwkBGaWOD0L>I$o#h2WL?g z$u;V&LH-T#X&3F}tU3}cp>YXU=Z}qFL%~$|Jca#!$fmJ5kscPG zkKgjz<`6Zl2PKA4cVmu4_KNic-)3gUk+tE^gOs(kbD=7`NXxgc>*^S#E^$7(St#M; zp#hK?oc4wAq%;#PFOKFw2Em)9%;sYAKTw03K@7mSzC^5A4@tD|r`yh;HoXSxh_J*C z)ZFDT~SXgqFC2p7DGcqz(jh;|mrQF%y57GGo$Gv;^jv6p9 zGV*VsNz4o5CfIV|0jHgFfV(;V*or+^!j4b?q4C-(b|HJ3!T@1JF}e zv9jXq-1Cg*24heE7(u&!W@|l?Gb6)r1C1VIHF^~e0od56q3DE031RTl_8DcEO+Y90 zynhsr19HXsMlsb4oNhJOB`jbxNQ@hXv+pt<>Sob#Bw_1r`z_DQqz?B#-mk*!>UgNuFJUW#kbQT*ao<#c?TM=*(M2 zwU|YRxk-*E1ue+*m=^V1JSkINQHm4!9rH)RJp-{@gm-7qM&!2B0#A3>%g<;c5!wV3 z?@yQ&F^@OFYI0ikeoqk|?rKxO4gb;&&DBt}6{H!MZ;v%W8wF+!2#^+F`dCg}V=eVz6WdPegQb4a*iEQpQP`j_g zyEhXM{~Iqnfl2afElqwDelT&B=u^+aVa$7%n>)c(RlRBV^BDetKgVB__H{LQ#4cCd z${d}y+x!m4>BP1Lsy_q5C&rG*>va}~Tgw6Dk3Uo?N)?<}2WKqMx}~+z-{z(&a>aIj z-sI7Mf>mJoL%`K~f3Ttj zk9Jpexy0-!5LR*Aa=&j=zD8J^NhDph7)A*!ASn>@=V^4NC@dGhiax2bqp5x>a#hEa zQaOs4OyYGPzL}Yl5|JouWId9j9`WXlM5Ak0By;?ctGOsbA}l8dE8t&rX>a4K{7h(1 zqd%Kgf>_p_PIAj=tLJ-U&&*n{ce(pzJ^0`Y1=iNq^Zw|mNxk0-xFb~eVpkLdM6rl0 zPSkz&(J8(6;DNfMqtNp0h8&;UF@Dx;QKis(<~IQ?EiFAMgrA>3<(8|`crINK4NDI>TB!)n~1)PSV3o*KilBx_?ymV&)PKveAMU zl@6?327g+%-kEJe7`MCnE34yu=JiZ1^_2O+{fbu$_=M-Nu z+NRy^Ta7O7%J;-`R7sKca`mvecq38tk%GI50_LT0vhzN9PJi9DG7)W`oSEG z$42v?d&_HWMdQpwPI~idp>EwET_JIIEOU_P0s6g^@;`i84>F-VYA&=(NrMGiC8ZAJ z$`LV?6=JMEhB9rGDRLY0xFIA&Ry*|`%WG*`wZBU|sHu>kyD<;Tb^rgtb^pbi_w%xD z3SPdPgE6tjx(<6wIW7W_ z->4t?G1sI%6k+j#5_|XqNV)A$fKy{%W->5$aH#gF-jJFV@f%Bi{jW{}5 zPx2D-@dIM%YJN-I6@>WP!YS$cstKQSCxOeIlQD@R${ojcyu|>Zn=()$w z`e?aK9`t}*Sx;~HNSd&-iOX7398yJmjZPNAncng3I44m5q6$wa9ePaWygVz2+71TQ>)qAdntTcBCtKC2kl$ znX8KZ`Lx#QT-~hMuzVZo8?j#y5aKMP?DUxeiXbD@Ut2poNR_2k(?rNEVP=(iuy_>@# zBFHt2N5qFNEcR0Lt2Z0vw!1pypejk{tm9M&zhHF8!;%K>I)(C@5{ovjD!YNgR)v#M zNvYy7IwaYzPn^f(w5pT2FDE~YD{a)ql7ZqU6|c1j#Y0kVPCr0kr`-HzY?Z^b1q2)y zT+f(^&2pQ;v4wlp)7p0VV~Pxfw0-?9%YX1A0V)Etsy`Z^0pxLLZvVFH?ri|$fHPWR z_SXO+l!~kJhN{O9!&J-^dDDd%`d_1!1@-~wE^ZFgWL|AQ=OZi}Bn+NH&Cx$! zY|(+|y?$AdGhwGnd+(B(SF*YKazOs=oh46(!8F|O#l?`*Q~zS)D)J~+vC`6H7!^@6 zXA#efIx7MfwY&=Hl)nF)@+NMk_spn#uKnqzAqe;$>FRdEp*SO9mhV%HKD47M#pM!L ziFDjS+f))Q(QS%V9Ls`6`X2J}W(N9U3g{5tgP(`!CMbQVr~bSGA#X8v{s(pNzp&v< zW~ZoA1^;nox7#oIWbV4XfGNqpAQwHU7{zXOl&H6^YGsxE5H2GlQ;Msj%Yco+`|bN0 z4&i&f0&F0fTZs#lTeg#w;<`mMZT2yBgJuIYgq$7eyEq#LyBAxT)i1*y5;W0)NVG}N z-&z_QP7Try^X#G6$~~cv(|OA*Bp2i+ZeUTa?Y$;#l94(Iag~OpvnpBTmr5ffueqnmlRstH4O%~i%JqA6X@ zohqoJZ$%uH3CTP!1C(8UtNfAg6C-5_Ewf^E%|Ik4vjQG5F*;|3j1?9VO=0_TfkFoiT?@7xC%2_DP^f0G!xODs@AK-2gpTB7)NQQ@PFm& zXPC=;ciEV*mg}2V{J{4JYW1Uun=;d-6uTjV<;$x303F-VK8eI=RX2(BV`aj>gD(wC}ZyzeiBgQ z@NX%%-FG5_4dh#jsO=dzzYeG~Wca-zDmCavN0p`#Z#<}`gUMf)~-+8xvwD))33xw6{xm}7er(wPAt4e5$MY-4I8&&B5v zd_0Dr_q5S8U}^`|LJjbL+i&$^SOYTY1k@#f<&*DMbFs03jY$yX+w#V?z$g*`J_cWc z0#iTc?Bje2pgd#oGsr^U;O?a)((p^;bJ!J_|D5-gyOt*(>(?{uoTf>X8-rXU4}EC# zY*zlB4o;h5bwA#^koOeF=za9ds{zhIxvGj3KZ^IAXYZfoK;SNhj404$^^_k$#g|&L zsdE`GW<5x?x=2+FAG+7SqpF6@|1xiGC#U{Jr%fG zY~2niJLFjWS=AX0z!AA3Ff%4=eX;H0!A&>%`2iHXcdVJJ*%5IGfMn?ge?E3ZXD%@OnDT6-*^pUc`H~s*Y^vb73m3H`2~uEBp43 zqp1%p=SbcYsyC<5!_sF-3B+x@0yT6HQS;`WEm=hW70qIy2GU;MbO;F2p`oAJWN17{ z{h9|?Q6Yh)|8+jtQo1Cg@y5u+WfV`8D3zCwz6tIWBemsl*^?S8TjjonOv!lk&^@bx zwA)aS)D6W_nRl~N{J3!Y56Tn+Z}j1Hf92jiv|a>&Yn|Oi1}-u=Ik_l|$v=X@;g>MP zi@PabY4Yut%u^k%!^jJtoJb{_Ws{% z;BIc^4++uH)TKBm2}v}@-qv`TnV1|IjcLQar>di`XOIsWII5LdZ!^&UCPMl; zI5@SguI?c`<}UGCiiCt@>hF*e(Gz@q!#JzLr=-QJiaKV!RJ1LcUI zXUd&!_y+_)!0p?&QzXUu7wN?}=q-u8^t`QLVbJz5LoAK?9xp$Cs57e7%mCFI&~)Y# z&YD8-Kl+f5&qN1y7KG~aqv8DClpj1?C8E==PA5j#kv*cMrM2_)^vr2YPftI~gFt|Z z&oSPwR&P50{O7wlJcj@1RMkLt`{W--bM0@()M1F!!vH^(v@_m&;7fbfkTZ9nsi|r8 zi2M$+rxxx*AXazgL6+|C(4T!fN2~{jIjDL{Al7h}z;>zX15M1da}8d9IaIUo>tr{NU^LLqeNw&AtcNL~; zx7GdD7`spuU>uJxmC?0a^cqlqrRt2%S?HKk?<9-+{i7Mbb?*5^MlPX3c1QLkXO^4S zXRfC(lCY$cI>~*fLEw`Ws~5@q&0l_x53iV-C^3P6?pRJJ@UMVT$R4Z?60hYU$>a4zCWo6ku}HFRRv?*ZdwVe*gZf#dcc;|@YL+c*&)2vNb+4`BL8!Os9B={ z_g|P)+Pd$6JISNM(*jNsbCIq(_Nd`2hs+;McO*6&O%Y{fVwH+sfL`o5p=0TK69CZU zv;P9PVhVPLRFM(5A*f)JQBCm10OL_$APLxs_9KhEzt1tq*%nRP5=|G(6#GEW+`pU1 z>Aij2z_C}?X#VvUvjD%5)-`Hi7&F5+eePWll)@TScyipnAgYqV8RAN}Rn{tYX=cWHbE zHkehPPborWZUf$i>hk&F!V+|AU_{q*kNehJ2(nVF^=&ac!VwCf?{1`6SK@3HTd!K!E<+_pvdiN znL+%qboH+$=p5#0f7U^K>yFUCHITb7_m|m&u&wop&`jq*`(6se26pi; zIWK>@@7wP$OI%IWf@gk@OC_%Sl43HDrRh!vER*7g7{Au`kwUN_U@|WDF