From c502bad4504e6b07f542888ac40afd0d4692dc4f Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Wed, 14 Dec 2022 16:35:44 +1000 Subject: [PATCH 01/61] Merge pull request #14202 from VOREStation/upstream-merge-8859 [MIRROR] Greenjoe12345/xmas2022 --- code/game/objects/structures/signs.dm | 3 + code/game/turfs/flooring/flooring.dm | 6 + code/game/turfs/flooring/flooring_premade.dm | 6 + code/game/turfs/simulated/outdoors/snow.dm | 1 + code/modules/planet/sif.dm | 15 +- icons/obj/christmas.dmi | Bin 8730 -> 9116 bytes icons/turf/flooring/fakesnow.dmi | Bin 0 -> 1196 bytes maps/cynosure/cynosure-2.dmm | 13166 +++++++++-------- maps/cynosure/cynosure-3.dmm | 260 +- maps/cynosure/cynosure-6.dmm | 589 +- maps/cynosure/cynosure-7.dmm | 5973 ++++---- maps/cynosure/datums/random_map.dm | 20 +- 12 files changed, 10623 insertions(+), 9416 deletions(-) create mode 100644 icons/turf/flooring/fakesnow.dmi diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 45625c3990..002cdd76f5 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -970,12 +970,15 @@ desc = "Flashy and pretty." icon = 'icons/obj/christmas.dmi' icon_state = "xmaslights" + layer = 4.9 + plane = PLANE_LIGHTING_ABOVE /obj/structure/sign/christmas/wreath name = "wreath" desc = "Prickly and festive." icon = 'icons/obj/christmas.dmi' icon_state = "doorwreath" + layer = 5 /obj/structure/sign/hostilefauna icon = 'icons/obj/decals_vr.dmi' diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 8e9101d3b9..24183421f6 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -252,6 +252,12 @@ var/list/flooring_types 'sound/effects/footstep/snow4.ogg', 'sound/effects/footstep/snow5.ogg')) +/decl/flooring/snow/fake + desc = "A coating of fake snow, looks surprisingly realistic, though not as cold as the real thing." + icon = 'icons/turf/flooring/fakesnow.dmi' + icon_base = "snow" + flags = TURF_HAS_EDGES | TURF_HAS_CORNERS | TURF_REMOVE_SHOVEL + /decl/flooring/snow/snow2 name = "snow" desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is." diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index d0556fb59e..f0d57fb1d4 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -489,6 +489,12 @@ initial_flooring = /decl/flooring/snow var/list/crossed_dirs = list() +/turf/simulated/floor/fakesnow + name = "fake snow" + icon = 'icons/turf/outdoors.dmi' + icon_state = "snow" + initial_flooring = /decl/flooring/snow/fake + /turf/simulated/floor/snow/snow2 name = "snow" icon = 'icons/turf/snow.dmi' diff --git a/code/game/turfs/simulated/outdoors/snow.dm b/code/game/turfs/simulated/outdoors/snow.dm index e7d1afa545..bd6eacb595 100644 --- a/code/game/turfs/simulated/outdoors/snow.dm +++ b/code/game/turfs/simulated/outdoors/snow.dm @@ -79,3 +79,4 @@ icon_state = "ice" desc = "Looks slippery." movement_cost = 4 + edge_blending_priority = 0 diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm index 499dc6f915..3d60cedcdb 100644 --- a/code/modules/planet/sif.dm +++ b/code/modules/planet/sif.dm @@ -128,10 +128,8 @@ var/datum/planet/sif/planet_sif = null WEATHER_OVERCAST = 30, WEATHER_LIGHT_SNOW = 20, WEATHER_SNOW = 5, - WEATHER_BLIZZARD = 5, - WEATHER_RAIN = 5, - WEATHER_STORM = 2.5, - WEATHER_HAIL = 2.5 + WEATHER_BLIZZARD = 2.5, + WEATHER_HAIL = 5 ) /datum/weather/sif @@ -164,7 +162,6 @@ var/datum/planet/sif/planet_sif = null WEATHER_OVERCAST = 50, WEATHER_LIGHT_SNOW = 10, WEATHER_SNOW = 5, - WEATHER_RAIN = 5, WEATHER_HAIL = 5 ) observed_message = "It is overcast, all you can see are clouds." @@ -280,8 +277,6 @@ var/datum/planet/sif/planet_sif = null transition_chances = list( WEATHER_OVERCAST = 25, WEATHER_LIGHT_SNOW = 10, - WEATHER_RAIN = 50, - WEATHER_STORM = 10, WEATHER_HAIL = 5 ) observed_message = "It is raining." @@ -338,8 +333,6 @@ var/datum/planet/sif/planet_sif = null // CHOMPEdit - change weather sounds to proper storm sounds transition_chances = list( - WEATHER_RAIN = 45, - WEATHER_STORM = 40, WEATHER_HAIL = 10, WEATHER_OVERCAST = 5 ) @@ -390,10 +383,8 @@ var/datum/planet/sif/planet_sif = null effect_message = "The hail smacks into you!" transition_chances = list( - WEATHER_RAIN = 45, - WEATHER_STORM = 40, WEATHER_HAIL = 10, - WEATHER_OVERCAST = 5 + WEATHER_OVERCAST = 10 //higher chance to switch to overcase since rain/storm are off ) observed_message = "Ice is falling from the sky." transition_messages = list( diff --git a/icons/obj/christmas.dmi b/icons/obj/christmas.dmi index dfdc46c0886717de9883705a6c0524b92d0b36b5..3c7addf9fe4d4842002c62b086ff3576b5ff13d9 100644 GIT binary patch literal 9116 zcmai4Wm_9f8x28=yA+BRcYn~J#ih8r7f7+R`@dhi@360gE8{(~nmC zl%2(!lGbF9QaA)6mM@qkpx;J^98tSILIVEaEBR3x2{$5pw+7+o0Bxo%1@%X!vA$e7 zJgT_rE8bF%+u6^{MFiH1%QK|7)OcwFJ&V5~1wNJAOK7t(8f0qQRqq4eJJON4J?=uz zPNDcp#y?N=Uf^({U{}VtlnnrY5+ElfuHlh+oaN`LG1I;WvIYiI1&m33p~czrbqD|= zHQ}MCi1*=o@Z9s4KcnUiMKoCS?KL_*wMVVyQVIwY-F*ITBrVn8S)^- zrTx7m;&-)#l3A$*@S`Gd@aVQb&39+S0vGskSCMPCPD_hU;Bn;s7j&&1>V0~8+nQ8} zhKA5-xcVJ+cYxcnJU%<4(IlW`t**HL^zg*sr)QCU(%pq65$A5hOwnrC-=n1lai6O} z&Z#v&TiepJ$LGi=^w6FMVf&b-=H%-lvxoKl~l0|BLhvs}AKq0g)`USk%B2`CBu5wYxu0 zNG0|48vp*q0CG!r@ByUSNH}~o-`_D@Gzll)>H1|C6mwmqK2;(B1Dc4`4#^^E#>MZ= ztJP|qjZ)S|uSXTpvm)?_Jt37YC3I(7sHp!L7_J;Qiw&U|2wnqAKR)F$iGAHbs&U&~ z{GFWngj4adC<-9IYeowvGJD=l_Fkj{US=Pe%DysHN`zZpocK4|w6V{1?;EkL zfSGM3?KW=>kL9nl8eHLVdUXy+1l=$Js$c)n4>bh>VY0PN^=}Qhd?dhazc>=A_}bKx z-aRujeY)^-fXMh|zMPTS z_)Mbx2L{`0-h>vhtvQh5soI+ZSB5f`Uc+d{1Kf8r#72VQeiOhDD>|yg^7g?l6;?Yt zygmASLCAt_8D$MT_>Yo64xdmaJE*o%)MDv|68`fW{6mD})4?6h9lG9hp29OZcip@NatNa2Jt8Wyc5Z4op5Jf;IrCsYeTO_i> z`b?Q(Z9A)g`r)<`9R7v~OuGS1Cz0cB0@-#_qaSR!5N?y8sxuUG`}qJh|LedLnC-!! zDS%SBz@JE-tl>!p%XK*2if*cqQ|3(x2!Z|vX^1u!ZbFE3%Dyot*AM9aKu zyFHoJL=I@V0oGn8Uung9a}}#a^n?fr1QqfJj1}FLhPHuWO6lR=A!p_*zoBA@H^9)s z;4ih7gZGRXK<$VfLY?PU(l~z1p@jejX!Dtq+(Jj6&-o(?r%5LK^d-i5Y-i< z4xa_-bb5Qigd0?oxYdGo;PUoL$(wh(aafAwtIV?m_SW16VvD%_c) zb3P)eh3M_7+Ucv*fDZ18ur^6b)I+l)X9D-+8!{JHbl1=scQ763f*O!z?eD#CH>HaC zpUvVRygrnSfvfDyIQtla^Fur1N>M06ug4QNQyhMmmFPxRT2%NAqg=Gp{&+S(c{AZ=SAAHG2qhE%PxzT zOJ5K)|E7Pv$g;bl5w2;nZt?dVGcaQ&tEz&zoe(EP#31LmQy*D5#8~kUxea4_Qd660 zBA>YSvpOxdhvk!%O$W!I$DfF{W7^;RgVF1t3O>mw5+|0fu48VlyO)Agi==)*E>L#O zXCd%yVH?NAzvOwX$vW8yduJ(g*BkB;s%@k{`H-+Zwi~ffx^LFQ!vk!TY@2cvmB}o)@=RILs8h&& zd)4pYttnahg=;@E=nJbKB96ObXJQv3%2EHmvb0x4!iHPxxFBjHx)6Sr9=ZlR+?o0+ zuz+qYhUvY8hb}F&(0nt&?z_nqnf-3sK0ja(QXROXkkDivh>JuF*oX=s#dCJ$ivHvY zaIJI&>)EAX4CMzNe>5Vg=VFND-tfzV`B_O>IV<@>+_K=^;q#!8SSmlP9$iY~bENGCQo}{=efZZxu0upG^?-J+wAdD7479Y? zVj-COjV1e9ZSS*twG{xpdZl?o3olhcKc*=!-Vr%{GjQvQDNdb3m7QzU6+lo7`t9GtE@ z6}$Tgf|!icVm1rEX@+qLtc>r`G(qWiZe^fbT3AejV<4=&?AH<^(Xaf5-u{{4r)&hL zKfY|55ho|_&kh2ZDrm=)l6WV~;%vGE6zM}$+u0}La+c`Y34Mh5YNig!ky7H$I> zaCELy6%=Idk`Da1LNIG(tS>&9(^s>R0{I3YOm$0FApp>0_F_5sZi_74P8p}o>Vp*5 z*Y;XLwzx`?)GENBv*wUEqnKH~p}^NeHUZdyN!SC*i99@yU2!1ce!F2Wj4dCdLrxNg z4)#lC!Z6400 z-Xf{&_JlDrD}h)CiwHA2s*8-I?8`p9g!i!V8HtxUU2H0a-)!_Z)Lo3N*^o-njPGUb z$joK9!;+^6u0P6~_L{Y8nZSng2m1G&s^g@{+zF^HoGOdgBv=1k9zQK{KfDP4yeudJcQ!|nO_c!qotsm z4i$uJSq&AS$XJ!7B~n>wE5J4jzkc&YuTa8`G2yP!$+hxTRVnpdfWMi=Ar>8jSnfbo z(>IW!x{}TzYS#TXQI7Vqm*Y=bL-63hGsDt5Ca?>skQQ1O#ea3X|(a&<=C>{w>*-eO4lWR+tz1M(o`$@sb6V zN83o*Q}=wGT}74I_*-5(?0gXxmjFVy&-(a<@TYDfoLN_!#EItMxui&sing}QF zq`fsy=M@aP)}M_mdY@v|ShZBkN1NQE9`}d(PA%?`f6U^r3R6Wvl63fV|7yWLID5si zDkpX$XkBW_?|9NpzJzWBi`-4O@|ALT^fvVTQ_=y&RgXGJwruda1DeVx*uiEiqL?dO z3g1}D0TY9?n)oj~0vxzF|35#G6HJw_J3Kpc)rV>WY2bdtnW7Uy9iC;iVDaFiL8fv& zX{*a&HEMr8ZA~R4DVqP?SGTewJh|Xi{y)pB>mZq)k2!U3*L`bpz zU5LkY@s#Y`ay)Ipuve#v^-1(5H77jyW8h_Ld8h|wF5BJy3N=un4*m2V;~Fu(4n%5{ zfzi_lTyq4|3Gs8YJ_k$&G;>D|hbxELuO#)(8q#bYP>h@-bFor>5^c-G7#bVpIn-iN zr2O?VWk#hq_Q*fudMzb9F+a%O^KKvcqa3MUE)ONb9W{=Pt<9ysNY#rZuj%z^Vc%-v z#>s?N3W`6k!W`paLj{41f!)aQ4&$udnTZ8V%6!@2d?j9zY#vg=Q{-jYm)iR&of-AdqQU@@y(|P)B$Cf_p=B4h^1=Y~i0aq!KIsAXu1worOTNM{ zWKu8|uSiBeM5!6f?ZxgFRb<9< z^lN*}D-p2REb8ad3lBHF+*zq>%Ccmo&f$zQ0!^cGo*jYG+Ro*a@3Bxvs*P1J4=81m z6FS7ORGtK3S^JoEomL?72fb$*eIMUvKaWMZPa{MF9C-6rAsn(tz~4#dC(bH*=)m|n zztD|a(>)2D+yQc>L7W^yc6?uws&rnT{d^ARPDPf7K{NlKw}@pPg5BLbybfp#Pp9tF z-#nfk3w>aVW_d$R1H?ja0dX{r=XH-kFqflCkp<7^EwJ2$ZQws;)m`_Ltz7HE?Rk<^ zA)letl>gZbpU{%a<-%4HJTxuRRe&+?*~1F)f(kz0Z@NeIvhw*fpv)sRG546D*&cmy zgawc&Dg5G5I$@Y8BIx<52q$fDUihYElZ>T-W%}U39u9n^C%AEnCA(t`vtTlu#PZaK z+DSyIoI$Fr*eYxQfr_;U0JFVXRVOhb8X59Uo3LM|@$*Z=Xw3tEJ@Ukp|HTKV1xkqO z7T4&L99_XFy9oDMQ4fON!r7&K_;=Izb?O#U)O9!Q5N4{br`CMOwZg(c@a+-}I?4@s zMF|t6x&YVYXbE$Lvg!M5X!M>0aoc0suj3$7)UVq^w9>cD(~1_a|A|KPU&`2&o{Q~b zq`t@hJ1X|n_&Lu=QZes~^+(bQ>j@1!tBrW{*`!8~#*-nYa-oV2M}ZIXK@u2V&KJje z&lIZMYg@4R?bKO`aH!6}WZ>|z$!*AG7&;GwRRnrXxC+Fehl zk%6D>!4&iXyh}L@SX6@yH_i|od-4YAO4|u{lWHD6ZP%+a``vypJ#K9{8QT2I6|$c1 z<{$XwHeEx_t6Nraq@ZzhZ-X^Sa*JYk%dB)lLpbCtPb5ta zdw5-0Z=?l|?l(R9cz7?F4HZg>>>l&U^hg&`{3JE~WxG+>MDbp!E$)$59`Dv`749sL z5tK}+)n&xo4*vDC`*vu!?kwGJvlBhyQ(+H%!opr|@|($ZM;IaJ{XSe&>e5q*ag6@B zi5y#073OWuH~tEv5)ZHeE)fZs zWb_fU*?Q3o5~Uq^^?WL;WgpQHrl!8z6>qDg*|odAn=*dUtmmue-bmjDkcm*XF+&}h z;eWeNu(MUcNHAir2j$S;Yul{_s+GIhL&I>M@>c*Z&ZQON(q3(KKjrHu)KmoFA-f;c*8$RYQtSL+*_HurGoO(EPUfWzM@?u zHd=g25|ZAWOUR|@?<6CTM&c5gK?L!aU$BMPD)biMf+Vz&w^NF!(-@a|W zppfvI>iOq=ND~bJ%0JlST(`%AY|p6yy{DznX9)D7uMxtO?t)q(!dfqaz|F_1p`#G+zO141s%Iz-Mr6tMKP9t@cTUmUHDI*#G61GV|nuWaRAOB_785{;?2|N1&LH)e-A^pMk=Gq&%=$caRJ)V9+q zN0zm*zOrvla?z-)Eb5*={DLxzM73k0C#548*ZRmX1-YWSS!;BwK?sBVGXqIwb%xjSXZgP%d zK#>J+;N#}SR%>U+tlZLdx2=wA#Gre!kq%v~c*UC%5qjhNC#1~d%@rE>O6bN^&%LIs z;7cl*Ea1a#%+HO0fJgMe@_<~9%z;S+EGEwP;5u`))j4m|*{NRc&{$rs7r}kd% z{r&mWhhYS+@Vf2(lt&t!7qLFGYXH)uI>cv~Xn?GOyz`?PEeO(L{x+HMj03A-B;Qcc z!ZP6yIgW|-J!Dv{q8MAkifJ^UMwd8*n=X9N889&}_!k>@3$<(g2KgxYxsIAaqfoLX zW;M166u6t*yZVDZV;ECZc(oYi&x{}6BPM%vKn*Bx6~Q?mS>O-ip!i+ zk9j8@-ZlBWY(RQ#wi`E%H)uoS~T0&FK6F*-fQZ0mxTXV z?>g>g%6oi>NoEH!v|YV-7F|K?;j%4Wd_j>c5MwT`zLpLxD-}w_#JRmlD7;iY;)Far zjmZO+=Kb@NW48NGJ!+d-wnWXj;|hq=DX>dAK&)b)ILM%&uIs)v9d^F+uZC(RiEv~h z90f~=g8K&;IMpM=b?ld)#?Xau8bN_ZdHyCm%)z!c<^WT5i3fOC9)aUsLJV#H(vVJL ztoo5Fkt;4QF>czESu$gvxORloujdB`&9`729Q_GH0z$RY$t0LvJK2)JlE<#O`CaC$ zu5wpYcBGS}jOe;qkX<=j5*^9pN;fQ+z$zlHjBkHwL*#WeN)^}8^wRw1?0G>i6C5;z zWtCT@+7eIp4F^9iI)AdU&NPaGUOi_*>bbUkFt}9)rKJETI;W!2s$!8Ca0%T5UIo+*cu3$mM`d}<;y0ER|W$CpcIAX2} zkbASO^t87|pP~0ES&xj>b;kY6@&UuzN+v2eVW)qb7?tK*$-;>8Ot5Vk)d}LzIIISY zV~uz^aUG7K_;95y=OXDKj(01=K@Wnsds7UQ@S>K|y+$)9|kv>;E@ zgE8!<+Y$%R-De!!L(l+Lhl|3MUIxPQ@QfjwTKfXE_(B}Kr#{R^O=sehy)CW zbfx`~#;uV?m(x64r_;QX;u#i}hxgr?8+I#G%yluN8LSn&505EKHR~w<6qZ(-lNyW@0s?h&ysp79YJgCL{iyAx-`X`Z60Y@V&bJ- zOL9zcpHH^U1P|DPz)q2P0rZKhWQWWL%Wh^oKjCZ&;@$J)C&Jizh>@hn~YO#yC zi#DYRp7tXP7ej4UJVZ2jg<4n^a|bpq4@(;}1sHW+zba^bIzoFQ_9t&2RoH%cVQth`77wL&T%rIFC8`C?(M#|(%Ce;E;iEkj!)v8X3^^QX%z%IAto|L z$oX*CdU)$^b*UnPnIXBmyhkjE6sw-2#A~Qu66;!MxVW;gQ=5go^f_o}w)&3eWFFcg zy1rxb8tU^B2eQk7*4{8XHN05OS!Ifc-Q2RgSmzjn=83tzA$Q-eo%*X@CvThGZ~b~+ zK8I70eOqIkR~Xp=VWGQ+GQ;?wdY@JiHr8+$?KIfBD5nd`b)Pogiol#L214OFD4rv< z?otMiQihR(4q|Pn@!)>Tcmb_zd@<`-11cxrv(ij0hm zhr|pQ-T>6@u8&sRTgL;x0H>-HUqrUp)cuSzEoKkv%%AOEzto8UPD?~C?>oTV1i5C; z&GFB!MSMuHq|z}yObMgvYI8(3zP-gh;eu|hMR$`;=KNr_(VQ5YU4G`VYGzT=wZ(H* zyHdpUIsPZXlX=p^7j{7ZU9|3($JHmeyNzdkoBv87kbi$YgsxXBzW{86-(`S}b3E)` zbHCj0B13#voy}8$vhLw9x(U@6y=;}V{xV$Om2OZfR^G-+b($qUXyt{=4>!&#mM7|; zN#oi`4gwE1gB{`EpDLW4answZuIGIH9xLxL=ypn~8IZQGTk!JO!gXYGv?a{5?!=Vb z`w4Yw$}%%4TagleZxDeiI9o9nB35_*vy0*kIT6kFo;Gw8c>H2zA-X;!$e4LdW6t^K zfM@TL`pZA)SIRa6x_<|J+*#5Oe=S2Au{djxv87Y+nJja1@;qQZI40^{a)%gfB3l8K zAV#b}<9&0d5}Y)*=h!C-On+KwY3WEF*w`304zSf`N*{FLd+-2MqzM!Kw>0%3^byF& zcfIO;fhgY__jSFlpQBU;qG^_Vz76k^d%}8yc!WF~RDpnVnvu zl)H^;lIa*lW5VTrRibjtCgd;cKR{D8b0NQmrsg{V03S_G?Bg*A4L0i9-mo{y+KtM? zF~wHMXX1|8Pq2`4M_~rVhI~$KkyJE;JVpP4D}=pE*9ioh;=?!&>>S+BqcPPDcQ7Vw z6i1s|OrAYb7o8ma7|w#}_}Bf9CVOm9NplLjB7+5StZzkna?}lpr#_)=v~7o&!2L~= z?L=}YUuagxF#pX;e|rLu_j0s_J?g4U6|p4Mpz4ijO1JBBItMH?cfSSGe4(iSDYet^9v1qwB@7DKiCP~+wYb5r$(u3o96#cWq7w;7Csu9brL}##OcJ}uR z9>Z64G1Iaso(z5EUr2OEsw^36`PF+#z`c-hmbbYUg2ozqNK{9@HfruW;}s0*bu5NM z!<_8nMA80AZr=wpYiu;M|H3M;Pg+QOObjf4*Gd%dw^P8QOKddO)GX(*PQF)wWBET# c`YVZdcVzl=`QSc-R!!0000_Q9)J{(e@xp9ws`X)@L#MifF2Rv~=BM zEnLl9texDf9UTAwuk6@~F6@x^B;h;4hitFfmC7Y$QaR*UU-{toQYEQZCs5h=Lf=wh z%gvlUZSSaFEv~OopVWkrg&n0avsH2F5L61Ds+;P8oc5}B&tw->%HF>Trluw#A{dH@ z#C9bxo8h&8+S<1=b;hiwc@VOKjU4Ll=YJR{T9nG%h}V9)6+aR3J`p;f!w$_?3{=mb zFlXY$VioX@bzkZu8wNPKK>~9m003HmqO7!*SN2(sztiWX=A%FZy|Q-1TeSQdllqU^YXNpk}ov$z9 za?&OAPUVppF`?R0P$}Tr8`BVEh5t?^J{TTY4I9~B zG((MS?FnB+)Yq|S+gTce!oo6iu}w7Q|F3FK6-lfkZNv}uJ8ZC+o*TPvZ8x#?ER{%? zL@dqlf4i_j*mcRYlBaiGdnUOzfiD{_b<^IGaQudII0jiDJWcDrQ3~rGLnv;5M4_FB zwSi)>Vc}`XiIuY}1wrfl>6dKy%|)uiI_rOz&>MIU!^Z9$Fc=Mq1z9abmf-8D!~wrvcia zj=w!MqHh~~RXg+#&~FgXI8ozNrl?-R3ItC#Tj0sgP^1(0cx^mkzL%t$I^m74jU%S( zi`whHic#x|Com203NV`P_Lzc3W`l?~R^e9`|DcJ)?-6em0MFG!((FqkdAWSHr{8*= z=pVp4$#q6gV3^1M#4R%`>n0G6Z(rcB3N7ofB~B!samGGAUmaMD5ZJNaw6w#|n}|!k%m`Do zBrAIDv_TzT z%q1q6;UPQx3mV4=-8M2Rp=Hv?L?mmvfjsEE|1KQsWPsg8-nMu+eRyyb+x@I$I{b?N zK@^_(x_Mr_DT-f>qY&8WLvAdu#47R$iC=l@3Cg8_0z3kA%aFJew1FW${fHIv(K`Xd@ifz3lY%>$?|^t- z&BUJOU?bYYV!)vdWP&!A^9*#D-K|OxMJaJUda&}K-_OfhF!|zkv`Hzgsu~N3l%3&tX(&#NCEf!e2#16UWGO9J~{`Uu|RyhS}gsT+( zDSym7uv8+NX5(gSpGNXo6yW(Nhz&5_Rl=%!NWt`6Kd`)E&rF(o+tP-$Xit!bHI-J| zN(GV(xQEWyr{It&xlfo3Bl|u47|-w>R{E@yhVxH9=G*iE9_)CXqtmFCqm}|i%Ic&P zU}s1zz1kx{$1x8*?l^@$?vjM0Xl#}1Ab66OS|Q7paY~69PYo;$yGDZTf2*AZsB z`Wp=i+J;K;;kA<5e)e0H*@N9(jqmg68g8(!%!+5NsSO}xb~wF`)?nStWIyh(Z#PXfxq zJ0W-)h`#HwV;g`&+qo+Y%+2@nAnwB(dS8m)e22SYFcK-OI-?o?Sau7OD-Pst$)9xV zE9PnA)PAoEE<-#vvW%mOCct*R8YKq#M%~n1)=4KmwZ40VnUQ^2UP(U0BLE>vgUb%EJhVIDAy}*J zTdA?Et_OFXzT@Bn_O;1@7F}YOQ>kU$Ez?XJN%xHU(isAN@H@|u8nt)NVRp!G20?U* zk2P*L?1`qZy5y7afG%Ku==U;KKmy%;-bQq08M%#84tG`hHlt6zMzH3QS(?(=f?t} z-(6#ist<|pnBH#PN{h+3kIf(u@Y8Tq`*X+IT1Q^bdj6#O@*QA>bISyneRf-7%rRRV zj{i<>=E=gMuv0o>jpSlbeMTH)x5bvi4hd^F$-9v`wz>G$f0sv9#=kVoi6Jx_2uWsu z83MzRec+t?cp^}xv#WLItgK1JTAd{BIW24tf=*LkbxRDVY)68K#@P(Q?mQJxullQR zwP1)dn}n1wly!=EO^z;MJfa){VdtjeF!7IQ2z$pLmjg%V)4rBMa|bPol+tICPE+vx zRJ=efVKe^H;DSBw{*2&hYp-j(nyQ+EY8tq1*>?d2-;oLz8MLlB1A(!(s|A49QV$1} zq*aKC6J6#$-C?3M4;-i49X6*#`vb$!4}gQ5pabq)*we93I5yi|3jznYY2O!cvg1W> z*B^`dT~E>;f5LBCugcp<)@gNrJEouvQkTsP1lf7NUO_XL75i7X;35ZPE&i-w`q)Db z6E;1<4P8k8$dCP>Wp`~q;07Nqa^savV2!HFj1Xp|ylzWrRH6IqBo2}Y(A^@cgodnK zuTaMy3#BXoX%0na>LKG~PUG&my9g>CxvSP3#3b`kR})~%RErJLih2JXDwKewj;Tk7^Tw+tw~4^z(Ug;!U4wVs#R9)Wd$8){)hd+!{c4OX=dIqgzkS_ z&RVsQkKoR(J=i?weK0Ru$``^Rsam5wZ=K9(XZGKQwQuu^bNma9Mo0(Lu3g z=DtEo9B_`;YV$zvyOCF^FqHH;ezh=OTKQJhoGqrDBpLa1rIXI055cSDiw2VZr9`g# zBHFRUTH4Vk)ZUB?GjgnITrCl!e;UiLLN-;@`#vP=2a5N$;{g#gG#}cNU4xobXvI5r zgy!)rIy#Dz>)2e4Qwni}H2Iz9-tX+y{QyR=&C9uty(0I_*k;`Y< zElVxuTmB-BZfZXM-G?Ig&1#LtF(w4;-0qi z_RKURZu@qB4K=5Seg=QX3vO0Sq=_%^8a530Zdez<&|*9MH2ewKJJakZ<9sjK-8br!~g zYM#5C$T=$pg$BqWl`wS#vFhviS+_w3Kr$0X1YjC$qCA{dAGlCM05U||!~IAcPmhL7xGi`#)ZDIp9C z#@j)1X8w|u)Vn8*gx;>0)l31T!2E=JwslWWF$>_Pr{{XDW<28lRWsS$C8Ch~HsTuor&cI+ zRT`oQx{b}hCuV7D9~mHJ-v9DS#DG8PBb;C}Tj+-%GjO3LP>-aqcBb_DrMVE}Qy=kC z8roQ;yoM1!ww<#JfAlEF7{J=psHE#ul83PA*F1iLLi$?ae`b19lQ1FtxlbnG==^AZ z`-#5rWwIyP3-nRUH}S@_|6G_=F7o$~mxrE=#^eC5JOWM;;;YEB6?HNbSr6^kZHf>3 zxNcP?>JFRhTj^KOp>k{S53BQl)`J@&5yq`fMM~e!Rx{k0@rBQf1cm2o`tcUT?))nu zaKA*TUY<8Z*_KEhI)GElHHwsJ$(dO-h}^oK2exSOCQ&_q*R937Znq1i_-; zy*!3s1 z*6PK;^qZ-Cjm`}}3Q(@374#jE?78l(wY}O$Zppx@PxN%bSk=OOcAej3@d=Qgo#_nW z-uo?niF$M8_Qp%K36*0(rENNEoOPB>#hCq=3rYO^&=IE7d2r`<9r-bkcuU)S%mmS(|uxIyDm*4=BJl9^N9jb{}J!g=c=Un7|24-0XVR$fQT zud&%tl8HT#jn@o*Pcx*?w+@6m7RBMv=kQ15@|9e?jzd63b%Vb4Zy@*w_b3^p1ceSpljtd5lGEK;NtqJ9!sY4-N)BM622Z~9=c0s% zR@cP)7)2};fqC?_*r>!<2uMMK7z$qst9j0DKA3TjIeC8XQbz5mus9iLSFPOVX(4re zI$c<_xpXo|te7bqoLOpc28O;c-QPGi`PWU>1j_h;_G02hxk67Kv&QZ>WG6psY={9o zZa)Q+_Qw?2%DDFD`_S~remH?YvJ-2ynVjFYgH&(hLq^EFX;4^p)IiD#qX>r{o6GCK zZVX)u$J8vBy&M@Jb#)?oxOa=rRZWg}`&|M^)NlEsl7S|&kk1*Bb%t$g`l`)v zXR;3yEpmA_;NQ!dXhE+G{l?W1L+~ka|KIT8;iaicZ1i;x zd{Lp8$N^bBb%WELSyH1Z>y`>bA;`^VC#)YSQOjM%$d2kqjV)By976QR)))SV5#too)Yd*X%Dh={Wml$WW|H;X+2?Uc-^mL$ol&D-{O(A7XTYif)NJvSzDtI!N>wDcC$G#L}nhUSdAsWcy0?+HW*Y^ zKv!ne5BD;ww}*lLEuRAVYXqKQ;Haz?ez$%%?W+g8WdC}6Y${Xl{_3vqXYH?LoKW{KRS3uea zHwi`XpCL3r&9w@PXnr%p?di_vo#*};X*jCmxuac;sMZ$h`>U^|4g~AUY7ydX1n3vA z$>qD=_h|QH*Tww!?aeCYH2z{gJS&EZG9Epsar zW`8tAPbk`9h~of{N}@vCf&Z;gBoNORq0aKhtx^jxGYNJSd(ax*dfX%dvBCvD>Lsq3 z-*lP~?*|z^of`C*cnocntEolu{ZXT%#eX^91z4Y-g+&dv76by+t5fyIF2KqLe~f0> z+J4JNTX}Un@C6F(Dy4Kk8Pv}^cC{8JGb0C&#GU|xd=D#tnm+v_pC%9tq|~#_4|rdL zF>;APVW0u@E@oihZO}VHGxnDdQYyO*rSgNjO?^o4__w)4VP+hyiHlS;z7?ppt~M)n ze13#RHUGPIDS&xPP{)MDwNY#(+H$d5_`IiN64~M@q}5>37EjduAZ_to{K1K`%r{uc zg3CffAephT(onPILANodOn$ zu(Z5KfFJn_B_D}qfL|j|#|sV+iOVbcS7PqZbO9!QSAw;bjQVd0uF=#RJoPy_$+`Si z(bV<;4wr*r?oVi5dI8SYb^r;RH4NE?W8)`q=`PuD%R>Dek?JHk~w9zKdq+hpA~ zx4WLloA}@ZRt0hZ3%0+m;{zaWfIMg_QTK@`4Tgw;q}- zIcdH9Bk90zt@MnO%+OI55Xn{K>ebK*WQ_Y$0PV`p5S80p?vYKJo$1d9a{})gW9<93 z@eHL|q_|Gq5h?mJ>FN}t*Ppn_SC~QvNlbP(C$1yBIUz>fJF-79kv$tMh^ z^4B`E>v?{j4*3^&STP{j@=vLCJ0};n0sx)(2%${A+Vn<3w-*sI-zc)^qoiK&5SQ_V z|EF%h40FM5t}e+w3tv+l@VEGgMV#^zZc!(g1xEBQ@J@C~UIpCtVFN9vmUalxpR>_h zJD$Xw(*7qSO zob~bfUTYO&g(jc*AET9D>fX1(V#Dtg_3HkTI*D3Lv(qp% zA?J5S^6Q7VV2|-C76JrOHICpTrl)dXRLNFo4 zf%ZNz21dxC(yIvwse_DSVnreJbN^YRea#oio{r-;uhMfl%Wtr(x&oHmUkoiwT{A#P ztM9F?>RZ9M-B{nsJQu$D9F0~HalFTe#yXdATM59^KwS#aEG=T{gdaJ~&VJ>BXV`Cf zBqamt%`&9Wook-&Z30opX-0IbsC%T)$KxFzkTXISP|{`d_lCJW{<}G46^N>n(m(Tj zKNz=wLOx;g#E`rZ@CKoWn{%@yjx@{=1qfhO(_h5=QnP4JJrUY{+SMjtN~W)kD(%Ws z^dv;n0R4FBZ&u%Zkx|q0GR%Y)mOKHMv^3taGGjT7&l3zG$8^`-ED!XHJN(83 zWUmW;>p>IQKgPrA9vg2g-4mFKdt@{VMC}41C7Nqv&MCwq6{*TXj2Yv+%^yoUVxo=gX|Hv6B<{ZEo6! zhXV}2ci%JXfcud0l0|sreC$V)+m+i7u<%CLpK{-XZ+6!{_N7t zBoKtZbR>_gcfhW}|uxRgg9i?5BvX-bv%bFIn1sad6Kkfr#dqhLB+nqW+G171 zyFABQq-c?eIHnE>HO`Ip;88)zp0t`wd;0`?Q<0Kd)RQi{l;NV4C36ii@)CgN00V#- z`YzbMR(!HNZZlc+Uxmwdg^SZguaEadZ&2w12L~5_xNv{7wF-Q-wJ^@rP0}z4H)LSCX ziQyhST0-$QHFRm0W5+IueavFjkapI$qOnP(yV9YYHfl9*banSA`$>A39_e|Rt8J0J z=B`-ZF>Edg_sbm#zc!thbhu&-q@`}s4&}U#H)Wc+#@Mp?<-dTRfhbY&UZT8`5{tm} zFk$j`f|3#mL}=BqAfLj1)({l;yRP+?Tmlo}opN_vh~y-a4t&|)p3f<*e+F^H3~4#e z#5~_?Yx3a`zc)lmRt}{=DT^%_meA>I)G+`{kq&)ZCYPeYuMDoBo1@fvK-PQnlQX6- zc|ET!bZgU-^MVSD1cKEX=`=p~wp68P~S_Jg;vEXU}{`esrirn=y%wNYxs!VdT_eYl!?V>)` z2&$s zElJexprq~GTV{I}dL%q056CGx!kU|T#b%{{HvWv4@p_^&gQ3ZRO0CU{RVNKBT)1CA z|G^d!MIy3776T~BUt%n;C-D>3^#NWM|Ia~wL}~kX qel!SqcnU@)l*<*|=%bH+4s4N004jp0{{R3ySB!XR#nI=<)#=OD>CD&a%GK$|)9A+1=eWq?OFa$Co&fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33t zGfE(w;*!LYR3KBSI4{3kiHkEOv#1!zHRR$vD46|@BgIx z&5&(xRso4vAnhFGg3zWt9eaMT)XOjo&N=Uc>mv2erNo{S?&OU7!*E$)T;b)1r|URg zr`Nv#7LFYCM1i`Jy@P5c?;H~mzP2WKz21JgUa#ZF!X3z+{er;}sSA_OxbW2tRql8q zNUjM^V4gq0Jj?Z{@Adjic>UqqINnwSec(ccDUr*Bt5O^mx)PVdB~e-v+{G3_m(zm? zDo*wy0#`~M5W~uk@+f6Bg1eYSaDM$g97IZ9jC83*f>>o^)>Opsa6vyLU0H%w6+^hj zTCpdw150DUPZ9il{XH5iO%v{+s2LMWC>0>H{o#Us_%YOE7A=Wf@kLU*ZIWz?;2_i` zV6qv142v2bE?6}qoOoq5lQ5$GNrE78xT)ZlB+2O+x(=)Rt%e1iZg8qf@o+)(3(Z`O zoMf&nGocb9T{=%~Be`LoZI=Jrh`R;@M3QRmp9~+;)k# z2y)b9eO8(xO|CNhD%B1Ry73Zk5bPtS0zwZ#6qF=O zDr1e-K}6FpTe52_IDL%c$4Ufq(3wE;!qrRZ`_MF2x?g= zENhIeTv?hP>pYz(67@|5zeMo$v;Bp2{==Gv<$OWTV-Umg&`uKCX7QKIgDZk=$%(Se zSXC-ueGXu_>iS(r8*dSGX&JOqk8FVx^YZ+pwXnKfhePiW#Fk5ex$6SUKpkUXybYN4 zb@Uo`9j~nl$~?Gl5q9vlKcf}8DX@gX(JudFMh&^?>%P*>4r2NhT&cweF-fAs4xCgF zXe$FpyBLOH7=~dOhGD#&(?9f_|FQAx58kIgx;Xve&*_iP48t%C!!QiPFbu;m4C6?q z>9ps|3)2;xTX6mVN!tE^)|`I{&c2Ba!!QiPFbu;m48t&t|C&Gf-$8}6m**=00000< KMNUMnLSTZqn>;K4 literal 0 HcmV?d00001 diff --git a/maps/cynosure/cynosure-2.dmm b/maps/cynosure/cynosure-2.dmm index 95bc2a15d1..f394aae906 100644 --- a/maps/cynosure/cynosure-2.dmm +++ b/maps/cynosure/cynosure-2.dmm @@ -58,9 +58,6 @@ }, /turf/simulated/floor/lino, /area/surface/station/security/detectives_office) -"acu" = ( -/turf/simulated/floor/water, -/area/surface/outside/plains/plateau) "acv" = ( /obj/structure/cable{ d1 = 4; @@ -879,6 +876,10 @@ dir = 4; pixel_x = 30 }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/arrivals/cynosure) "ayX" = ( @@ -889,10 +890,17 @@ /turf/simulated/floor/tiled/dark, /area/surface/station/hallway/secondary/groundfloor/civilian) "azs" = ( +<<<<<<< HEAD /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, /turf/simulated/floor/grass, +======= +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/turf/simulated/floor/fakesnow, +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 /area/surface/station/park) "aBf" = ( /obj/effect/floor_decal/spline/plain{ @@ -1731,6 +1739,10 @@ dir = 6 }, /obj/machinery/smartfridge/drying_rack, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/hydro, /area/surface/station/park) "aTC" = ( @@ -2025,6 +2037,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "aZv" = ( @@ -2888,12 +2904,11 @@ /turf/simulated/floor/tiled, /area/surface/station/park) "bqn" = ( -/obj/structure/flora/ausbushes/pointybush, /obj/machinery/camera/network/ground_floor{ c_tag = "Ground Floor - Park Southwest"; dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/fakesnow, /area/surface/station/park) "bqP" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -2958,6 +2973,10 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/steel/sif/planetuse{ icon_state = "asteroidfloor"; initial_flooring = /decl/flooring/tiling/asteroidfloor @@ -3313,6 +3332,10 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/groundfloor/north) "bAb" = ( @@ -3391,6 +3414,13 @@ }, /turf/simulated/floor/tiled, /area/surface/station/arrivals/cynosure) +"bCq" = ( +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/wood, +/area/surface/station/crew_quarters/cafeteria) "bCx" = ( /obj/effect/zone_divider, /turf/simulated/wall, @@ -3461,6 +3491,10 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/arrivals/cynosure) "bDx" = ( @@ -3917,6 +3951,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/arrivals/cynosure) "bOp" = ( @@ -5909,25 +5947,22 @@ /turf/simulated/floor/tiled/eris/cafe, /area/surface/station/crew_quarters/kitchen) "cQp" = ( -/obj/structure/showcase{ - desc = "A statue dedicated to the goodest boy"; - icon = 'icons/obj/statue.dmi'; - icon_state = "corgi2"; - name = "Dog Statue"; - pixel_y = 6 - }, /obj/effect/floor_decal/spline/plain{ icon_state = "spline_plain_full" }, +<<<<<<< HEAD /obj/item/weapon/bikehorn/rubberducky{ pixel_x = 6; pixel_y = -6 }, +======= +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 /obj/machinery/camera/network/ground_floor{ c_tag = "Ground Floor - Park Center"; dir = 1; layer = 2.1 }, +/obj/structure/flora/tree/pine/xmas/presents, /turf/simulated/floor/tiled/techfloor, /area/surface/station/park) "cQr" = ( @@ -5978,7 +6013,7 @@ /turf/simulated/floor/plating, /area/surface/station/maintenance/storage/emergency/sec) "cQN" = ( -/turf/simulated/floor/water/deep, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/plains/plateau) "cRm" = ( /obj/machinery/light{ @@ -6607,6 +6642,10 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/groundfloor/north) "dcz" = ( @@ -8182,10 +8221,6 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor/plating, /area/surface/station/rnd/misc_lab) -"dOI" = ( -/obj/structure/flora/ausbushes/sunnybush, -/turf/simulated/floor/grass, -/area/surface/station/park) "dOT" = ( /obj/structure/cable/green{ d1 = 1; @@ -8214,6 +8249,7 @@ /obj/machinery/door/airlock/glass{ name = "Engineering Foyer" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/engineering/foyer) "dPv" = ( @@ -8288,10 +8324,6 @@ }, /turf/simulated/floor/tiled, /area/surface/station/engineering/atmos) -"dQn" = ( -/obj/effect/zone_divider, -/turf/simulated/floor/water/deep, -/area/surface/outside/ocean) "dQR" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -8891,11 +8923,14 @@ /turf/simulated/floor/carpet, /area/surface/station/security/detectives_office) "eiv" = ( -/obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/camera/network/ground_floor{ c_tag = "Ground Floor - Park Northeast" }, -/turf/simulated/floor/grass, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/fakesnow, /area/surface/station/park) "eiB" = ( /obj/structure/cable/green{ @@ -8945,6 +8980,11 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "ekq" = ( @@ -9209,6 +9249,9 @@ /obj/item/weapon/reagent_containers/food/condiment/small/peppershaker{ pixel_x = -4 }, +/obj/item/toy/xmastree{ + pixel_x = -8 + }, /turf/simulated/floor/tiled/eris/cafe, /area/surface/station/crew_quarters/cafeteria) "epp" = ( @@ -9771,6 +9814,10 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "eBp" = ( @@ -10804,6 +10851,17 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/showcase{ + desc = "A statue dedicated to the goodest boy. It has been moved to the side to make space for the tree."; + icon = 'icons/obj/statue.dmi'; + icon_state = "corgi2"; + name = "Dog Statue"; + pixel_y = 6 + }, +/obj/item/bikehorn/rubberducky{ + pixel_x = 6; + pixel_y = -6 + }, /turf/simulated/floor/tiled/monotile, /area/surface/station/park) "eVQ" = ( @@ -11271,6 +11329,10 @@ dir = 1 }, /obj/random/vendorfood, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "fgS" = ( @@ -11851,6 +11913,10 @@ /obj/machinery/seed_storage/garden{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/hydro, /area/surface/station/park) "fsU" = ( @@ -11992,6 +12058,7 @@ locked = 1; name = "External Access" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/techfloor, /area/surface/station/hallway/primary/groundfloor/north) "fxr" = ( @@ -12597,6 +12664,7 @@ dir = 4; pixel_x = 24 }, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled, /area/surface/station/security/briefing_room) "fKR" = ( @@ -13537,7 +13605,6 @@ /turf/simulated/floor/tiled, /area/surface/station/quartermaster/storage) "glD" = ( -/obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/camera/network/ground_floor{ c_tag = "Ground Floor - Park Northwest" }, @@ -13545,7 +13612,11 @@ dir = 1; pixel_y = 21 }, -/turf/simulated/floor/grass, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/fakesnow, /area/surface/station/park) "glE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -13844,6 +13915,9 @@ }, /obj/structure/table/marble, /obj/item/sticky_pad/random, +/obj/item/toy/xmastree{ + pixel_x = 8 + }, /turf/simulated/floor/tiled/eris/cafe, /area/surface/station/crew_quarters/cafeteria) "gsu" = ( @@ -13945,8 +14019,17 @@ /area/surface/station/rnd/research_lockerroom) "gvo" = ( /obj/structure/table/woodentable, +<<<<<<< HEAD /obj/item/weapon/dice/d20, /obj/item/weapon/deck/cards, +======= +/obj/item/dice/d20, +/obj/item/deck/cards, +/obj/structure/flora/pottedplant/xmas{ + pixel_x = 16; + pixel_y = 25 + }, +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 /turf/simulated/floor/carpet, /area/surface/station/library) "gvD" = ( @@ -14125,7 +14208,7 @@ /area/surface/station/hallway/primary/groundfloor/south) "gyu" = ( /obj/effect/zone_divider, -/turf/simulated/floor/water, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/ocean) "gzp" = ( /obj/machinery/door/firedoor/border_only, @@ -14533,12 +14616,14 @@ /turf/simulated/floor/tiled/eris/cafe, /area/surface/station/crew_quarters/kitchen) "gGO" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/brflowers, /obj/machinery/light/spot{ dir = 1 }, -/turf/simulated/floor/grass, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/fakesnow, /area/surface/station/park) "gGY" = ( /obj/machinery/portable_atmospherics/hydroponics, @@ -14653,6 +14738,10 @@ /obj/effect/floor_decal/corner/green/bordercorner{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "gIT" = ( @@ -14872,7 +14961,7 @@ /obj/structure/railing/grey{ dir = 8 }, -/turf/simulated/floor/water, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/river/gautelfr) "gNR" = ( /obj/structure/cable/green{ @@ -15139,6 +15228,10 @@ /obj/structure/sign/bigname/seg_7{ pixel_y = 32 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "gUf" = ( @@ -15754,11 +15847,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled/techfloor/grid, /area/surface/station/ai/upload_foyer) -"hlM" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, -/area/surface/station/park) "hlP" = ( /obj/structure/cable/green{ d1 = 1; @@ -15900,6 +15988,10 @@ pixel_x = 24; pixel_y = -12 }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "hpH" = ( @@ -16367,7 +16459,7 @@ /area/surface/station/maintenance/north/gnd) "hCc" = ( /obj/effect/map_effect/portal/master/side_a/plains_to_wilderness/river, -/turf/simulated/floor/water, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/river/gautelfr) "hCk" = ( /obj/effect/floor_decal/corner_steel_grid{ @@ -16803,10 +16895,6 @@ }, /turf/simulated/floor/tiled/white, /area/surface/station/rnd/hallway/stairwell) -"hMj" = ( -/obj/effect/map_effect/portal/line/side_a, -/turf/simulated/floor/water, -/area/surface/outside/river/gautelfr) "hMo" = ( /obj/machinery/button/remote/blast_door{ dir = 1; @@ -17043,6 +17131,10 @@ /obj/structure/sign/bigname/seg_4{ pixel_y = 32 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "hSO" = ( @@ -17322,6 +17414,26 @@ }, /turf/simulated/floor/tiled/old_tile/gray, /area/surface/station/medical/surgery_storage) +<<<<<<< HEAD +======= +"ibT" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/structure/sign/level/ground{ + dir = 4; + pixel_x = -35 + }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/surface/station/park) +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 "icz" = ( /obj/structure/table/reinforced, /obj/machinery/firealarm{ @@ -17341,6 +17453,13 @@ /obj/item/weapon/deskbell, /turf/simulated/floor/tiled, /area/surface/station/security/lobby) +"icD" = ( +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/fakesnow, +/area/surface/station/park) "icE" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/hologram/holopad, @@ -17472,6 +17591,10 @@ /obj/machinery/firealarm{ pixel_y = 24 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/groundfloor/north) "ieS" = ( @@ -17515,6 +17638,17 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner{ dir = 1 }, +<<<<<<< HEAD +======= +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = 30 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/groundfloor/north) "ihg" = ( @@ -17677,6 +17811,10 @@ /obj/machinery/vending/hydronutrients{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/hydro, /area/surface/station/park) "imi" = ( @@ -18065,11 +18203,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/surface/station/ai/upload) -"ivC" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/grass, -/area/surface/station/park) "ivI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -18290,10 +18423,6 @@ /obj/effect/catwalk_plated, /turf/simulated/floor/plating, /area/surface/station/arrivals/cynosure) -"iDl" = ( -/obj/structure/flora/ausbushes/fullgrass, -/turf/simulated/floor/grass, -/area/surface/station/park) "iDu" = ( /obj/structure/closet, /obj/random/contraband, @@ -18435,6 +18564,10 @@ /obj/structure/sign/bigname/seg_3{ pixel_y = 32 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "iHY" = ( @@ -18452,7 +18585,7 @@ /area/surface/station/engineering/reactor_room) "iIo" = ( /obj/effect/map_effect/portal/line/side_a, -/turf/simulated/floor/water/deep, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/river/gautelfr) "iIs" = ( /obj/structure/table/woodentable, @@ -18745,11 +18878,20 @@ }, /turf/simulated/floor/plating/sif/planetuse, /area/surface/outside/station/solar/westsolar) +<<<<<<< HEAD "iOa" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/grass, /area/surface/station/park) +======= +"iOD" = ( +/obj/structure/sign/level/ground/large{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/surface/station/hallway/primary/groundfloor/east) +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 "iPo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21171,6 +21313,10 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/groundfloor/north) "jUC" = ( @@ -21289,6 +21435,9 @@ initial_flooring = /decl/flooring/tiling/asteroidfloor }, /area/surface/outside/plains/station) +"jWt" = ( +/turf/simulated/floor/outdoors/shelfice, +/area/surface/outside/ocean) "jWB" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/green/border, @@ -22109,10 +22258,8 @@ /turf/simulated/floor/water, /area/surface/outside/plains/station) "klO" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/brflowers, /obj/machinery/light/spot, -/turf/simulated/floor/grass, +/turf/simulated/floor/fakesnow, /area/surface/station/park) "kmw" = ( /obj/structure/cable/green{ @@ -22490,6 +22637,10 @@ icon_state = "frame"; pixel_y = 32 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "kxd" = ( @@ -22674,6 +22825,10 @@ /obj/structure/sign/bigname{ pixel_y = 32 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "kBn" = ( @@ -22706,6 +22861,10 @@ dir = 8; pixel_x = 24 }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "kCC" = ( @@ -22881,6 +23040,10 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "kFF" = ( @@ -23102,7 +23265,12 @@ /area/surface/station/medical/etc) "kKR" = ( /obj/structure/table/woodentable, +<<<<<<< HEAD /obj/item/weapon/deck/cards, +======= +/obj/item/deck/cards, +/obj/item/toy/xmas_cracker, +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "kKX" = ( @@ -23954,7 +24122,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/structure/flora/pottedplant/subterranean, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled, /area/surface/station/engineering/foyer) "lhB" = ( @@ -24967,6 +25135,14 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/hallway/primary/groundfloor/south) +"lFA" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass{ + name = "Cafeteria" + }, +/obj/structure/sign/christmas/wreath, +/turf/simulated/floor/tiled/steel_grid, +/area/surface/station/crew_quarters/cafeteria) "lFD" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 @@ -25104,6 +25280,17 @@ }, /turf/simulated/floor/tiled, /area/surface/station/security/lobby) +<<<<<<< HEAD +======= +"lIt" = ( +/obj/random/vendorfood, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/hydro, +/area/surface/station/park) +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 "lIJ" = ( /obj/machinery/computer/aifixer{ dir = 8 @@ -26281,6 +26468,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/arrivals/cynosure) "mhn" = ( @@ -27656,6 +27847,10 @@ /area/surface/station/maintenance/east/gnd) "mLm" = ( /obj/machinery/media/jukebox, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "mLF" = ( @@ -28318,6 +28513,20 @@ /obj/item/weapon/folder/red, /turf/simulated/floor/plating, /area/surface/station/security/briefing_room) +<<<<<<< HEAD +======= +"mWA" = ( +/turf/simulated/wall/r_concrete, +/area/surface/station/maintenance/kitchen) +"mWO" = ( +/obj/machinery/vending/coffee, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/hydro, +/area/surface/station/park) +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 "mXo" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -28428,7 +28637,15 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 10 }, +<<<<<<< HEAD /obj/item/weapon/banner/nt, +======= +/obj/item/banner/nt, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "naO" = ( @@ -30067,12 +30284,6 @@ }, /turf/simulated/floor/tiled, /area/surface/station/quartermaster/storage) -"nPp" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/grass, -/area/surface/station/park) "nPy" = ( /turf/unsimulated/mask, /area/surface/station/hallway/primary/groundfloor/west/elevator) @@ -30858,6 +31069,14 @@ }, /turf/simulated/floor/tiled/old_tile/blue, /area/surface/station/crew_quarters/gym) +"ogV" = ( +/obj/machinery/portable_atmospherics/hydroponics/soil, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/fakesnow, +/area/surface/station/park) "ogY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -31327,10 +31546,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central7, /turf/simulated/floor/tiled/white, /area/surface/station/security/detectives_office/lab) -"oqM" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/grass, -/area/surface/station/park) "orb" = ( /obj/structure/cable/green{ d1 = 1; @@ -31388,6 +31603,18 @@ c_tag = "Ground Floor - South Hallway 3"; dir = 8 }, +<<<<<<< HEAD +======= +/obj/structure/sign/directions/bar{ + dir = 5; + pixel_y = 39 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/obj/structure/flora/pottedplant/xmas, +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "osf" = ( @@ -31512,6 +31739,7 @@ name = "Medbay"; req_access = list(5) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/medical/reception) "otX" = ( @@ -32549,6 +32777,10 @@ c_tag = "Ground Floor - South Hallway 2"; dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/old_cargo/gray, /area/surface/station/hallway/primary/groundfloor/south) "oST" = ( @@ -32924,6 +33156,10 @@ /obj/structure/sign/bigname/seg_6{ pixel_y = 32 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "oYh" = ( @@ -33868,10 +34104,6 @@ }, /turf/simulated/floor/tiled, /area/surface/station/security/range) -"pql" = ( -/obj/structure/flora/ausbushes/palebush, -/turf/simulated/floor/grass, -/area/surface/station/park) "pqo" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -34091,7 +34323,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/flora/pottedplant/fern, /obj/effect/catwalk_plated, /obj/machinery/camera/network/security{ c_tag = "SEC - Lobby"; @@ -34100,6 +34331,7 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/plating, /area/surface/station/security/lobby) "puN" = ( @@ -34765,6 +34997,10 @@ /area/surface/station/quartermaster/lockerroom) "pKF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "pKH" = ( @@ -35346,6 +35582,7 @@ locked = 1; name = "External Access" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/hallway/primary/groundfloor/south) "qaU" = ( @@ -35673,11 +35910,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/flora/pottedplant/stoutbush, /obj/structure/extinguisher_cabinet{ dir = 4; pixel_x = 30 }, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/wood/sif, /area/surface/station/chapel/main) "qiC" = ( @@ -36492,11 +36729,6 @@ }, /turf/simulated/floor/carpet, /area/surface/station/library) -"qwT" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/grass, -/area/surface/station/park) "qxt" = ( /obj/structure/cable/green{ d1 = 1; @@ -37099,6 +37331,10 @@ c_tag = "Ground Floor - Arrivals South"; dir = 5 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/arrivals/cynosure) "qIX" = ( @@ -37123,6 +37359,10 @@ dir = 8; pixel_x = -24 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "qJC" = ( @@ -38185,6 +38425,7 @@ dir = 1 }, /obj/structure/table/marble, +/obj/item/toy/xmas_cracker, /turf/simulated/floor/tiled/eris/cafe, /area/surface/station/crew_quarters/cafeteria) "rjq" = ( @@ -38853,6 +39094,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/arrivals/cynosure) "rze" = ( @@ -39474,6 +39719,7 @@ id = "bar2"; layer = 3.3 }, +/obj/item/toy/xmastree, /turf/simulated/floor/lino, /area/surface/station/crew_quarters/bar) "rNx" = ( @@ -39551,6 +39797,10 @@ name = "Reception Emergency Phone"; pixel_y = -6 }, +/obj/item/toy/xmastree{ + pixel_x = 10; + pixel_y = 5 + }, /turf/simulated/floor/tiled/neutral, /area/surface/station/medical/reception) "rON" = ( @@ -39996,6 +40246,10 @@ /obj/structure/sign/bigname/seg_5{ pixel_y = 32 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "scm" = ( @@ -40131,6 +40385,7 @@ /obj/item/weapon/material/kitchen/utensil/spoon{ pixel_x = 2 }, +/obj/item/toy/xmas_cracker, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "sgm" = ( @@ -40251,6 +40506,7 @@ /obj/machinery/door/airlock/glass{ name = "Cafeteria" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/crew_quarters/cafeteria) "skI" = ( @@ -40873,6 +41129,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/arrivals/cynosure) "szU" = ( @@ -41907,9 +42167,8 @@ /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/exploration) "sYq" = ( -/obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/portable_atmospherics/hydroponics/soil, -/turf/simulated/floor/grass, +/turf/simulated/floor/fakesnow, /area/surface/station/park) "sZq" = ( /turf/simulated/wall, @@ -42131,11 +42390,6 @@ }, /turf/simulated/floor/plating, /area/surface/station/engineering/reactor_room) -"tga" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/surface/station/park) "tgg" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -42430,6 +42684,10 @@ pixel_x = 2; pixel_y = 2 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/hydro, /area/surface/station/park) "tmx" = ( @@ -42493,6 +42751,13 @@ }, /turf/simulated/floor/plating, /area/surface/station/maintenance/substation/engineering/gnd) +"tmP" = ( +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/turf/simulated/floor/wood, +/area/surface/station/crew_quarters/cafeteria) "tmQ" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -42625,6 +42890,10 @@ dir = 1 }, /obj/machinery/vending/coffee, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "toW" = ( @@ -42727,9 +42996,7 @@ /turf/simulated/floor/tiled/steel_grid, /area/surface/station/medical/etc) "tss" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, +/turf/simulated/floor/fakesnow, /area/surface/station/park) "tsM" = ( /obj/effect/floor_decal/borderfloorwhite{ @@ -42768,6 +43035,13 @@ }, /turf/simulated/floor/tiled/old_cargo/gray, /area/surface/station/ai/upload) +"tsW" = ( +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/surface/station/park) "ttl" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -42826,6 +43100,7 @@ locked = 1; name = "External Access" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/techfloor, /area/surface/station/hallway/primary/groundfloor/north) "twb" = ( @@ -43162,6 +43437,7 @@ /area/surface/station/security/detectives_office) "tCe" = ( /obj/machinery/door/firedoor/glass, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/medical/reception) "tCj" = ( @@ -43691,6 +43967,7 @@ d2 = 8; icon_state = "1-8" }, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled/dark, /area/surface/station/crew_quarters/heads/hos) "tMQ" = ( @@ -43943,12 +44220,11 @@ /turf/simulated/floor/plating, /area/surface/station/security/processing) "tUr" = ( -/obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/camera/network/ground_floor{ c_tag = "Ground Floor - Park Southeast"; dir = 1 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/fakesnow, /area/surface/station/park) "tUY" = ( /turf/simulated/wall/r_wall, @@ -45409,6 +45685,14 @@ /obj/machinery/status_display, /turf/simulated/floor/plating, /area/surface/station/rnd/xenobiology/xenoflora) +"uHN" = ( +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/obj/structure/flora/pottedplant/xmas, +/turf/simulated/floor/wood, +/area/surface/station/crew_quarters/cafeteria) "uIk" = ( /obj/machinery/door/airlock/maintenance/engi{ icon_state = "door_locked"; @@ -46170,6 +46454,10 @@ pixel_y = 21 }, /obj/random/vendordrink, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "vaT" = ( @@ -46565,6 +46853,10 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "vim" = ( @@ -48079,7 +48371,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/wood/sif, /area/surface/station/chapel/main) "vQT" = ( @@ -48098,7 +48390,7 @@ /obj/structure/railing/grey{ dir = 4 }, -/turf/simulated/floor/water, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/river/gautelfr) "vRD" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -48130,6 +48422,9 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor/plating, /area/surface/station/engineering/reactor_waste) +"vSk" = ( +/turf/simulated/floor/outdoors/shelfice, +/area/surface/outside/river/gautelfr) "vSp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -48510,6 +48805,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "wcF" = ( @@ -49026,6 +49325,10 @@ /obj/structure/sign/bigname/seg_2{ pixel_y = 32 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "wqH" = ( @@ -49235,6 +49538,10 @@ /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/primary/groundfloor/south) "wxQ" = ( @@ -49390,7 +49697,7 @@ dir = 1; pixel_y = -22 }, -/obj/structure/flora/pottedplant/orientaltree, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled/white, /area/surface/station/medical/reception) "wCc" = ( @@ -49401,6 +49708,7 @@ req_access = list(63); req_one_access = list() }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/security/lobby) "wCF" = ( @@ -49504,6 +49812,13 @@ }, /turf/simulated/floor/tiled/white, /area/surface/station/rnd/hallway/gnd) +"wFo" = ( +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/outdoors/snow/sif/planetuse, +/area/surface/outside/plains/station) "wFE" = ( /obj/structure/table/bench/wooden, /obj/structure/disposalpipe/segment{ @@ -50436,7 +50751,7 @@ /area/surface/station/medical/chemistry) "wVF" = ( /obj/effect/zone_divider, -/turf/simulated/floor/water, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/river/gautelfr) "wVK" = ( /obj/machinery/atmospherics/valve/digital{ @@ -50941,6 +51256,7 @@ locked = 1; name = "External Access" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/hallway/primary/groundfloor/south) "xjm" = ( @@ -50993,6 +51309,13 @@ has_fish = 0 }, /area/surface/outside/station/reactorpond) +"xky" = ( +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/outdoors/snow/sif/planetuse, +/area/surface/outside/plains/station) "xlW" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -51772,8 +52095,17 @@ }, /obj/item/roller, /obj/item/bodybag/cryobag, +<<<<<<< HEAD /obj/item/weapon/storage/firstaid/regular, /obj/item/weapon/storage/pill_bottle/spaceacillin, +======= +/obj/item/storage/firstaid/regular, +/obj/item/storage/pill_bottle/spaceacillin, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) "xGi" = ( @@ -52521,6 +52853,13 @@ }, /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/exploration) +"xUE" = ( +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/fakesnow, +/area/surface/station/park) "xUY" = ( /turf/simulated/wall, /area/surface/station/rnd/exploration) @@ -52689,6 +53028,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/surface/station/ai/cyborg_station) +"xWV" = ( +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/obj/structure/flora/pottedplant/xmas, +/turf/simulated/floor/wood, +/area/surface/station/crew_quarters/cafeteria) "xXe" = ( /obj/structure/fence{ dir = 4 @@ -53218,6 +53565,10 @@ /obj/effect/floor_decal/industrial/outline{ color = "#D4D4D4" }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/old_cargo/gray, /area/surface/station/hallway/primary/groundfloor/south) "yjH" = ( @@ -53941,17 +54292,17 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (3,1,1) = {" @@ -54198,17 +54549,17 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (4,1,1) = {" @@ -54455,17 +54806,17 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (5,1,1) = {" @@ -54712,17 +55063,17 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (6,1,1) = {" @@ -54969,17 +55320,17 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (7,1,1) = {" @@ -55226,17 +55577,17 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (8,1,1) = {" @@ -55482,18 +55833,18 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (9,1,1) = {" @@ -55739,18 +56090,18 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (10,1,1) = {" @@ -55995,19 +56346,19 @@ vwy vwy iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (11,1,1) = {" @@ -56252,19 +56603,19 @@ vwy vwy iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (12,1,1) = {" @@ -56510,18 +56861,18 @@ vwy vwy iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (13,1,1) = {" @@ -56767,18 +57118,18 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (14,1,1) = {" @@ -57024,18 +57375,18 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (15,1,1) = {" @@ -57281,18 +57632,18 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz +jWt +jWt wYa "} (16,1,1) = {" @@ -57538,18 +57889,18 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt wYa "} (17,1,1) = {" @@ -57795,18 +58146,18 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt wYa "} (18,1,1) = {" @@ -58052,18 +58403,18 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt wYa "} (19,1,1) = {" @@ -58309,18 +58660,18 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz +jWt wYa "} (20,1,1) = {" @@ -58566,18 +58917,18 @@ vwy vwy iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (21,1,1) = {" @@ -58823,18 +59174,18 @@ vwy vwy iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (22,1,1) = {" @@ -59080,18 +59431,18 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (23,1,1) = {" @@ -59337,18 +59688,18 @@ vwy iGM iGM iGM +jWt dXk dXk dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (24,1,1) = {" @@ -59594,18 +59945,18 @@ vwy iGM iGM iGM +jWt +jWt dXk dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (25,1,1) = {" @@ -59850,19 +60201,19 @@ vwy vwy iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (26,1,1) = {" @@ -60024,11 +60375,11 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -60107,19 +60458,19 @@ vwy iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (27,1,1) = {" @@ -60278,16 +60629,16 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -60364,19 +60715,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (28,1,1) = {" @@ -60533,20 +60884,20 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -60621,19 +60972,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (29,1,1) = {" @@ -60786,28 +61137,28 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -60878,19 +61229,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (30,1,1) = {" @@ -61031,41 +61382,41 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -61135,19 +61486,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (31,1,1) = {" @@ -61284,48 +61635,48 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -oum -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -61392,19 +61743,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (32,1,1) = {" @@ -61539,52 +61890,52 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -61648,20 +61999,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (33,1,1) = {" @@ -61792,13 +62143,23 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum @@ -61806,44 +62167,34 @@ oum oum oum oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -61905,20 +62256,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (34,1,1) = {" @@ -62047,64 +62398,64 @@ vwy vwy vwy vwy +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk aNW aNW aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -62162,20 +62513,20 @@ iGM iGM iGM iGM +jWt dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (35,1,1) = {" @@ -62303,33 +62654,33 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -62338,32 +62689,32 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -62421,18 +62772,18 @@ iGM iGM dXk dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (36,1,1) = {" @@ -62558,22 +62909,22 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -62598,30 +62949,30 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -62678,18 +63029,18 @@ iGM iGM dXk dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (37,1,1) = {" @@ -62813,17 +63164,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -62858,28 +63209,28 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -62934,19 +63285,19 @@ iGM iGM iGM dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (38,1,1) = {" @@ -63068,17 +63419,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -63119,26 +63470,26 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy xdu vwy @@ -63190,20 +63541,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (39,1,1) = {" @@ -63323,18 +63674,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk vwy vwy vwy @@ -63378,25 +63729,25 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk wVF vwy vwy @@ -63448,19 +63799,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt wYa "} (40,1,1) = {" @@ -63578,19 +63929,19 @@ vwy vwy vwy vwy +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -63638,25 +63989,25 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk wVF -aNW -aNW +vSk +vSk vwy vwy vwy @@ -63705,19 +64056,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt +jWt wYa "} (41,1,1) = {" @@ -63832,90 +64183,90 @@ vwy vwy vwy vwy +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk aNW aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum +vSk wVF -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk vwy vwy vwy @@ -63962,19 +64313,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (42,1,1) = {" @@ -64088,17 +64439,17 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy kgZ @@ -64156,25 +64507,25 @@ vwy vwy vwy vwy -aNW +vSk vwy -aNW -aNW -aNW -aNW -aNW -oum -oum +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum cKh oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -64219,19 +64570,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (43,1,1) = {" @@ -64343,18 +64694,18 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -64417,24 +64768,24 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum cKh oum oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -64476,19 +64827,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (44,1,1) = {" @@ -64598,18 +64949,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -64675,25 +65026,25 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -aNW -oum -cKh -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +wVF +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -64733,19 +65084,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (45,1,1) = {" @@ -64854,17 +65205,17 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum oum oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -64934,24 +65285,24 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk wVF -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -64991,18 +65342,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (46,1,1) = {" @@ -65110,17 +65461,17 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum oum oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -65193,24 +65544,24 @@ vwy vwy vwy vwy -aNW -aNW -aNW +vSk +vSk +vSk wVF -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -65248,18 +65599,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (47,1,1) = {" @@ -65365,17 +65716,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum -oum -oum -oum -aNW -aNW +vSk +vSk vwy vwy vwy @@ -65454,22 +65805,22 @@ vwy vwy vwy wVF -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -65505,18 +65856,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (48,1,1) = {" @@ -65621,17 +65972,17 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum oum oum oum -oum -oum -oum -aNW -aNW +vSk +vSk vwy vwy vwy @@ -65712,22 +66063,22 @@ vwy vwy xdu vwy -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -65762,18 +66113,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (49,1,1) = {" @@ -65876,18 +66227,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum oum aNW -aNW -aNW +vSk +vSk vwy vwy vwy @@ -65971,21 +66322,21 @@ xdu vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -66019,18 +66370,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (50,1,1) = {" @@ -66132,18 +66483,18 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -66231,19 +66582,19 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -66276,18 +66627,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (51,1,1) = {" @@ -66388,18 +66739,18 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -66489,20 +66840,20 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -66533,18 +66884,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (52,1,1) = {" @@ -66641,21 +66992,21 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -66748,20 +67099,20 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -66789,19 +67140,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (53,1,1) = {" @@ -66896,21 +67247,21 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -67006,21 +67357,21 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -67046,19 +67397,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (54,1,1) = {" @@ -67150,23 +67501,23 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -67265,21 +67616,21 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -67303,19 +67654,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (55,1,1) = {" @@ -67405,24 +67756,24 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -67524,21 +67875,21 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum aNW aNW aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk vwy vwy vwy @@ -67559,20 +67910,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (56,1,1) = {" @@ -67660,24 +68011,24 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -67782,21 +68133,21 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum aNW aNW aNW -aNW -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -67816,20 +68167,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (57,1,1) = {" @@ -67914,25 +68265,25 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -68040,22 +68391,22 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -oum -oum +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum aNW aNW aNW -aNW -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -68073,20 +68424,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (58,1,1) = {" @@ -68169,25 +68520,25 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -68299,21 +68650,21 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -68330,20 +68681,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (59,1,1) = {" @@ -68425,25 +68776,25 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -68557,21 +68908,21 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -68586,21 +68937,21 @@ iGM iGM iGM iGM -aNW -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -dXk -qzz -qzz -qzz -qzz +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (60,1,1) = {" @@ -68680,25 +69031,25 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -68816,6 +69167,7 @@ vwy vwy vwy vwy +<<<<<<< HEAD aNW aNW aNW @@ -68831,6 +69183,23 @@ aNW aNW aNW aNW +======= +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 vwy vwy vwy @@ -68843,6 +69212,7 @@ iGM iGM iGM iGM +<<<<<<< HEAD aNW dXk qzz @@ -68858,6 +69228,23 @@ qzz qzz qzz qzz +======= +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 wYa "} (61,1,1) = {" @@ -68892,9 +69279,15 @@ vwy vwy vwy vwy +<<<<<<< HEAD vwy vwy vwy +======= +fyc +fyc +fyc +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 vwy vwy vwy @@ -68936,25 +69329,25 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -69075,46 +69468,46 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy -aNW +vSk iGM iGM -aNW -aNW -oum -qzz -qzz -qzz -qzz -dXk -qzz -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +vSk +vSk +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (62,1,1) = {" @@ -69191,25 +69584,25 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -69333,45 +69726,45 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -qzz -qzz -qzz -qzz -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (63,1,1) = {" @@ -69447,24 +69840,24 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -69592,43 +69985,43 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -qzz -qzz -qzz -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (64,1,1) = {" @@ -69703,24 +70096,24 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -69849,43 +70242,43 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -qzz -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (65,1,1) = {" @@ -69962,14 +70355,14 @@ wVF wVF wVF wVF -cKh -cKh -cKh -cKh -cKh -cKh -cKh -cKh +wVF +wVF +wVF +wVF +wVF +wVF +wVF +wVF wVF wVF wVF @@ -70113,21 +70506,21 @@ wVF wVF wVF wVF -cKh -cKh -cKh -cKh -cKh -cKh -cKh -cKh -cKh -cKh -cKh -cKh -cKh -cKh -cKh +wVF +wVF +wVF +wVF +wVF +wVF +wVF +wVF +wVF +wVF +wVF +wVF +wVF +wVF +wVF wVF gyu gyu @@ -70137,12 +70530,12 @@ gyu gyu gyu gyu -dQn -dQn -dQn -dQn -dQn -dQn +gyu +gyu +gyu +gyu +gyu +gyu wYa "} (66,1,1) = {" @@ -70214,23 +70607,23 @@ vwy vwy vwy vwy -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -70366,40 +70759,40 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (67,1,1) = {" @@ -70470,22 +70863,22 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -70624,39 +71017,39 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (68,1,1) = {" @@ -70726,22 +71119,22 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -70883,37 +71276,37 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk iGM iGM -aNW -aNW +vSk +vSk iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (69,1,1) = {" @@ -70982,21 +71375,21 @@ xdu vwy vwy vwy -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -71141,17 +71534,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk iGM iGM iGM @@ -71159,18 +71552,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (70,1,1) = {" @@ -71238,21 +71631,21 @@ vwy xdu vwy vwy -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum oum -oum -oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -71399,35 +71792,35 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk iGM iGM iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (71,1,1) = {" @@ -71494,20 +71887,20 @@ vwy vwy xdu vwy -aNW -aNW -aNW -aNW -oum -oum -oum +vSk +vSk +vSk +vSk +vSk +vSk +vSk oum oum oum aNW -aNW -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -71657,34 +72050,34 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk iGM iGM iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (72,1,1) = {" @@ -71750,20 +72143,20 @@ vwy vwy vwy xdu -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -71915,33 +72308,33 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk iGM iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (73,1,1) = {" @@ -72007,18 +72400,18 @@ vwy vwy vwy xdu -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -72173,32 +72566,32 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (74,1,1) = {" @@ -72264,17 +72657,17 @@ vwy vwy vwy wVF -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -72432,30 +72825,30 @@ nCe nCe nCe nCe -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum -oum -oum -aNW +vSk +vSk +vSk iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (75,1,1) = {" @@ -72521,16 +72914,16 @@ vwy vwy vwy wVF -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -72690,29 +73083,29 @@ nCe nCe nCe nCe -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk aNW oum oum -oum -aNW -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +vSk +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (76,1,1) = {" @@ -72776,18 +73169,18 @@ vwy vwy vwy vwy -aNW +vSk wVF -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -72949,27 +73342,27 @@ nCe nCe nCe nCe -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk oum -oum -oum -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +vSk +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (77,1,1) = {" @@ -73033,17 +73426,17 @@ vwy vwy vwy vwy -aNW -cKh -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +wVF +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -73207,26 +73600,26 @@ nCe nCe nCe nCe -aNW -aNW -aNW -aNW -oum -oum -qzz -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +vSk +vSk +vSk +vSk +vSk +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (78,1,1) = {" @@ -73289,17 +73682,17 @@ vwy vwy vwy vwy -aNW -aNW -cKh -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +wVF +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -73465,25 +73858,25 @@ nCe nCe nCe nCe -aNW -aNW -aNW -aNW -oum -qzz -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +vSk +vSk +vSk +vSk +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (79,1,1) = {" @@ -73546,16 +73939,16 @@ vwy vwy vwy vwy -aNW -oum -cKh -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +wVF +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -73723,24 +74116,24 @@ nCe nCe nCe nCe -aNW -aNW -aNW -oum -qzz -qzz -qzz -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +vSk +vSk +vSk +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (80,1,1) = {" @@ -73802,16 +74195,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -cKh -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +wVF +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -73981,23 +74374,23 @@ xpd xnL nCe nCe -aNW -aNW -aNW -dXk -dXk -qzz -qzz -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +vSk +vSk +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (81,1,1) = {" @@ -74059,15 +74452,15 @@ vwy vwy vwy vwy -aNW -aNW -oum -cKh -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +wVF +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -74239,22 +74632,22 @@ nCe nCe nCe pNa -aNW -aNW -dXk -dXk -dXk -qzz -qzz -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +vSk +vSk +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (82,1,1) = {" @@ -74316,14 +74709,14 @@ vwy vwy vwy vwy -aNW -aNW -oum -cKh -oum -oum -aNW -aNW +vSk +vSk +vSk +wVF +vSk +vSk +vSk +vSk vwy vwy vwy @@ -74498,20 +74891,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -qzz -qzz -dXk -dXk +jWt +jWt +jWt dXk dXk qzz qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (83,1,1) = {" @@ -74572,15 +74965,15 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -cKh -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +wVF +vSk +vSk +vSk +vSk vwy vwy vwy @@ -74756,19 +75149,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -qzz -qzz -dXk -dXk +jWt +jWt +jWt +jWt dXk qzz qzz qzz +jWt +jWt +jWt +jWt +jWt wYa "} (84,1,1) = {" @@ -74828,14 +75221,14 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -cKh -aNW -aNW +vSk +vSk +vSk +vSk +vSk +wVF +vSk +vSk vwy vwy vwy @@ -75014,18 +75407,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (85,1,1) = {" @@ -75085,13 +75478,13 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum +vSk +vSk +vSk +vSk +vSk wVF -aNW +vSk vwy vwy vwy @@ -75271,18 +75664,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (86,1,1) = {" @@ -75341,12 +75734,12 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk wVF vwy vwy @@ -75528,18 +75921,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (87,1,1) = {" @@ -75598,12 +75991,12 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk wVF vwy vwy @@ -75785,18 +76178,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (88,1,1) = {" @@ -75853,14 +76246,14 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk xdu vwy vwy @@ -76042,18 +76435,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (89,1,1) = {" @@ -76110,13 +76503,13 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy xdu vwy @@ -76298,19 +76691,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (90,1,1) = {" @@ -76366,13 +76759,13 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy xdu @@ -76555,19 +76948,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (91,1,1) = {" @@ -76623,13 +77016,13 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy xdu @@ -76812,19 +77205,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (92,1,1) = {" @@ -76879,13 +77272,13 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -77070,18 +77463,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (93,1,1) = {" @@ -77136,13 +77529,13 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -77327,18 +77720,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (94,1,1) = {" @@ -77393,12 +77786,12 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -77584,18 +77977,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (95,1,1) = {" @@ -77649,13 +78042,13 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -77841,18 +78234,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (96,1,1) = {" @@ -77906,13 +78299,13 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -78097,19 +78490,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (97,1,1) = {" @@ -78162,13 +78555,13 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -78354,19 +78747,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (98,1,1) = {" @@ -78418,14 +78811,14 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -78571,7 +78964,7 @@ stJ stJ vCy vCy -aqn +xky aqn nCe nCe @@ -78611,19 +79004,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (99,1,1) = {" @@ -78674,15 +79067,15 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -78828,7 +79221,7 @@ oYn cen ieS hfw -aqn +xky aqn nCe nCe @@ -78869,18 +79262,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (100,1,1) = {" @@ -78931,14 +79324,14 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -79085,7 +79478,7 @@ jod tZJ eAI hfw -aqn +xky aqn aqn nCe @@ -79126,18 +79519,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (101,1,1) = {" @@ -79187,15 +79580,15 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -79342,7 +79735,7 @@ qrz wXK tZJ mJK -aqn +xky aqn aqn aqn @@ -79383,18 +79776,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (102,1,1) = {" @@ -79443,16 +79836,16 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -79599,7 +79992,7 @@ tTd tZJ jOe kxI -aqn +xky aqn aqn aqn @@ -79640,18 +80033,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt +jWt +jWt wYa "} (103,1,1) = {" @@ -79700,16 +80093,16 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -79856,7 +80249,7 @@ nKl wXK tZJ mJK -aqn +xky aqn aqn aqn @@ -79896,19 +80289,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk +jWt +jWt +jWt +jWt +jWt +jWt dXk dXk qzz qzz -qzz -qzz -qzz +jWt +jWt +jWt wYa "} (104,1,1) = {" @@ -79957,15 +80350,15 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -80113,7 +80506,7 @@ uOl tZJ eqC hfw -aqn +xky aqn aqn aqn @@ -80153,19 +80546,19 @@ pNa pNa pNa pNa +jWt +jWt +jWt +jWt +jWt dXk dXk dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt wYa "} (105,1,1) = {" @@ -80213,16 +80606,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -80370,7 +80763,7 @@ oye tZJ eSQ hfw -aqn +xky aqn aqn aqn @@ -80410,19 +80803,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (106,1,1) = {" @@ -80470,16 +80863,16 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -80666,20 +81059,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (107,1,1) = {" @@ -80727,15 +81120,15 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -80923,20 +81316,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (108,1,1) = {" @@ -80983,15 +81376,15 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -81180,20 +81573,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (109,1,1) = {" @@ -81240,15 +81633,15 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -81437,20 +81830,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (110,1,1) = {" @@ -81497,14 +81890,14 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -81694,20 +82087,20 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt +jWt +jWt wYa "} (111,1,1) = {" @@ -81754,14 +82147,14 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -81951,20 +82344,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt +jWt +jWt wYa "} (112,1,1) = {" @@ -82011,14 +82404,14 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -82208,20 +82601,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz qzz +jWt +jWt wYa "} (113,1,1) = {" @@ -82267,15 +82660,15 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -82427,7 +82820,7 @@ mjW vSp qsw jkH -aqn +xky aqn qkr pNy @@ -82465,20 +82858,20 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (114,1,1) = {" @@ -82524,14 +82917,14 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk vwy vwy vwy @@ -82684,7 +83077,7 @@ mjW lYk iJn oEj -aqn +xky aqn pNy qkr @@ -82722,20 +83115,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (115,1,1) = {" @@ -82781,14 +83174,14 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk oum oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk vwy vwy vwy @@ -82941,7 +83334,7 @@ mjW mjW fgw jkH -aqn +xky aqn qkr pNy @@ -82979,20 +83372,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (116,1,1) = {" @@ -83037,14 +83430,14 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk oum oum -oum -oum -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -83198,7 +83591,7 @@ mjW ayF ufL ufL -aqn +xky aqn pNy qkr @@ -83237,19 +83630,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (117,1,1) = {" @@ -83294,14 +83687,14 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk oum oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk vwy vwy vwy @@ -83494,19 +83887,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (118,1,1) = {" @@ -83552,11 +83945,11 @@ vwy eSI vRh vRh +vRh vux vux -vux -vux -vux +vRh +vRh vRh eSI vwy @@ -83661,12 +84054,21 @@ lUL jmQ lUL lUL +<<<<<<< HEAD oqM sYq oqM sYq pts bql +======= +xUE +ogV +xUE +ogV +ibT +tsW +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 wAe rIC tDF @@ -83678,10 +84080,10 @@ tmp imh fsP aTA -sYq -oqM -sYq -oqM +ogV +xUE +ogV +xUE pfh pfh wlg @@ -83708,9 +84110,9 @@ fJg oPb omw bsn -aqn -aqn -aqn +wFo +wFo +wFo aqn aqn pPG @@ -83751,19 +84153,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (119,1,1) = {" @@ -83917,7 +84319,7 @@ mRw lUL lUL lUL -pql +tss rVf rVf rVf @@ -84008,19 +84410,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (120,1,1) = {" @@ -84265,19 +84667,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (121,1,1) = {" @@ -84323,11 +84725,11 @@ vwy eSI gNL gNL +gNL xkh xkh -xkh -xkh -xkh +gNL +gNL gNL eSI vwy @@ -84434,27 +84836,27 @@ hlM pts bql bql -oqM +tss wMG nLV eYp -oqM -oqM -dOI +tss +tss +tss bql vxx bql -dOI -iDl -oqM +tss +tss +tss wMG iUi eYp -oqM +tss bql bql oVr -hlM +tss tRC icM kee @@ -84522,19 +84924,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (122,1,1) = {" @@ -84578,14 +84980,14 @@ vwy vwy vwy vwy -aNW +vSk +vSk +vSk oum oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -84690,25 +85092,25 @@ jgp gGO pts bql -oqM -oqM +tss +tss ydK vue rzu -oqM -oqM -tga +tss +tss +tss bql eCu bql -tga -oqM -oqM +tss +tss +tss ydK vue rzu -oqM -oqM +tss +tss bql hNc klO @@ -84737,7 +85139,7 @@ kDt ogu ogu ogu -aqn +xky aqn nCe nCe @@ -84780,18 +85182,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (123,1,1) = {" @@ -84834,15 +85236,15 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk vwy vwy vwy @@ -84944,28 +85346,28 @@ oKA nZk vmK eNB -hlM +icD pts bql -tga -oqM -qwT -qwT -qwT -oqM -oqM -tga +tss +tss +tss +tss +tss +tss +tss +tss bql eCu bql -tga -oqM -oqM -qwT -ivC -ivC -oqM -tga +tss +tss +tss +tss +tss +tss +tss +tss bql hNc azs @@ -84994,7 +85396,7 @@ mSO cOE aHr ogu -aqn +xky aqn nCe nCe @@ -85037,18 +85439,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (124,1,1) = {" @@ -85091,14 +85493,14 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -85204,25 +85606,25 @@ pfh glD pts bql -tga -oqM -oqM -oqM -oqM -oqM -oqM -tga +tss +tss +tss +tss +tss +tss +tss +tss bql eCu bql -tga -oqM -oqM -oqM -oqM -oqM -oqM -tga +tss +tss +tss +tss +tss +tss +tss +tss bql hNc bqn @@ -85251,7 +85653,7 @@ rNb nXP jOt kDt -aqn +xky aqn nCe nCe @@ -85294,18 +85696,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (125,1,1) = {" @@ -85348,14 +85750,14 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -85458,28 +85860,28 @@ lGu rHb vmK pfh -oqM +icD pts bql tss -oqM -oqM -oqM -oqM -oqM -oqM -oqM +tss +tss +tss +tss +tss +tss +tss bql lxE bql -oqM -oqM -oqM -oqM -oqM -oqM -oqM -tga +tss +tss +tss +tss +tss +tss +tss +tss bql okY rVf @@ -85508,7 +85910,7 @@ qUk twn kcu dGI -aqn +xky aqn nCe nCe @@ -85551,18 +85953,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (126,1,1) = {" @@ -85604,15 +86006,15 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -85715,28 +86117,28 @@ lGu fCf vmK eNB -hlM +icD pts bql -oqM -oqM -qwT -qwT -nPp -oqM -oqM +tss +tss +tss +tss +tss +tss +tss bql niD eVB xjU bql -oqM -oqM -qwT -qwT -qwT -oqM -iDl +tss +tss +tss +tss +tss +tss +tss bql bql nzB @@ -85765,7 +86167,7 @@ kDP bUO jOt kDt -aqn +xky nCe nCe nCe @@ -85808,18 +86210,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (127,1,1) = {" @@ -85861,14 +86263,14 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -85972,7 +86374,7 @@ bzH fCf vmK jgp -hlM +icD pts bql bql @@ -86022,7 +86424,7 @@ uge hbn snA ogu -aqn +xky nCe nCe nCe @@ -86065,18 +86467,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (128,1,1) = {" @@ -86117,15 +86519,15 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -86229,28 +86631,28 @@ dbY fCf vmK eNB -hlM +icD pts bql -oqM -oqM -qwT -qwT -qwT -oqM -oqM +tss +tss +tss +tss +tss +tss +tss bql raN oRf ssV bql -oqM -oqM -qwT -qwT -qwT -oqM -iOa +tss +tss +tss +tss +tss +tss +tss bql bql nzB @@ -86261,14 +86663,14 @@ aMy aMy oWm xHN -heM +xWV wPL len gFr ueg owl heM -shK +lFA xys mfj oDQ @@ -86279,7 +86681,7 @@ aDE qrZ ewh ogu -aqn +xky nCe nCe nCe @@ -86321,19 +86723,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (129,1,1) = {" @@ -86374,15 +86776,15 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -86486,28 +86888,28 @@ dbY rHb eWW pfh -oqM +icD pts bql -tga -oqM -oqM -oqM -oqM -oqM -oqM -oqM +tss +tss +tss +tss +tss +tss +tss +tss bql lxE bql -oqM -oqM -oqM -oqM -oqM -oqM -oqM -tga +tss +tss +tss +tss +tss +tss +tss +tss bql aGP tnc @@ -86536,7 +86938,7 @@ nIh nIh ogu ogu -aqn +xky nCe nCe nCe @@ -86578,19 +86980,19 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (130,1,1) = {" @@ -86631,15 +87033,15 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -86746,25 +87148,25 @@ pfh eiv pts bql -tga -oqM -oqM -oqM -oqM -oqM -oqM -tga +tss +tss +tss +tss +tss +tss +tss +tss bql eCu bql -tga -oqM -oqM -oqM -iOa -oqM -oqM -tga +tss +tss +tss +tss +tss +tss +tss +tss bql hNc tUr @@ -86780,7 +87182,7 @@ heM hpC kCz xFu -heM +tmP eYt nyc aYV @@ -86835,19 +87237,19 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (131,1,1) = {" @@ -86887,15 +87289,15 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -87000,33 +87402,33 @@ jTX dRM vmK eNB -hlM +icD pts bql -tga -oqM -qwT -qwT -qwT -oqM -oqM -tga +tss +tss +tss +tss +tss +tss +tss +tss bql eCu bql -tga -oqM -oqM -qwT -qwT -qwT -oqM -tga +tss +tss +tss +tss +tss +tss +tss +tss bql hNc -hlM +tss xAq -heM +bCq heM heM ktB @@ -87092,19 +87494,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (132,1,1) = {" @@ -87144,15 +87546,15 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -87260,25 +87662,25 @@ jgp gGO pts bql -oqM -oqM +tss +tss ydK vue rzu -oqM -oqM -tga +tss +tss +tss bql eCu bql -tga -oqM -oqM +tss +tss +tss ydK vue rzu -oqM -oqM +tss +tss bql hNc klO @@ -87349,19 +87751,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (133,1,1) = {" @@ -87400,16 +87802,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -aNW -aNW -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -87514,31 +87916,31 @@ qrK uoO dPB eNB -hlM +icD pCv bql bql -oqM +tss osk gNX pOh -oqM -oqM -dOI +tss +tss +tss bql vxx bql -dOI -oqM -oqM +tss +tss +tss osk wRu pOh -oqM +tss bql bql hNc -hlM +tss xAq pKF fFD @@ -87606,19 +88008,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (134,1,1) = {" @@ -87657,16 +88059,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -aNW -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -87795,9 +88197,9 @@ bql bql kPY hNc -oqM +tss cLb -heM +bCq gNl gNl heM @@ -87862,20 +88264,20 @@ nCe pNa pNa pNa +jWt +jWt +jWt +jWt dXk dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (135,1,1) = {" @@ -87914,16 +88316,16 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk oum -oum -oum -oum -oum -oum -oum -aNW +vSk +vSk +vSk vwy vwy vwy @@ -88051,10 +88453,10 @@ rLA oaG oaG oaG -oqM +tss rif rif -heM +bCq heM heM nZD @@ -88119,20 +88521,20 @@ nCe pNa pNa pNa +jWt +jWt +jWt dXk dXk dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (136,1,1) = {" @@ -88171,16 +88573,16 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum oum -oum -oum -oum -oum -oum -aNW +vSk +vSk +vSk vwy vwy vwy @@ -88287,13 +88689,13 @@ kgP jmY dNE pfh -oqM +tss sYq -oqM +tss sYq -oqM +tss sYq -oqM +tss sYq imM kWT @@ -88305,9 +88707,9 @@ wAe bql hNc sYq -oqM +tss sYq -oqM +tss rif rif giV @@ -88376,20 +88778,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (137,1,1) = {" @@ -88428,16 +88830,16 @@ vwy vwy vwy vwy -aNW +vSk +vSk +vSk +vSk +vSk oum -oum -oum -oum -oum -oum -oum -oum -aNW +vSk +vSk +vSk +vSk vwy vwy vwy @@ -88633,20 +89035,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (138,1,1) = {" @@ -88685,16 +89087,16 @@ vwy vwy vwy vwy -aNW +vSk +vSk +vSk +vSk +vSk oum -oum -oum -oum -oum -oum -oum -oum -aNW +vSk +vSk +vSk +vSk vwy vwy vwy @@ -88890,20 +89292,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (139,1,1) = {" @@ -88942,17 +89344,17 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -89148,19 +89550,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (140,1,1) = {" @@ -89199,17 +89601,17 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -89337,11 +89739,11 @@ xJB pPS usl nyc -heM +uHN tJW -heM +tmP eBl -heM +tmP mLm iWL gda @@ -89405,19 +89807,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (141,1,1) = {" @@ -89456,16 +89858,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -89662,19 +90064,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (142,1,1) = {" @@ -89713,16 +90115,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -89919,19 +90321,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (143,1,1) = {" @@ -89969,17 +90371,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -90176,19 +90578,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (144,1,1) = {" @@ -90226,17 +90628,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -90434,18 +90836,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (145,1,1) = {" @@ -90483,17 +90885,17 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -90691,18 +91093,18 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (146,1,1) = {" @@ -90740,16 +91142,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -90947,19 +91349,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (147,1,1) = {" @@ -90996,17 +91398,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -91204,19 +91606,19 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (148,1,1) = {" @@ -91253,17 +91655,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -91460,20 +91862,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (149,1,1) = {" @@ -91509,18 +91911,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -91717,20 +92119,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt +jWt +jWt wYa "} (150,1,1) = {" @@ -91766,17 +92168,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -91974,20 +92376,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt +jWt wYa "} (151,1,1) = {" @@ -92023,17 +92425,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -92231,20 +92633,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz qzz +jWt wYa "} (152,1,1) = {" @@ -92280,17 +92682,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -92488,20 +92890,20 @@ nCe pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (153,1,1) = {" @@ -92536,18 +92938,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -92745,20 +93147,20 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (154,1,1) = {" @@ -92793,18 +93195,18 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -93002,20 +93404,20 @@ pNa pNa pNa pNa -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (155,1,1) = {" @@ -93050,18 +93452,18 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -93260,19 +93662,19 @@ pNa pNa pNa iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (156,1,1) = {" @@ -93307,18 +93709,18 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -93517,19 +93919,19 @@ pNa pNa pNa iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (157,1,1) = {" @@ -93564,18 +93966,18 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -93774,19 +94176,19 @@ pNa pNa pNa iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (158,1,1) = {" @@ -93820,19 +94222,19 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -94031,19 +94433,19 @@ pNa pNa pNa iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (159,1,1) = {" @@ -94077,19 +94479,19 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -94288,19 +94690,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (160,1,1) = {" @@ -94334,17 +94736,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -94545,19 +94947,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (161,1,1) = {" @@ -94591,17 +94993,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -94802,19 +95204,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (162,1,1) = {" @@ -94848,17 +95250,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -95059,19 +95461,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (163,1,1) = {" @@ -95105,16 +95507,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -95316,19 +95718,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (164,1,1) = {" @@ -95362,16 +95764,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -95574,18 +95976,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (165,1,1) = {" @@ -95618,17 +96020,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -95831,18 +96233,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (166,1,1) = {" @@ -95875,17 +96277,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -96088,18 +96490,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (167,1,1) = {" @@ -96131,18 +96533,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -96345,18 +96747,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (168,1,1) = {" @@ -96388,17 +96790,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -96602,18 +97004,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (169,1,1) = {" @@ -96644,18 +97046,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -96859,18 +97261,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (170,1,1) = {" @@ -96901,17 +97303,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -97116,18 +97518,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (171,1,1) = {" @@ -97158,17 +97560,17 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -97372,19 +97774,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (172,1,1) = {" @@ -97415,16 +97817,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -97629,19 +98031,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (173,1,1) = {" @@ -97671,17 +98073,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -97886,19 +98288,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (174,1,1) = {" @@ -97928,17 +98330,17 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -98143,19 +98545,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (175,1,1) = {" @@ -98184,17 +98586,17 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -98400,19 +98802,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (176,1,1) = {" @@ -98441,17 +98843,17 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -98657,19 +99059,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (177,1,1) = {" @@ -98697,18 +99099,18 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -98913,20 +99315,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (178,1,1) = {" @@ -98953,18 +99355,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -99170,20 +99572,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (179,1,1) = {" @@ -99210,18 +99612,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -99427,20 +99829,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (180,1,1) = {" @@ -99466,19 +99868,19 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -99684,20 +100086,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (181,1,1) = {" @@ -99723,18 +100125,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -99941,20 +100343,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (182,1,1) = {" @@ -99980,18 +100382,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -100197,21 +100599,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (183,1,1) = {" @@ -100236,18 +100638,18 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -100454,21 +100856,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (184,1,1) = {" @@ -100494,17 +100896,17 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -100711,21 +101113,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (185,1,1) = {" @@ -100751,17 +101153,17 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -100968,21 +101370,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (186,1,1) = {" @@ -101007,17 +101409,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -101225,21 +101627,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (187,1,1) = {" @@ -101264,16 +101666,16 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -101482,21 +101884,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (188,1,1) = {" @@ -101520,17 +101922,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -101739,21 +102141,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (189,1,1) = {" @@ -101777,16 +102179,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -101996,21 +102398,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (190,1,1) = {" @@ -102033,17 +102435,17 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -102252,22 +102654,22 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (191,1,1) = {" @@ -102290,16 +102692,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -102509,22 +102911,22 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (192,1,1) = {" @@ -102547,16 +102949,16 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -102766,22 +103168,22 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (193,1,1) = {" @@ -102803,17 +103205,17 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -103023,22 +103425,22 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (194,1,1) = {" @@ -103062,11 +103464,11 @@ xdu wVF wVF wVF -cKh -cKh -cKh -cKh -cKh +wVF +wVF +wVF +wVF +wVF wVF wVF wVF @@ -103291,11 +103693,11 @@ gyu gyu gyu gyu -dQn -dQn -dQn -dQn -dQn +gyu +gyu +gyu +gyu +gyu wYa "} (195,1,1) = {" @@ -103316,16 +103718,16 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -103538,21 +103940,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (196,1,1) = {" @@ -103572,17 +103974,17 @@ vwy vwy vwy vwy -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk oum oum oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -103795,21 +104197,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (197,1,1) = {" @@ -103829,17 +104231,17 @@ vwy vwy vwy vwy -aNW -aNW +vSk +vSk +vSk +vSk oum oum oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk vwy vwy vwy @@ -104052,21 +104454,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz +jWt +jWt +jWt wYa "} (198,1,1) = {" @@ -104085,16 +104487,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -104309,21 +104711,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz +jWt +jWt +jWt wYa "} (199,1,1) = {" @@ -104342,16 +104744,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -104565,22 +104967,22 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt +jWt wYa "} (200,1,1) = {" @@ -104599,16 +105001,16 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -104822,22 +105224,22 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz qzz +jWt wYa "} (201,1,1) = {" @@ -104855,16 +105257,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -105080,21 +105482,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz +jWt wYa "} (202,1,1) = {" @@ -105111,16 +105513,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -105337,21 +105739,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz +jWt wYa "} (203,1,1) = {" @@ -105368,16 +105770,16 @@ vwy vwy vwy vwy -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -105594,21 +105996,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt qzz +jWt wYa "} (204,1,1) = {" @@ -105624,16 +106026,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -105851,21 +106253,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (205,1,1) = {" @@ -105880,16 +106282,16 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -106108,21 +106510,21 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (206,1,1) = {" @@ -106136,15 +106538,15 @@ vwy vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -106366,20 +106768,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (207,1,1) = {" @@ -106392,16 +106794,16 @@ bVN vwy vwy vwy -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -106623,20 +107025,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (208,1,1) = {" @@ -106648,16 +107050,16 @@ qpk bVN vwy vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -106880,20 +107282,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (209,1,1) = {" @@ -106904,17 +107306,17 @@ qpk qpk bVN vwy -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -107137,20 +107539,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (210,1,1) = {" @@ -107160,17 +107562,17 @@ qpk qpk qpk bVN -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -107394,20 +107796,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk +jWt +jWt +jWt +jWt +jWt +jWt dXk qzz qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt wYa "} (211,1,1) = {" @@ -107417,16 +107819,16 @@ qpk qpk aHG vZt -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -107651,20 +108053,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk +jWt +jWt +jWt +jWt dXk dXk dXk qzz qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt wYa "} (212,1,1) = {" @@ -107673,16 +108075,16 @@ cos cos cos vZt -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -107908,37 +108310,37 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk +jWt +jWt +jWt +jWt +jWt dXk dXk qzz qzz qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt wYa "} (213,1,1) = {" -acu +cQN hCc +vSk aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -108166,35 +108568,35 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (214,1,1) = {" -acu -hMj -aNW +cQN +iIo +vSk aNW bMK -oum -oum -oum -oum -oum -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -108423,33 +108825,33 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (215,1,1) = {" -acu -hMj -aNW +cQN +iIo +vSk +vSk +vSk +vSk oum -oum -oum -oum -oum -oum -aNW -aNW +vSk +vSk +vSk +vSk vwy vwy vwy @@ -108679,33 +109081,33 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (216,1,1) = {" cQN iIo -oum -oum -oum -oum +vSk +vSk +vSk +vSk gDr -aNW -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -108936,32 +109338,32 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (217,1,1) = {" cQN iIo -oum -oum -aNW -aNW -aNW -aNW -aNW +vSk +vSk +vSk +vSk +vSk +vSk +vSk vwy vwy vwy @@ -109193,20 +109595,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (218,1,1) = {" @@ -109214,9 +109616,9 @@ cQN iIo aNW eQE -aNW -aNW -aNW +vSk +vSk +vSk vwy vwy vwy @@ -109450,29 +109852,29 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (219,1,1) = {" -acu -hMj -aNW -aNW -aNW -aNW +cQN +iIo +vSk +vSk +vSk +vSk nOe vwy vwy @@ -109707,27 +110109,27 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (220,1,1) = {" -acu -hMj -aNW -aNW +cQN +iIo +vSk +vSk nOe nOe nOe @@ -109964,20 +110366,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (221,1,1) = {" @@ -110221,20 +110623,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (222,1,1) = {" @@ -110478,20 +110880,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (223,1,1) = {" @@ -110735,20 +111137,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (224,1,1) = {" @@ -110992,20 +111394,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (225,1,1) = {" @@ -111249,20 +111651,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (226,1,1) = {" @@ -111506,20 +111908,20 @@ iGM iGM iGM iGM +jWt +jWt +jWt +jWt +jWt +jWt dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (227,1,1) = {" @@ -111764,19 +112166,19 @@ iGM iGM iGM iGM +jWt +jWt +jWt +jWt dXk dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (228,1,1) = {" @@ -112021,19 +112423,19 @@ iGM iGM iGM iGM +jWt +jWt +jWt +jWt dXk dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (229,1,1) = {" @@ -112278,19 +112680,19 @@ iGM iGM iGM iGM +jWt +jWt +jWt +jWt dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (230,1,1) = {" @@ -112535,19 +112937,19 @@ iGM iGM iGM iGM +jWt +jWt +jWt +jWt dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (231,1,1) = {" @@ -112791,20 +113193,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (232,1,1) = {" @@ -113048,20 +113450,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (233,1,1) = {" @@ -113305,20 +113707,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (234,1,1) = {" @@ -113562,20 +113964,20 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (235,1,1) = {" @@ -113820,19 +114222,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (236,1,1) = {" @@ -114077,19 +114479,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (237,1,1) = {" @@ -114334,19 +114736,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (238,1,1) = {" @@ -114591,19 +114993,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (239,1,1) = {" @@ -114848,19 +115250,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (240,1,1) = {" @@ -115105,19 +115507,19 @@ iGM iGM iGM iGM +jWt +jWt +jWt dXk dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (241,1,1) = {" @@ -115366,15 +115768,15 @@ dXk dXk dXk dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (242,1,1) = {" @@ -115619,19 +116021,19 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (243,1,1) = {" @@ -115877,18 +116279,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (244,1,1) = {" @@ -116134,18 +116536,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (245,1,1) = {" @@ -116391,18 +116793,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (246,1,1) = {" @@ -116648,18 +117050,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (247,1,1) = {" @@ -116905,18 +117307,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (248,1,1) = {" @@ -117162,18 +117564,18 @@ iGM iGM iGM iGM -dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (249,1,1) = {" @@ -117420,17 +117822,17 @@ iGM iGM iGM dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (250,1,1) = {" @@ -117677,17 +118079,17 @@ iGM iGM iGM dXk -dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (251,1,1) = {" @@ -117935,16 +118337,16 @@ iGM iGM dXk dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (252,1,1) = {" @@ -118192,16 +118594,16 @@ iGM iGM dXk dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (253,1,1) = {" @@ -118449,16 +118851,16 @@ iGM iGM dXk dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (254,1,1) = {" @@ -118706,16 +119108,16 @@ iGM iGM iGM dXk -dXk -dXk -dXk -qzz -qzz -qzz -qzz -qzz -qzz -qzz +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt +jWt wYa "} (255,1,1) = {" diff --git a/maps/cynosure/cynosure-3.dmm b/maps/cynosure/cynosure-3.dmm index d4942804fa..23e9e7b29e 100644 --- a/maps/cynosure/cynosure-3.dmm +++ b/maps/cynosure/cynosure-3.dmm @@ -13,6 +13,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/patient_wing) "abG" = ( @@ -111,6 +115,14 @@ /obj/effect/catwalk_plated, /turf/simulated/floor/plating, /area/surface/station/hallway/primary/secondfloor/west) +"agf" = ( +/obj/structure/table/bench/padded, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/surface/station/hallway/secondary/secondfloor/command) "agj" = ( /obj/machinery/hologram/holopad, /obj/effect/floor_decal/industrial/outline/grey, @@ -345,6 +357,7 @@ name = "Cargo"; req_one_access = list(50) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/quartermaster/office) "amK" = ( @@ -680,12 +693,12 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor, -/obj/structure/table/bench/padded, /obj/effect/floor_decal/corner/white/border, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled, /area/surface/station/hallway/secondary/secondfloor/dormhallway) "auR" = ( @@ -1254,12 +1267,12 @@ /turf/simulated/floor/tiled/steel_grid, /area/surface/station/medical/patient_wing) "aSg" = ( -/obj/structure/flora/pottedplant/tropical, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /obj/machinery/status_display/supply_display{ pixel_y = -32 }, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled, /area/surface/station/quartermaster/qm) "aSo" = ( @@ -2319,11 +2332,16 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 5 }, +<<<<<<< HEAD /obj/structure/flora/pottedplant/drooping, /obj/item/device/radio/intercom{ +======= +/obj/item/radio/intercom{ +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 dir = 4; pixel_x = 21 }, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled/white, /area/surface/station/crew_quarters/heads/cmo) "bDD" = ( @@ -3505,6 +3523,10 @@ /obj/effect/floor_decal/corner/green/bordercorner{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "cmP" = ( @@ -3839,6 +3861,7 @@ /area/surface/station/ai) "cyU" = ( /obj/structure/table/wooden_reinforced, +/obj/item/toy/xmastree, /turf/simulated/floor/wood, /area/surface/station/command/meeting_room) "czC" = ( @@ -4113,6 +4136,10 @@ c_tag = "MED - Patient Room B"; dir = 5 }, +/obj/item/toy/xmastree{ + pixel_x = -5; + pixel_y = 9 + }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/patient_b) "cLp" = ( @@ -5057,6 +5084,13 @@ }, /turf/simulated/floor/tiled, /area/surface/station/engineering/locker_room) +"dmY" = ( +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/surface/station/hallway/primary/secondfloor/east) "doE" = ( /turf/simulated/wall/r_wall, /area/surface/station/quartermaster/foyer) @@ -5998,6 +6032,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "dWg" = ( @@ -6308,6 +6346,17 @@ dir = 8; pixel_y = 32 }, +<<<<<<< HEAD +======= +/obj/structure/sign/levels/security{ + dir = 5; + pixel_y = 26 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 /turf/simulated/floor/tiled, /area/surface/station/hallway/secondary/secondfloor/civilian) "ehU" = ( @@ -7200,6 +7249,10 @@ dir = 1; pixel_y = 30 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/secondary/secondfloor/civilian) "ePK" = ( @@ -7758,6 +7811,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "ffk" = ( @@ -8616,6 +8673,10 @@ c_tag = "Second Floor -East Hallway 2"; dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "fKa" = ( @@ -9501,6 +9562,10 @@ dir = 4; pixel_x = -32 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "gmZ" = ( @@ -11763,6 +11828,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/patient_wing) "hDC" = ( @@ -13005,6 +13074,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/item/toy/xmastree, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_1) "itI" = ( @@ -13657,6 +13727,7 @@ "iKn" = ( /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/quartermaster/office) "iKZ" = ( @@ -13830,6 +13901,10 @@ dir = 4; pixel_x = 24 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/secondary/secondfloor/command) "iPq" = ( @@ -13962,6 +14037,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "iRT" = ( @@ -13983,6 +14062,10 @@ c_tag = "MED - Patient Room A"; dir = 5 }, +/obj/item/toy/xmastree{ + pixel_x = -5; + pixel_y = 9 + }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/patient_a) "iRU" = ( @@ -14028,6 +14111,10 @@ dir = 8; pixel_x = -21 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "iSV" = ( @@ -14480,8 +14567,25 @@ name = "Research Division Access"; req_one_access = list(47) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/rnd/research_foyer) +"jeC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled, +/area/surface/station/hallway/secondary/secondfloor/civilian) "jeO" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/grille, @@ -14596,6 +14700,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/patient_wing) "jhW" = ( @@ -14743,6 +14851,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "jmb" = ( @@ -15324,6 +15436,10 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/patient_wing) "jAh" = ( @@ -16687,6 +16803,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/patient_wing) "kuD" = ( @@ -18767,6 +18887,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central7, /turf/simulated/floor/tiled/freezer, /area/surface/station/engineering/engi_restroom) +"mgT" = ( +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/surface/station/hallway/secondary/secondfloor/command) "mhc" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -18972,6 +19099,19 @@ }, /turf/simulated/floor/tiled/white, /area/surface/station/rnd/research) +"mpF" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/surface/station/hallway/primary/secondfloor/east) "mqi" = ( /obj/machinery/computer/centrifuge, /obj/effect/floor_decal/borderfloorwhite{ @@ -20385,6 +20525,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/item/toy/xmastree, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_5) "nmz" = ( @@ -20848,6 +20989,10 @@ "nzR" = ( /obj/structure/table/standard, /obj/item/tabloid, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/secondary/secondfloor/command) "nAp" = ( @@ -21987,6 +22132,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central7{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/secondary/secondfloor/civilian) "oup" = ( @@ -22811,6 +22960,10 @@ pixel_x = -24; pixel_y = 12 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "oVf" = ( @@ -23089,6 +23242,7 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 5 }, +/obj/structure/flora/pottedplant/xmas, /turf/simulated/floor/tiled/white, /area/surface/station/rnd/research_foyer) "pgm" = ( @@ -23230,6 +23384,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/item/toy/xmastree, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_2) "pkd" = ( @@ -23898,6 +24053,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/item/toy/xmastree, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_4) "pIq" = ( @@ -24051,10 +24207,16 @@ pixel_x = -32; pixel_y = -6 }, +<<<<<<< HEAD /obj/structure/sign/directions/stairs_down{ dir = 4; pixel_x = -32; pixel_y = -12 +======= +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 }, /turf/simulated/floor/plating, /area/surface/station/hallway/primary/secondfloor/east) @@ -24586,6 +24748,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/secondary/secondfloor/civilian) "qbt" = ( @@ -25433,6 +25599,10 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/secondary/secondfloor/civilian) "qGp" = ( @@ -26303,6 +26473,10 @@ /obj/machinery/alarm{ pixel_y = 22 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/secondary/secondfloor/civilian) "rmT" = ( @@ -26448,6 +26622,10 @@ }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/west/elevator) +"rsz" = ( +/obj/structure/flora/pottedplant/xmas, +/turf/simulated/floor/wood, +/area/surface/station/crew_quarters/captain) "rsP" = ( /obj/structure/cable/green{ d1 = 2; @@ -26860,10 +27038,8 @@ dir = 1 }, /obj/item/modular_computer/console/preset/command, -/obj/machinery/computer/security/telescreen{ - name = "Research Monitor"; - network = list("Research","Toxins Test Area","Robots","Anomaly Isolation","Research Outpost"); - pixel_y = 28 +/obj/item/toy/xmastree{ + pixel_y = 11 }, /turf/simulated/floor/tiled/white, /area/surface/station/crew_quarters/heads/rdoffice) @@ -28051,6 +28227,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "szd" = ( @@ -29999,6 +30179,22 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor/plating, /area/surface/station/security/prison) +"tBf" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled, +/area/surface/station/hallway/secondary/secondfloor/civilian) "tBq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/spline/plain, @@ -30928,6 +31124,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/item/toy/xmastree, /turf/simulated/floor/carpet, /area/surface/station/crew_quarters/sleep/Dorm_3) "uiT" = ( @@ -31856,6 +32053,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "uSL" = ( @@ -33783,6 +33984,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/secondfloor/east) "wkH" = ( @@ -36085,6 +36290,10 @@ dir = 1 }, /obj/structure/table/bench/padded, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/hallway/secondary/secondfloor/command) "xwr" = ( @@ -36316,6 +36525,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/patient_wing) "xFM" = ( @@ -60039,7 +60252,7 @@ ddU ddU sBb rMU -iYW +jeC oWj dfb cOD @@ -60296,7 +60509,7 @@ ddU ddU sBb dFq -iYW +jeC gdJ xVx cOD @@ -60553,7 +60766,7 @@ ddU ddU sBb rMU -iYW +jeC jvK oZX xVx @@ -61324,7 +61537,7 @@ ddU ddU ddU mxN -jIT +tBf oQQ gtF lcF @@ -61581,7 +61794,7 @@ ddU ddU ddU rMU -iYW +jeC lyD uSL wRE @@ -63123,7 +63336,7 @@ ddU ddU sBb rMU -jIT +tBf juh tzq xdj @@ -63380,7 +63593,7 @@ ddU ddU sBb tWb -iYW +jeC imI pJV kMa @@ -64151,7 +64364,7 @@ kst kst lnd bow -iYW +jeC qNP cCD lQR @@ -69025,8 +69238,13 @@ uwO uwO uwO uwO +<<<<<<< HEAD uDG iaD +======= +aPW +rsz +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 iaD jIo ifR @@ -70575,7 +70793,7 @@ leV xHL mwp pim -lMj +mgT mRL dki hYK @@ -70832,7 +71050,7 @@ xDt mKi srw bQX -lMj +mgT jgu pBd ibd @@ -71346,7 +71564,7 @@ vfL vHm eLU dmy -oXY +agf oAv udE kki @@ -71603,7 +71821,7 @@ oVJ xHL cAf jVB -oXY +agf ksz hAN eua @@ -71860,7 +72078,7 @@ eXV mKi dNq bQX -lMj +mgT kzK qIh eua @@ -72870,7 +73088,7 @@ kby lvx etV poa -xYF +dmY clG uSB uSB @@ -72878,7 +73096,7 @@ uSB jlZ syR iSF -cKe +mpF cKe cKe kCl diff --git a/maps/cynosure/cynosure-6.dmm b/maps/cynosure/cynosure-6.dmm index 5fbfaa4e5b..0105ffc05d 100644 --- a/maps/cynosure/cynosure-6.dmm +++ b/maps/cynosure/cynosure-6.dmm @@ -159,6 +159,16 @@ /obj/item/weapon/storage/box/glasses/square, /turf/simulated/floor/carpet, /area/shuttle/merchant/home) +"aiB" = ( +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/main_hall) "aiQ" = ( /obj/structure/reagent_dispensers/beerkeg, /turf/unsimulated/floor{ @@ -353,6 +363,23 @@ icon_state = "dark" }, /area/centcom/security) +"aoW" = ( +/obj/structure/table/standard, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/terminal) "apA" = ( /obj/structure/holostool{ dir = 4 @@ -522,6 +549,10 @@ /obj/machinery/vending/cigarette{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -691,6 +722,16 @@ icon_state = "carpet" }, /area/centcom/command) +"aLT" = ( +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/main_hall) "aMd" = ( /obj/effect/floor_decal/corner/green/full{ dir = 1 @@ -842,6 +883,10 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/centcom/bar) "aVM" = ( @@ -1149,6 +1194,27 @@ /obj/machinery/optable, /turf/simulated/shuttle/floor/white, /area/skipjack_station/start) +<<<<<<< HEAD +======= +"boh" = ( +/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/main_hall) +"boo" = ( +/obj/structure/shuttle/falsewall_no_join{ + icon = 'icons/turf/wall_masks_tgmc.dmi'; + icon_state = "white2" + }, +/turf/simulated/floor/plating, +/area/shuttle/escape/centcom) +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 "bos" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -1646,6 +1712,24 @@ }, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/syndicate_elite/mothership) +"bVj" = ( +/obj/structure/table/standard, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/obj/item/toy/xmastree, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/terminal) "bVM" = ( /obj/effect/floor_decal/industrial/warning/corner, /turf/unsimulated/floor{ @@ -1843,6 +1927,10 @@ "cfy" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/bar_soft/full, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -3677,6 +3765,10 @@ "etB" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/bar_alc/full, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -3915,6 +4007,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 6 }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "steel" @@ -4656,6 +4752,10 @@ /obj/machinery/vending/boozeomat{ req_access = null }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -4668,6 +4768,25 @@ /obj/machinery/teleport/station, /turf/simulated/shuttle/plating, /area/ninja_dojo/start) +"fzU" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/terminal) "fzX" = ( /turf/unsimulated/wall, /area/centcom/medical) @@ -4697,6 +4816,23 @@ icon_state = "techfloor_gray" }, /area/centcom/specops) +"fAL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/obj/structure/flora/pottedplant/xmas, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/terminal) "fBf" = ( /obj/effect/floor_decal/industrial/warning{ dir = 10 @@ -5403,6 +5539,22 @@ icon_state = "lino" }, /area/tdome) +"gou" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/terminal) "gow" = ( /obj/machinery/recharge_station, /turf/simulated/shuttle/floor/voidcraft/dark, @@ -5697,6 +5849,10 @@ /area/centcom/bar) "gIh" = ( /obj/structure/closet/secure_closet/bar, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -6508,6 +6664,10 @@ /area/centcom/command) "hIC" = ( /obj/structure/flora/pottedplant/stoutbush, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "steel" @@ -6608,6 +6768,19 @@ name = "plating" }, /area/centcom/living) +"hMX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/main_hall) "hNd" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -6781,6 +6954,10 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/centcom/bar) "hUw" = ( @@ -6913,6 +7090,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, +/obj/item/toy/xmastree, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "white" @@ -8742,6 +8920,7 @@ /area/holodeck/source_boxingcourt) "khb" = ( /obj/structure/table/woodentable, +/obj/item/toy/xmas_cracker, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -9544,6 +9723,7 @@ /obj/structure/table/woodentable, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/brown/border, +/obj/item/toy/xmastree, /turf/simulated/floor/tiled/white, /area/centcom/bar) "kPT" = ( @@ -9782,6 +9962,16 @@ icon_state = "steel" }, /area/shuttle/trade) +"leI" = ( +/obj/item/stool/padded, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/bar) "leY" = ( /obj/machinery/light{ dir = 4 @@ -9912,6 +10102,10 @@ /obj/effect/floor_decal/corner/green/border{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "steel" @@ -10199,6 +10393,12 @@ icon_state = "steel" }, /area/centcom/terminal) +"lFE" = ( +/obj/structure/flora/tree/pine/xmas/presents, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/bar) "lFQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -11826,6 +12026,10 @@ /obj/machinery/computer/arcade{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -11892,6 +12096,22 @@ icon_state = "dark" }, /area/centcom/specops) +"nDE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/terminal) "nDQ" = ( /obj/structure/table/rack, /obj/item/clothing/suit/space/vox/medic, @@ -12384,6 +12604,23 @@ icon_state = "wood" }, /area/centcom/bar) +"oke" = ( +/obj/structure/closet/emcloset, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/terminal) "okj" = ( /obj/effect/floor_decal/industrial/warning/cee{ dir = 8 @@ -13289,6 +13526,21 @@ }, /turf/simulated/shuttle/floor/red, /area/shuttle/response_ship/start) +"pmz" = ( +/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/main_hall) "pnf" = ( /obj/machinery/light{ dir = 8 @@ -13683,6 +13935,16 @@ icon_state = "techfloor_gray" }, /area/centcom/specops) +"pGc" = ( +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/main_hall) "pGg" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_theatre) @@ -14271,6 +14533,15 @@ "qpd" = ( /turf/simulated/shuttle/floor/voidcraft/dark, /area/ninja_dojo/start) +"qpg" = ( +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/bar) "qqa" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -14953,6 +15224,19 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant/home) +"qZM" = ( +/obj/structure/table/woodentable, +/obj/structure/flora/pottedplant/large{ + pixel_y = 10 + }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/bar) "rar" = ( /obj/structure/table/steel_reinforced, /obj/random/plushie, @@ -16126,6 +16410,10 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/centcom/bar) "sdu" = ( @@ -16510,6 +16798,10 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 9 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/centcom/bar) "sBr" = ( @@ -16924,6 +17216,10 @@ /obj/effect/floor_decal/spline/plain{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -17643,6 +17939,17 @@ }, /turf/simulated/floor/holofloor/lino, /area/holodeck/source_meetinghall) +"tNu" = ( +/obj/structure/table/bench/padded, +/obj/structure/sign/christmas/lights{ + dir = 4; + pixel_x = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/main_hall) "tOF" = ( /obj/effect/floor_decal/sign/small_f, /turf/simulated/floor/holofloor/wood, @@ -18327,7 +18634,11 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 5 }, -/obj/structure/flora/pottedplant/decorative, +/obj/structure/flora/pottedplant/xmas, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/centcom/bar) "uAk" = ( @@ -19013,6 +19324,10 @@ /area/shuttle/supply) "vpD" = ( /obj/structure/table/bench/padded, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, /turf/unsimulated/floor{ icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "steel" @@ -20106,10 +20421,32 @@ /area/syndicate_station/start) "wvQ" = ( /obj/machinery/smartfridge, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/unsimulated/floor{ icon_state = "wood" }, /area/centcom/bar) +"wvR" = ( +/obj/machinery/floor_light{ + anchored = 1 + }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/plating.dmi'; + icon_state = "plating"; + name = "plating" + }, +/area/centcom/bar) "wwH" = ( /obj/structure/table/steel, /obj/item/weapon/storage/firstaid/surgery, @@ -20530,6 +20867,10 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, /turf/simulated/floor/tiled/white, /area/centcom/bar) "wTz" = ( @@ -20787,6 +21128,16 @@ icon_state = "dark" }, /area/wizard_station) +"xeX" = ( +/obj/structure/table/marble, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/bar) "xfC" = ( /obj/item/clothing/head/xenos, /turf/unsimulated/floor{ @@ -20989,6 +21340,15 @@ /obj/effect/floor_decal/corner/brown/bordercorner, /turf/simulated/floor/tiled/white, /area/centcom/bar) +"xri" = ( +/obj/structure/table/marble, +/obj/structure/balloon/xmas{ + pixel_y = 10 + }, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/bar) "xrk" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -21107,6 +21467,21 @@ }, /turf/simulated/floor/holofloor/space, /area/holodeck/source_space) +"xxq" = ( +/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/sign/christmas/lights{ + dir = 1; + pixel_y = 32 + }, +/obj/structure/sign/christmas/lights{ + dir = 8; + pixel_x = -32 + }, +/turf/unsimulated/floor{ + icon = 'icons/turf/flooring/tiles.dmi'; + icon_state = "steel" + }, +/area/centcom/main_hall) "xyf" = ( /obj/effect/floor_decal/sign/small_e, /turf/simulated/floor/holofloor/wood, @@ -29969,7 +30344,7 @@ puk puk puk pAD -kXS +hMX kXS kXS pAD @@ -30226,7 +30601,7 @@ puk puk puk pAD -gBA +aiB gBA gBA pAD @@ -30483,7 +30858,7 @@ puk puk puk pAD -gBA +aiB piF gBA pAD @@ -30740,7 +31115,7 @@ puk puk puk pAD -gBA +aiB piF gBA gSq @@ -30997,7 +31372,7 @@ puk puk puk pAD -gBA +aiB piF gBA mBj @@ -31012,19 +31387,19 @@ puk puk fVm wvQ +qpg +qpg +qpg +qpg haV haV haV haV haV -haV -haV -haV -haV -nAm +leI nyS azw -mqp +qZM iuf jEH eSW @@ -31042,7 +31417,7 @@ nxV nxV nxV nxV -amw +nDE quS vjU nxV @@ -31254,7 +31629,7 @@ puk puk puk pAD -gBA +aiB gBA gBA gSq @@ -31299,7 +31674,7 @@ kpE kpE kpE nxV -amw +nDE qTA rLA nxV @@ -31511,7 +31886,7 @@ puk puk puk pAD -gBA +aiB gBA gBA pAD @@ -31556,7 +31931,7 @@ kpE kpE kpE nxV -amw +nDE qTA rLA pEe @@ -31768,7 +32143,7 @@ vlH vlH vlH vlH -gBA +aiB piF gBA pAD @@ -31813,7 +32188,7 @@ kpE kpE kpE pEe -amw +nDE quS rLA nxV @@ -32025,7 +32400,7 @@ wfT wfT wfT vlH -gBA +aiB piF gBA pAD @@ -32070,7 +32445,7 @@ kpE kpE kpE pEe -amw +nDE qTA rLA pEe @@ -32282,7 +32657,7 @@ pCM tLG wfT vlH -gBA +aiB piF gBA pAD @@ -32296,10 +32671,10 @@ mTz mTz mTz fVm -oNF +xeX wux wux -oNF +xri snZ haV haV @@ -32327,7 +32702,7 @@ kpE kpE kpE pEe -amw +nDE qTA rLA pEe @@ -32539,7 +32914,7 @@ pSk dGs wfT vlH -gBA +aiB gBA gBA pAD @@ -32562,7 +32937,7 @@ haV haV haV haV -haV +lFE haV haV haV @@ -32584,7 +32959,7 @@ kpE kpE kpE nxV -amw +nDE qTA rLA pEe @@ -32796,7 +33171,7 @@ pSk dGs wfT vlH -gBA +aiB gBA gBA pAD @@ -32810,7 +33185,7 @@ rrI xOi mTz fVm -yce +wvR yce yce yce @@ -32841,7 +33216,7 @@ kpE kpE kpE nxV -amw +nDE quS rLA nxV @@ -33053,7 +33428,7 @@ pSk dGs wfT roT -gBA +aiB piF gBA gSq @@ -33067,7 +33442,7 @@ rrI xOi mTz fVm -yce +wvR yce yce yce @@ -33098,7 +33473,7 @@ kpE kpE kpE pEe -amw +nDE qTA rLA pEe @@ -33310,7 +33685,7 @@ pSk dGs wfT roT -gBA +aiB piF gBA gSq @@ -33324,7 +33699,7 @@ rrI nYl qWM fVm -yce +wvR yce yce yce @@ -33355,7 +33730,7 @@ kpE kpE kpE pEe -amw +nDE qTA rLA pEe @@ -33567,7 +33942,7 @@ aLL dGs wfT roT -gBA +aiB piF gBA gSq @@ -33581,7 +33956,7 @@ rrI pXt gBA fVm -yce +wvR yce yce yce @@ -33612,7 +33987,7 @@ kpE kpE kpE pEe -amw +nDE qTA rLA pEe @@ -33824,7 +34199,7 @@ vFe nmu wfT vlH -gBA +aiB gBA gBA pAD @@ -33838,7 +34213,7 @@ qup sbj gBA fVm -yce +wvR yce yce yce @@ -33869,7 +34244,7 @@ kpE kpE kpE nxV -amw +nDE quS rLA nxV @@ -34081,7 +34456,7 @@ wfT wfT wfT vlH -gBA +aiB gBA gBA pAD @@ -34126,7 +34501,7 @@ kpE kpE kpE nxV -amw +nDE qTA rLA pEe @@ -34352,16 +34727,16 @@ pAD chb iUS pAD -hIC +xxq vpD vpD vpD +aLT +aLT gBA gBA -gBA -gBA -gBA -gBA +aLT +aLT vpD vpD vpD @@ -34383,7 +34758,7 @@ pEe pEe nxV qeE -amw +nDE qTA rLA pEe @@ -34609,7 +34984,7 @@ pAD gSq gSq pAD -gBA +aiB gBA piF piF @@ -35637,7 +36012,7 @@ pAD gSq gSq pAD -gBA +aiB gBA piF piF @@ -35894,20 +36269,20 @@ pAD iUS iUS pAD -hIC -gBA -gBA -gBA +pmz +pGc +pGc +pGc wcx -gBA -vpD -vpD -gBA -gBA +pGc +tNu +tNu +pGc +pGc mRQ wcx -gBA -hIC +pGc +boh pAD boE oUZ @@ -35925,7 +36300,7 @@ pEe pEe nxV use -amw +nDE qTA rLA pEe @@ -36137,7 +36512,7 @@ wha sqs sqs jKw -gBA +aiB gBA gBA pAD @@ -36182,7 +36557,7 @@ kpE kpE kpE nxV -amw +nDE qTA rLA pEe @@ -36394,7 +36769,7 @@ wha sqs jrv jKw -gBA +aiB gBA gBA pAD @@ -36439,7 +36814,7 @@ kpE kpE kpE nxV -amw +nDE quS rLA nxV @@ -36651,7 +37026,7 @@ wha sqs wha vDV -gBA +aiB piF gBA gSq @@ -36696,7 +37071,7 @@ kpE kpE kpE pEe -amw +nDE qTA rLA pEe @@ -36908,7 +37283,7 @@ wha wha wha vDV -gBA +aiB piF gBA gSq @@ -36953,7 +37328,7 @@ kpE kpE kpE pEe -amw +nDE qTA rLA pEe @@ -37165,7 +37540,7 @@ wha wha wha vDV -gBA +aiB piF gBA gSq @@ -37210,7 +37585,7 @@ kpE kpE kpE pEe -amw +nDE qTA rLA pEe @@ -37422,7 +37797,7 @@ wha wha wha jKw -gBA +aiB gBA gBA pAD @@ -37467,7 +37842,7 @@ kpE kpE kpE nxV -amw +nDE quS rLA nxV @@ -37679,7 +38054,7 @@ wha wha wha jKw -gBA +aiB gBA gBA pAD @@ -37724,7 +38099,7 @@ kpE kpE kpE nxV -amw +nDE qTA rLA pEe @@ -37936,7 +38311,7 @@ wha wha tra jKw -gBA +aiB piF gBA pAD @@ -37981,7 +38356,7 @@ kpE kpE kpE pEe -amw +nDE qTA rLA pEe @@ -38193,7 +38568,7 @@ jKw jKw jKw jKw -gBA +aiB piF gBA pAD @@ -38238,7 +38613,7 @@ kpE kpE kpE pEe -amw +nDE qTA rLA pEe @@ -38450,7 +38825,7 @@ puk puk puk pAD -gBA +aiB piF gBA pAD @@ -38495,7 +38870,7 @@ kpE kpE kpE pEe -amw +nDE quS rLA nxV @@ -38707,7 +39082,7 @@ puk puk puk pAD -gBA +aiB gBA gBA pAD @@ -38752,7 +39127,7 @@ kpE kpE kpE nxV -amw +nDE qTA rLA pEe @@ -39009,7 +39384,7 @@ kpE kpE kpE nxV -amw +nDE qTA rLA nxV @@ -39266,7 +39641,7 @@ kpE kpE nxV nxV -amw +nDE quS rdN nxV @@ -40298,25 +40673,25 @@ wHT quS wHT nxV -wCB -xWO -lFQ -xWO -lFQ -xWO -lFQ -xWO -wCB -xWO -lFQ -xWO +aoW +fzU +gou +fzU +gou +fzU +fAL +fzU +aoW +fzU +gou +fzU llZ -wCB -wCB -eox -xWO -lFQ -xWO +bVj +aoW +oke +fzU +fAL +fzU eHd nxV puk diff --git a/maps/cynosure/cynosure-7.dmm b/maps/cynosure/cynosure-7.dmm index cc01185cfe..dd595cf42d 100644 --- a/maps/cynosure/cynosure-7.dmm +++ b/maps/cynosure/cynosure-7.dmm @@ -18,6 +18,19 @@ }, /turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) +<<<<<<< HEAD +======= +"dj" = ( +/obj/vehicle/boat/sifwood, +/turf/simulated/floor/outdoors/mask, +/area/surface/outside/wilderness/normal) +"dV" = ( +/turf/simulated/floor/outdoors/shelfice, +/area/surface/outside/river/gautelfr) +"eZ" = ( +/turf/simulated/wall/sifwood, +/area/surface/wilderness/shack) +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 "fy" = ( /obj/structure/cliff/automatic, /turf/simulated/floor/outdoors/mask, @@ -56,9 +69,6 @@ /obj/structure/prop/rock/small/alt, /turf/simulated/floor/outdoors/mud/sif/planetuse, /area/surface/outside/wilderness/normal) -"lt" = ( -/turf/simulated/floor/water/deep, -/area/surface/outside/wilderness/mountains) "mA" = ( /obj/structure/cliff/automatic{ dir = 6 @@ -79,12 +89,6 @@ /obj/structure/prop/rock/small, /turf/simulated/floor/outdoors/mud/sif/planetuse, /area/surface/outside/wilderness/normal) -"oG" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/water/deep, -/area/surface/outside/river/gautelfr) "oR" = ( /turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/deep) @@ -166,12 +170,6 @@ /obj/effect/zone_divider, /turf/simulated/floor/water/deep, /area/surface/outside/river/gautelfr) -"zS" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/water/deep, -/area/surface/outside/river/gautelfr) "Aq" = ( /obj/effect/zone_divider, /turf/simulated/floor/outdoors/mask, @@ -180,7 +178,7 @@ /turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "Ay" = ( -/turf/simulated/floor/water, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/wilderness/mountains) "Be" = ( /obj/structure/cliff/automatic{ @@ -195,12 +193,19 @@ }, /turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/wilderness/mountains) +<<<<<<< HEAD "Cb" = ( /obj/structure/cliff/automatic/corner{ dir = 6 }, /turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) +======= +"CP" = ( +/obj/structure/table/bench/sifwooden, +/turf/simulated/floor/outdoors/shelfice, +/area/surface/outside/river/gautelfr) +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 "CR" = ( /turf/simulated/floor/outdoors/dirt/sif, /area/surface/outside/wilderness/mountains) @@ -235,12 +240,6 @@ "Hb" = ( /turf/simulated/floor/outdoors/dirt/sif, /area/surface/outside/wilderness/deep) -"HF" = ( -/obj/effect/map_effect/portal/line/side_b{ - dir = 1 - }, -/turf/simulated/floor/water, -/area/surface/outside/river/gautelfr) "Ih" = ( /obj/structure/prop/rock/waterflat, /turf/simulated/floor/water, @@ -264,7 +263,7 @@ /obj/effect/map_effect/portal/line/side_b{ dir = 1 }, -/turf/simulated/floor/water/deep, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/river/gautelfr) "MS" = ( /turf/simulated/floor/water/deep, @@ -294,7 +293,7 @@ /area/surface/outside/path/wilderness) "Sa" = ( /obj/effect/zone_divider, -/turf/simulated/floor/water, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/river/gautelfr) "Sl" = ( /turf/simulated/floor/outdoors/mud/sif/planetuse, @@ -307,7 +306,7 @@ /obj/structure/railing{ dir = 8 }, -/turf/simulated/floor/water, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/river/gautelfr) "UA" = ( /obj/structure/cliff/automatic/corner{ @@ -315,6 +314,10 @@ }, /turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) +"VF" = ( +/obj/structure/prop/rock/small/water, +/turf/simulated/floor/outdoors/shelfice, +/area/surface/outside/river/gautelfr) "VU" = ( /obj/structure/cliff/automatic{ dir = 2 @@ -351,7 +354,7 @@ /obj/structure/railing{ dir = 4 }, -/turf/simulated/floor/water, +/turf/simulated/floor/outdoors/shelfice, /area/surface/outside/river/gautelfr) (1,1,1) = {" @@ -705,19 +708,19 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -tM -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -963,19 +966,19 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -tM -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -1220,19 +1223,19 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -tM -tM -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -1478,18 +1481,18 @@ oR oR oR oR -tM -MS -MS -MS -MS +dV +dV +dV +dV +dV MS tM MS -MS -tM -tM -tM +dV +dV +dV +dV oR oR oR @@ -1735,18 +1738,18 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV +dV +dV MS MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV oR oR oR @@ -1993,18 +1996,18 @@ oR oR oR oR +dV +dV +dV +dV +dV tM MS MS -MS -MS -tM -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV oR oR oR @@ -2250,18 +2253,18 @@ oR oR oR oR -tM +dV +dV +dV +dV +dV +dV tM MS -MS -MS -MS -tM -MS -MS -tM -tM -tM +dV +dV +dV +dV oR oR oR @@ -2504,17 +2507,17 @@ oR oR oR oR +dV +dV +dV +dV +dV tM MS -MS -MS -MS -tM -MS -MS -tM -tM -tM +dV +dV +dV +dV oR oR oR @@ -2942,6 +2945,212 @@ oR oR oR oR +<<<<<<< HEAD +======= +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +dV +dV +dV +dV +dV +dV +MS +dV +dV +dV +dV +dV +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +VU +GK +GK +bE +"} +(11,1,1) = {" +jq +pM +pM +pM +oR +oR +oR +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 oR oR oR @@ -3043,17 +3252,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -3327,18 +3536,18 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -3611,18 +3820,18 @@ oR oR oR oR -tM -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -3894,17 +4103,17 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -4190,17 +4399,17 @@ oR oR oR oR -tM -tM -tM -tM -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -4482,17 +4691,17 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -4769,16 +4978,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -5073,16 +5282,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -5385,16 +5594,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -5685,17 +5894,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -5983,17 +6192,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -6295,17 +6504,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -6592,17 +6801,17 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -6886,17 +7095,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -7192,16 +7401,16 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -7502,16 +7711,16 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV +dV MS MS -MS -MS -MS -MS -tM -tM +dV +dV +dV oR oR oR @@ -7801,17 +8010,17 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV +dV MS MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV oR oR oR @@ -8107,16 +8316,16 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV MS MS MS -MS -MS -tM -tM -tM +dV +dV +dV oR oR oR @@ -8414,16 +8623,16 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV +dV MS MS -MS -MS -MS -MS -tM -tM +dV +dV +dV oR oR oR @@ -8708,16 +8917,16 @@ oR oR oR oR -tM -tM -tM +dV +dV +dV +dV +dV +dV MS -MS -MS -MS -MS -tM -tM +dV +dV +dV oR oR oR @@ -9005,17 +9214,17 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -9301,16 +9510,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -9602,16 +9811,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -9902,15 +10111,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -10206,15 +10415,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -10508,16 +10717,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -10816,16 +11025,16 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -11126,15 +11335,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -11422,16 +11631,16 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -11728,16 +11937,16 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -12028,16 +12237,16 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -12328,15 +12537,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -12629,16 +12838,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -12916,16 +13125,16 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -13186,15 +13395,15 @@ oR oR oR oR -tM -tM +dV +dV +dV MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV oR oR oR @@ -13462,15 +13671,15 @@ oR oR oR oR -tM -tM -tM +dV +dV +dV MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV oR oR oR @@ -13739,6 +13948,7 @@ oR oR oR oR +<<<<<<< HEAD tM tM tM @@ -13939,6 +14149,17 @@ oR oR oR oR +======= +dV +dV +dV +MS +MS +dV +dV +dV +dV +>>>>>>> d94406daccd... Merge pull request #8859 from Spookerton/greenjoe12345/xmas2022 oR oR oR @@ -14030,15 +14251,15 @@ oR oR oR oR -tM -tM +dV +dV +dV MS MS -MS -MS -tM -tM -tM +dV +dV +dV +dV oR oR oR @@ -14295,16 +14516,16 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV MS -MS -MS -MS -tM -tM -tM -tM +dV +dV +dV +dV +dV oR oR oR @@ -14552,16 +14773,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -14809,17 +15030,17 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -15067,16 +15288,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -15324,16 +15545,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -15581,16 +15802,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -15839,15 +16060,15 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -16096,15 +16317,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -16353,15 +16574,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -16610,16 +16831,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -16867,16 +17088,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -17124,16 +17345,16 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -17382,15 +17603,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -17639,15 +17860,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -17896,15 +18117,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -18153,15 +18374,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -18412,11 +18633,11 @@ PH PH Sa Sa -zn -zn -zn -zn -zn +Sa +Sa +Sa +Sa +Sa Sa Sa PH @@ -18667,15 +18888,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -18924,15 +19145,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -19181,15 +19402,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -19438,15 +19659,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -19695,16 +19916,16 @@ oR oR oR oR -tM -tM -tM +dV +dV +dV +dV MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV oR oR oR @@ -19952,16 +20173,16 @@ oR oR oR oR -tM -tM -tM +dV +dV +dV +dV MS MS -MS -MS -MS -tM -tM +dV +dV +dV +dV oR oR oR @@ -20210,15 +20431,15 @@ oR oR oR oR -tM -tM +dV +dV +dV MS MS -MS -MS -MS -tM -tM +dV +dV +dV +dV oR oR oR @@ -20467,15 +20688,15 @@ oR oR oR oR -tM -tM +dV +dV +dV MS MS -MS -MS -MS -tM -tM +dV +dV +dV +dV oR oR oR @@ -20724,15 +20945,15 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV oR oR oR @@ -20981,15 +21202,15 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV MS MS -MS -MS -MS -tM -tM +dV +dV +dV oR oR oR @@ -21238,16 +21459,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -21495,16 +21716,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -21752,16 +21973,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV oR oR oR @@ -22009,17 +22230,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -22267,16 +22488,16 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -22524,16 +22745,16 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -22781,16 +23002,16 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -23038,15 +23259,15 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -MS +dV +dV +dV +dV +dV +dV +dV +dV +dV tM Ax Ax @@ -23295,15 +23516,15 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -MS +dV +dV +dV +dV +dV +dV +dV +dV +dV tM tM Ax @@ -23552,16 +23773,16 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV tM Ax Ax @@ -23809,17 +24030,17 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -24066,17 +24287,17 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -24323,17 +24544,17 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -24580,17 +24801,17 @@ oR oR oR oR -tM -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -24837,17 +25058,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -25094,16 +25315,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -25351,16 +25572,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -25608,17 +25829,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -25865,17 +26086,17 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -26123,16 +26344,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -26380,16 +26601,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -26637,16 +26858,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -26894,17 +27115,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -27151,17 +27372,17 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -27408,17 +27629,17 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -27666,16 +27887,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -27923,16 +28144,16 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -28180,16 +28401,16 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -28438,15 +28659,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -28695,15 +28916,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -28952,16 +29173,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -29209,16 +29430,16 @@ oR oR oR oR -tM -tM +dV +dV +dV MS MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV Ax Ax Ax @@ -29466,16 +29687,16 @@ oR oR oR oR -tM -tM +dV +dV +dV MS MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV Ax Ax Ax @@ -29723,16 +29944,16 @@ oR oR oR oR -tM -tM -tM +dV +dV +dV MS MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV Ax Ax Ax @@ -29980,16 +30201,16 @@ oR oR oR oR -tM -tM -tM +dV +dV +dV +dV MS MS -MS -MS -tM -tM -tM +dV +dV +dV +dV Ax Ax Ax @@ -30237,16 +30458,16 @@ oR oR oR oR -tM -tM -tM +dV +dV +dV +dV MS MS -MS -MS -tM -tM -tM +dV +dV +dV +dV Ax Ax Ax @@ -30495,15 +30716,15 @@ oR oR oR oR -tM -tM +dV +dV +dV MS MS -MS -MS -MS -tM -tM +dV +dV +dV +dV Ax Ax Ax @@ -30752,16 +30973,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -31009,17 +31230,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -tM -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -31266,17 +31487,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -31523,18 +31744,18 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -31780,18 +32001,18 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -32038,17 +32259,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -32295,17 +32516,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -32552,17 +32773,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -32809,18 +33030,18 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -33067,17 +33288,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -33324,17 +33545,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -33581,18 +33802,18 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -33838,18 +34059,18 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -34096,17 +34317,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -34353,17 +34574,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -34613,12 +34834,12 @@ oR id ZB ZB -zS -zS -zS -zS -zS -zS +ZB +ZB +ZB +ZB +ZB +ZB ZB ZB id @@ -35384,12 +35605,12 @@ oR id TP TP -oG -oG -oG -oG -oG -oG +TP +TP +TP +TP +TP +TP TP TP id @@ -35639,17 +35860,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -35896,16 +36117,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -36153,16 +36374,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -36410,16 +36631,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -36667,17 +36888,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -36924,17 +37145,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -37182,17 +37403,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -37439,17 +37660,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -37696,18 +37917,18 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -37954,17 +38175,17 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV +dV MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV Ax Ax Ax @@ -38211,17 +38432,17 @@ oR oR oR oR -tM -tM -tM +dV +dV +dV +dV +dV MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV Ax Ax Ax @@ -38469,16 +38690,16 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV MS MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV Ax Ax Ax @@ -38726,16 +38947,16 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV MS MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV Ax Ax Ax @@ -38983,17 +39204,17 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV MS MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV Ax Ax Ax @@ -39240,17 +39461,17 @@ oR oR oR oR -tM -tM -tM +dV +dV +dV +dV MS MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV Ax Ax Ax @@ -39498,16 +39719,16 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV Ax Ax Ax @@ -39755,16 +39976,16 @@ oR oR oR oR -tM -tM +dV +dV +dV +dV MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV Ax Ax Ax @@ -40012,16 +40233,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -40269,16 +40490,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -40526,15 +40747,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -40783,15 +41004,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -41040,15 +41261,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -41298,14 +41519,14 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -41555,14 +41776,14 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -41812,15 +42033,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -42069,15 +42290,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -42326,15 +42547,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -42583,15 +42804,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -42840,15 +43061,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -43097,16 +43318,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -43354,16 +43575,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -43611,16 +43832,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -43868,16 +44089,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -44126,15 +44347,15 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -44383,16 +44604,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -44640,16 +44861,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -44897,16 +45118,16 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -45154,17 +45375,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -45411,17 +45632,17 @@ oR oR oR oR -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -45668,18 +45889,18 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -45926,17 +46147,17 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -46183,18 +46404,18 @@ oR oR oR oR -tM -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -46441,17 +46662,17 @@ oR oR oR Ax -tM -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -46699,17 +46920,17 @@ oR oR Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -46957,15 +47178,15 @@ oR Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -47214,16 +47435,16 @@ oR Ax Ax Ax -tM -tM -tM +dV +dV +dV +dV +dV MS MS -MS -MS -MS -tM -tM +dV +dV +dV Ax Ax Ax @@ -47472,16 +47693,16 @@ Ax Ax Ax Ax -tM -tM +dV +dV +dV +dV MS MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV Ax Ax Ax @@ -47729,16 +47950,16 @@ Ax Ax Ax Ax -tM -tM +dV +dV +dV +dV MS MS MS -MS -MS -MS -MS -tM +dV +dV +dV Ax Ax Ax @@ -47987,16 +48208,16 @@ Ax Ax Ax Ax -tM -tM +dV +dV +dV +dV MS MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV Ax Ax Ax @@ -48244,16 +48465,16 @@ Ax Ax Ax Ax -tM -tM +dV +dV +dV +dV +dV MS -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV Ax Ax Ax @@ -48501,17 +48722,17 @@ Ax Ax Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -48759,16 +48980,16 @@ Ax Ax Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -49017,16 +49238,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -49275,15 +49496,15 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -49532,16 +49753,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -49789,16 +50010,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -50047,15 +50268,15 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -50304,16 +50525,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -50562,15 +50783,15 @@ Ax Ax Ax Ax -tM -MS -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -50819,16 +51040,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -51076,16 +51297,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -51333,17 +51554,17 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -51592,13 +51813,13 @@ Aq Aq Aq Sa -zn -zn -zn -zn -zn -zn -zn +Sa +Sa +Sa +Sa +Sa +Sa +Sa Sa Sa Aq @@ -51848,17 +52069,17 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -52106,16 +52327,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -52363,17 +52584,17 @@ Ax Ax Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -52621,16 +52842,16 @@ Ax Ax Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -52879,16 +53100,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -53136,17 +53357,17 @@ Ax Ax Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -53394,16 +53615,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -53651,17 +53872,17 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -53909,16 +54130,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -54166,17 +54387,17 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -54423,17 +54644,17 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -54680,17 +54901,17 @@ Ax Ax Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -54938,16 +55159,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -55196,15 +55417,15 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -55453,15 +55674,15 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV tM Ax Ax @@ -55711,13 +55932,13 @@ Ax Ax Ax Ax -tM -MS -MS -MS -MS -MS -MS +dV +dV +dV +dV +dV +dV +dV tM Ax Ax @@ -55968,13 +56189,13 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS +dV +dV +dV +dV +dV +dV +dV tM tM Ax @@ -56226,15 +56447,15 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -56483,16 +56704,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -56741,16 +56962,16 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -56841,9 +57062,9 @@ nu Sl aU tM -tM -tM -HF +dV +dV +MK Ay "} (215,1,1) = {" @@ -56998,17 +57219,17 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -57044,63 +57265,63 @@ Ax Ax Ax Ax -tM -tM -tM -tM +dV +dV +dV +dV Ih tM -tM -tM -tM +dV +dV +dV Qw tM tM tM tM +dV +dV tM -tM +jh +dV +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +dV +dV +dV +dV +dV +dV +Ax +dV +dV +dV tM jh tM -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -tM -tM -tM -tM -tM -tM -Ax -tM -tM -tM -tM -jh -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV tM Qw tM -HF +MK Ay "} (216,1,1) = {" @@ -57255,18 +57476,18 @@ Ax Ax Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -57297,68 +57518,68 @@ Ax Aq Ax Ax +dV +dV +dV +dV +dV +dV +dV +dV tM tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV tM tM tM aU tM +dV +dV tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ih tM -tM -tM -tM -tM +dV +dV +dV +dV jh tM tM tM Ih tM -tM -tM +dV +dV tM tM vQ tM +dV tM -tM -tM -tM -tM -tM -MS +dV +dV +dV +dV +dV MK -lt +Ay "} (217,1,1) = {" jq @@ -57513,18 +57734,18 @@ Ax Ax Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -57550,72 +57771,72 @@ Ax Ax Ax Ax -tM +dV Sa -tM -tM -tM -tM -tM -tM -Qw -tM +dV +dV +dV +dV +dV +dV +VF +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV MS MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM +dV +dV +dV +dV tM Qw tM tM tM aU -tM -tM +dV +dV vQ tM -tM -tM +dV +dV aU tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV MS -MS -MS -tM -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV jh tM -MS -MS -MS -MS +dV +dV +dV +dV MK -lt +Ay "} (218,1,1) = {" jq @@ -57770,21 +57991,21 @@ Ax Ax Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -57806,73 +58027,73 @@ Ax Ax Ax Ax -tM -tM +dV +dV Sa +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +MS +MS +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +MS +MS +dV +dV tM tM -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV MK -lt +Ay "} (219,1,1) = {" jq @@ -58028,24 +58249,24 @@ Ax Ax Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -58057,78 +58278,78 @@ Ax Ax Ax Ax -tM -tM -tM -tM -tM -tM -tM -tM -zn -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM -tM -tM -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +Sa +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Qw tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV tM Qw -tM +dV tM Ih -tM -MS -MS -MS +dV +dV +dV +dV +dV tM tM -tM -tM -HF +dV +MK Ay "} (220,1,1) = {" @@ -58286,106 +58507,106 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -MS -zn -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +Sa +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV vQ tM -tM -tM +dV +dV jh tM tM vQ tM +dV +dV +dV tM tM -tM -tM -tM -tM +dV tM Ih -MS -MS +dV +dV tM jh tM tM vQ tM -tM -tM -MS -MS -MS -MS +dV +dV +dV +dV +dV +dV MS Ih tM Qw MS MS -tM +dV aU -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV tM Ih -tM -HF +dV +MK Ay "} (221,1,1) = {" @@ -58544,101 +58765,101 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -MS -MS +dV +dV +dV +dV +dV MS MS +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV MS zn MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +tM +tM +dV +dV tM tM tM tM tM +dV +dV +dV Ax +dV +dV +dV +dV +dV +dV tM tM tM tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV tM Qw -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV tM vQ +dV tM -tM -tM -tM +dV +dV Ax Ax Ax -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV Ax Ax ct @@ -58801,52 +59022,52 @@ Ax Ax Ax Ax -tM -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -MS -MS -MS -MS +dV +dV +dV +dV +dV +dV MS MS MS +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV MS MS MS zn -MS -MS -MS -MS -MS -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV tM Ax Ax @@ -58856,36 +59077,36 @@ Ax Ax Ax Ax -tM -tM +dV +dV Ax Ax Ax Ax -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV Ax Ax Ax Ax Ax Ax -tM -tM -tM -tM +dV +dV +dV +dV tM jh tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -59059,49 +59280,49 @@ Ax Ax Ax Ax -tM -tM -tM +dV +dV +dV +dV +dV +dV MS MS MS +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV MS MS MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -zn -MS -MS -tM -tM -tM -tM -tM -tM +dV +Sa +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -59318,46 +59539,46 @@ Ax Ax Ax Ax -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -zn -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +CP +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +Sa +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -59575,45 +59796,45 @@ Ax Ax Ax Ax -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Sa -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -59832,43 +60053,43 @@ Ax Ax Ax Ax -tM -tM -tM -tM -tM -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Sa -tM -tM -tM -tM +dV +dV +dV +dV Ax Ax Ax @@ -60090,40 +60311,40 @@ Ax Ax Ax Ax -tM -tM -tM -tM -tM -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM -MS -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Sa -tM -tM +dV +dV Ax Ax Ax @@ -60349,35 +60570,35 @@ Ax Ax Ax Ax -tM -tM -tM -tM -tM -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Aq Ax Ax @@ -60608,29 +60829,29 @@ Ax Ax Ax Ax -tM -tM -tM -tM -tM -tM -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -MS -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -60867,24 +61088,24 @@ Ax Ax Ax Ax -tM -tM -tM -tM -tM -tM -MS -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -61128,19 +61349,19 @@ Ax Ax Ax Ax -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax @@ -61387,15 +61608,15 @@ Ax Ax Ax Ax -tM -tM -tM -tM -tM -tM -tM -tM -tM +dV +dV +dV +dV +dV +dV +dV +dV +dV Ax Ax Ax diff --git a/maps/cynosure/datums/random_map.dm b/maps/cynosure/datums/random_map.dm index 9ae314f624..31d4daa9aa 100644 --- a/maps/cynosure/datums/random_map.dm +++ b/maps/cynosure/datums/random_map.dm @@ -26,17 +26,7 @@ T.update_icon() /datum/random_map/noise/sif/get_appropriate_path(var/value) - switch(value) - if(0) - return /turf/simulated/floor/outdoors/mud/sif/planetuse - if(1 to 2) - return /turf/simulated/floor/outdoors/dirt/sif/planetuse - if(3 to 5) - return /turf/simulated/floor/outdoors/grass/sif/planetuse - if(6 to 8) - return /turf/simulated/floor/outdoors/grass/sif/forest/planetuse - if(9) - return /turf/simulated/floor/outdoors/snow/sif/planetuse + return /turf/simulated/floor/outdoors/snow/sif/planetuse /datum/random_map/noise/sif/get_additional_spawns(var/value, var/turf/T) if(prob(45) || T.check_density()) @@ -77,13 +67,7 @@ descriptor = "Sif forest (roundstart)" /datum/random_map/noise/sif/forest/get_appropriate_path(var/value) - switch(value) - if(0 to 3) - return /turf/simulated/floor/outdoors/grass/sif/planetuse - if(4 to 6) - return /turf/simulated/floor/outdoors/grass/sif/forest/planetuse - if(7 to 9) - return /turf/simulated/floor/outdoors/snow/sif/planetuse + return /turf/simulated/floor/outdoors/snow/sif/planetuse /datum/random_map/noise/sif/forest/get_additional_spawns(var/value, var/turf/T) if(prob(25) || T.check_density()) From 391a8cbff055f695027a95939460a14ed12b5904 Mon Sep 17 00:00:00 2001 From: Fluff Date: Fri, 16 Dec 2022 17:44:45 -0500 Subject: [PATCH 03/61] Doom Peninsula Overhaul Expanded the merc base upon the peninsula, giving it a purpose of being a research base. Added some more goodies, and more foes. Turrets might be a tad overboard. Oh and added 8? gyropistol clips, and a cell battery to the manor. Cell battery is in the storage room, and 3 clips with the gyropistol, while 5 are in a closest in another room. Note gyropistol cannot be made. Those 8 clips are all you're getting. --- .../surface_submaps/wilderness/DoomP.dmm | 879 +++++++++++++----- .../surface_submaps/wilderness/Manor1.dmm | 13 +- 2 files changed, 649 insertions(+), 243 deletions(-) diff --git a/maps/submaps/surface_submaps/wilderness/DoomP.dmm b/maps/submaps/surface_submaps/wilderness/DoomP.dmm index e780dc90ca..b390c0beae 100644 --- a/maps/submaps/surface_submaps/wilderness/DoomP.dmm +++ b/maps/submaps/surface_submaps/wilderness/DoomP.dmm @@ -64,8 +64,9 @@ /turf/simulated/floor/outdoors/grass/sif/forest, /area/submap/DoomP) "ar" = ( -/obj/machinery/light/small, -/turf/simulated/floor/outdoors/grass/sif/forest, +/obj/structure/closet/l3closet/scientist, +/obj/effect/floor_decal/corner/orange/diagonal, +/turf/simulated/floor/tiled/asteroid_steel, /area/submap/DoomP) "as" = ( /obj/machinery/porta_turret/poi{ @@ -192,6 +193,7 @@ /area/submap/DoomP) "aK" = ( /obj/structure/closet/secure_closet/engineering_electrical, +/obj/item/stolenpackage, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/DoomP) "aL" = ( @@ -353,18 +355,21 @@ /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "bm" = ( -/obj/structure/table/standard, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/borderfloorwhite, +/obj/machinery/light/small, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/simulated/floor/tiled/asteroid_steel, /area/submap/DoomP) "bn" = ( /obj/structure/table/standard, /obj/item/weapon/storage/box/syndie_kit/spy, +/obj/item/weapon/storage/box/handcuffs, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "bo" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/smokes, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/weapon/rig/combat/empty, +/obj/item/weapon/rig/combat/empty, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "bq" = ( @@ -377,16 +382,21 @@ /obj/item/clothing/shoes/boots/tactical, /obj/item/clothing/shoes/boots/tactical, /obj/item/clothing/head/helmet/tactical, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/suit/storage/vest/heavy/merc, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "br" = ( /obj/structure/table/rack, -/obj/random/energy, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, /obj/random/energy, +/obj/random/energy, +/obj/random/energy/highend, +/obj/random/energy/highend, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "bs" = ( @@ -397,6 +407,8 @@ /obj/item/weapon/gun/projectile/contender, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357, +/obj/random/projectile/random, +/obj/random/projectile/random, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "bt" = ( @@ -409,19 +421,14 @@ /turf/simulated/floor/tiled/white, /area/submap/DoomP) "bu" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/corner/lime{ - dir = 5 +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/asteroid_steel, /area/submap/DoomP) "bv" = ( -/obj/structure/bed, -/obj/item/weapon/bedsheet, -/obj/effect/floor_decal/corner/lime{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, +/obj/machinery/light/small, +/turf/simulated/floor/plating, /area/submap/DoomP) "bw" = ( /obj/structure/table/standard, @@ -437,36 +444,29 @@ /turf/simulated/floor/tiled, /area/submap/DoomP) "by" = ( +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/submap/DoomP) "bz" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/standard, +/obj/item/weapon/storage/box/metalfoam, +/obj/item/weapon/storage/box/smokes, +/turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "bA" = ( -/obj/structure/sink{ - dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/borderfloorwhite, +/turf/simulated/floor/tiled/asteroid_steel, /area/submap/DoomP) "bB" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "bC" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/full, -/turf/simulated/floor/tiled/white, +/mob/living/simple_mob/humanoid/merc/ranged/ionrifle, +/turf/simulated/floor/tiled/asteroid_steel, /area/submap/DoomP) "bD" = ( /obj/effect/floor_decal/corner/lime{ @@ -475,60 +475,45 @@ /turf/simulated/floor/tiled/white, /area/submap/DoomP) "bE" = ( +/obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/light/small{ - dir = 4; - pixel_y = 0 + dir = 4 }, -/obj/effect/floor_decal/corner/lime{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/plating, /area/submap/DoomP) "bF" = ( /obj/machinery/shower{ dir = 1 }, /obj/structure/curtain/open/shower, +/obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled/white, /area/submap/DoomP) "bG" = ( /obj/structure/toilet{ dir = 1 }, +/obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled/white, /area/submap/DoomP) "bH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/asteroid_steel, /area/submap/DoomP) "bI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/border_only, /turf/simulated/floor/plating, /area/submap/DoomP) "bJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ +/obj/machinery/light/small{ dir = 1 }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/sink{ + pixel_y = 16 }, -/obj/machinery/door/firedoor/border_only, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled/white, /area/submap/DoomP) "bK" = ( /obj/structure/lattice, @@ -561,12 +546,426 @@ /turf/simulated/floor/tiled/white, /area/submap/DoomP) "bP" = ( -/obj/random/junk, -/turf/simulated/floor/outdoors/rocks, +/obj/structure/table/standard, +/obj/item/weapon/paper, +/obj/item/weapon/pen, +/obj/effect/floor_decal/borderfloorwhite, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/asteroid_steel, /area/submap/DoomP) "bQ" = ( -/obj/random/junk, -/turf/simulated/floor/outdoors/grass/sif/forest, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"fm" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"gA" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/floor_decal/borderfloorwhite, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"jD" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/obj/item/toy/plushie/borgplushie/drakiesec, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"kp" = ( +/obj/random/mob/merc/all, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"kI" = ( +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"kS" = ( +/obj/machinery/power/emitter{ + anchored = 1; + dir = 1; + state = 2 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"lc" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/diagonal, +/turf/simulated/floor/tiled/red, +/area/submap/DoomP) +"nX" = ( +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/random/thermalponcho, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"og" = ( +/obj/machinery/auto_cloner, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + external_pressure_bound = 0; + external_pressure_bound_default = 0; + icon_state = "map_vent_in"; + initialize_directions = 1; + internal_pressure_bound = 4000; + internal_pressure_bound_default = 4000; + pressure_checks = 2; + pressure_checks_default = 2; + pump_direction = 0; + use_power = 1 + }, +/turf/simulated/floor/airless, +/area/template_noop) +"px" = ( +/obj/structure/table/standard, +/obj/item/clothing/head/welding, +/obj/item/weapon/weldingtool, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 + }, +/obj/item/weapon/flame/lighter/random, +/obj/item/weapon/storage/box/monkeycubes, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"pB" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/machinery/atmospherics/binary/pump, +/obj/random/mob/merc/all, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"pL" = ( +/turf/simulated/wall{ + can_open = 1 + }, +/area/submap/DoomP) +"rJ" = ( +/obj/effect/floor_decal/corner/lime/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"vd" = ( +/obj/effect/floor_decal/corner/lime/full{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"vq" = ( +/obj/structure/table/rack, +/obj/item/weapon/archaeological_find, +/obj/item/weapon/archaeological_find, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/weapon/gun/energy/captain/xenoarch, +/obj/item/weapon/archaeological_find, +/obj/item/weapon/archaeological_find, +/obj/item/weapon/gun/energy/captain/xenoarch, +/obj/item/weapon/gun/energy/captain/xenoarch, +/obj/item/weapon/cell/device/weapon/recharge/alien/omni, +/obj/item/weapon/gun/energy/captain/xenoarch, +/turf/simulated/floor/tiled/techfloor, +/area/submap/DoomP) +"vu" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"xE" = ( +/obj/structure/lattice, +/turf/simulated/floor/water/deep, +/area/submap/DoomP) +"yp" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/submap/DoomP) +"yF" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/effect/floor_decal/corner/lime/full, +/obj/item/toy/plushie/basset, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"BW" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/diagonal, +/turf/simulated/floor/tiled/red, +/area/submap/DoomP) +"Cn" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/submap/DoomP) +"Db" = ( +/obj/structure/curtain/open/shower, +/obj/machinery/shower{ + dir = 4; + pixel_x = 5 + }, +/turf/simulated/floor/plating, +/area/submap/DoomP) +"FE" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"Hz" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/techfloor, +/area/submap/DoomP) +"Jj" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light/small, +/obj/machinery/artifact, +/turf/simulated/floor/tiled/techfloor, +/area/submap/DoomP) +"Jq" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 10 + }, +/obj/random/mob/merc/all, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"JU" = ( +/obj/effect/floor_decal/corner/orange/diagonal, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"LU" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/machinery/computer/general_air_control, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"LW" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"Mc" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"MQ" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"Nl" = ( +/obj/structure/table/standard, +/obj/machinery/cell_charger, +/obj/item/weapon/tool/screwdriver{ + pixel_y = 15 + }, +/obj/item/weapon/melee/baton/loaded, +/obj/item/device/multitool, +/obj/effect/floor_decal/borderfloorwhite, +/obj/item/weapon/tool/crowbar, +/obj/item/clothing/gloves/sterile/latex, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"OV" = ( +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"Pk" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/submap/DoomP) +"PU" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"Ra" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/submap/DoomP) +"Re" = ( +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"TX" = ( +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/food/snacks/pancakes/berry, +/obj/effect/floor_decal/corner/lime/border, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"Ul" = ( +/obj/structure/table/rack, +/obj/item/weapon/archaeological_find, +/obj/item/weapon/archaeological_find, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/capture_crystal, +/obj/item/stack/material/morphium{ + amount = "5" + }, +/obj/item/weapon/circuitboard/mecha/imperion/main, +/obj/item/weapon/circuitboard/mecha/imperion/targeting, +/obj/item/weapon/archaeological_find, +/obj/item/weapon/cell/device/weapon/recharge/alien/omni, +/obj/item/weapon/archaeological_find, +/turf/simulated/floor/tiled/techfloor, +/area/submap/DoomP) +"VA" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"VC" = ( +/obj/structure/bed/chair, +/mob/living/simple_mob/humanoid/merc/ranged/deagle, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"VV" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/obj/item/toy/plushie/moth, +/turf/simulated/floor/tiled/white, +/area/submap/DoomP) +"Wt" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/mob/living/simple_mob/mechanical/mecha/ripley/pirate/last_stand_merc{ + faction = "syndicate" + }, +/turf/simulated/floor/tiled/techfloor, +/area/submap/DoomP) +"Ww" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"Wy" = ( +/obj/random/mob/merc/all, +/obj/effect/floor_decal/corner/orange/diagonal, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"WH" = ( +/obj/machinery/door/airlock/hatch, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"Xj" = ( +/obj/structure/table/standard, +/obj/item/stolenpackage, +/turf/simulated/floor/tiled, +/area/submap/DoomP) +"XV" = ( +/obj/structure/table/darkglass, +/obj/item/weapon/gun/energy/imperial, +/obj/item/clothing/suit/armor/swat/officer, +/obj/item/clothing/glasses/graviton/medgravpatch, +/obj/item/clothing/head/psy_crown/wrath, +/obj/item/toy/plushie/carp/nebula, +/turf/simulated/floor/plating, +/area/submap/DoomP) +"Yt" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/DoomP) +"YT" = ( +/obj/effect/floor_decal/corner/red/diagonal, +/obj/random/mob/merc/armored, +/turf/simulated/floor/tiled/red, +/area/submap/DoomP) +"Zl" = ( +/obj/machinery/door/airlock/external/bolted, +/turf/simulated/floor/plating, /area/submap/DoomP) (1,1,1) = {" @@ -1775,17 +2174,17 @@ af af af af -af -af -af as af af as ak ak +as ak ak +as +ak ak ak ak @@ -1837,17 +2236,17 @@ af ac ac ac -ac -ac -ac aL af af aX af af +aX ak ak +aX +ak ak ak ak @@ -1896,9 +2295,6 @@ af af af ac -ac -ad -ad ad at at @@ -1909,8 +2305,11 @@ at at at at -af -ak +at +at +at +at +at ak ak ak @@ -1959,20 +2358,20 @@ af ac ac ad -ad -ad -ad at ax aM aY bd -bj -bl -bl at -af -ak +bz +bo +bq +br +at +Hz +vq +at ak ak ak @@ -2020,23 +2419,23 @@ af ac ac ad -ad -ad -ad as at ay aN aN be -at -bm +bj bl +bL +bl +bB at -af -af -ak -ak +Wt +Jj +at +xE +as ak ak ak @@ -2083,20 +2482,20 @@ ac ad ad ad -ad -ad -ad at aA aO -aN +Xj be at bn -bB +bo +bq +bs +at +Hz +Ul at -af -af af af ak @@ -2145,20 +2544,20 @@ ad ad ad ad -ad -ad -ad at ay aN aN bf at -bo -bl at -aL -as +at +at +at +at +bj +at +at af af af @@ -2206,21 +2605,21 @@ ac ad ad ad -ad -ad -ad as at aB -aN +aO bg be at -bq -bL +FE +bH +bH +fm +bH +bH +px at -ac -af af af af @@ -2269,20 +2668,20 @@ aq ad ad ad -ad -ad -ad at ay aN aN bx at -bq -bB -at +LU +pB +vu +kI +bQ +VC bP -ac +at af af af @@ -2330,9 +2729,6 @@ ad ad ad ad -ad -ad -ar at at az @@ -2340,11 +2736,14 @@ aP aP bM at -br -bl +yp +Ra +lc +VA +bQ +bQ +Nl at -ad -ac af af af @@ -2392,9 +2791,6 @@ ad ad ad ad -ad -ad -ad au at aC @@ -2402,13 +2798,16 @@ aQ aZ aP at -bs -bl +og +Zl +YT +bQ +kS +bQ +gA at -ad -ac -af -af +aX +as af af af @@ -2454,9 +2853,6 @@ ad ad aq ad -ad -ad -ad av at at @@ -2464,11 +2860,14 @@ at at bh at +Pk +Ra +BW +VA +bQ +bQ +bA at -at -at -ad -ac af af af @@ -2516,9 +2915,6 @@ ad ad ad ad -ad -ad -ad av aw aD @@ -2526,11 +2922,14 @@ aP ba aP at -bt +Yt +bH +bH +Re bC +bQ +bm at -ad -ac ac af af @@ -2578,9 +2977,6 @@ ac ad ad ad -ad -ad -ad av at at @@ -2588,11 +2984,14 @@ at at bN at +MQ bu -bD +bu +PU +bu +bu +Ww at -bK -as ac ac af @@ -2640,9 +3039,6 @@ ac ad ad ad -ad -ad -ad au at aE @@ -2650,11 +3046,14 @@ aR at bi at -bv -bD -bH -ad -ad +at +WH +at +at +at +at +at +at ad ac af @@ -2702,9 +3101,6 @@ ac ad ah ad -ad -ad -ar at at aF @@ -2712,12 +3108,15 @@ aS at aP at -bw -bD +ar +JU +JU +as +at bI +XV +at ad -ad -bQ ac af af @@ -2765,22 +3164,22 @@ ad ad ad ad -ad -ad -ad at aF aS at aP -at +bh +JU +Wy +JU bv -bD -bI -ad -ad -ad -ac +at +pL +at +at +bK +as af af af @@ -2826,9 +3225,6 @@ ad ad ad ad -ad -ad -ad as at aF @@ -2836,11 +3232,14 @@ aS at aP at -bO -bD -bI -ad -ad +JU +JU +JU +as +at +bJ +bF +at ad ac af @@ -2889,20 +3288,20 @@ ad ad ac ad -ad -ad -ad at aG aT at aP -bk -by +at +Db bE -bJ -ad -ad +Db +at +at +LW +bG +at ad ac af @@ -2951,20 +3350,20 @@ ac am ac ac -ad -ad -ad at aH aU bb aP at +at +at +at +at +at bk at at -bK -as ac ac af @@ -3012,9 +3411,6 @@ ac af af af -ac -ac -ad as at aI @@ -3022,12 +3418,15 @@ aV bc bi at -bz -bF +bt +Mc +jD +OV +VV +OV +yF at ac -ac -ac af af af @@ -3075,20 +3474,20 @@ af af af af -ac -ac -ad at aJ aW at aP at -bk +nX +Jq +bw +bD +bO +kp +TX at -at -bP -af af af af @@ -3137,22 +3536,22 @@ af af af af -af -ac -ac at aK aV at aP +bk +rJ +by +by +by +by +by +vd at -bA -bG -at -af -af -af -af +aX +as af af af @@ -3199,9 +3598,6 @@ af af af af -af -af -af at at at @@ -3209,6 +3605,11 @@ at at at at +Pk +Cn +Cn +Cn +Ra at at af @@ -3218,8 +3619,6 @@ af af af af -af -af ak ak ak @@ -3263,17 +3662,17 @@ af af af af -af -af -af aX af af aX af af +aX af af +aX +af af af af @@ -3325,17 +3724,17 @@ af af af af -af -af -af as af af as af af +as af af +as +af af af af diff --git a/maps/submaps/surface_submaps/wilderness/Manor1.dmm b/maps/submaps/surface_submaps/wilderness/Manor1.dmm index a9fc9053bd..3df6ee1299 100644 --- a/maps/submaps/surface_submaps/wilderness/Manor1.dmm +++ b/maps/submaps/surface_submaps/wilderness/Manor1.dmm @@ -307,9 +307,7 @@ /area/submap/Manor1) "bi" = ( /obj/effect/decal/cleanable/cobweb, -/turf/simulated/floor/holofloor/wood{ - icon_state = "wood_broken0" - }, +/turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bj" = ( /obj/effect/decal/cleanable/cobweb, @@ -396,6 +394,11 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, /obj/item/clothing/head/hood/winter, /obj/item/clothing/shoes/boots/winter/climbing, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bz" = ( @@ -641,6 +644,7 @@ /obj/item/stack/material/tritium{ amount = 20 }, +/obj/item/weapon/cell/super, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "co" = ( @@ -1237,6 +1241,9 @@ /obj/structure/loot_pile/surface/bones, /obj/effect/spider/stickyweb, /obj/item/weapon/gun/projectile/gyropistol, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, +/obj/item/ammo_magazine/m75, /turf/simulated/floor/carpet/purcarpet, /area/submap/Manor1) "GM" = ( From e86a4512c9370381ae135879e647ae9e4c2f2195 Mon Sep 17 00:00:00 2001 From: Fluff Date: Sat, 17 Dec 2022 11:48:02 -0500 Subject: [PATCH 04/61] Trying to fix things Trying to make it so there isn't an error. Also fixed some lights, and added a beacon to the Xenomoprh POI because there is an actual transmitter there. --- .../surface_submaps/wilderness/DoomP.dmm | 24 ++++++++++++++++++- .../surface_submaps/wilderness/xenohive.dmm | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/maps/submaps/surface_submaps/wilderness/DoomP.dmm b/maps/submaps/surface_submaps/wilderness/DoomP.dmm index b390c0beae..dac6dd530f 100644 --- a/maps/submaps/surface_submaps/wilderness/DoomP.dmm +++ b/maps/submaps/surface_submaps/wilderness/DoomP.dmm @@ -226,6 +226,9 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/submap/DoomP) "aR" = ( @@ -597,6 +600,24 @@ }, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/DoomP) +"kU" = ( +/obj/machinery/power/terminal{ + dir = 1; + icon_state = "term" + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techfloor/grid, +/area/submap/DoomP) "lc" = ( /obj/structure/railing{ dir = 8 @@ -874,6 +895,7 @@ /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/snacks/pancakes/berry, /obj/effect/floor_decal/corner/lime/border, +/obj/machinery/light/small, /turf/simulated/floor/tiled/white, /area/submap/DoomP) "Ul" = ( @@ -3104,7 +3126,7 @@ ad at at aF -aS +kU at aP at diff --git a/maps/submaps/surface_submaps/wilderness/xenohive.dmm b/maps/submaps/surface_submaps/wilderness/xenohive.dmm index 5e0a2158f4..f5e0bb748a 100644 --- a/maps/submaps/surface_submaps/wilderness/xenohive.dmm +++ b/maps/submaps/surface_submaps/wilderness/xenohive.dmm @@ -533,6 +533,7 @@ /obj/effect/alien/weeds, /obj/structure/prop/transmitter, /obj/effect/decal/cleanable/dirt, +/obj/item/device/gps/internal/poi, /turf/simulated/floor, /area/submap/XenoHive) "Vj" = ( From 8aa7d71ea78ea735b20f58da6a703814a2751a19 Mon Sep 17 00:00:00 2001 From: Fluff Date: Sun, 18 Dec 2022 09:17:18 -0500 Subject: [PATCH 05/61] Fixing the purple bacon Does this work with only one change to an existing thing? --- maps/submaps/surface_submaps/wilderness/DoomP.dmm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/maps/submaps/surface_submaps/wilderness/DoomP.dmm b/maps/submaps/surface_submaps/wilderness/DoomP.dmm index dac6dd530f..3fc2936c43 100644 --- a/maps/submaps/surface_submaps/wilderness/DoomP.dmm +++ b/maps/submaps/surface_submaps/wilderness/DoomP.dmm @@ -904,13 +904,15 @@ /obj/item/weapon/archaeological_find, /obj/effect/floor_decal/corner/grey/diagonal, /obj/item/capture_crystal, -/obj/item/stack/material/morphium{ - amount = "5" - }, /obj/item/weapon/circuitboard/mecha/imperion/main, /obj/item/weapon/circuitboard/mecha/imperion/targeting, -/obj/item/weapon/archaeological_find, /obj/item/weapon/cell/device/weapon/recharge/alien/omni, +/obj/item/stack/material/morphium, +/obj/item/stack/material/morphium, +/obj/item/stack/material/morphium, +/obj/item/stack/material/morphium, +/obj/item/stack/material/morphium, +/obj/item/weapon/archaeological_find, /obj/item/weapon/archaeological_find, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) From eed7361d5d3583890cff7424355fd5c7dc5683aa Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 18 Dec 2022 16:55:23 -0500 Subject: [PATCH 06/61] Merge pull request #14210 from Heroman3003/borg-human-emotes Gives borgs access to human emotes --- code/modules/admin/verbs/smite_vr.dm | 2 +- code/modules/mob/living/silicon/robot/emote.dm | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/smite_vr.dm b/code/modules/admin/verbs/smite_vr.dm index f1a1a08deb..fc8452831c 100644 --- a/code/modules/admin/verbs/smite_vr.dm +++ b/code/modules/admin/verbs/smite_vr.dm @@ -130,7 +130,7 @@ if(SMITE_AD_SPAM) if(target.client) - create_fake_ad_popup_multiple(/obj/screen/popup/default, 15) + target.client.create_fake_ad_popup_multiple(/obj/screen/popup/default, 15) else return //Injection? Don't print any messages. diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 018c2b4336..79df20a324 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -33,4 +33,6 @@ var/list/_robot_default_emotes = list( ) /mob/living/silicon/robot/get_available_emotes() - return global._robot_default_emotes.Copy() + var/list/fulllist = global._robot_default_emotes.Copy() + fulllist |= _human_default_emotes + return fulllist \ No newline at end of file From 56f0906618c913835fb98b37c2d15a03b9daf023 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Wed, 21 Dec 2022 21:28:48 -0500 Subject: [PATCH 08/61] Merge pull request #14224 from Heroman3003/cream Gives service borgs some cream --- code/modules/reagents/reagent_containers/borghypo.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/borghypo.dm b/code/modules/reagents/reagent_containers/borghypo.dm index 544d6e8f42..1825d2d67e 100644 --- a/code/modules/reagents/reagent_containers/borghypo.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -136,13 +136,14 @@ volume = 60 possible_transfer_amounts = list(5, 10, 20, 30) reagent_ids = list("ale", - "cider", "beer", "berryjuice", "bitters", + "cider", "coffee", "cognac", "cola", + "cream", "dr_gibb", "egg", "gin", From e57d7497a863fbfc34838d3113a5dd66d2b904c0 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Thu, 22 Dec 2022 13:49:26 +1000 Subject: [PATCH 10/61] Merge pull request #14223 from Seris02/nomorereplicantsensors stops ai controlled humanoids from spawning with sensors on --- .../mob/living/carbon/human/ai_controlled/ai_controlled_vr.dm | 2 ++ vorestation.dme | 1 + 2 files changed, 3 insertions(+) create mode 100644 code/modules/mob/living/carbon/human/ai_controlled/ai_controlled_vr.dm diff --git a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled_vr.dm b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled_vr.dm new file mode 100644 index 0000000000..1dbd38868c --- /dev/null +++ b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled_vr.dm @@ -0,0 +1,2 @@ +/mob/living/carbon/human/ai_controlled + sensorpref = 1 diff --git a/vorestation.dme b/vorestation.dme index d94f11e021..ac886b359e 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3010,6 +3010,7 @@ #include "code\modules\mob\living\carbon\human\unarmed_attack.dm" #include "code\modules\mob\living\carbon\human\update_icons.dm" #include "code\modules\mob\living\carbon\human\ai_controlled\ai_controlled.dm" +#include "code\modules\mob\living\carbon\human\ai_controlled\ai_controlled_vr.dm" #include "code\modules\mob\living\carbon\human\descriptors\_descriptors.dm" #include "code\modules\mob\living\carbon\human\descriptors\descriptors_generic.dm" #include "code\modules\mob\living\carbon\human\descriptors\descriptors_skrell.dm" From 20f27cec9456a2c610716db084f693997afa42a2 Mon Sep 17 00:00:00 2001 From: Raeschen Date: Thu, 22 Dec 2022 10:18:44 +0100 Subject: [PATCH 12/61] Fix oversight with #5420 forgot the .dme entry with an added code file --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index d94f11e021..4417bc4e65 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4518,6 +4518,7 @@ #include "modular_chomp\code\modules\client\preference_setup\general\03_body.dm" #include "modular_chomp\code\modules\client\preference_setup\global\setting_datums.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_general.dm" +#include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_xeno.dm" #include "modular_chomp\code\modules\clothing\clothing.dm" #include "modular_chomp\code\modules\clothing\spacesuits\rig\clockwork_ch.dm" #include "modular_chomp\code\modules\clothing\spacesuits\rig\rig.dm" From 0e5c709ea54534b496a7137f0a300cce82fed87b Mon Sep 17 00:00:00 2001 From: Verkister Date: Thu, 22 Dec 2022 15:08:17 +0200 Subject: [PATCH 13/61] Fixes point-blank throws Disables the funny feature someone had felt the urge to code in that overrides intentional throws with a give action. We have an actual verb for that in IC tab. --- code/modules/mob/living/living.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 8df2a4c789..225a6ef197 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1125,6 +1125,7 @@ if(!item) return FALSE //Grab processing has a chance of returning null +/* CHOMPEdit. If I want to do a nice little give I use the actual verb for it. if(a_intent == I_HELP && Adjacent(target) && isitem(item) && ishuman(target)) var/obj/item/I = item var/mob/living/carbon/human/H = target @@ -1135,6 +1136,7 @@ to_chat(src, SPAN_NOTICE("You offer \the [I] to \the [target].")) do_give(H) return TRUE +*/ drop_from_inventory(item) From 3ff6d6401161087752256255f74c61f5bf52bff3 Mon Sep 17 00:00:00 2001 From: Verkister Date: Thu, 22 Dec 2022 17:52:16 +0200 Subject: [PATCH 14/61] Adds custom egg name option for vorgan egg mode Funnily enough I'm not adding this for some dirty disposals reasons this time. I just wanted to name my bottie's compact material packages something other than "rock egg" lmao --- code/game/objects/items/weapons/storage/egg_vr.dm | 1 + code/modules/vore/eating/belly_obj_vr.dm | 7 +++++-- code/modules/vore/eating/bellymodes_datum_vr.dm | 11 +++++++++++ code/modules/vore/eating/vorepanel_vr.dm | 9 +++++++++ tgui/packages/tgui/interfaces/VorePanel.js | 10 +++++++++- tgui/public/tgui.bundle.js | 2 +- 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/storage/egg_vr.dm b/code/game/objects/items/weapons/storage/egg_vr.dm index 97da55c4ff..3ee2e0046e 100644 --- a/code/game/objects/items/weapons/storage/egg_vr.dm +++ b/code/game/objects/items/weapons/storage/egg_vr.dm @@ -15,6 +15,7 @@ show_messages = 0 allow_quick_empty = TRUE use_sound = 'sound/items/drop/flesh.ogg' + var/egg_name = null //CHOMPAdd /obj/item/weapon/storage/vore_egg/Initialize() . = ..() diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index a0f977d789..fe248b58fe 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -49,6 +49,7 @@ var/obj/item/weapon/storage/vore_egg/ownegg // Is this belly creating an egg? var/egg_type = "Egg" // Default egg type and path. var/egg_path = /obj/item/weapon/storage/vore_egg + var/egg_name = null // CHOMPAdd. Custom egg name var/list/list/emote_lists = list() // Idle emotes that happen on their own, depending on the bellymode. Contains lists of strings indexed by bellymode var/emote_time = 60 // How long between stomach emotes at prey (in seconds) var/emote_active = TRUE // Are we even giving emotes out at all or not? @@ -278,7 +279,8 @@ "autotransfer_max_amount", "slow_digestion", "slow_brutal", - "sound_volume", //CHOMP end of variables from CHOMP + "sound_volume", + "egg_name", //CHOMP end of variables from CHOMP "egg_type", "save_digest_mode" ) @@ -1391,7 +1393,8 @@ dupe.autotransfer_max_amount = autotransfer_max_amount dupe.slow_digestion = slow_digestion dupe.slow_brutal = slow_brutal - dupe.sound_volume = sound_volume //CHOMP end of variables from CHOMP + dupe.sound_volume = sound_volume + dupe.egg_name = egg_name //CHOMP end of variables from CHOMP dupe.belly_fullscreen = belly_fullscreen dupe.disable_hud = disable_hud diff --git a/code/modules/vore/eating/bellymodes_datum_vr.dm b/code/modules/vore/eating/bellymodes_datum_vr.dm index b55843a96c..3078717d2e 100644 --- a/code/modules/vore/eating/bellymodes_datum_vr.dm +++ b/code/modules/vore/eating/bellymodes_datum_vr.dm @@ -218,6 +218,14 @@ GLOBAL_LIST_INIT(digest_modes, list()) var/list/egg_contents = list() for(var/E in touchable_atoms) if(istype(E, /obj/item/weapon/storage/vore_egg)) // Don't egg other eggs. + var/obj/item/weapon/storage/vore_egg/EG //CHOMPEdit Start + if(EG.egg_name != B.egg_name) + if(!B.egg_name) + EG.egg_name = null + EG.name = initial(EG.name) + else + EG.egg_name = B.egg_name + EG.name = B.egg_name continue if(isliving(E)) var/mob/living/L = E @@ -231,6 +239,9 @@ GLOBAL_LIST_INIT(digest_modes, list()) if(B.egg_type in tf_vore_egg_types) B.egg_path = tf_vore_egg_types[B.egg_type] B.ownegg = new B.egg_path(B) + if(B.ownegg && B.egg_name) + B.ownegg.egg_name = B.egg_name + B.ownegg.name = B.egg_name //CHOMPEdit End for(var/atom/movable/C in egg_contents) if(isitem(C) && egg_contents.len == 1) //Only egging one item var/obj/item/I = C diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index f57f3114bd..5c9a66057e 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -181,6 +181,7 @@ // "messages" // TODO "can_taste" = selected.can_taste, "egg_type" = selected.egg_type, + "egg_name" = selected.egg_name, //CHOMPAdd "nutrition_percent" = selected.nutrition_percent, "digest_brute" = selected.digest_brute, "digest_burn" = selected.digest_burn, @@ -238,6 +239,7 @@ //CHOMPEdit END selected_list["egg_type"] = selected.egg_type + selected_list["egg_name"] = selected.egg_name //CHOMPAdd selected_list["contaminates"] = selected.contaminates selected_list["contaminate_flavor"] = null selected_list["contaminate_color"] = null @@ -1198,6 +1200,13 @@ return FALSE host.vore_selected.egg_type = new_egg_type . = TRUE + if("b_egg_name") //CHOMPAdd Start + var/new_egg_name = html_encode(tgui_input_text(usr,"Custom Egg Name (Leave empty for default egg name)","New Egg Name")) + if(length(new_egg_name) > BELLIES_NAME_MAX) + tgui_alert_async(usr, "Entered name too long (max [BELLIES_NAME_MAX]).","Error") + return FALSE + host.vore_selected.egg_name = new_egg_name + . = TRUE //CHOMPAdd End if("b_desc") var/new_desc = html_encode(tgui_input_text(usr,"Belly Description, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.desc, multiline = TRUE, prevent_enter = TRUE)) diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 3357ef5109..8c3d51da50 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -49,7 +49,7 @@ const digestModeToPreyMode = { * show_liq, liq_interacts, liq_reagent_gen, liq_reagent_type, liq_reagent_name, * liq_reagent_transfer_verb, liq_reagent_nutri_rate, liq_reagent_capacity, liq_sloshing, liq_reagent_addons, * show_liq_fullness, liq_messages, liq_msg_toggle1, liq_msg_toggle2, liq_msg_toggle3, liq_msg_toggle4, - * liq_msg_toggle5, liq_msg1, liq_msg2, liq_msg3, liq_msg4, liq_msg5, sound_volume, + * liq_msg_toggle5, liq_msg1, liq_msg2, liq_msg3, liq_msg4, liq_msg5, sound_volume, egg_name, * * To the tabs section of VoreSelectedBelly return * setTabIndex(5)}> @@ -649,6 +649,7 @@ const VoreSelectedBellyOptions = (props, context) => { contaminate_flavor, contaminate_color, egg_type, + egg_name, selective_preference, save_digest_mode, vorespawn_blacklist, @@ -776,6 +777,13 @@ const VoreSelectedBellyOptions = (props, context) => { content={capitalize(egg_type)} /> + +