From 1ddda2f85223601ce25c12c61a50cfb8d0633dc8 Mon Sep 17 00:00:00 2001 From: KasparoVy <12377767+KasparoVy@users.noreply.github.com> Date: Mon, 26 Aug 2019 22:05:03 -0400 Subject: [PATCH 1/4] Allow Tajara to use Tiny/Short Tails + Its Marking & Mild Cleanup Tajara can now use the species-ambiguous tiny tail, short tail + marking and cleans up body accessory code. --- .../living/carbon/human/body_accessories.dm | 73 +++++++++--------- .../vulpkanin/vulpkanin_tail_markings.dm | 15 ++-- icons/mob/body_accessory.dmi | Bin 4543 -> 4567 bytes 3 files changed, 43 insertions(+), 45 deletions(-) diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index 071ad99cd95..f44ec079067 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -8,9 +8,9 @@ var/global/list/body_accessory_by_name = list("None" = null) if(body_accessory_by_name.len) if(initialize_body_accessory_by_species()) - return 1 + return TRUE - return 0 //fail if no bodies are found + return FALSE //fail if no bodies are found var/global/list/body_accessory_by_species = list("None" = null) @@ -24,10 +24,10 @@ var/global/list/body_accessory_by_species = list("None" = null) body_accessory_by_species["[species]"] += accessory if(body_accessory_by_species.len) - return 1 - return 0 + return TRUE + return FALSE -/proc/__init_body_accessory(var/ba_path) +/proc/__init_body_accessory(ba_path) if(ispath(ba_path)) var/_added_counter = 0 @@ -38,9 +38,8 @@ var/global/list/body_accessory_by_species = list("None" = null) ++_added_counter if(_added_counter) - return 1 - return 0 - + return TRUE + return FALSE /datum/body_accessory var/name = "default" @@ -58,8 +57,8 @@ var/global/list/body_accessory_by_species = list("None" = null) var/list/allowed_species = list() -/datum/body_accessory/proc/try_restrictions(var/mob/living/carbon/human/H) - return 1 +/datum/body_accessory/proc/try_restrictions(mob/living/carbon/human/H) + return TRUE /datum/body_accessory/proc/get_animated_icon() //return animated if it has it, return static if it does not. if(animated_icon) @@ -87,7 +86,6 @@ var/global/list/body_accessory_by_species = list("None" = null) pixel_x_offset = -16 - //Tails /datum/body_accessory/tail icon = 'icons/mob/body_accessory.dmi' @@ -96,10 +94,10 @@ var/global/list/body_accessory_by_species = list("None" = null) icon_state = "null" animated_icon_state = "null" -/datum/body_accessory/tail/try_restrictions(var/mob/living/carbon/human/H) +/datum/body_accessory/tail/try_restrictions(mob/living/carbon/human/H) if(!H.wear_suit || !(H.wear_suit.flags_inv & HIDETAIL)) - return 1 - return 0 + return TRUE + return FALSE /datum/body_accessory/tail/wingler_tail // Jay wingler fluff tail @@ -109,34 +107,33 @@ var/global/list/body_accessory_by_species = list("None" = null) animated_icon_state = "winglertail_a" allowed_species = list("Tajaran") +/datum/body_accessory/tail/tiny //Pretty ambiguous as to what species it belongs to, tail could've been injured or docked. + name = "Tiny Tail" + icon_state = "tiny" + animated_icon_state = "tiny_a" + allowed_species = list("Vulpkanin", "Tajaran") + +/datum/body_accessory/tail/short //Same as above. + name = "Short Tail" + icon_state = "short" + animated_icon_state = "short_a" + allowed_species = list("Vulpkanin", "Tajaran") //Vulpkanin -/datum/body_accessory/tail/vulpkanin_2 - name = "Vulpkanin Alt 1 (Bushy)" - icon_state = "vulptail2" - animated_icon_state = "vulptail2_a" +/datum/body_accessory/tail/bushy + name = "Bushy Tail" + icon_state = "bushy" + animated_icon_state = "bushy_a" allowed_species = list("Vulpkanin") -/datum/body_accessory/tail/vulpkanin_3 - name = "Vulpkanin Alt 2 (Straight)" - icon_state = "vulptail3" - animated_icon_state = "vulptail3_a" +/datum/body_accessory/tail/straight + name = "Straight Tail" + icon_state = "straight" + animated_icon_state = "straight_a" allowed_species = list("Vulpkanin") -/datum/body_accessory/tail/vulpkanin_4 - name = "Vulpkanin Alt 3 (Tiny)" - icon_state = "vulptail4" - animated_icon_state = "vulptail4_a" - allowed_species = list("Vulpkanin") - -/datum/body_accessory/tail/vulpkanin_5 - name = "Vulpkanin Alt 4 (Short)" - icon_state = "vulptail5" - animated_icon_state = "vulptail5_a" - allowed_species = list("Vulpkanin") - -/datum/body_accessory/tail/vulpkanin_6 - name = "Vulpkanin Alt 5 (Straight Bushy)" - icon_state = "vulptail6" - animated_icon_state = "vulptail6_a" +/datum/body_accessory/tail/straight_bushy + name = "Straight Bushy Tail" + icon_state = "straightbushy" + animated_icon_state = "straightbushy_a" allowed_species = list("Vulpkanin") diff --git a/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm index 85b93ad3f19..ae6953f7f44 100644 --- a/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm @@ -12,25 +12,26 @@ /datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_bushy_fluff name = "Vulpkanin Bushy Tail Fluff" - tails_allowed = list("Vulpkanin Alt 1 (Bushy)") + tails_allowed = list("Bushy Tail") icon_state = "bushfluff" -/datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_short_tip - name = "Vulpkanin Short Tail Tip" - tails_allowed = list("Vulpkanin Alt 4 (Short)") +/datum/sprite_accessory/body_markings/tail/vulpkanin/short_tip //Species-ambiguous, generic short tail. + name = "Short Tail Tip" + species_allowed = list("Vulpkanin", "Tajaran") + tails_allowed = list("Short Tail") icon_state = "short" /datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_hybrid_tip name = "Vulpkanin Bushy Straight Tail Tip" - tails_allowed = list("Vulpkanin Alt 5 (Straight Bushy)") + tails_allowed = list("Straight Bushy Tail") icon_state = "sbtip" /datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_hybrid_fade name = "Vulpkanin Bushy Straight Tail Fade" - tails_allowed = list("Vulpkanin Alt 5 (Straight Bushy)") + tails_allowed = list("Straight Bushy Tail") icon_state = "sbfade" /datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_hybrid_silverf name = "Vulpkanin Bushy Straight Tail Black Fade White Tip" - tails_allowed = list("Vulpkanin Alt 5 (Straight Bushy)") + tails_allowed = list("Straight Bushy Tail") icon_state = "sbsilverfade" \ No newline at end of file diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi index 48198ff09014d7d7b71af3117277f352d1e154b1..4a9c56c8280da46c68cbc31fdd5fbefa492c6ede 100644 GIT binary patch delta 4305 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
  • dPV3`^dL-g0X zK=U1Ew0p~`XIj7{?P&2&Knf(Q=2goo`yTe4R@1^^^L{uzAmqPGi&jPb zP9Z6(zn0ezRJ~#bNj{fpRfNN4p)751Q2=bN7K$IOCeWpuRd1efnxvVvz;B$k)BI=6 zT$Q+*e2}7A&?D8G*DG7iFzt{Y+?W4RM${Up!X4C^d7%Ebuwen=v@~Btam|g zk{ZlYA<2>wLSc>rRa{+M*|g$b)b|F)UK)+IdWwfekrJr#PM8ER^}15dIu4Qcz%p_u zX4`uq?BlJ_LbIx0V!ytrKfedldCOA4nFjt44<*kn=l3~61Z1m%<0xRQ0xKcOH1}Mg zRyId7ZYcx7#FHX1%9rYXonGE0VEc_{_bKXP716)guVo9nMRG9ieR{l4j+*7{F zg@q)R)dfDC)7(~9^^c;0>pQuQBmELb?1;Gz@UP&wXG7Cyc&D6TgBmy2glNoL6I_m8EIc}hQ zE`Z-?Iya;lU{KbrER!B_OLYTRpa+L{+O%fV%N)Km@qJ|~{E55!gTIC{_5RV(GZ}kW z>8-{+W@7}h^~!EizT4BpzU#g>O&P-vc%}HWTpWG`QOGs9t9N#sIREdfeVk$verc3f z_+y>snZC9NAm@hMz02*4l5M1ATi+vx5oyKkQ>x z^X?tiqbwqSmdu;2|A589jI|Nxee`%dR5j=Ia(6|}i$=3JS7dK$g~e>blz^rhw{+w| z4Zu?RPR+^EMps)Hg|OXwSB#)YXdat`RifbqGWbXbrR_~mJP-0ZPpi78I?0BtgWb}W z!wnwFbea_Y(VPiOj9SCNrUby`TH eRVsw_LI#ILabxXNbYuK~DK^wI)vdVg67?U*Aj``D delta 4322 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 From e5e7ea27ec3a39d757cc9c0a68880a6737da37a5 Mon Sep 17 00:00:00 2001 From: KasparoVy <12377767+KasparoVy@users.noreply.github.com> Date: Tue, 27 Aug 2019 13:28:16 -0400 Subject: [PATCH 2/4] Turn Wingler Tail into a Tail Marking Allows Tajara to use tail markings and turns the wingler tail body accessory into a marking you can colour properly. Keeps some of the original naming to pay homage. --- .../living/carbon/human/body_accessories.dm | 7 ------- .../living/carbon/human/species/tajaran.dm | 2 +- .../tajaran/tajaran_tail_markings.dm | 7 +++++++ icons/mob/body_accessory.dmi | Bin 4567 -> 3548 bytes .../tajaran/tajaran_tail_markings.dmi | Bin 0 -> 791 bytes paradise.dme | 1 + 6 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm create mode 100644 icons/mob/sprite_accessories/tajaran/tajaran_tail_markings.dmi diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index f44ec079067..d1c2900cc8d 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -100,13 +100,6 @@ var/global/list/body_accessory_by_species = list("None" = null) return FALSE -/datum/body_accessory/tail/wingler_tail // Jay wingler fluff tail - name = "Striped Tail" - - icon_state = "winglertail" - animated_icon_state = "winglertail_a" - allowed_species = list("Tajaran") - /datum/body_accessory/tail/tiny //Pretty ambiguous as to what species it belongs to, tail could've been injured or docked. name = "Tiny Tail" icon_state = "tiny" diff --git a/code/modules/mob/living/carbon/human/species/tajaran.dm b/code/modules/mob/living/carbon/human/species/tajaran.dm index 6c8c2312e17..f441d4fab4d 100644 --- a/code/modules/mob/living/carbon/human/species/tajaran.dm +++ b/code/modules/mob/living/carbon/human/species/tajaran.dm @@ -26,7 +26,7 @@ species_traits = list(LIPS, CAN_BE_FAT) clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS - bodyflags = HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_HEAD_MARKINGS | HAS_BODY_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING + bodyflags = HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING dietflags = DIET_OMNI taste_sensitivity = TASTE_SENSITIVITY_SHARP reagent_tag = PROCESS_ORG diff --git a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm new file mode 100644 index 00000000000..971fe1ce7c5 --- /dev/null +++ b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm @@ -0,0 +1,7 @@ +/datum/sprite_accessory/body_markings/tail/tajara + icon = 'icons/mob/sprite_accessories/tajaran/tajaran_tail_markings.dmi' + species_allowed = list("Tajaran") + +/datum/sprite_accessory/body_markings/tail/tajara/taj_wingler_stripes //Tiger stripes. + name = "Tajaran Tail Stripes" + icon_state = "default_wingler" diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi index 4a9c56c8280da46c68cbc31fdd5fbefa492c6ede..5d304441f6713b5abcd51f2f3579589ec33a13ce 100644 GIT binary patch literal 3548 zcmZ8kXH*kPw*?|aX<|b_2=^i)2qa1kEpWjG2q;aYB!VC@bP}Qv5~Cn;1+fz8ARtJK zO6ZV;u5_d+U1>t-Az~7eJbdr1Z{7RtwPxm=IeV?yXRrA&6YpSmUUHxOJ^=v%$%_}P zt_TPS(tZyy!0wI^=YqxV0(P)`UO-7gt@LrNlMcoD-XPVDzBS=;Wr?Ih>3P4)FH% zxswNE5hsg6-H`DE*RoqX_LbqZr%_@8nAD0VO}>3=0s<287p*LuZl|wItVHA*9*Mm^ zCaj@$Jep4&!ycb_{4}OA2BnP40+#z7c%-rjUrue6B8u3z2o6rcg>E8L+4# zb(tT=3Fkc5SygUZVQB3{IBr`4Lm#qz_$S!a&DEZyNiMzC?rRcBP)<>|3|bM4J=ihx z_`8v3lgr3EgmEMq5Ea;&beVq!z19`nh~T(%W@3CsrN0?Ym{?6((AmTwO3b7Ydi=Ua zFx}=0nGn4e=?iElZbKBlyur;X4rg#IL$H7nXw3YntN73k!gzjf%>%t6AkqP|x|U@@r+L1kz4Nk&vQJ$=E?eUs+RjJ+zVe$n0^z5 z7tfbDy+OLh#e}X>bCVqS^;70PWW`TY)ZAgw|1;r#XY;@fj%hV;_LsNfzVUv>HtC9a z6w?PiHs;;Uh+S-#=C@(&>0DghUQ6#X(d z7^1kfK-VaN>K0j3zzh1VrKcOG?mTx6=eKY)rY5hzc(gQ9@p~NAh}Gn4JSZFxc;_7< z^Tv?77eL48N9V|p8x`;L68r6g!luw`!oL}^!K0tmZSoT@g6zC0xPQ1WkX4#?s5&vnqg(W5{#I}8 z{Q_Lb7vE2Qu`bF%WeabLx&^)WAn|%5Q%%phHW#GAR*^fb=iM@6G9|NhGjqx|jYH#*?&MuSyfI76vLp zw9HKbuB0TdW0ikijpPnVmyTq?1E!wfB@;o}YcE0`9#x-w3`b;1xn-%op~ED&*&=&^ z-RdX#!A8-5R^b4vck;S@5!`b1tDb$d#YdVP%YcQF6b33T?ve>PWbKlOPtP|xp4eWgYkocb>>1!xvOw&RZo zH~gJcg<;Of;>f9%vX2t>NHk|67s+vJw$hUV9b1v8ikb6C? z6tc53b^lOg2-osstFNe6ThVu|4-~9>CmZ(s_Gly#eZmAdcM*Hb-VwNcw(cfwc^V(i z>%SCxdsx$QSNlHZ%vwR{xFdj*AQj}f^_q&!tbK0Z+Afn~{Hh;{rv&oZ{UUbZKk)V5 zW*Mz=sP_ilD9wC4eW#LdcwCB3 zy_+1wzKlzuu4_l!4_3G$63GZ$SxR!P{K}vqyc+r%8!=Cg6W$sZ4C52jAqy~<+ecue z5#n@rm0k&St{f{%!B-26d&NLUHQ%qsw zn1cVjo&sRsERv;BGd2S;)?Cr5z|e_X&c8^}e!n#$&0J#BK9;*ZNRa#m@k5?a?Ume8 zEU}HA`Zfuz%|Ov^+1lx}fnL1aSm9;W zL-DcIRb-)m^|!u>v!Sd$X-R9=5eju?ph5N%Qqi2EdAe6-eJo`~r)#9asDPUDfXQ>4 zr++@bXc^&LKp9{x*-cPuS+!dhm5L=!Q*){Tt*B%KWi`s_M;%hF0YY{)D5UNge@1$3 z>0&;r3)}Wo|AMZdc-7sC)|#%28Vn&~J+I|YgI?fW=hb|RheiO;7UzCKy}uk2mRRAxMaB0dCweCbs^BbRihpI zRa?yaSaT5YiPZROk39L{L+H~m-CIr7leYh*1#TU6?^dbXvFfn;THY4a8gIYBcvfL6v1PgPqU?l;4;+y%hJF5MRPTZ%78n z*u5{y!Y| zIZ}rH(f@V$%#)xOC84hQA+|wF9vp`t=VY(+3w3&CRn`@#)cQY!jejUEnY}PhdnwC5 z)HR}qfLCC1u+~u`c}k5in|(ot^Xl)hYEMX(B!gaH^5EiJOLsl+D-v>mc8%4vLGw0L z!AlZy0?qFK$ugp2ugev*~MUhvy^^sU+E=HY{sC1Y@vo$RsEJi>6VXStm} z(U|}HE%{I2jAyVJcPQ)2^1cdxbunTK_S;kq1;bGTX|v+Z^xzbdW?uy&8y~t+b?N!- zYa!gI*;5K3@Ao(|F>vgNyDqq%m(1!o&@Xmv1@%;1G%Xoc0Mx*2drJnqBx$}5xRSWE zv7H@~w=5TfA2<$MWPe@|9c@#|RdaYA6Bu$M4eJ{UD9woa+1kd-s3%Y-ca9E*JWLT$ zni!`!5a00TpbbZ~G$pq%h((~J3Ax79a*c0e`0*J zI5%_32qWr9U4B_+(|{~ho;ei%>oT>3q9FamDA6qQW#Z6d6G5g<1MlXllu|Wrk!Rp$ zZm2ZJW9`^dW3V{ha|j`K7&L|7{#pRcP6D~~RwZ&q3Z^j2ZF^@|;MIf-7wEQxl)*a` zza1bZE~XFGnbOyDVC|RI2P-)xc?b@&39`X^=GsL>Dr->u0?fOxyM6I5h{0*v@Qy_O z%pM`dbOSI}SZrkqD|C@rZkPR0wGhSMz6E!oTv~zU-Dm7QWa3gt7(HwfAz5`RTi0x~ zF+MdoJnIuI2l#lt;qPuJ{lRp0UyUjgw5fiyaED*rSU32c>sm&Gop*q?s<8Bl8#fKS zeeU5O7f5@Kx6Z{G!0BM^KH6t45d%hcb~6HV$`&%rjeD|NdB6V>{{gKg-4urT$wuVk zgDI=aOdDx;2IqqEkq_YJ#ky0K9?o4$ct|97 zdhZr@=;R+tbEcvlGnYFpW2!!z<|t|=wSO(+y9b#B@+P*j6ch}z?oCpkI*ih;U(GbD zg$zOoit_%oykKF;W62?OzZIHDk=(X(lkUc&uO38tzT~Ad*B=^cNtCCm< zdy1xX8)Xi?!JTbW_%hFmp6>;fd^DV@q%$~=IXg{%r_PQoL8-lLR;*t{;(0l<{|}=D z^1d-R^FVnsYF|fCue67ESw!zz+HSqCgVHOli^aiiSk*1a%KLBa7!53JD^9aw1#l^N ZLH9obM?Mz_mj70A@vNOy*nc4ziCXLk0Tsj==w76BFp28N4z54Fr0 z7|tyId;WFyRHM&gTyQELni^VaqtWQj&d!pOl7WE%H8nLsK|v1>k5l8&&`?TBiU2>q zq@?8d__(;ZxUsP@8ylO5h)6&{0001piHYIo=MM`DtE;O!JwzcrS^IR`nV06q77X`( zVxOEY7DFr{FSXqKU0!(jz4Y*X#=rneFH1CIjgaH$$*MDvKd`zcQz#t5EcU9m;)+3q zVkPse{t3xPr*Onn?)TcW6Z+xocB+Z-ca_11uk?0Vzb@Ba(XDnUllO!brAaDY(z$Sy zv1yX6FyUmLzypx5>R05g4YLpC`)DtP@7cJqdDdH)^agKH6__bi&=wHt&%*6vBml_W z5R{N9YWXd?DQ(Xk2jyEONj`URGsNvY(Uw=hL1i zr|L-Km!?qxGWuaeRf@xdEYU}E@Cc=4!D&$r!i*&Y1BaQOmZl{veLDjmn0uE~M@Z?l zaU$^5X67Msd}&!U(Db9_ebd0|!-SeAv0oeYA`X@xGzpy|`p>|^W(Zk~U_z+(+3C=^ zzp3-IDVmLO+xcu0UkQ0i%N;05ILNuJf)Lh%!&D+eSbo+OOBuAv3f+?W<&Bi^ZF{@U z=IV3)uxG4Ndx+F~)uHxIdu^HMp)*p+G6?nBzb;bM^&#PAlDyr6)(b0^F1-HM&D(_H z=P?U5b)?YDHr;SaRQfTGifDcL=a~>EXPR5(QMY# za{(XUW<50?RP0AOW^|fH6QoLB&@2S~KePWx^q~$?^>v-Dut-@%2L;-Ow7Y<{h1wlX z43oE_&URqzUGdIttNr~5-@<7Em9{3<4}wxlD-bZw{6~gQQ`Qh?PObYj#FnM?^>mh$ zvEe5y--L*m#A=0rz@GenU^0cVK)ly0-=kxd+GFmngPLHFK+{%KK|_Z9B1Er~@qE(z z;b6c}p`Sd}TY=^W(xv*{na?x_+@uuUSc-}KVDwGMREIQM)`AAT2v-^zF5c}gEfR?@ zGqQkFu1W1lz>^woRfBe7YSExzfNXx_(AD=<)Ihh}rHUes)T3wOV-HyaH?g^t8n zJH_26PY)ca6EVq*HbjMRf2Pv#fs@UC;$F|K=$4+Qeqjzgn{9n z$74{#j=+FRqB)en!aF{!0qkBqzaX0sD5o#cpS$Uv(v2jnHrItx48G~w-%l%*{jS<= zG&U?75580}R>ISkDg;H#Gv`epLRNyfsK1_o@}mwePP-@b-!-PVlSgW{6`jxEIs1q> zyUBx^m=zOZwx_$5$Bbef+UIleBp(p9Y11a^dW4(l=KpB=yNo%r&hbl@0}y!)4xc6U z`x<3DT0#`M4lZ+i2{<=AQ{vbyniNQ>5#il%kLk?12Tcr?zb)-uL^$})5To3Gq!&^D z`W7sRv#PfB3omT#NPOn5X;LY)gd9zlZsl_O3qN{6n)ID zUJV_8ZRbpB+LtPm>}{$&>0x6L{rr_ ze%v=I*+Y*t{=gWtg z@}Vs+u3m{vKls>fcFj}Ws7TEp?uX9T`1Ve<0-}TfQ@2!|udWrQC}?3nji)Llca*cU zn0$uU9Qi)pKB69!h@c`mdY5!DJ&9Wv0@k|zS#6v^Bom1%hvOAGx-yfN4W;#tLkQso z(wRTtVQ6J7Cp%B0%&_mLyFTaavfcm^F@4jnK5xQED3gK2!V;a@r*ANSucXA*Z$=5K zpcStHczP(k`j@|(DCl@aZ;MF^Ayci0n2=5*u}>b=os;lraB0s=a24O6WNVruAyO-Z zD<0fiOm>ezZ*EQ4yLDnOf-bH+mPC*>yIA4VJN&CU=oaP&O zTyl}@qF6V_#nkhs-b+utgF1$GU@BS4a$=CUs_zzyvp=<#j@+QtJweG{{K|?l~PbZZ7YB^>AjmD^;vic0-FyVL@mpVCId3xXzrD%Zbr?vqq2j! zRo~nH-umR^amJUsEelc4y>49@@RI+e6h&{uq^$LuRwk4(6*X%<|*Uv9U(( z=2lz4a>f0>w^6)`aG?DPvbGqsO$7WY>M)UnP3_e?3%0Vi zf3i-n#I?<5k_$XQE3*P@!#uU7vt@H?dHs z$}F#W!rYihE|iEk_s3cd(-J1;xpBudk4>GB0gx*Q=}jFo#UE^X_4p{?Ubc}(;L=CX zHngXi;wZbgI~e+Dtwf|8CFxiHfm}VSoRx!yu0L`j#x70RR0>mg0LEaKhDzm- z+v5yV*7Q5oJARGn8kWy^{DEK{`b%0KlJbM*k!h{&RQ&=IMlnK)R4SD?9PdU+sK|w6@AqG^M250+h17AfaTP_ zE2HJrE4X=@;yR(Pl^A+IW~CJFaK`j-#VhfHofCo$_w3k@~EUBfNV z`d^}_X)k6*&pa12XF0Jh;H{rbbgsj#*BQ@WjdI=^xX=$M_a@CJ??9a7qcz&f?42Hj zJr2LU%??1Rt-b|Jint~Tb$UXdHj{Pl<}I@yKi@u#~Zu~)_h6WIRZ7QTFw zaOLBU=pAFZL~1Fsb=au4;LAXmDLZufqqJW#+zbAZCE>Cm&_Jqkn=O0(I_h}9RQYYA zC47Qq9qYUBfv(jcAX9G;-)2>Y)%z5hPnHUDZr|fk(1#lZEmpx-<@=wseLt!(!C#lj z%|>@zs4=PZW3&e=V0+C{Z>L*vdhx_uAB=8hM$P@HtMx92;@y#NsUoFWRDKdSwYUz! zOA-4O%9^Adz(eZC+OXK0wn^tQy`^%Jtj>xZG+iRvjYTu||4jm!vnx?}o45NpkGl4T zzA;U896BV=AnCn^TJWid{D_02ii@RIi_fFpeHV;kic&j$u2C7SvX{060vAVD=*{D@ zS!ie0ZBax5iHp;l`lfrTyU4S7G`yjxi`240ufM@nABIpedZnSm_t!{q*f6c`P32j@ zFP!d4L_`29_1VDL*(+(2QLXL6+1^iZ>WDwoE2OV(WLTq;dhJyx^;gC$G(&ZAnD%xb z+4R7%&9(XLOAX`{^q~r{Z>x{y{@$(sx*3M&&-d|z{%jW%f z^=EQ|nvitzriFRJ)5{V)Hy}sH4_YaMzBVr`xRdcg6AxEUO8G{2P$vsY}!l<}Z9Mp`y%k52W zL%qAq!J(t2*%RYv3aWz zb1N;d5DIR6@SzA!7E?d15*D%g*NDIqO%&LZ7Jmugafw=Ks5HfjsD<7G%V39&rMip? zeyh)h#7C^-ct(c<$>->;29kZhZ;_V(T%#rx+A~6yux^Q*tT<-2iHp_g2-q3zgRzoP z?KVPACbCI`%EVz{ZVOJ=)}(%8-8!xt;+kUrELoC8(p0BUrd=drG@FTIm5TVy0y?`{ WQA5piWJBz~`RZvKYn9)3iuf0bThl`T diff --git a/icons/mob/sprite_accessories/tajaran/tajaran_tail_markings.dmi b/icons/mob/sprite_accessories/tajaran/tajaran_tail_markings.dmi new file mode 100644 index 0000000000000000000000000000000000000000..f8fe1e1c7edb17d10a29dadd9e375b8a5bad778e GIT binary patch literal 791 zcmV+y1L*vTP)fFDZ*Bkp zc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LY zR3K9+B{eOvG^ZrKJTosnC$%WPSc!`>C9|j)WB?auT2W$dDu``}Q%5;2E#^Sc)SSdh zkZv6$$i-Qd3e=kdHdR@{)z1a&Z~!F%H;}pg0$2b50vJg|K~#90?VDjz#4rejo9qRm zCqPfINAUiqvUR4m5CSA^)EVFR$IUiCg4>x#OO^!y0001>mm)rw)FWY z>}v|&6CLBmKZMT4_2nu>MEZDD@#;@1opgVwzz}Iq`?y^y?Mnz27;;PdI4^4Xu$5tZ zfQto2^PWrMZ`=|90000W%vD9<*^5WB+7weYx%C56y1F=&TD5Jja#(LK0#tEKEzQa8 zb&ds4R{eiPpk^lg5-aac$r86sKYoh77u`_*&LuZRZjI&`s}%=ByaTzPi#J-HEd8hN z9{>OV0RNCph3oR%dZ^2FlUYB|iYAlN)?X7-&rbc&6yX%xfLlMbHTZtTtYyaP2S!%3 z_|bnfRzL6n^|X`r9IPL>yV`OtW&TU9kLeKr00000f}J}T9!r*peUG$~3bCxRnm_q{ zscpmp?A{ltBuU6|DZiC+#12qh6{=cF&9ZKif79DPB$Fl+E^Del|B#K`BHv-8f2fnf zJo^1Z7xDXtuHyC&0RR910D!+k|M`PH?m0j3tISSO?EJwn_aAVU0VW)9W=uVQ@Co8r V6O|LORMG$d002ovPDHLkV1hcgSz-VH literal 0 HcmV?d00001 diff --git a/paradise.dme b/paradise.dme index efb27499c47..31faf0f0469 100644 --- a/paradise.dme +++ b/paradise.dme @@ -2029,6 +2029,7 @@ #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_hair.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_head_accessories.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_head_markings.dm" +#include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_tail_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\unathi\unathi_alt_heads.dm" #include "code\modules\mob\new_player\sprite_accessories\unathi\unathi_body_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\unathi\unathi_facial_hair.dm" From cdca2ac360d83cec37d58e9cfb38f58b1ca7d9a8 Mon Sep 17 00:00:00 2001 From: KasparoVy <12377767+KasparoVy@users.noreply.github.com> Date: Tue, 27 Aug 2019 18:15:49 -0400 Subject: [PATCH 3/4] Moves Short Tail Tip marking to a Shared Marking File Uses a 'shared' directory to avoid dirtying up species-specific files. --- .../shared/shared_tail_markings.dm | 8 ++++++++ .../vulpkanin/vulpkanin_tail_markings.dm | 6 ------ .../shared/shared_tail_markings.dmi | Bin 0 -> 380 bytes .../vulpkanin/vulpkanin_tail_markings.dmi | Bin 13262 -> 12988 bytes paradise.dme | 1 + 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm create mode 100644 icons/mob/sprite_accessories/shared/shared_tail_markings.dmi diff --git a/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm new file mode 100644 index 00000000000..ea1176ff738 --- /dev/null +++ b/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm @@ -0,0 +1,8 @@ +/datum/sprite_accessory/body_markings/tail/shared + icon = 'icons/mob/sprite_accessories/shared/shared_tail_markings.dmi' + +/datum/sprite_accessory/body_markings/tail/shared/short_tip //Species-ambiguous, generic short tail. + name = "Short Tail Tip" + species_allowed = list("Vulpkanin", "Tajaran") + tails_allowed = list("Short Tail") + icon_state = "short" diff --git a/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm index ae6953f7f44..05060d3c676 100644 --- a/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dm @@ -15,12 +15,6 @@ tails_allowed = list("Bushy Tail") icon_state = "bushfluff" -/datum/sprite_accessory/body_markings/tail/vulpkanin/short_tip //Species-ambiguous, generic short tail. - name = "Short Tail Tip" - species_allowed = list("Vulpkanin", "Tajaran") - tails_allowed = list("Short Tail") - icon_state = "short" - /datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_hybrid_tip name = "Vulpkanin Bushy Straight Tail Tip" tails_allowed = list("Straight Bushy Tail") diff --git a/icons/mob/sprite_accessories/shared/shared_tail_markings.dmi b/icons/mob/sprite_accessories/shared/shared_tail_markings.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3cbc5cb0e1257192297ae2d680268ce623893213 GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvS8AxUb{c{0QYymzYt_Kc)#I>(4Tn3~VOM?7@ z862M7NCR@}szM@4TvCgZi!uvJGV}8o7%JujhZPi+e*Y3&@bT*tEpJ_|b7#&6ZwNKG zX#C)j&UqirlMF>Yy*n(7gN!d5dnwF$H0j8s5QX5C7RviqsO*dA>^4^2yh370Z@2MU z4MTI$BW5na;eFly@;%@dTsqKkpwwr``F@LY6uhTWOj-oaM3c z#fr+h9ja&QI-l|}NC_;}HbPEwTo5qn&wPE>Jm_N0g;e)%4=Q=;3X-D79iSb+Tv2G5-2ko>;pZ0ZGuDS9vJM{B^#;!<4 Y)wBFuA4~GL0$s`A>FVdQ&MBb@08UPqz5oCK literal 0 HcmV?d00001 diff --git a/icons/mob/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dmi b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dmi index 28a247c39fe699d1265a4838b97356a50450d65f..ee1dc7298760c889089d9324abb4d706b532b529 100644 GIT binary patch literal 12988 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 K`lS~fAN(&4dmjD( literal 13262 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 diff --git a/paradise.dme b/paradise.dme index 31faf0f0469..8c705176f0f 100644 --- a/paradise.dme +++ b/paradise.dme @@ -2023,6 +2023,7 @@ #include "code\modules\mob\new_player\sprite_accessories\kidan\kidan_head_accessories.dm" #include "code\modules\mob\new_player\sprite_accessories\kidan\kidan_head_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\nucleation\nucleation_face.dm" +#include "code\modules\mob\new_player\sprite_accessories\shared\shared_tail_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\skrell\skrell_face.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_body_markings.dm" #include "code\modules\mob\new_player\sprite_accessories\tajaran\tajaran_facial_hair.dm" From 2e785ebba0f176616a892d73a25bc218eba68c4f Mon Sep 17 00:00:00 2001 From: KasparoVy <12377767+KasparoVy@users.noreply.github.com> Date: Tue, 27 Aug 2019 21:15:13 -0400 Subject: [PATCH 4/4] Re-Add Wingler Tail Body Accessory & Fix Bright Pixel on Marking Re-adds the wingler body accessory. One of the pixels in the wagging animation of the striped tail marking was significantly brighter than the rest. --- .../living/carbon/human/body_accessories.dm | 6 ++++++ icons/mob/body_accessory.dmi | Bin 3548 -> 4567 bytes .../tajaran/tajaran_tail_markings.dmi | Bin 791 -> 811 bytes 3 files changed, 6 insertions(+) diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index d1c2900cc8d..9c677444eb5 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -100,6 +100,12 @@ var/global/list/body_accessory_by_species = list("None" = null) return FALSE +/datum/body_accessory/tail/wingler_tail // Jay wingler fluff tail + name = "Striped Tail" + icon_state = "winglertail" + animated_icon_state = "winglertail_a" + allowed_species = list("Tajaran") + /datum/body_accessory/tail/tiny //Pretty ambiguous as to what species it belongs to, tail could've been injured or docked. name = "Tiny Tail" icon_state = "tiny" diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi index 5d304441f6713b5abcd51f2f3579589ec33a13ce..4a9c56c8280da46c68cbc31fdd5fbefa492c6ede 100644 GIT binary patch literal 4567 zcmZvecT^L~(!ddkUO)knP5=u?69S49DG{Ye?+|GL0g)ys0s%}y@rqKff)u3)Nbew_ zLm)KiNDDPoDG@_UfP^HE_nr6s^PYRoo;f>nc4ziCXLk0Tsj==w76BFp28N4z54Fr0 z7|tyId;WFyRHM&gTyQELni^VaqtWQj&d!pOl7WE%H8nLsK|v1>k5l8&&`?TBiU2>q zq@?8d__(;ZxUsP@8ylO5h)6&{0001piHYIo=MM`DtE;O!JwzcrS^IR`nV06q77X`( zVxOEY7DFr{FSXqKU0!(jz4Y*X#=rneFH1CIjgaH$$*MDvKd`zcQz#t5EcU9m;)+3q zVkPse{t3xPr*Onn?)TcW6Z+xocB+Z-ca_11uk?0Vzb@Ba(XDnUllO!brAaDY(z$Sy zv1yX6FyUmLzypx5>R05g4YLpC`)DtP@7cJqdDdH)^agKH6__bi&=wHt&%*6vBml_W z5R{N9YWXd?DQ(Xk2jyEONj`URGsNvY(Uw=hL1i zr|L-Km!?qxGWuaeRf@xdEYU}E@Cc=4!D&$r!i*&Y1BaQOmZl{veLDjmn0uE~M@Z?l zaU$^5X67Msd}&!U(Db9_ebd0|!-SeAv0oeYA`X@xGzpy|`p>|^W(Zk~U_z+(+3C=^ zzp3-IDVmLO+xcu0UkQ0i%N;05ILNuJf)Lh%!&D+eSbo+OOBuAv3f+?W<&Bi^ZF{@U z=IV3)uxG4Ndx+F~)uHxIdu^HMp)*p+G6?nBzb;bM^&#PAlDyr6)(b0^F1-HM&D(_H z=P?U5b)?YDHr;SaRQfTGifDcL=a~>EXPR5(QMY# za{(XUW<50?RP0AOW^|fH6QoLB&@2S~KePWx^q~$?^>v-Dut-@%2L;-Ow7Y<{h1wlX z43oE_&URqzUGdIttNr~5-@<7Em9{3<4}wxlD-bZw{6~gQQ`Qh?PObYj#FnM?^>mh$ zvEe5y--L*m#A=0rz@GenU^0cVK)ly0-=kxd+GFmngPLHFK+{%KK|_Z9B1Er~@qE(z z;b6c}p`Sd}TY=^W(xv*{na?x_+@uuUSc-}KVDwGMREIQM)`AAT2v-^zF5c}gEfR?@ zGqQkFu1W1lz>^woRfBe7YSExzfNXx_(AD=<)Ihh}rHUes)T3wOV-HyaH?g^t8n zJH_26PY)ca6EVq*HbjMRf2Pv#fs@UC;$F|K=$4+Qeqjzgn{9n z$74{#j=+FRqB)en!aF{!0qkBqzaX0sD5o#cpS$Uv(v2jnHrItx48G~w-%l%*{jS<= zG&U?75580}R>ISkDg;H#Gv`epLRNyfsK1_o@}mwePP-@b-!-PVlSgW{6`jxEIs1q> zyUBx^m=zOZwx_$5$Bbef+UIleBp(p9Y11a^dW4(l=KpB=yNo%r&hbl@0}y!)4xc6U z`x<3DT0#`M4lZ+i2{<=AQ{vbyniNQ>5#il%kLk?12Tcr?zb)-uL^$})5To3Gq!&^D z`W7sRv#PfB3omT#NPOn5X;LY)gd9zlZsl_O3qN{6n)ID zUJV_8ZRbpB+LtPm>}{$&>0x6L{rr_ ze%v=I*+Y*t{=gWtg z@}Vs+u3m{vKls>fcFj}Ws7TEp?uX9T`1Ve<0-}TfQ@2!|udWrQC}?3nji)Llca*cU zn0$uU9Qi)pKB69!h@c`mdY5!DJ&9Wv0@k|zS#6v^Bom1%hvOAGx-yfN4W;#tLkQso z(wRTtVQ6J7Cp%B0%&_mLyFTaavfcm^F@4jnK5xQED3gK2!V;a@r*ANSucXA*Z$=5K zpcStHczP(k`j@|(DCl@aZ;MF^Ayci0n2=5*u}>b=os;lraB0s=a24O6WNVruAyO-Z zD<0fiOm>ezZ*EQ4yLDnOf-bH+mPC*>yIA4VJN&CU=oaP&O zTyl}@qF6V_#nkhs-b+utgF1$GU@BS4a$=CUs_zzyvp=<#j@+QtJweG{{K|?l~PbZZ7YB^>AjmD^;vic0-FyVL@mpVCId3xXzrD%Zbr?vqq2j! zRo~nH-umR^amJUsEelc4y>49@@RI+e6h&{uq^$LuRwk4(6*X%<|*Uv9U(( z=2lz4a>f0>w^6)`aG?DPvbGqsO$7WY>M)UnP3_e?3%0Vi zf3i-n#I?<5k_$XQE3*P@!#uU7vt@H?dHs z$}F#W!rYihE|iEk_s3cd(-J1;xpBudk4>GB0gx*Q=}jFo#UE^X_4p{?Ubc}(;L=CX zHngXi;wZbgI~e+Dtwf|8CFxiHfm}VSoRx!yu0L`j#x70RR0>mg0LEaKhDzm- z+v5yV*7Q5oJARGn8kWy^{DEK{`b%0KlJbM*k!h{&RQ&=IMlnK)R4SD?9PdU+sK|w6@AqG^M250+h17AfaTP_ zE2HJrE4X=@;yR(Pl^A+IW~CJFaK`j-#VhfHofCo$_w3k@~EUBfNV z`d^}_X)k6*&pa12XF0Jh;H{rbbgsj#*BQ@WjdI=^xX=$M_a@CJ??9a7qcz&f?42Hj zJr2LU%??1Rt-b|Jint~Tb$UXdHj{Pl<}I@yKi@u#~Zu~)_h6WIRZ7QTFw zaOLBU=pAFZL~1Fsb=au4;LAXmDLZufqqJW#+zbAZCE>Cm&_Jqkn=O0(I_h}9RQYYA zC47Qq9qYUBfv(jcAX9G;-)2>Y)%z5hPnHUDZr|fk(1#lZEmpx-<@=wseLt!(!C#lj z%|>@zs4=PZW3&e=V0+C{Z>L*vdhx_uAB=8hM$P@HtMx92;@y#NsUoFWRDKdSwYUz! zOA-4O%9^Adz(eZC+OXK0wn^tQy`^%Jtj>xZG+iRvjYTu||4jm!vnx?}o45NpkGl4T zzA;U896BV=AnCn^TJWid{D_02ii@RIi_fFpeHV;kic&j$u2C7SvX{060vAVD=*{D@ zS!ie0ZBax5iHp;l`lfrTyU4S7G`yjxi`240ufM@nABIpedZnSm_t!{q*f6c`P32j@ zFP!d4L_`29_1VDL*(+(2QLXL6+1^iZ>WDwoE2OV(WLTq;dhJyx^;gC$G(&ZAnD%xb z+4R7%&9(XLOAX`{^q~r{Z>x{y{@$(sx*3M&&-d|z{%jW%f z^=EQ|nvitzriFRJ)5{V)Hy}sH4_YaMzBVr`xRdcg6AxEUO8G{2P$vsY}!l<}Z9Mp`y%k52W zL%qAq!J(t2*%RYv3aWz zb1N;d5DIR6@SzA!7E?d15*D%g*NDIqO%&LZ7Jmugafw=Ks5HfjsD<7G%V39&rMip? zeyh)h#7C^-ct(c<$>->;29kZhZ;_V(T%#rx+A~6yux^Q*tT<-2iHp_g2-q3zgRzoP z?KVPACbCI`%EVz{ZVOJ=)}(%8-8!xt;+kUrELoC8(p0BUrd=drG@FTIm5TVy0y?`{ WQA5piWJBz~`RZvKYn9)3iuf0bThl`T literal 3548 zcmZ8kXH*kPw*?|aX<|b_2=^i)2qa1kEpWjG2q;aYB!VC@bP}Qv5~Cn;1+fz8ARtJK zO6ZV;u5_d+U1>t-Az~7eJbdr1Z{7RtwPxm=IeV?yXRrA&6YpSmUUHxOJ^=v%$%_}P zt_TPS(tZyy!0wI^=YqxV0(P)`UO-7gt@LrNlMcoD-XPVDzBS=;Wr?Ih>3P4)FH% zxswNE5hsg6-H`DE*RoqX_LbqZr%_@8nAD0VO}>3=0s<287p*LuZl|wItVHA*9*Mm^ zCaj@$Jep4&!ycb_{4}OA2BnP40+#z7c%-rjUrue6B8u3z2o6rcg>E8L+4# zb(tT=3Fkc5SygUZVQB3{IBr`4Lm#qz_$S!a&DEZyNiMzC?rRcBP)<>|3|bM4J=ihx z_`8v3lgr3EgmEMq5Ea;&beVq!z19`nh~T(%W@3CsrN0?Ym{?6((AmTwO3b7Ydi=Ua zFx}=0nGn4e=?iElZbKBlyur;X4rg#IL$H7nXw3YntN73k!gzjf%>%t6AkqP|x|U@@r+L1kz4Nk&vQJ$=E?eUs+RjJ+zVe$n0^z5 z7tfbDy+OLh#e}X>bCVqS^;70PWW`TY)ZAgw|1;r#XY;@fj%hV;_LsNfzVUv>HtC9a z6w?PiHs;;Uh+S-#=C@(&>0DghUQ6#X(d z7^1kfK-VaN>K0j3zzh1VrKcOG?mTx6=eKY)rY5hzc(gQ9@p~NAh}Gn4JSZFxc;_7< z^Tv?77eL48N9V|p8x`;L68r6g!luw`!oL}^!K0tmZSoT@g6zC0xPQ1WkX4#?s5&vnqg(W5{#I}8 z{Q_Lb7vE2Qu`bF%WeabLx&^)WAn|%5Q%%phHW#GAR*^fb=iM@6G9|NhGjqx|jYH#*?&MuSyfI76vLp zw9HKbuB0TdW0ikijpPnVmyTq?1E!wfB@;o}YcE0`9#x-w3`b;1xn-%op~ED&*&=&^ z-RdX#!A8-5R^b4vck;S@5!`b1tDb$d#YdVP%YcQF6b33T?ve>PWbKlOPtP|xp4eWgYkocb>>1!xvOw&RZo zH~gJcg<;Of;>f9%vX2t>NHk|67s+vJw$hUV9b1v8ikb6C? z6tc53b^lOg2-osstFNe6ThVu|4-~9>CmZ(s_Gly#eZmAdcM*Hb-VwNcw(cfwc^V(i z>%SCxdsx$QSNlHZ%vwR{xFdj*AQj}f^_q&!tbK0Z+Afn~{Hh;{rv&oZ{UUbZKk)V5 zW*Mz=sP_ilD9wC4eW#LdcwCB3 zy_+1wzKlzuu4_l!4_3G$63GZ$SxR!P{K}vqyc+r%8!=Cg6W$sZ4C52jAqy~<+ecue z5#n@rm0k&St{f{%!B-26d&NLUHQ%qsw zn1cVjo&sRsERv;BGd2S;)?Cr5z|e_X&c8^}e!n#$&0J#BK9;*ZNRa#m@k5?a?Ume8 zEU}HA`Zfuz%|Ov^+1lx}fnL1aSm9;W zL-DcIRb-)m^|!u>v!Sd$X-R9=5eju?ph5N%Qqi2EdAe6-eJo`~r)#9asDPUDfXQ>4 zr++@bXc^&LKp9{x*-cPuS+!dhm5L=!Q*){Tt*B%KWi`s_M;%hF0YY{)D5UNge@1$3 z>0&;r3)}Wo|AMZdc-7sC)|#%28Vn&~J+I|YgI?fW=hb|RheiO;7UzCKy}uk2mRRAxMaB0dCweCbs^BbRihpI zRa?yaSaT5YiPZROk39L{L+H~m-CIr7leYh*1#TU6?^dbXvFfn;THY4a8gIYBcvfL6v1PgPqU?l;4;+y%hJF5MRPTZ%78n z*u5{y!Y| zIZ}rH(f@V$%#)xOC84hQA+|wF9vp`t=VY(+3w3&CRn`@#)cQY!jejUEnY}PhdnwC5 z)HR}qfLCC1u+~u`c}k5in|(ot^Xl)hYEMX(B!gaH^5EiJOLsl+D-v>mc8%4vLGw0L z!AlZy0?qFK$ugp2ugev*~MUhvy^^sU+E=HY{sC1Y@vo$RsEJi>6VXStm} z(U|}HE%{I2jAyVJcPQ)2^1cdxbunTK_S;kq1;bGTX|v+Z^xzbdW?uy&8y~t+b?N!- zYa!gI*;5K3@Ao(|F>vgNyDqq%m(1!o&@Xmv1@%;1G%Xoc0Mx*2drJnqBx$}5xRSWE zv7H@~w=5TfA2<$MWPe@|9c@#|RdaYA6Bu$M4eJ{UD9woa+1kd-s3%Y-ca9E*JWLT$ zni!`!5a00TpbbZ~G$pq%h((~J3Ax79a*c0e`0*J zI5%_32qWr9U4B_+(|{~ho;ei%>oT>3q9FamDA6qQW#Z6d6G5g<1MlXllu|Wrk!Rp$ zZm2ZJW9`^dW3V{ha|j`K7&L|7{#pRcP6D~~RwZ&q3Z^j2ZF^@|;MIf-7wEQxl)*a` zza1bZE~XFGnbOyDVC|RI2P-)xc?b@&39`X^=GsL>Dr->u0?fOxyM6I5h{0*v@Qy_O z%pM`dbOSI}SZrkqD|C@rZkPR0wGhSMz6E!oTv~zU-Dm7QWa3gt7(HwfAz5`RTi0x~ zF+MdoJnIuI2l#lt;qPuJ{lRp0UyUjgw5fiyaED*rSU32c>sm&Gop*q?s<8Bl8#fKS zeeU5O7f5@Kx6Z{G!0BM^KH6t45d%hcb~6HV$`&%rjeD|NdB6V>{{gKg-4urT$wuVk zgDI=aOdDx;2IqqEkq_YJ#ky0K9?o4$ct|97 zdhZr@=;R+tbEcvlGnYFpW2!!z<|t|=wSO(+y9b#B@+P*j6ch}z?oCpkI*ih;U(GbD zg$zOoit_%oykKF;W62?OzZIHDk=(X(lkUc&uO38tzT~Ad*B=^cNtCCm< zdy1xX8)Xi?!JTbW_%hFmp6>;fd^DV@q%$~=IXg{%r_PQoL8-lLR;*t{;(0l<{|}=D z^1d-R^FVnsYF|fCue67ESw!zz+HSqCgVHOli^aiiSk*1a%KLBa7!53JD^9aw1#l^N ZLH9obM?Mz_mj70A@vNOy*~sKb_wYC=c?XkYq&FS{s7AiK`|L0A?50001hUW)i$S{-HQD0F_!qFs^QaLKeO zsq$fYeAl{s$cW5gPJhV^FhFJwDQ7dl%A1iCWqzgPI*FIg#G0R4A9<0S_7yRf#y=`q zLo_Kodu4rTz1G)ofMxl*Hky7$o)rK9004kL=4r`tw{or#>T$ppFaQq z0090Wy9(Fkxqr2&%XO1kKhTCIlhVGwCZ?X9`k^VpDK-JOerRj(<@c?& z5d*OIzDOlWLXJ!Mt&}5nfaw)PS={|Y0000007E>!s2S4#J^1>6J_1MT{{VCP|Nip_GHLgmKbWHbh(@1% t?EFC+$A0#Jvui(n{=l=JJ%3=@e**?Y77x#OO^!y0001>mm)rw)a%GnI?;KN9YGXJLJI*F&r#D?$M9Qh?V<1=C{ zjbBuGTa<2dY0002|Fta7g-O9N}sLRU}DyYjoRA3km zM(k?}-xD3<#y^D4#`WbYMMU~|Rq^UiDxGwHsK5|uPy4uCD(y=Me-;>WOZzx4YWc90 zVS9j!1xE9pOX6?b5&!@I03gg&Md8_tN3+@#Q#HBu15>)XIFwqoZLe}zZ!ZE=aZD}E z$?bKH1yEM~e?_2XCj1gB?@q}Qw@p8OioO@!Q2)*)H$`rZ<`}CL2SdCAxu1(STAnQZ zr|%yC00030kWGc_fAZXVsLOSeSwGN?EUlUW$PW{jn;S}3|TR*fl_