From 3dd79b6729890a4a309199de648abb646d106eca Mon Sep 17 00:00:00 2001 From: Atermonera Date: Thu, 6 Aug 2020 11:46:04 -0700 Subject: [PATCH 1/2] Merge pull request #7409 from listerla/headtailnames Adjusts Skrellian hair names to fit descriptions on wiki --- .../mob/new_player/sprite_accessories.dm | 16 ++++++++-------- icons/mob/human_face.dmi | Bin 109456 -> 109456 bytes icons/mob/human_face_m.dmi | Bin 162659 -> 162658 bytes 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 2bf54878b2d..a875b8a5744 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -1126,23 +1126,23 @@ //Skrell 'hairstyles' skr_tentacle_veryshort - name = "Skrell Very Short Tentacles" - icon_state = "skrell_hair_veryshort" + name = "Skrell Short Tentacles" + icon_state = "skrell_hair_short" species_allowed = list(SPECIES_SKRELL) gender = MALE skr_tentacle_short - name = "Skrell Short Tentacles" - icon_state = "skrell_hair_short" - species_allowed = list(SPECIES_SKRELL) - - skr_tentacle_average name = "Skrell Average Tentacles" icon_state = "skrell_hair_average" species_allowed = list(SPECIES_SKRELL) - skr_tentacle_verylong + skr_tentacle_average name = "Skrell Long Tentacles" + icon_state = "skrell_hair_long" + species_allowed = list(SPECIES_SKRELL) + + skr_tentacle_verylong + name = "Skrell Very Long Tentacles" icon_state = "skrell_hair_verylong" species_allowed = list(SPECIES_SKRELL) gender = FEMALE diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index baffef6647bb5ccfee9bd227e61ade1a744bdea7..0d607dd537110a89c8c781a9fa65376946ce85e5 100644 GIT binary patch delta 1575 zcmV+?2H5$K*9MT+29P^{j^#EET~~d@MY10x{g}+AH-ioay-0q+plw=WSr#2ivg_8@ z&%)Q$)q_g)VbAVf;Ls8&@o`A~eEIk9|M~Lg<~$;oA8|$PKk#Z7sx!!&Kr_62dBs`#c}H6PKM}w_$7~#2{!s@ zOd}i}wxl_r;0MkFg&o(EI{_k8yH%xxM1YsqW_yPUB+X$m$pLrUL}GB(XqMn>8D-(2 zxpjpNy7`q&ngbVjOJ$Xrudo6VXflO!x&zxA3G7pWQ(_oh$O2P_Z8B4!1@^zdxhD8{ zld%Cz5AavAiaX`1%Sxj*Sk1qhlMDhLf03dWGLuPya?(wvM78Q&s6@5uT`8(%1itBG z2a>_B&`#3`!IS2IhSg0U4^`a)e>KoHn?824-k0nwFaA5==W#JL~ z5(&I(5A!jq9x71jp{z3FT5>6Ptw=e*g*5DrC%u-D`-TOdo5<2?_4IgF&V!^r`#Q`Ud7?$qb#b&$Oj5FD4Hlq0UfpSZRh{5FRn_E53(S)b0~voa zkO$>b$zkz>)_?E{d~~t~*y^r?d;~h)*b4i??&K<~c~LO*mf1KZw7~hQaU?OM6>v6$ zHPHj?jXreWvh%b&(LGX{N~8^E2T5~aqf~LG+VIGxtxxO_D2e$A4z{Ly`PBo4b*#H& zPk!eGXZlI^2`d0^rNHQcM+wn`?my7cdFrv zVw0h&!SFNX{}XPw)auCJzA4>7u}X0*6ht6YB~nRF;g zI`O`;WYLk|+Sseg)5b>lR6sMAsA$D{>H%8#gjWw4-`K9+HrfmQOH{}iU$mvMq15fV zl!a3Izb*`XHmB<#HN&|8lR<5|7Z%&tuHb>5<6pHxX);M~R2;8Z;V8Bx2ezG{;lZg^ zAf%D~>}Hf5DW6MmxWMgXW?p~cTc(e${z6pCG``(H{X66CGI`88n(FEaV0|-agm~gt zm0UdwfbU7Z$wf%>|JeZtqkwf_BZ+lS!Xdf1Av~2myEd!LZ}G#wJL(K|Bwjqz`A$#% zm30o{%BG9pzSl}L)y383fyu~WTo2XhTXvKlMMnPKtmBRFesd2n1)YCVZ8cAV+@-)% zz5h+7lqy@M>dry%3H|FAM{ie=H+#>)iYIFL`;oHBeD%J8@e~9v`Zcn+2(POi3Pu@c zuzm+I-5nhd(|v4|ybJi6_=D-X^7sR9BZnwCaVe@iHGpc%_(hX$^RXKy5<$LnXN?3n)*$z1SJ)G6TLXPzW* zeja`)eG1@1ZFx2nSNbb5GB^P^f|ewF9=yp0kNa;Nuh$*E3x#^ArOj`w@$=>PKR;hS Z|MBJizuudmeGfBOPlMM6x7P*%xumKV7$5)u delta 1575 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 delta 1754 zcmV<01||98_6g(m36Lazu6k5hbVOxyV{&P5bZKvH004NL&05Qn-8K$gcYnpLWIvVo zk<7-MDW|5qNPa;DNf3z^MJOOC_3f|ELRal}%4r{XHnY38>Odq&;&p%@FaP=Nzn}iN zeEj{>{l->A^X0?k-M@aizuRT3@$%vF_RalWWC^hze@dmwmk*bJAAY#M8^y}y!{z7u zyUA$b&&isROQ$DIt(`LIhKBNKe+qcM%Jci58VfPx=57j`^X7#~TjE3;&eqLI?n z6TbVo70MI@#jl#Ll_bG<*wdb0e(P4165;_~KAY_gDv&gX$s`BdY!ivWQKMOcpJkMV zhvwE5KG4mtY|#_^qsD6}RD4mz73su$q51nc&=| zts|^t(j0VuW8*8VYKdwUmnj-z%U#kO$|@PEpK6F3foHSnV>e3<35mj+K6Z;n+7U;RWG$URHkM>9 z-P&x0B3Y8PbPqJb*gg^D`uaq9?)b{zhB8^{)d2xk)_q@p@de>gQQYv zh>i+-(dHEiN|hb>vQWbJbsTTxi55xM#lg0iq-4z+EI@g@y2JXaI>B$Ms>ziWxZpkU zaC$s{2>k7(r4dik%Fq%N5F&|nS*jXbuskT2N{$mhSb%q4f%ncL13qTXx=-$Gb;LQ;D?U)j`r6*eF%J zux+?!)7B?;2$aP91Up;Pz5MI}!#dVovM0WO^MVrtN%sj$0B@^5OxkWR5=APRW`(KV2Y^XJQ-9C^i|Y8Vo-}{x2}$l1H|oRV1FZOf^c^ONeTJ zue|%aq`H1J)E>O&#zqj2ep}FJaW7c8L^A2nI_bpwGLuC|er;o4)xSiA-s8dKWiC!^;F{<+ttgXz0m$y+{aC0jjY>)DGR0aKRp@P!<_bmBo5~SOa^gve>*ks zQqPvLTA?(Vq*v08ubje>aZ3(tJ3$S9hf}RU2%G(EXp|jspG$F=!R=;dUU55nbdd~E zEz|fqi~3K8yUXM`*3nc~j|=OYL2btqzpCWwSpb|t`63`89e`&89E<`+!$uP8o`gek z6^L*r_oQxCnO`ds|LLkTL`%FF?fC{V|CM!)>Xl6w!ELXVXsU~g>wznh<8VEH^-kZi zBmXEe^0yiuuekS{d4M74lxnMag5)j*ZteX&pi-)AnW{Sm!8i2ppBx0QB6EJv&Wa~$ z_{>RJWxjgnW;_YO3(`gwSJmsviGoqa%UHjGnC=eR!*m}TCGP@0CVwzpS02A(o^pti z6PJRDy{P1T*?HA<&I(_mX~yG!+HD2`r+}j5EIAnCgzqUcnc_1urx0AiPGAe^bLz-E_e&;6mXP8be_0zejXmkJ_Yb*xIBt0Vip-0>>M0!Q4-!q-eiNv1a4(v wuRHt}3iVP;n_pSu$IEYje7t=8{nPzly)VHPz?+zXgW3j%+6Do)+6DrMbeK_NuK)l5