From dcdf46212c789e8c9a0f290b89643a78e053a6f6 Mon Sep 17 00:00:00 2001 From: SweetBlueSylveon Date: Sat, 30 May 2020 14:55:44 -0700 Subject: [PATCH 1/3] Drink update Adds 20 new drinks, 30 replaced sprites for old drinks, and adds 3 new sprites to drinks without one. Snow White recipe changed. Requires"Allow reagents to have specific metaglass icon files" from Arokha. --- .../food/drinkingglass/metaglass_vr.dm | 258 ++++++++++++++++++ icons/obj/drinks_vr.dmi | Bin 1655 -> 30543 bytes vorestation.dme | 7 +- 3 files changed, 262 insertions(+), 3 deletions(-) create mode 100644 code/modules/food/drinkingglass/metaglass_vr.dm diff --git a/code/modules/food/drinkingglass/metaglass_vr.dm b/code/modules/food/drinkingglass/metaglass_vr.dm new file mode 100644 index 00000000000..55e4e80a378 --- /dev/null +++ b/code/modules/food/drinkingglass/metaglass_vr.dm @@ -0,0 +1,258 @@ +/datum/reagent/ethanol/ginzamary + glass_icon_state = "ginzamaryglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/deathbell + glass_icon_state = "deathbellglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/brownstar + glass_icon_state = "brownstarglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/spacersbrew + glass_icon_state = "spacersbrewglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/galacticpanic + glass_icon_state = "galacticpanicglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/bulldog + glass_icon_state = "bulldogglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/sbagliato + glass_icon_state = "sbagliatoglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/italiancrisis + glass_icon_state = "italiancrisisglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/bigbeer + glass_icon_state = "bigbeerglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/sugarrush + glass_icon_state = "sugarrushglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/lotus + glass_icon_state = "lotusglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/shroomjuice + glass_icon_state = "shroomjuiceglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/russianroulette + glass_icon_state = "russianrouletteglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/lovepotion + glass_icon_state = "lovepotionglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/honeyshot + glass_icon_state = "honeyshotglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/appletini + glass_icon_state = "appletiniglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/glowingappletini + glass_icon_state = "glowingappletiniglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/scsatw + glass_icon_state = "slowcomfortablescrewagainstthewallglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/choccymilk + glass_icon_state = "choccymilkglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/sweettea + glass_icon_state = "sweetteaglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/redspaceflush + glass_icon_state = "redspaceflushglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/graveyard + glass_icon_state = "graveyardglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/unsweettea + glass_icon_state = "unsweetteaglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/hairoftherat + glass_icon_state = "hairoftheratglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/soda/kiraspecial + glass_icon_state = "kiraspecial" + glass_center_of_mass = list("x"=16, "y"=12) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/soda/brownstar + glass_icon_state = "brownstar" + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/drink/doctor_delight + glass_icon_state = "doctorsdelightglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/acid_spit + glass_icon_state = "acidspitglass" + glass_center_of_mass = list("x"=16, "y"=7) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/antifreeze + glass_icon_state = "antifreeze" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/coffee/b52 + glass_icon_state = "b52glass" + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/bananahonk + glass_icon_state = "bananahonkglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/bloody_mary + glass_icon_state = "bloodymaryglass" + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/booger + glass_icon_state = "booger" + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/devilskiss + glass_icon_state = "devilskiss" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/driestmartini + glass_icon_state = "driestmartiniglass" + glass_center_of_mass = list("x"=17, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/ginfizz + glass_icon_state = "ginfizzglass" + glass_center_of_mass = list("x"=16, "y"=7) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/gargle_blaster + glass_icon_state = "gargleblasterglass" + glass_center_of_mass = list("x"=17, "y"=6) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/goldschlager + glass_icon_state = "goldschlagerglass" + glass_center_of_mass = list("x"=16, "y"=12) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/hippies_delight + glass_icon_state = "hippiesdelightglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/irishcarbomb + glass_icon_state = "irishcarbomb" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/irish_cream + glass_icon_state = "irishcreamglass" + glass_center_of_mass = list("x"=16, "y"=9) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/longislandicedtea + glass_icon_state = "longislandicedteaglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/manhattan_proj + glass_icon_state = "proj_manhattanglass" + glass_center_of_mass = list("x"=17, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/neurotoxin + glass_icon_state = "neurotoxinglass" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/screwdrivercocktail + glass_icon_state = "screwdriverglass" + glass_center_of_mass = list("x"=15, "y"=10) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/silencer + glass_icon_state = "silencerglass" + glass_center_of_mass = list("x"=16, "y"=9) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/snowwhite + glass_icon_state = "snowwhite" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/tequilla_sunrise + glass_icon_state = "tequillasunriseglass" + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/white_russian + glass_icon_state = "whiterussianglass" + glass_center_of_mass = list("x"=16, "y"=9) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/whiskey_cola + glass_icon_state = "whiskeycolaglass" + glass_center_of_mass = list("x"=16, "y"=9) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/holywine + glass_icon_state = "holywineglass" + glass_center_of_mass = list("x"=15, "y"=7) + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/holy_mary + glass_icon_state = "holymaryglass" + glass_icon_file = 'icons/obj/drinks_vr.dmi' + +/datum/reagent/ethanol/angelskiss + glass_icon_state = "angelskiss" + glass_center_of_mass = list("x"=16, "y"=8) + glass_icon_file = 'icons/obj/drinks_vr.dmi' diff --git a/icons/obj/drinks_vr.dmi b/icons/obj/drinks_vr.dmi index a8d69aa3276569cf8f4eb9cb7e0ffd8e0afff76d..68ebab9b0005796d7b1b6c213f45fa3fc8a1261a 100644 GIT binary patch literal 30543 zcma&NcT`kC(>HjBEFeKZBqtFR1Qe9a5F`jnQi5be1VJ)Lo0kN%JrSI`#UE`0PsppNYZec6QS%L>d6zSDWYAQ>E=qx z>KN|0WFRqmEm-qwOUJ$GWDFj2-6eedt>vxqj~V;iex^SfZ0 zajw%!%ruF7`NwmoF}4>t7l5 zqrcT?RxWSXErzz6CeOF!%gP?tF+i{r^5mK1Rx@?=J4c-{HhF@H58tZ>!rsm;k!Q1pJL)v@6o*vu$p)OaCCr(pZukAok!+~Xp4^A|D0<4_Z~lbH~* zw-0={`ey_9c^^6w(58O1=Za-9{?!uiRbRJ|(AVi>0J(f8@}}XI>{OSczP2iXwG|Ts zw}PwUw_grVl|4c>vZf|DN7pUJe;1+=%uyu!5rZ3?{R3{QgZ#lzUAhDA!l?VqUd{KX z)<5LW+SS%PP8g>xB74>S;&P^b~@*)dW2^*IRjA?d-DZZ$k+3=sxOaw z__o|AsHj~`9BVo99b(>nEWlpjgOXNF+Klt9?Xp2{Ju6Wo%4%^Lk!! zC^Q_n?Kd1iV3pQfUswJrv9Gh#q~(Gp_fyZS&9@BSFa;pV86@M4Klh~qCH(I_rr?cSH=z|2np0af`H6oITIx}b#0_{4GclT1E`Q8ZR9!~N@>cV7o(v_}1w$_&h& zzy0YwB>Hqibje0Y&&NlKERd6|eGG9!mXJt+hKP%RT>k0>PZn?+|3&7;|9kV07T3~8ilG$nDVsm0MzQC%A+?zgqR2j}PWuhs#c4hT?5!GUNyWr{>d1;IW{D#4QgGkFI+$4GP!VPqWBl zoXKx0a?{ZIMavw0k`ol91f2J#D?kBRHYaEFH{$cKZq zb(=iq9_NwoR~TLcQ)T9)7Dk|lh74*|=CfA#e+*a4Uu&nD9!YCyX+a!4d@p`^dD%WS z#b{T}JTfwJCA`1CY>nfBy73A*X9Hde)N!LVBfr9@%$AnLwbRqxsg>Q`a6DTpWW~J- zS#BRZ>A}>N2XlR>uJ^URKD>$4BOkV8%zhjws!MdUZ72Xc&XdGTi9+An| z>qVE)*zPyycI+RfG#XKG`Laa`f@@g!-qp$;Kl${LAcoU~b^FWcH{h$ivb})qv_!4| zyA9zmGq>WOv>+$-gWLCgTXHsqYGH|Dc(Q*!eH9S*CHOPrU49CFpV|!ZU95ZrE5Uix zP`q@Xu6ILx8#4=x!4oaEa0prdLvAQkE32nzd@pMfts9oRJ$Ivp+d1jNo%H9L=4gXG znJ&;k+ZgWt*hyOMLA&(#sV1*`uAXgAUEbo7a$N>X=h+I{Q?sfMbhIdVJ)PiH96#+q znOPcyer1<`D=p{dg^2C~3&B;))z}7oW0Cblh|c8CnNv&wffkuUu7HTKfSoU)b^*fK zog-8BIBWci;dYKfn!-ubr?bA!D`KyfE6BB_`b{$dcOFABBNnLnr$i0p;TA#FdJTiT zjJ`Q8M=)=f6Js8e@-qdFCiEm0`3zJleIQcnE|WUfex8lvWB zJ7G44u$!8l)tF0xT_Ja(kO={Jsv8J$*n)DyP35rrcT~LQ^kV9)fiK0aCg18kDd(%D zQQ3?@FcP)oYkhhxjep^bNIPHD1Ius^7?#k-4Ow z?Dt=HI9_bGWd}X*hNozej`!?*s3NFh408&5a~J*odJ>D)nXxnhJ@D6&xhj?o$Pv?N zPN&#d0SPXtbR}kV_f9RI33yPjruQxBzy$6?j|4he#k*80RAF&**+0riTOLgAc=tN2 zJUcUxh{Na=jT!nlQtS|Th`yFGS+a2Ox+$V@7mhGy?mf(L+A?oJzB=w7Xjm>XXm6gW z)3Wc@yXQgl-91FAIsD!%J4{#aQ!_;4Sg2iCe2sAzYL)tUS=bzHV%xLiPV{TEayT$y zo6&uA$|>^mQO)BL)@0JT0Iu_7%35*cEvhsUORa>QHwO89s8^?qV=I>=8YmpViSr4Y z+4F0Kd$fK3taQ2e^?)&+;@BBlGA-VxpeBsU2?gSC~!3(~RJA>Qgt*V7JKhP}N z+7^$fGOB(%ldnLV0;hTyIv?RwW4 z4LIYLu=Z0p2i$pvHttW7tpf+=0_|dCxjyDwH15jm|HjBU$PtV)?~!ucSav#E-K>Up zf6rj#MsFmP|3`!&^oaQQ{E%4y(nqM#q(=*K)c6TJ0u%C? z@yz>j^FVmGf@a>&Ge+DO{gXU2bs|GDNuAQA8nXm#7Y-W)0qV!cv@>HI1?DCIz&g<2 zcq6_<0kqY{DpZG!$X&^;KJ8Ht0s4$z8b<$=rulAUTpe{APrtK36wFzs2gQB z==$et?YTFEo3Mwthzau#kc0*JQ-(~ISZH&{dt=h}HFLN~%3S{zsQC|ubBzyt5wcB( z+07m^yENkQFNrVOmcQly&f}UCX($Mxs0assY>sngc>;r2{gAl>F8~m+31+Ts^8Z~* zXaVpYkXY`%1lSFN4&UGyr~JfR#IMiVI>?k6b60e<294W!c^A-Qj^Z-VYo7O^MkTX5 z#NzSa89zup*=!YYKXM3${cs-}_u-m_(SA2l3fpKm4NIVqR}{=hDiD)fOpJcKK?})9 zP_$}UXS%UGw6CfLIf^q+HNQPdQx(dyLaGhiz=K!E_LfT^1=A80%ps5ZhY-ZuMgr`w zOOeNOk_95v@UG+^YQQ_q|D*ZoaRtBS3wAAP;f!W&l&L+0^&>%f8qH3|I~f@XIk^S8 zviK*?p(RNDpF?{>{w4JN9oR3SvqQBQb@@$D4V~eZHHYYY>aV5`b<;(sH`qI}gP(gh z8T4|ePG+7p4mL@sr`&5z7&F*0&@_KK5o+;wb?kJeI}kDWg80_MUtijXI+mN)9S&CO zk3`F)1P7?gye+(pPy;Sg2*P}daff7Cmxy%P{%-3xxAQ|IirY;^Q6Q0hD&AS~_q!>Z z5dL&Iw|;|~aY)7S>OoZjMZ6v~yhbqlOAt>bU(|@xbhG)X>tfjDX5)|^DBwhL2;Lvh_h_a0opogRf<&`01nlZtC5>v!JLN?&R^}X85@7k$&cQShQ zGnSIk?J^5b=hF(YIgb-yC)e8dO!MYq?Klj#6enH?aCvdi_0<6gfNM_T#O%tK1|*Uy zIWRuav7R?g<0Q2(N__s!STOFFUo`hOO9k=6GX=((a*i?De@~uJXrcS-U{9O+G-}Os z`}sWN_8_%`{`aV7bL{9*hNIq-Zwn0PdC>e{dLSLtoHxpJ4>i!Y3PQ8lNh67Sd8$au*apB?q#cY?;POQk0}gT7^+v{(?=mUp*R#ZnqKu z+ktUsz76J54!*~8e{+MCNOQ|@-yoZ|s!JUe!+34p6~xdYPB0st7?|w0oKwzj)|0(Pjb| zHd=`NeCCz!)t#=@o;&vJ8$$a55Vt)YE&mR8Wo3*69}2xMs_%`ZM3+9xm|2LMb&A?L zBYX{mrY}NrF}msL82#tki+==xWK(TXb>juPsqv+(N>9%wdXKGT@EDvGbFx=!w>Vuc z(wctmRz-306SVsC36;d~bpY`@?>WPAP)hkf!)lktz|bT+sPDO` zA#y+{pGmK4U6yT%TNloc+-hY zBYY0K&omO=bgqQgiT7(%91M+rr;<8G5L%G^?of4q3Yx0lqwvcqr$)HZUM4Up!spX~ z!uaDfekt~cVy~ZQ0m-#H7Nv(2=0vPUb#@|O0;(xgSh{VRP%nRc#j>E;$?K0-iTQMh zI0@>TF!%v_uK{6(p9EwI zuwQb?YtTNsba!{#A6!5FV&;O(?$RYYB8Mfx_d=6mZ7$RWJU?`- za0nZ*^78d@AGAeKs16@)@J!S1h0WxlW3=PK{I`mVCE5`-i#DWg9-RZq<(^(+f3>&5 zRPnob1{%;VDgpq%EZ^7Te3BV|vlgidfazn{Gf2r~?74k2MSMs`d>AN|2=O2wg|~x# zkHlKlW07Tp0i&W1IUI9&aQ!{&Q14LLs=(v!yu6{8e(dfD#X2paDCIDo1D{9kW|3sY zPPQ11^~{344&yR$EN6r{noQoHIM6dV(BL%>-s8e6AW(SJC$jO?xKu4#+Wc;8wwCtG zl817h^m)_?CL>jFYVadj&2~fDdyz@e(LJ+^(!-^MkhNTN^9F2BQuPk>l;Y0YjCTJ` zjgRE_?Ow7mxJ^vz|Gs^aW^(eT$wvhBwG!VA^}s7^H}-HSkNbEKb3^Ih*j;st%AVX6 z;^7{q`8B$!JQ0=QvSI?HzhB(kJT5QeLb7goItYBmdW<-|W%03H>c?KkH%tn_fSOju zJD(Vht&EcB7oX_*u;E)pc9c^1&1BmZX&&8HyOsSZJgu7tLt8FH4R@Ap>Nt)05T*u0 zyQUI8!E;`6!z6A+uuGIl2kV+V_J$zK811xhCq+u|b##yG^My1cF$Sw*<9NC&-hGv& z&e!oQ)u!J_Tq@u2+pBj;4Mbjgc{+Szjmm847`X_Qco|CF3CS=_Wy<_R!U*(%34ktP zIg|qb={g=*^uX&OfW_vicNQ&URaj)l&@R>078Jje+Q^)CD$r&qMfUR@67M{?on(dy zBZu247H$0u!x#WZliI@Jzj8{%(|X%Q-^9f9D|dfiY&~teKCc)PV&dPa8@@`7^NQ`8 zuy`FU=6-#6k`r7d`lUmWX0&KSyuOUUimLHmFbvv_KB182S?tM|?zzN?F6u%0qOSnc z=H*Om=8~Ba9G1KFJbvdWV#RZ(g5T=Y2L2QgP(nT|c+#&bzE~VIHLz%iEvJ&WCPN|A z3~etcGyHP-CHGbVy!0UyeO#`@Sp1GILCH#6#zlg_@ynBpYt8i%C6Ef9z2s0l8}Nm- zA~VFH?E_(yk2v7G zs%#-PIu^YyZt;A2GuzhV5+rEHz)y_WB;FWBd{pryJ+ukg`C<8 zAejzok$v)O;h#fCO*yVa?x7a*45DhfAcuw3MZk6C#jP zrP}mz|D1d7?Dcl|;PE8i)!$^th6oN$v|!(5eyp;#VZ$v`Os{VYwBg0ET82MI0nH@7 zgx{ie7N~`V8A5&jU^Vf0%%J02W@YHA_-}{5+mWFMS`#WxX!}HQY(=aVvF#$}8t_~- z$j-|>NRzDYz!bF)GL;Xb(*EXfjM&3o1%GBkMa6$t`wvNK<|%kd;qf9la5W;JZl5&u zcv*4P(tyqX`V{+V5& zlzlcG%;cEExoVC&))1BdEEm^RFMN;+k23cGsUNZbCxHA9o}2^W(SmWuSVy0Y@Hk}Z zJ4awlN*0gP*o@D4<9+nn^f;+c-h^1AGQU_PUZ>Ku#~cwoLO z87}XR^kNX5;Ew%ijz#9Wu z`t(^Xu0KIZH7ZO&j-#?UkKzuPO1_nqwEgf^vHxJoKQeu}RO9+$KjU;S>qp+B^h-FJ zW6Gw?$>n?u`8@pO&-=?F&fUr>8=nST0d5edLj_Ga1GU6EZ)KjGUICx|lN3o{ZnGVo zr!?7hz3H)Vcv6PKJ|FDF!}qL`91(JoMZCxx(zQ~HLMi*38=C__L%G_s?fe&O>8auq z*jF6sNI~XWIZ~jGnLZ)|v$WbWi6kDrIWP@*ZYEdwZEe0@u!f)tlFCtEt=I3peX&|GN< zW%{CUamv?&$v?^Ux*^}>+YvG(&%>Y0cx>OP|9&sgC)A3fax-i_#rdPdp_--*JTt@2WQI7|z z3_;!&q#E_okU2eOxavsnQ#^>G>(V+}uYP$W@yiQeNfoybU9Kym2N=b-$>WsxF;&#tSg^|m;h*35$$-jrIH>94sUDeVjITTK2W1%-6Lt+~L z-tz6gyNvGm*FXpeL@i$!g4P1R80CJ_AOMj z2?M$TeQ?2WqVa$l2I_$8%K#uHvTTy?deA++Yk=Nt3z_!z%DO-8(2vK#{Bndh9v5pw zK59{eGe^k5Oi2S~gl}U6|G>xAz?u-0OC3S+1XJOVu)9{o_bXu-8~9Y7W=LN`uH3;w z_fX6SZ?k4sc1s=d(?+9Aohedl-ZYvuHxPrhwe9%n%0{~An?b}<8oRLvCS_+A2OB*%OIDBozJnFZz22mFHz!)ZWl9aqD5!bsyKASX@v*$ zDRuSw6m}(P@K|)Rd)9~JE)@sSDtv*K_M?yA*WUC|ZUqLVPRE~fL zdqyw)W$U(datzwUt3(4Hy6=r&Gh1Z5_>`i?5hG{P{8*&&AZ5pqt&2Eug*(s&>fRTP z5Ag6@^cVUkH(6BpI4pl@a4KB=0pacF)I5T+IYrwRO>)=!9- zHLGLfgbVdsSkkY6hXiNzF@)UWjav+oJFC#AOtF+b0Us3IZq>Lj^b4t-Y)`?3lDiP=Y!aY7=^$#u8=&No&n1=eAkhA8{Je@TwSgu0 zq>x_M3yu7P4=jeCihg+MWe@OwASJW^G3h?s^kFE#eh&?fHO=H$E0wtOmtXs+Z`EmR zKL!sTOrDTrUWhD$Y`4E>$OHwTkC0a>F6U%6hQ;r9J1*@3i*9P0`VSv}0neD{H;s0B z!npt(aC?^25vuAH$cf~}Th7wSJXKSE$F&wwjWwm47Bi4Keg(i5DQ};LR6j_1kW+e*AU#s6Qg-`{Zl?9IqAZy*8FA4z~)Ml zg8*j!qB031(~1mM_NiYQOGD$6)LNwhUIt*@+6x(k;_O?UjOOwCuIxXcY@G$<&UhdE z3`oZBE6&@9DP!n#0h5c*)7BNd@K&~rjf-^?5R z2p9Q+aRL>uA8#w|N%_K6`TarJ_P5N@};II+JR%frB7%h5KlT~RJaLErQwuOc%ovkW`Zbi($z%o9t$1tM zocPyS_)egE!unETP2VK(_Xlpd_jvqs)gQ@FFzE^CsfR@uUC5@f}4tx6{$v$SF!qi!&IdMyJQ@Mn{RzQ%{K=N{&ZL=*4@Y|ex z6;0UM#-n=gN5?b|7ncGKHJc2UmKH6EeQ42U=mzZ#Ahw#h`T(x9SeD2|mqrW&cCO*y z!_4KNV~op<+*_jFS(=yUNe)h~3pd_644A^6P2ZGII>B}a*iQvJpaFXM?9HtEeM?zF z!=8?5r(Vvzb>7t715}q=?J4^3-zL(SwFbUuN0a@%XRmmyTLUW~#wx|O14~{*>o##i z#j||1=Dj;TeWiZR)&{>h8lT_$N(J@X{N6*xwg!{(Fo8C)tU+9pN&ZJj8%~+=ad>hd1Q&*{#ep z&=Z6`PIuoB=r%Jf#JAMC56!T(O^EEFXyKMjh80}2xrf+t2+qqumBX|bhw|JD+4QJw zIVv0)$<>g6V(%-Arvgk1Em3G!G+=G(}P> za(+w>2I@v?NmaliynjPoJekANyu6KLBcWFgdSxLQ#@Y7@cJV@lY`64c9j>-Ysve;Bnt#O}!@9NeV%Ut#=VV<_Mi?-tA&k#ptB z?kSX&`3P<@LGatv6IAB&P0+95RW=CaO&|KJSHU@dAoqvQqNz?)3L+30BY!BP{??idRVj`phU^O{>VE~_g4bj}B(xJ;vxkJZaigH?wN;pbgu z-0soN&Q7L&(SO+s?c@bnu&#}C%vj_~pzN=mamC;#3lGLj$Fx9O!27-+f3nG%C-KPT z|0VBTAT9IVih}0{d^5(q*S(oy_#Wl4EUd)w7xgVZG9v z%>Pl)<+hAGQ~3w>-p@(347`4FN&mR@zyl$L09)&b0LyJZIfKa*rLX@HWBvHWzhn*j zH8!Fv&*F8PK7iG0eMI#%d-EgySS=DlplvC`i~gDyaro)O4Wbc9W{x~VaLCfA$Lq3<;;q$ChkC7(ufK8JuK&Rg!>HYC}Hu%2iC8OTI0Xm0wZiS5~%ez604aZGoZP zeLlN;=^W}^56N_Gs=a=$1FS^1*KjP2`M<&TNarmb*opbPIr)XZ(HtuKCU z$`Is-KANgmDwk9SfO8WYVWnURAj7p4-f5*fiCVxtw9VX=hB1bE}(v_C* zx8?$l_GDcduYM?On&$w^9G7Vy^j^{NG%=LWjM+_m-#kF)9iE=;^CEfw%Kl+O2764) zwYK*anEvR1$}%ETbWwn6#PpA{f*Bh>Q(fJ$*UTl8&MT2}{-M=HG|x(OY}hl(sTuw} zDs^UZv8}(sUST8nm0;)1E(!hikmf{7;b&@Qcs^Jv$F7W3FLM;~DvE$%0rO`dBf~r@ zIa&L-&E}llffnK#`@q859sN!DyNz#g`)`Hj{lX_>n(Kdz{AXXI&Tg$7i_VBfI zHG>wb;mXck%-e)(7YiN2a|$B+vG}a{hA<&F0ke(`8JJ?49L5(K91KfYI4d2F014#i zP&`M+%H4s-xy&iY$-h}03p`VJ*W0(rEq0;=v|`S~R+5yy2wbB;P%5~ooa}uj6#pJ- z;j7y4%b`>*-t;2QToN`0s=IPH940d%6LCr3OfpXn)B4^t1BK0aM*Cd; zX(+lRtt2ET_4ehIGC17-`?{W0WJfwB(2a%Gv%#QI(_vl3z_4*U7KrZg(F63@j!w!}_ah>Bij+r`?3jOr!<>&~ z^HY#VM}>{!ojZQEtX&OrU1H6p@}=Ah8QB=6uYQS~)#R&Z{cKKU=A{Q(?2tSH=hHQ7 zgSSm5FNuJ1*#Ee;sw>Z$?N0U$<>bGv$I(iGJ1mWYs9%G5x6ZJ5U0kfoe-f;W(Jy*@ z4Qwx1#vE=_5pB%KPyK;$Ta3<$V@(@4z+&T7202~du&;eE=DF>qb{{|@7ftfq$m5f5vJxE=NCZ7~o+dK~{gKK=*!wLKuf;t>uprLc$H=M53Vy?IP@S=5p z0ly!WxX<(^@vS9wUwMKn30?pB$B(ObI=uA*)KOQ4UcWON5YQSLDlGoKtkLrfWB2=a z@OPrjlj;j>8ybD&Sr#f*^(bQRI;`s5gc@3qCcrfz^8~n6gM(vH9RN_q=JS-+#x9{u z#b9-s_9uST{u0dQO=Y^`DVaeoRhEV$6(B zBIX2ETjbs1DdmA%lCD4AUX9}X{zTJVHb|D+$r3Knd2Xp?y5@Psdb&~0AW^_7-Pt$y zj*4EwfW3)~BIHaPf62vqG1d#2c0kbl|8(7z@XZ};2PrktqBIJUHeeUSc6&_heP?^F z$48B&v&4>}_UFv58y)@KeUTR<8S-vOP-~z9uA}e;RQt!JdlkVm=>#5>%u6{p*o4dX z??$V~A9tyGOCD$4U9%%ud|0$**Ot)weMi@Q-={Wvg)~|JV ze#;!79>&3WElJi&R249Mu%Z+(CpzVBB7Is}ss`Muu-Wr+gSx9sn60`yu6f=AN*2-~ zSIA)$id$i*cM9eoH8*|rIY9oAA^~9$Y`&ZgaE9-pN<78y)`5q0k)ZNhfoghoLc{pX zj|B=RLwwV91cbfQL1=F`LftAEb=_Fz%EGbZ;@Llu zwNmD-+QbB{Nh~!}6|lXE+um7EbGr+{l7(4Ma1C1#<2(Rm8(#@}TI5X1!RXOL-DrM@ z=3?#A<1q7M(1YHGnForslk8u5JdBD|rG;NrZk&95WUuL|!&Ew!IXYS7mI%&5eg*_j zyh1ouPqwS?D0GYd6Iv7k!=DOPF{D3}(Wkd@F}E{#b-~ey7rk1ZLFGZe+7(xiUx44N z70*>ntLgbXFKz<Z~C|gpGyAu=F1rv|B3Do z&4!abij7L%ej%DNw^6|x^{<%aHHrN}#&Oua;a7hHnh^S4(fo#ISrOZKM$S^CY~oE@BsFPcskjS=Jk!Mt8`yPAC7h?<1763 z(wNLs(Z8=nWW3XUj5?DZC!RGziWrhff{jZzVLq6Kr^6M6)Ih180Vx&p%`p3k ziH}o-MG2Aw%8K~XgetMUe)Hq(Z0?&ta0myp9@oYy%Z{C*(K9}ZpL{7-^DS0{l{2ZN z;wXJZ+N#a)7qN8LFX4vo0NSjdEbsOE>E)0XQDs2 z_}39_gdg9hR==B1`|`zb)v7;vuC5_6Ycikw@F-gBCB*E~KC(K*g4#??pr!S@QGXha ze`63zFJMq6JK%7KEUUO#BV=uj3_nWY+X1&mMbZUV^FuQxHRUV?feSp21!x{ZE!g;y$^@1RT#jI4()s;wB_lt;S z;Fjcr)`sA;3-houP-&wT8L*58(sw#|@TeClx9WNSON*KLM!#QuJot4Rfvnv}s|jm1 z9vd05{O^$6wf zXNZ^YhN*gOg}km44c=zsQo(~BCoRu_^00V%$2{4T;Y5ZO{AB}Sbbh%xk-E?5&d|@*l3*8ynn^co=`bdPJp1<1N z&V@+rv8*p9XaS*6Dy*_pi`GRC3uwJv>x(zud8Ar}d{5wcU3Z^uaTEK%B&*kI6T>F` z;n}oIu~2kxXQO;?BaQ35_V{bm*1tBn(H%}vgT(VN3{?ghZfoVemBDTNLFlHUE6=P` zYV=P8A&|a8Di$&nVjil&kzT%Z7heH**^JI4$Jd5Xe$01A^5T)vTth!o*-kXgkd?7# zGMX3Wd&#y#kkI0|6D9WT?d*x~)nI`Eko(#n+L;D<wLrwPeuEak*&goLCH*L7sTuvj zAfRTjqw)j&9l)eaI4+lfZlCWe$I1B1gkpTw+l$X^Q9mA0f5iCo=D!c~)M1XFcDEAr z)>_!}ZNd1k-U!6`G75n|;S#M34rBgX@OFT|jzP3?=QlN#qYG_lL|lUVK|$QVXkeX4 zqTm!5G45OwAp!a4J&q83weNp?g`W$!mi)!rX85}VE(=M?Xc`I z#MvDkZ7gT!F>Cx2Oi%`1Z1BV{NZyD285&41X5mu_mwD=*bs28fKS)>>d3s1X8*YAb z#JK-og#T-fBTc8;Q|+r(<6$GY67=aXVe4m>u@IAm&$UpS+_JapY&A;dE;#z|4qO(N zC@zR4pWr=lSc81^u9fyjlQ_#)&!MY;`x7mThG%a7^1HccZl+6(z?O#(hyj`m?=m?a zv_>fxe{b3K$jFnsVEDMhrl|pa)Oa;7z3+SJ_%Hl?+(=H*3+{czaH$4=dM&4Lru_c) zlIcq+q5+I>RP^=79OsHVGq3BFhHp-`Ymrk(YfNNT<~OQX;)xnju2v7}Xu>)+LF&-= z1I8I>h~IzaRC(;dJ#q?ixn6}!&yS;)P5LctIoajQy$v^hq&qwq1UIC-J|3xqk{9cJ zoQ%=;!7D!d71`BLs;bG~Fc@wY9P%$DejE_)x9^*i?9cvd7w_07((++)$qtBGim!MB z@ArzB3pz|jWVuM}Ix>x&G!WGP@&wlh;@Zlh!H8|R%6qn28%JSZj4OLE_kWa1{q*Qn z;P|~O{O1TuU5LhSfLF$#r!;os~n*4|mK;v71x( z3*M~y)%d+FCNdu?twEDG{AisbP5a_T!^!lv;8Fl_`Vl5ay>sLKuwLw|2kn7c%!)Fx zeY+>05w8MV!emf~hr$2y5nw0H`Q*}um^pJ|;JX=hI^UVVdTa_ z*{rl{J~tG+#*rJ?oq*0xg4x0znCKQ|ex`nS>8)p)jR^+btmD;~V(x$!jSB~CxqN9X zV--X9Pw*OzyGk#PKP(-;z9Xo)Psj?pYt@6IzV)HK1=mX7S<_%Tfm@#H=7_n(r_}^5 zu1107dMbAZvbch;WB`l@=^3c^=O2UzmbaAdUZtMXancUQz3pXSMYwoVVWo9Q;`1+b% z9zfvvKak7+*q31OdIhREyk^%piMVbnIqtyKjeiMwpSF=c?PbgfWgHIn>;@ zLG6Qak#-(|$eoSSzwz{s14Xtq!CC!Ve7W$MLp8hTm?H-5c3xGv&5MVISOEFk^xZY@-H+Fku6C$v**LpUB!r93W=zrFRiywFd(cVfkk) zG$YuFb)9-IMjF%w%kl#DYHIGnnbGOfSbV+TN@I3+^;Y0I6U4X3PuNHI+{QldaXFzC zUibVEuDzbN>kFP63~LoMz5N2MYs(~#;=dEd;3qnn(GCliM@i!UabGjB(W7B8Ooue% zyhg~~;|S8G^3Bm>+^tbUoA}qR&PwN7M|}%9eZrpjyn!pqxS6MkSJ!_0TkYAwTR(rX zO>%sovCbjnDv-^%$ryPuNX=a&Z-$a)lZBSarfp=3QITd|L`S#n{?GLUu`6L0A7z#u zcKMPHnvl`c29CyI3NAg&Qwy)4nM{IdLQChW;}(j=7c)@C*q}?+z(@a|r0wWW`;S+b z8iE@Y@%JMC6DPlFs{a3LYA#*J!?{2N>!R0T$|yeIeHr4C=G`A|BEc45JeaWd)LaYB z*me44`AReRFuxpD+zkEGeLR0||NCH?;&1^l?^=2rK5~8z08(0!s@pY`#lG(q*~^66 z65V*c!@m^iG~Dlyh^Wn|USdGwt=@{abzw-(x3w|}#t*&^J%s4&f*1GUV_;y(|Ge3B z?DOAAY1N(FvS@axpLYAu)P|e*lEkH^hNWll)}jOE&i$XC{woRuTarSZbaQ}tcE_ET zMQiyZlPA9}XfR!(>y|Ui2e|k(@tcsd;B@-DM)`qS`NuGkp_y8{O4#wZSFtWq=uaYg z^uBZK{`t#)Qk*e)*`Z`d;OB;tJ4@8cf3nBwYFsl9tH1WAOQ=A-*B`9zveT*7kSVEl zP{(ZZ4-dXrUH4+iYaT7tPXBb&K%On<8JZ^y4Ui+$QXSvKld119=Y2qpPiQqAB_CQY zo^F#lkjs;ERt)!Q$(%5GJx;GWgl>Nu0|1X<2K=QcJ@L4y_f4sW2$SXK@qE?qMDtU;DbU^2A`6+Flc2z5;oG48<$M(tiu{x zDgb^X8z85h=u8lt|tlRXN$1l+(fhpQz zgP0L<_-bk|cYmWCRW$j@C-apPTq9;b25;JozX*=lr|BfzdUy%c!~`R}JE8)|(gqn^ z=~?yU@%QU&pA_RFENd^E??x{h-@vM#Y&{?VoG)D64D!T~sn-?q2%QI%tkN(BuS5HKEp9bl;KvLZI&d z(5H2Z7JG`|eGG0+t(dNQ$XeIBa{j@NV|i^k^k9@Y{hLASzW%=pUifv6#qu4n&Anm{ z40wlpRYfidMkvYQx0sixr(^#BC$a+XQjlgodM)m3j*1ug#B0vm%D_gO=LeWMd^|n(m;_=LTX3> zNktlFC_zO^Qt3vzL23{bq!FZBx?`y6Z}U9wIp1~8b^h2fYt~-9*6&_-EgP(l`$dOy z0qO2yK|o+=$F}gW!$e36tD^Qthv>c$0SeH+2pBhp`AXnL3A=L@AOXZh(AK-1=Uh(E zfjNC*Sq_0n;NFg6C1AKkrzeL$sP^n*QT(=3yr`qEqf!8^NpMC$O`@aBo%6+V{PZcC zprwpM?aO|o!RAk(4DaIk`a8Xy`zK=UUk3$j&n>NNM4A;(1AbVlNvOXmr|8xv znqawngK_TKMoRsE);d?PNf$+l#s`va$G3om$pwqs#9haqY11NRBQwwwgC;nzr`2@# zWH1B&M(O4J@AX_Z)_awARQ{0#CxJj9J1|a-EO3dJ!mCK-m(~?O}?-^0gwRp#zkt<5Hv2yBV^WC`f(-;wUOt@WkIZ zyulY=FBL+vun_-;ln=L!@4qX{R~uOS&;NY*uv2NBxj%%5_AUsNw{0Tw4|RntU7`Gq z(LG$<3sH_Jw_kHoJOPN+JM*#3Kc@y;AuIBqvT@A&)hj|~lukVmD#y#JYt7#X1xfv6%x#7S!V-e?2xu)rNMzXJst|YBC&FAZ^RaY|ff|*llfPgK z?#^2Xhk?6&G9-F%{+hIiW-Y7{7nB&pROE(Ti%w^L`!#>3{zy>=gR+}PI8I>k^;m_r zal_K?I!9Gt@OCov$DG5?ThQ|Rd_*30K}apAlmRNbqo1`fGRD_xQb1;NBZ+ObUgq*w z1~3X8&I* z9IOOlf2l3rk5(V%;}P=8)E*>+YKKV#(;%pX%o&rk6HMM>*R%+oC6GMBTTiA9H6b{$ z7m}alEedR+*j5H7^C`9h7|?jONkZK-yr)OdocQTO+<}M)-f1soPJB-USeBO!2CGfW z3U9$2b>&6aMRxQSb1+<8zX%A%&A#Mt7@s#EaA~U;ZF!_e@*&Xq?Vi3{MuybmM1=R^ zs5%Ke7MrG8kjr{4^fgw&M6GeYJPf5YcoJyFvM^^nzfGYgH)$4B(j!cK?)5sOyP}Gz z|9-hrD$Xvvi0Lkl>0T7q;j13M$*9Ja!zOo7KbzHXZ|9=ZlaXR=gunc9x#=xsX>AfO zf)4#JP7bNxMmw>5cm;!4~kXIuyzOsX!q(o`*hC4^>t2+ZtY-)%$a29A)dd?*v-ainD91&c9KVHB2yx- z(c_NQ{+={W#5HFpB&c>chqU~aM_sK63gB|0=&-LlqU1Il>#Uy0VQy z1&|S=i-7jNP$iDtMCn9Bb0mPf?>tvTYX2IHL|S??Q}2CKG28jVe0nT@lu-cx)&6N2 z=~KN1d@MJ-?cciFODDg1yA;y1^WBE7NakZP9Z82?an<6sXZJ_)}_E?SeTy_Yi&lPBy zr;tkoB8ZL-eA|L2XZR)|!}m=gVDheqaJ1d?1r5zGjT3SjTbA0ep5me2>6GGg1ziMo zf0{FJ3C|I>ZI=GY?6{|WAe^3ys@eL;Y!pn=ziYjzh#sQAaHU0oZ*RLB&q_qJ|N5;a z`nqN$A-n~i7LH9YCTOW^W@Pk3O{f68HKuxK=`!5JT~pH6jCUa~STm3G$TxQs!{M5c zeMF!-M~$5hk>0$aOXsOxzG6ftS!#b*4ZcfIl?=D!0m`sMu652Aix{-?s~|I%OmUq9bpUn8MZ6jh@K9tM#-C@oW& z*W!rXSu53R*MJ`~k*mmtY_lxX++W>@BP9a>5ZfQn(6+t(T)jL7a=5__ma}T*qbw~y zn{*`*rUSDspKa&VnhF7jes!R(QMS~zP10HThH>$Du+0pozJBa8hCgCpL@=Gg*Zy-L zXo4mFSs@S9!y5CyA+}3BOM&?mPxtK%D0ajDPixNaha$H>S|uo(a3k$N2>|zU=PoE^ zHm=RDt0)}ZxO#On$3Fm11GGWKNgdaq*ZA(AvY{2HwL!;BGM6Y8aKC38O>d#(9h|@1 zak#LQFAy~#P8j@}YX5DQTNyrh@@SQJWb6!_ii@u?zxIsb?z<^+qu#E4B6ZG7p4v~c z0~Yoj7%;Aml;_B#(+Yy!Wncs4!1;G`(!1kN$8wqpAdf6%ciPn$*(#&I?zI;6`B5^Akg; z_3QeYetDJyFaMKnm$f9MwR>aKpwi?WXSDo>vz_MzO*FMCH7KVzU!kNfl-sXr?~LWi z@N2ZtmG*BqUZO+ARbwO2MDbb^Hb8b_;`LPrs%;R#i$W2E^@qC2G|NsSQ?yDyaZYGg z$8Wg2pk~9Y6)55;R}iRJPWmeVuKWup6Y#cbZBHx#clQV8Y_YkHt5PZKBi-I8(|iUr zeA*hDrTXM+=)Sq)0lwykOMTag+CiRa>iAd(4t+Z1JChrOJkt{%c!UFt`_xLJAvV*S zqP$~W^qd(1RUGb*@Y@o)Rd|5G*EoR=SRp%BbE13trJTVsKc0Xoy>E@y)hE%NxdTliGlyH@(x-wZX;w!QqCppw$zyewExe*e$!qyZm&D ztgTMwIO)A-eGsr{0dG_kfQ2!A_IC&Z+@`sibJ$Wr)opqZ%?3+TWCnE1&tReV2%u5E zO$YVkmYZR!Ly>M6b#G4{@{2(aW00GbU4sVgPAeik^zR&?(^L$j1ftZgxaa%B{pt`= zIcfdiz%22D>1Gs7+a7lehCQz7?dc{p(7CX*VaGw*S){FleZJDwAwmc82?PEThxT`2 zk>x%V3v;*TBSw?ljcMt(e{(E_TxGu4R?7D1gGtJ2kdo!1CfX$BLf)+A+4PE%a(eQ1 zblj_qq?XVp5AVoQsma_fhWlLK@myWB6Pl=5*|V9mv6Ph|uBLr1DL&>Wf%_*WcF*v4 z+(kdf`k?ze1~1=d`>_Nzz@&oekRHXEahP7(UKk5vIS}T=6?73W8JsaHdB#vHO|RLQ za463i=#-(;mKHXyPz?EsP`KU%_!rSXf{(#t;jHlMxVSHg$iP8_Z1FwyYi=s=N;q(a zj!XKj9clz@z7u3lS1Im&&dErTsq#xfa6^gB-Lt6irA0BpU96zsq<0V5KX;l(qeH2# z59_T=H1Rm=Td>&ben7A-pVWgIE9Vx$=cv9VpL($P?O5a(QPzJrd2>jl z5q~^&8xl*%E@hnU)x*AFTV`uKTj5 z|4=2?QBbVKhJADFCcG#xJTHPI){)4h!ut{tZFB_?_goB_O(DR+;i2>O$E;xzE`3Y8 zSpTBp{6~=R%XXmo9-+`4EhbjTgF{mA{6u`X>QWL)Fk#5{KKmAogu#i<4U3Wl>{i=p zKYkz-!rg@jI6MNA+BkaS=6Ug*A!5egB-zl@(euqT+lG2p{sYw*CatGbbawRSpwbE4 zfLaqj5C-AC4-_@iv^2L|oW?1E7Aqm|%9MT$&bxjU`V-d<+RcEbF5iMP-f{yqd^kX$ zNx6PC-u|fZUfUyz1Wk(d;|ImZGIO`?Z{SsyPo1D@&yLmLm4tkTJ{P&2?@R5jJ$W~O z0{dMRA{v7qL@_I;^PZI6$UBP{1ieAq4xP)W1d+X$pQ=>S2TLl3(l`;H=6L3RB_dKL2KDSmCtVv?>N9B!4f3 zI?(?sE@m9wx7MMOyKwH9FW8M&aC=#8f&I_9xS8kD|LrO8|8Tjnnw&fEayJ`F0=Zt%$M9l%M^>f=({qhR&n>}Q@=SA`EP@D zO;Pei?vg1X;)~i>M(Yh-ERy_W55x$wX1OB|x^@Gw2?Nvhu7*OgWaPhv&&zPZf&~&n zF<%wBda$vvam%MPY#)m)u#I$8qAGu1PcKg0X6-0Xe$F`neP+3TV-!=VIp6-ZQ}=~v z-xL>rQA9hNesh0Emd%5%xB`nM>&$F2H=Fc1%Rw}GZZuvBtgn*bRr%9z0g_F3@o!|P z+INf)>jesqORF+mm(c$HyC@(K9>j7d-z4$UFBk>s`M&KUl7k&y zlX<4URBT6%U0YrxgkH;-6mS<(FXS@NT<#3V$V&rqZA;&6u}? zOh6*d5n0G zz%?iLXUscO#h^eEhoLaAcurbzyX6~=q}}siJuE3nM(0-H}@6Heb%OXBcDz0Wo8Lbxoc?y|b{UbfJq zNH3P&X0urW7V^kw(yWSyi*E_9sc~9(KQ~+|_}E1mq_sHi+|BfJzPT0CNeS@8#wM+l zHJjv2e-ijGSY|Y`_Q`y36lqlalLi6_6$z+1YZ^D4H@ZOBfn<+b{rZbO|FBWJMU(Fh zn#_M18tUvXg;tx|N6TLeG!aQ;HsLr`&Jg{%_w4aGk|ZBEC%B+yRdAQ?hGt>>H067n z3`VOeP~&U0RGlmO>{a?fw5%?}w+0o?u0%#gzAneQ;JJZ%ZPYt&5a6KR4N>;gRNpletbR4yxJ3=;m;%TzxJ>saYsu z`NcWj_-Ah9``OxuFQ=~58~0z1P`Cd2Udo_U>^%ha(&=yAhq8z9mmhnL{ARH-E&Qs> z!J_hq_V5$KJ*u2{)d*U<1{4kLX{tnr!u()3y~L^c*{t8%0D5-q?%-XvaPmze>UitS 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 u5 Date: Sat, 30 May 2020 15:04:31 -0700 Subject: [PATCH 2/3] Patch 1 Some files didn't transfer over for some reason. This fixes that. --- .../Chemistry-Reagents-Food-Drinks_vr.dm | 299 +++++++++++++++++- code/modules/reagents/Chemistry-Recipes.dm | 2 +- code/modules/reagents/Chemistry-Recipes_vr.dm | 140 ++++++++ 3 files changed, 439 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm index d57b8405848..fee195bbac9 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm @@ -106,4 +106,301 @@ ..() playsound(M, 'sound/items/hooh.ogg', 50, 1, -1) if(prob(5)) - to_chat(M, "You feel like you've been gnomed...") \ No newline at end of file + to_chat(M, "You feel like you've been gnomed...") + + + +/datum/reagent/ethanol/galacticpanic + name = "Galactic Panic Attack" + id = "galacticpanic" + description = "The absolute worst thing you could ever put in your body." + taste_description = "an entire galaxy collasping in on itself." + strength = 10 + druggy = 50 + halluci = 30 + var/adj_dizzy = 10 + color = "#d3785d" + + glass_name = "Galactic Panic Attack" + glass_desc = "Looking into this is like staring at the stars." + +/datum/reagent/ethanol/galacticpanic/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + M.Stun(2) + +/datum/reagent/ethanol/galacticpanic/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + + if(dose * strength >= strength) // Early warning + M.make_dizzy(24) // Intentionally higher than normal to compensate for it's previous effects. + if(dose * strength >= strength * 2.5) // Slurring takes longer. Again, intentional. + M.slurring = max(M.slurring, 30) + +/datum/reagent/ethanol/bulldog + name = "Space Bulldog" + id = "bulldog" + description = "An inventive kahlua recipe." + taste_description = "fizzy, creamy, soda and coffee hell." + strength = 30 + color = "#d3785d" + + glass_name = "Space Bulldog" + glass_desc = "It looks like someone poured cola in a cup of coffee." + + +/datum/reagent/ethanol/sbagliato + name = "Negroni Sbagliato" + id = "sbagliato" + description = "A drink invented because a bartender was too drunk." + taste_description = "sweet bubbly wine and vermouth." + strength = 30 + color = "#d3785d" + + glass_name = "Negroni Sbagliato" + glass_desc = "Bubbles constantly pop up to the surface with a quiet fizz." + + +/datum/reagent/ethanol/italiancrisis + name = "Italian Crisis" + id = "italiancrisis" + description = "This drink was concocted by a madwoman, causing the Italian Crisis of 2123." + taste_description = "cola, fruit, fizz, coffee, and cream swirled together in an old boot." + strength = 20 + druggy = 0 + halluci = 0 + var/adj_dizzy = 0 + color = "#d3785d" + + glass_name = "Italian Crisis" + glass_desc = "This drink looks like it was a mistake." + +/datum/reagent/ethanol/sugarrush + name = "Sweet Rush" + id = "sugarrush" + description = "A favorite drink amongst poor bartenders living in Neo Detroit." + taste_description = "sweet bubblegum vodka." + strength = 30 + color = "#d3785d" + + glass_name = "Sweet Rush" + glass_desc = "This looks like it might rot your teeth out." + +/datum/reagent/ethanol/lotus + name = "Lotus" + id = "lotus" + description = "The result of making one mistake after another and trying to cover it up with sugar." + taste_description = "rich, sweet fruit and even more sugar." + strength = 25 + color = "#d3785d" + + glass_name = "Lotus" + glass_desc = "A promotional drink for a movie that only ever played in Neo Detroit theatres." + +/datum/reagent/ethanol/shroomjuice + name = "Dumb Shroom Juice" + id = "shroomjuice" + description = "The mushroom farmer didn't sort through their stock very well." + taste_description = "sweet and sour citrus with a savory kick." + strength = 100 + druggy = 30 + halluci = 30 + var/adj_dizzy = 30 + color = "#d3785d" + + glass_name = "Dumb Shroom Juice" + glass_desc = "Touch fuzzy, get dizzy." + +/datum/reagent/ethanol/russianroulette + name = "Russian Roulette" + id = "russianroulette" + description = "The perfect drink for wagering your liver on a game of cards." + taste_description = "coffee, vodka, cream, and a hot metal slug." + strength = 30 + var/adj_dizzy = 30 + color = "#d3785d" + + glass_name = "Russian Roulette" + glass_desc = "A favorite drink amongst the Pan-Slavic speaking community." + +/datum/reagent/ethanol/russianroulette/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + M.Stun(2) + +/datum/reagent/ethanol/lovepotion + name = "Love Potion" + id = "lovepotion" + description = "A drink said to help one find true love." + taste_description = "sweet fruit and honey." + strength = 30 + druggy = 0 + halluci = 0 + var/adj_dizzy = 30 + adj_temp = 10 + targ_temp = 360 + color = "#d3785d" + + glass_name = "Love Potion" + glass_desc = "A drink said to help one find the perfect fuck." + +/datum/reagent/ethanol/honeyshot + name = "Honey Shot" + id = "honeyshot" + description = "The perfect drink for bees." + taste_description = "sweet tart grenadine flavored with honey." + strength = 40 + var/adj_dizzy = 10 + color = "#d3785d" + + glass_name = "Honey shot" + glass_desc = "A glass of golden liquid." + +/datum/reagent/ethanol/appletini + name = "Appletini" + id = "appletini" + description = "A classic cocktail using every grandma's favorite fruit." + taste_description = "green sour apple with a hint of alcohol." + strength = 45 + color = "#d3785d" + + glass_name = "Appletini" + glass_desc = "The perfect fruit cocktail for a fancy night at the bar." + +/datum/reagent/ethanol/glowingappletini + name = "Glowing Appletini" + id = "glowingappletini" + description = "A new nuclear take on a pre-modern classic!" + taste_description = "overwhelmingly sour apples powered by a nuclear fission reactor." + strength = 30 + druggy = 20 + var/adj_dizzy = 20 + color = "#d3785d" + + glass_name = "Glowing Appletini" + glass_desc = "The atomic option to fruity cocktails." + +/datum/reagent/ethanol/scsatw + name = "Slow Comfortable Screw Against the Wall" + id = "scsatw" + description = "The screwdriver's bigger cousin." + taste_description = "smooth, savory booze and tangy orange juice." + strength = 0 + druggy = 0 + halluci = 0 + var/adj_dizzy = 0 + color = "#d3785d" + + glass_name = "Slow Comfortable Screw Against the Wall" + glass_desc = "The best accessory to daydrinking." + +/datum/reagent/drink/choccymilk + name = "Choccy Milk" + id = "choccymilk" + description = "Coco and milk, a timeless classic." + taste_description = "sophisticated bittersweet chocolate mixed with silky, creamy, whole milk." + color = "#d3785d" + + glass_name = "Choccy Milk" + glass_desc = "The most iconic duo in the galaxy, chocolate, and milk." + +/datum/reagent/ethanol/redspaceflush + name = "Red Space Flush" + id = "redspaceflush" + description = "A drink made by imbueing the essence of redspace into the spirits." + taste_description = "whiskey and rum strung out through a hellish dimensional rift." + strength = 30 + druggy = 10 + var/adj_dizzy = 10 + color = "#d3785d" + + glass_name = "Redspace Flush" + glass_desc = "A drink imbued with the very essence of Redspace." + +/datum/reagent/drink/graveyard + name = "Graveyard" + id = "graveyard" + description = "The result of taking a cup and filling it with all the drinks at the fountain." + taste_description = "sugar and fizz." + color = "#d3785d" + + glass_name = "Graveyard" + glass_desc = "Hahaha softdrink machine go pshshhhhh..." + +/datum/reagent/ethanol/bigbeer + name = "Giant Beer" + id = "bigbeer" + description = "Bars in Neo Detroit started to sell this drink when the city put mandatory drink limits in 2289." + taste_description = "beer, but bigger." + strength = 40 + color = "#d3785d" + + glass_name = "Giant Beer" + glass_desc = "The Neo Detroit beer and ale cocktail, perfect for your average drunk." + +/datum/reagent/drink/sweettea + name = "Sweet Tea" + id = "sweettea" + description = "Tea that is sweetened with some form of sweetener." + taste_description = "tea that is sweet." + color = "#d3785d" + + glass_name = "Sweet Tea" + glass_desc = "A southern classic. Southern what? You know, southern." + +/datum/reagent/ethanol/unsweettea + name = "Unsweetened Tea" + id = "unsweettea" + description = "A sick experiment to take the sweetness out of tea after sugar has been added resulted in this." + taste_description = "bland, slightly bitter, discount black tea." + strength = 80 + druggy = 10 + color = "#d3785d" + + glass_name = "Unsweetened Tea" + glass_desc = "A drink with all the calories of sweet tea, but with none of the satisfaction. Slightly psychoactive." + +/datum/reagent/ethanol/hairoftherat + name = "Hair of the Rat" + id = "hairoftherat" + description = "A meatier version of the monster tamer, complete with extra meat." + taste_description = "meat, whiskey, ground meat, and more meat." + strength = 45 + color = "#d3785d" + metabolism = REM * 3.5 // about right for mixing nutriment and ethanol. + var/alt_nutriment_factor = 5 //half as much as protein since it's half protein. + //using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account + + glass_name = "Hair of the Rat" + glass_desc = "The alcohol equivelant of saying your burger isn't cooked rare enough." + +/datum/reagent/ethanol/hairoftherat/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + ..() + + if(M.species.gets_food_nutrition) //it's still food! + switch(alien) + if(IS_DIONA) //Diona don't get any nutrition from nutriment or protein. + if(IS_SKRELL) + M.adjustToxLoss(0.25 * removed) //Equivalent to half as much protein, since it's half protein. + if(IS_TESHARI) + M.nutrition += (alt_nutriment_factor * 1.2 * removed) //Give them the same nutrition they would get from protein. + if(IS_UNATHI) + M.nutrition += (alt_nutriment_factor * 1.125 * removed) //Give them the same nutrition they would get from protein. + //Takes into account the 0.5 factor for all nutriment which is applied on top of the 2.25 factor for protein. + //Chimera don't need their own case here since their factors for nutriment and protein cancel out. + else + M.nutrition += (alt_nutriment_factor * removed) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.feral > 0 && H.nutrition > 100 && H.traumatic_shock < min(60, H.nutrition/10) && H.jitteriness < 100) // same check as feral triggers to stop them immediately re-feralling + H.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm. + if (H.feral <=0) //check if they're unferalled + H.feral = 0 + to_chat(H, "Your mind starts to clear, soothed into a state of clarity as your senses return.") + log_and_message_admins("is no longer feral.", H) + +/datum/reagent/ethanol/hairoftherat/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + ..() + if(alien == IS_SKRELL) + M.adjustToxLoss(removed) //Equivalent to half as much protein, since it's half protein. + if(M.species.gets_food_nutrition) + if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein + M.nutrition += (alt_nutriment_factor * removed) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index d76b731ee71..2275221b2fd 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1861,7 +1861,7 @@ name = "Snow White" id = "snowwhite" result = "snowwhite" - required_reagents = list("beer" = 1, "lemon_lime" = 1) +required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, "sugar" = 1) //VoreStation Edit result_amount = 2 /datum/chemical_reaction/drinks/irishcarbomb diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm index 7ab2aaecc43..f2783b67928 100644 --- a/code/modules/reagents/Chemistry-Recipes_vr.dm +++ b/code/modules/reagents/Chemistry-Recipes_vr.dm @@ -129,6 +129,146 @@ required_reagents = list("whiskey" = 1, "protein" = 1) result_amount = 2 +/datum/chemical_reaction/drinks/bigbeer + name = "Giant Beer" + id = "bigbeer" + result = "bigbeer" + required_reagents = list("syndicatebomb" = 1, "manlydorf" = 1, "grog" =1) + result_amount = 3 + +/datum/chemical_reaction/drinks/sweettea + name = "Sweetened Tea" + id = "sweettea" + result = "sweettea" + required_reagents = list("icetea" = 2, "sugar" = 1,) + result_amount = 3 + +/datum/chemical_reaction/drinks/unsweettea + name = "Unsweetened Tea" + id = "unsweettea" + result = "unsweettea" + required_reagents = list("sweettea" = 3, "phoron" = 1) + result_amount = 2 + +/datum/chemical_reaction/drinks/galacticpanic + name = "Galactic Panic Attack" + id = "galacticpanic" + result = "galacticpanic" + required_reagents = list("gargleblaster" = 1, "singulo" = 1, "phoronspecial" =1, "neurotoxin" = 1, "atomicbomb" = 1, "hippiesdelight" = 1) + result_amount = 6 + +/datum/chemical_reaction/drinks/bulldog + name = "Space Bulldog" + id = "bulldog" + result = "bulldog" + required_reagents = list("kahlua" = 1, "vodka" = 1, "cola" =1, "cream" =1) + result_amount = 4 + +/datum/chemical_reaction/drinks/sbagliato + name = "Negroni Sbagliato" + id = "sbagliato" + result = "sbagliato" + required_reagents = list("champagne" = 1, "vermouth" = 1, "sodawater" =1) + result_amount = 3 + +/datum/chemical_reaction/drinks/italiancrisis + name = "Italian Crisis" + id = "italiancrisis" + result = "italiancrisis" + required_reagents = list("bulldog" = 1, "sbagliato" = 1) + result_amount = 2 + +/datum/chemical_reaction/drinks/sugarrush + name = "Sweet Rush" + id = "sugarrush" + result = "sugarrush" + required_reagents = list("sugar" = 1, "sodawater" = 1, "vodka" =1) + result_amount = 3 + +/datum/chemical_reaction/drinks/lotus + name = "Lotus" + id = "lotus" + result = "lotus" + required_reagents = list("sbagliato" = 1, "sugarrush" = 1) + result_amount = 2 + +/datum/chemical_reaction/drinks/shroomjuice + name = "Dumb Shroom Juice" + id = "shroomjuice" + result = "shroomjuice" + required_reagents = list("psilocybin" = 1, "applejuice" = 1, "limejuice" =1) + result_amount = 3 + +/datum/chemical_reaction/drinks/russianroulette + name = "Russian Roulette" + id = "russianroulette" + result = "russianroulette" + required_reagents = list("whiterussian" = 5, "iron" = 1) + result_amount = 6 + +/datum/chemical_reaction/drinks/lovepotion + name = "Love Potion" + id = "lovepotion" + result = "lovepotion" + required_reagents = list("honey" = 1, "sexonthebeach" = 5) + result_amount = 6 + +/datum/chemical_reaction/drinks/honeyshot + name = "Honey Shot" + id = "honeyshot" + result = "honeyshot" + required_reagents = list("honey" = 1, "vodka" = 1, "grenadine" =1) + result_amount = 3 + +/datum/chemical_reaction/drinks/appletini + name = "Appletini" + id = "appletini" + result = "appletini" + required_reagents = list("applejuice" = 2, "vodka" = 1) + result_amount = 3 + +/datum/chemical_reaction/drinks/glowingappletini + name = "Glowing Appletini" + id = "glowingappletini" + result = "glowingappletini" + required_reagents = list("appletini" = 5, "uranium" = 1) + result_amount = 6 + +/datum/chemical_reaction/drinks/scsatw + name = "Slow Comfortable Screw Against the Wall" + id = "scsatw" + result = "scsatw" + required_reagents = list("vodka" = 1, "orangejuice" = 1, "rum" =1, "whiskey" =1, "gin" =1) + result_amount = 5 + +/datum/chemical_reaction/drinks/choccymilk + name = "Choccy Milk" + id = "choccymilk" + result = "choccymilk" + required_reagents = list("milk" = 3, "coco" = 1) + result_amount = 4 + +/datum/chemical_reaction/drinks/redspaceflush + name = "Redspace Flush" + id = "redspaceflush" + result = "redspaceflush" + required_reagents = list("rum" = 2, "whiskey" = 2, "blood" =1, "phoron" =1) + result_amount = 6 + +/datum/chemical_reaction/drinks/graveyard + name = "Graveyard" + id = "graveyard" + result = "graveyard" + required_reagents = list("cola" = 1, "spacemountainwind" = 1, "dr_gibb" =1, "space_up" = 1) + result_amount = 4 + +/datum/chemical_reaction/drinks/hairoftherat + name = "Hair of the Rat" + id = "hairoftherat" + result = "hairoftherat" + required_reagents = list("protein" = 3, "nutriment" = 2, "whiskey" =1) + result_amount = 6 + /////////////////////////////////////////////////////////////////////////////////// /// Reagent colonies. /datum/chemical_reaction/meatcolony From 2c3c8e845070bd7280d5ace5baa6da10e801203e Mon Sep 17 00:00:00 2001 From: SweetBlueSylveon Date: Sat, 30 May 2020 15:57:03 -0700 Subject: [PATCH 3/3] Patch 2 Fixed indentations. Removed "Icon_state" and "center_of_mass" where stated a second time. --- .../food/drinkingglass/metaglass_vr.dm | 158 ++++++------------ code/modules/reagents/Chemistry-Recipes.dm | 2 +- icons/obj/drinks_vr.dmi | Bin 30543 -> 30542 bytes 3 files changed, 54 insertions(+), 106 deletions(-) diff --git a/code/modules/food/drinkingglass/metaglass_vr.dm b/code/modules/food/drinkingglass/metaglass_vr.dm index 55e4e80a378..5381153dd70 100644 --- a/code/modules/food/drinkingglass/metaglass_vr.dm +++ b/code/modules/food/drinkingglass/metaglass_vr.dm @@ -1,258 +1,206 @@ /datum/reagent/ethanol/ginzamary glass_icon_state = "ginzamaryglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/deathbell glass_icon_state = "deathbellglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/brownstar glass_icon_state = "brownstarglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/spacersbrew glass_icon_state = "spacersbrewglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/galacticpanic glass_icon_state = "galacticpanicglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/bulldog glass_icon_state = "bulldogglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/sbagliato glass_icon_state = "sbagliatoglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/italiancrisis glass_icon_state = "italiancrisisglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/bigbeer glass_icon_state = "bigbeerglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/sugarrush glass_icon_state = "sugarrushglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/lotus glass_icon_state = "lotusglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/shroomjuice glass_icon_state = "shroomjuiceglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/russianroulette glass_icon_state = "russianrouletteglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/lovepotion glass_icon_state = "lovepotionglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/honeyshot glass_icon_state = "honeyshotglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/appletini glass_icon_state = "appletiniglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/glowingappletini glass_icon_state = "glowingappletiniglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/scsatw glass_icon_state = "slowcomfortablescrewagainstthewallglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/choccymilk glass_icon_state = "choccymilkglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/sweettea glass_icon_state = "sweetteaglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/redspaceflush glass_icon_state = "redspaceflushglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/graveyard glass_icon_state = "graveyardglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/unsweettea glass_icon_state = "unsweetteaglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/hairoftherat glass_icon_state = "hairoftheratglass" glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/soda/kiraspecial - glass_icon_state = "kiraspecial" - glass_center_of_mass = list("x"=16, "y"=12) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/soda/brownstar - glass_icon_state = "brownstar" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/drink/doctor_delight - glass_icon_state = "doctorsdelightglass" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/acid_spit - glass_icon_state = "acidspitglass" - glass_center_of_mass = list("x"=16, "y"=7) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/antifreeze - glass_icon_state = "antifreeze" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/coffee/b52 - glass_icon_state = "b52glass" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/bananahonk - glass_icon_state = "bananahonkglass" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/bloody_mary - glass_icon_state = "bloodymaryglass" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/booger - glass_icon_state = "booger" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/devilskiss - glass_icon_state = "devilskiss" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/driestmartini - glass_icon_state = "driestmartiniglass" - glass_center_of_mass = list("x"=17, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/ginfizz - glass_icon_state = "ginfizzglass" - glass_center_of_mass = list("x"=16, "y"=7) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/gargle_blaster - glass_icon_state = "gargleblasterglass" - glass_center_of_mass = list("x"=17, "y"=6) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/goldschlager - glass_icon_state = "goldschlagerglass" - glass_center_of_mass = list("x"=16, "y"=12) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/hippies_delight - glass_icon_state = "hippiesdelightglass" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/irishcarbomb - glass_icon_state = "irishcarbomb" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/irish_cream - glass_icon_state = "irishcreamglass" - glass_center_of_mass = list("x"=16, "y"=9) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/longislandicedtea - glass_icon_state = "longislandicedteaglass" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/manhattan_proj - glass_icon_state = "proj_manhattanglass" - glass_center_of_mass = list("x"=17, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/neurotoxin - glass_icon_state = "neurotoxinglass" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/screwdrivercocktail - glass_icon_state = "screwdriverglass" - glass_center_of_mass = list("x"=15, "y"=10) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/silencer - glass_icon_state = "silencerglass" - glass_center_of_mass = list("x"=16, "y"=9) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/snowwhite - glass_icon_state = "snowwhite" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/tequilla_sunrise - glass_icon_state = "tequillasunriseglass" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/white_russian - glass_icon_state = "whiterussianglass" - glass_center_of_mass = list("x"=16, "y"=9) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/whiskey_cola - glass_icon_state = "whiskeycolaglass" - glass_center_of_mass = list("x"=16, "y"=9) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/holywine - glass_icon_state = "holywineglass" - glass_center_of_mass = list("x"=15, "y"=7) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/holy_mary - glass_icon_state = "holymaryglass" - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' /datum/reagent/ethanol/angelskiss - glass_icon_state = "angelskiss" - glass_center_of_mass = list("x"=16, "y"=8) - glass_icon_file = 'icons/obj/drinks_vr.dmi' + glass_icon_file = 'icons/obj/drinks_vr.dmi' diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 2275221b2fd..b2591d992f7 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1861,7 +1861,7 @@ name = "Snow White" id = "snowwhite" result = "snowwhite" -required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, "sugar" = 1) //VoreStation Edit + required_reagents = list("pineapplejuice" = 1, "rum" = 1, "lemon_lime" = 1, "egg" = 1, "kahlua" = 1, "sugar" = 1) //VoreStation Edit result_amount = 2 /datum/chemical_reaction/drinks/irishcarbomb diff --git a/icons/obj/drinks_vr.dmi b/icons/obj/drinks_vr.dmi index 68ebab9b0005796d7b1b6c213f45fa3fc8a1261a..a7eaa3bdd57d8f920d046ab232bd1a6ca2d1178e 100644 GIT binary patch delta 781 zcmV+o1M>XO?g7s30gxnr?0QsKbVOxyV{&P5bZKvH004NLm6pwJ+b|5r&&g95>(vPI z*>;Cqh7Lmy-75^V#8_Nq(WB^i>C^9!4e^T9W?&ewfuAVy&kyOY`11AJ^Y`NE<#~QY z$;7GH7u&^hKI_SADE7r>J)Z@nI_UW)D<~HG;!{iN0?KOlX+HCRB)QlZtNH98(BS#| zJ-Jz0$(@;eFq4mFKUYh$(MisMzyVj&2G8Ky3L3OLgIgj+ zDLj*tSm1c-DPbKU=j-(2eC9F2sn{2*#jYHAFJ^NK4kcHD{fOm(A0(861F5*FCgF;? zHdJR$-1mWWS_MddN(VuFGYCd)OPD=Is)O2sOV|l3|E4s;e>ThfztrH!=a$A?8JJ#| z@1BdH$f>3rA$fA>6~PuX1Ncf zC|%Ap>fj(K#a|u82)Ro_d90O&#pwilFLXq?r9%XvvGIL>p!|v_$I+O`7F5_6a?R0a z7b4VF_q`BiZ9tR~88?9lPRX^9$c-&oUsAkWJnYKlV!bPG{u<1eE=JF_F_9J2kwDp) zMukX_oKU80TT)S7p;hPH)gaR4VC;!i`QbAh4cZx<%|V!(pB*`4Bm8YO;Vz=;*rI{g z+j3oQhh1BL?bgXN?g7v40gxnr?Rr#LbVOxyV{&P5bZKvH004NLm6uCz+b|5r&&j7SwyP23 z*~cN5p~KL_`V|IRVl1|@=uvdM^waN<4RMRqW?>kxfuAV8{*?W-`1bwB<5ThQ^KpJe z$;7GH7u&^hKI_SADE7r>J)Z@nI_UW&D<~HG;!8{F0?KOlWj^zNB)QlZtNH98(BS#` zJ-Jz0$(@ETp5^N zm+!8Np~$JG93gpf=oP^hTutdfudg<^6@LEJKnkD=W7)X5>hi^qXQwQdGHgeJzh=1) zq$pj^H0t0WD8=6$#R$1eLU~M2!{&5?y%#!KyZI~=L1=7$d><&k;K^|`7P18uHilet z^x1_7W-)pp%-Vn`B{FUT5uB21A(0zfvc8mfxwzex%f)(Ee)?%JWV#qV*TzCtP)7n~ zV;L19L2^QwvTaF4b%o}k*VQ1>+P9N2gcLEA?B zg#IG;lxoYWo2v~qD35TTvVygVBlnJ*1B*fxF+0H?YM_)=1NIQ3&5jG~+^M1XV%)b! zRP)Iv=yMAW4{=;>w;!l&kZFMe%Q{}TU!Gb z4X3Pze~SPle9(XbW1YRZxUgB4%f+r-zWETPh{;*!W)+$JsR23J_!kn$EjofYeJV{3 z*uZgW?_sp%rrZp_UTZW?p8r#8CfHN*@AOXT6(%$AwfO$@P(1v6oc{$Zjd~@_uHU5q L03ZOf9Ro3Rqtu71