From 1c9534a42e021f0378ba96c3822472a6acd8e4d1 Mon Sep 17 00:00:00 2001 From: desven <45808369+desvenlafaxine@users.noreply.github.com> Date: Mon, 13 Sep 2021 07:52:09 -0500 Subject: [PATCH] Adds new body marks, allows Skrell and Vaurca to use hair fade options (#12458) --- .../abstract/new_player/sprite_accessories.dm | 45 +++++++++++++++++- html/changelogs/desven-marks.yml | 5 ++ icons/mob/human_races/markings.dmi | Bin 18993 -> 19649 bytes 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/desven-marks.yml diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index e60fe3d068a..5870472b4f5 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -1733,7 +1733,8 @@ Follow by example and make good judgement based on length which list to include /datum/sprite_accessory/hair_gradients icon = 'icons/mob/hair_gradients.dmi' species_allowed = list(/datum/species/human,/datum/species/human/offworlder,/datum/species/machine/shell,/datum/species/machine/shell/rogue,/datum/species/zombie, - /datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara) + /datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara, + /datum/species/skrell, /datum/species/zombie/skrell, /datum/species/bug, /datum/species/bug/type_b) none name = "None" @@ -3746,6 +3747,24 @@ Follow by example and make good judgement based on length which list to include body_parts = list(BP_HEAD) species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/bug, /datum/species/bug/type_b) + scar_chest + name = "Scar, Chest" + icon_state = "surgicalscar_chest" + body_parts = list(BP_CHEST) + species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b) + + scar_chest_left + name = "Scar, Chest Left" + icon_state = "chestscar_l_chest" + body_parts = list(BP_CHEST) + species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b) + + scar_chest_right + name = "Scar, Chest Right" + icon_state = "chestscar_r_chest" + body_parts = list(BP_CHEST) + species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, /datum/species/bug, /datum/species/bug/type_b) + scratch_abdomen_left name = "Scratch, Abdomen Left" icon_state = "scratch_abdomen_l" @@ -3818,6 +3837,18 @@ Follow by example and make good judgement based on length which list to include body_parts= list(BP_R_LEG) species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi) + tat_circle_back + name = "Tattoo (Circle, Back)" + icon_state = "tat_circle_back" + body_parts = list(BP_CHEST) + species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi) + + tat_circle_big_back + name = "Tattoo (Big Circle, Back)" + icon_state = "tat_bigcircle_back" + body_parts = list(BP_CHEST) + species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi) + tat_forrest_left name = "Tattoo (Forrest, Left Eye)" icon_state = "tat_forrest_l" @@ -3830,6 +3861,12 @@ Follow by example and make good judgement based on length which list to include body_parts = list(BP_HEAD) species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi) + tat_harness + name = "Tattoo (Harness, Chest)" + icon_state = "tat_harness_body" + body_parts = list(BP_CHEST) + species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi) + tat_hive name = "Tattoo (Hive, Back)" icon_state = "tat_hive" @@ -3926,6 +3963,12 @@ Follow by example and make good judgement based on length which list to include body_parts = list(BP_R_LEG) species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi) + tat_spine_back + name = "Tattoo (Spine, Back)" + icon_state = "tat_spine_back" + body_parts = list(BP_CHEST) + species_allowed = list(/datum/species/human, /datum/species/human/offworlder, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi) + tat_tamoko name = "Tattoo (Ta Moko, Face)" icon_state = "tat_tamoko" diff --git a/html/changelogs/desven-marks.yml b/html/changelogs/desven-marks.yml new file mode 100644 index 00000000000..0dda80917c7 --- /dev/null +++ b/html/changelogs/desven-marks.yml @@ -0,0 +1,5 @@ +author: Desven, 50N00b +delete-after: True +changes: + - rscadd: "Added new tattoo body marks." + - rscadd: "Skrell and Vaurcae can now select hair fade options." diff --git a/icons/mob/human_races/markings.dmi b/icons/mob/human_races/markings.dmi index c1d5e9760ff53f0d3d05e9a9f5cb8fe693f32780..a85ddc1dac5bce627d23366f7421458d7f1e2656 100644 GIT binary patch delta 3213 zcmbtVc|4SB8-9mj>`Te0EY*pQY$Giu+Y};eDU!%UJN@Ng;LYkzq zHc?F{TSu9}kY!FY4P&ISjAhLC`a0hq-#_P^?>qlJzvsE{`?;U%y07b@X2D+Nz%r2_ zR!$ZG0GI2E_W%IyN<8R$*5L#`7#A9OHuOvc0L11|a(3Za+tpG!yQ(nP!}=c#_!B?q zv!AlCk6) zzta;2CbxzUC^<7c%!m9?Eu|@|f{a^`%0Bj^8}8sU3@=_7E6+lqeqrr9HD-Zs61p+1 zcJHRYv8Yj~4I-=<%ehkMy*KDwtm8{>=hF(5Y%Q-+toAthVz9#)m_`bZ%xzIn^uANc zAR7$!VdP2e4Oiq&b$MfU+Vp`vM$-BuZ!aCo^aqHJzUmcYxsH#N;QbFBGgh&R=vU$@ zot{POs1}_;H%T2XIPUvC#N^h*;Z*&2&ETB;H@>-@LDnJIq_DsW)J+9OSfJ$|*2&t$ zG)m3KYqG5m_}+d`A0LAI_95Y0oy}Uh)|qM`YyGe^e<}5PeNmL>UcyR{A{UvTe%UzD z+wwuM?GT1gj3RysXu`ytKddAEx~rxRTj;DjdDGS6R)5;_0!(Kf7V_h@2xt~ zyk`FkYp&OeD{sFf|LngJJfyc(cO|gXva_4qT=wd)>Z8HrPqJ?Bo$~c^zLm~wtP7$5 zsF|$tog3^7PB>fKExTmz91#9)Iu~JbKwbZ1WUA9X&)^W716Hr82W(nd>(c|);uHo6cOu6V39I_TC&b(R}Bl=i@KltiyjX}`Yh9TcJgsB<4$>|sVX@Uls7mwxKy!x$k zJu=p#v6xm@O0Dj#MS<|UWi|EiRq4vLO&2wrp8BH{3fA~V*fUm}WOhB!8~n6KEQ-F- z=^j`^@}p;dPWl{Cly$TlpXyY}bPEl;Ku@+i{&~NG8MpRIbW!`qfD7`MSM_mi2e(i( zvYT3u6`Q`D{aV@L627SDhkoXhQ#XvUN@k(cc;6AtHaB%m3T}g{{&^vS;rNl=Lv~!> z`PDf2TN#HE(S0Ig!n>eo&hV13U~Fxr(7$Bo=Iwrbwq_B@LB|!T{bp3oG5PpX$@}fU z6ZziAohDx7Obwi;epKbNU&kk3k~}%A3@4#T9J*k3d#Zk7&;7h30I&|&>#*x!Y#x6g z@KOMiVkRO)7*_|t;TT!D)ypS0U^{l)$ahc&JH+f~QGA&8;I;(WK~l<~GXK<6)n0%q zR6YoIeyC;ZkjaGeVxV~GIe8{*#d%u zmi?y9ox1H8-=rE!ut|{EH^Q~tGQHNk4a5Y?olZ2xE;0|;N_xCp2K|p7RS94cu7Yny z>gl>?wAtUk-J(7t^t&gV)4(>R3%d1&@GuqNQ`-+1 ztsoBmz%KIw9Q1YJIZka`XIO&V&xYvIZr&wj%w2S163kR5Ynnc^E|^2R4~Gr3m$Ur; z;Bp+hFkj86ax$7+JQ9cpfYFUKgF28cSNx=L$(7{3^>gI$2Kje0 zY=*`QSZi7DHUv<3G@==*x=bwi&nf&X2BC|NPXMll%H-S7G|{LmD;lmtyxu?xpk)g| zr*EK!x(p+Y7CptS{8fs|e@;lw0_?woCTP-l5(a>N5N!BJdFrZMk^$RX`hJSc= zNxUH7aNZJzfR$*OYm`)^Eh7Q8vA)-qb5uG!YO%JqmUpP!+pGzQ{)yJ}YwWCR%&XH~ z&sD8Cm%_o$h1CG?Q4SRyga9i-?d-nY{^=wl^$QN|9}u7%@f!AcEt5oDX@zyKmS&)= zu$I$mSi5Li&t;v*_j_Ssw{=jEviS7yuMmbwmNM#qC@8{S^|9U$X8*$xbO>M8+n?(M z{NH4iNs;1rmmg~3>OMCp*?KRlnX!&&4FE$Z14NJ35y?bw>xLrdSQvn5%=ZwhGMP+q zY0%jGe4Sle*60nqO1$7&Fw_^ho15p_2`vic!5@?G!ya-Hl(hhiA(9&+X;cx9k5k5q z*0M#<$9>aZ>Y!$>d#&m4@B|HQR7dhC`AZ`ad8e0FB>xOWx3F0CiHlr9k0!mqyzW$b z)uWYIz9F|?GCkaKsC3h&GcKJe^cW)UJEuxjuL-xq1K5x@Su=-LXXJyEvCPDN8LfD< z4La@yUQl4o3(U@UHG(9X-A73Heh;MJ1v0ZvvsOui+4+bQl>Gd~1f^i0t(VFt)yk$e zF3z*g*qsev4ty5RS4{c)UBfTMxbWyJf-~rG)`GJG;`AYA2^VJ4^LesN?5>4s=cxF$ z4@#nGg}Xgqc^RNjhGY9nQ5lP~4O7D1o##o3@LjkQdB1vDX}kC&oUs-5Tu1HHvix)p z#wQRc2hkKu8>^`Pj#+P|6 zp%{d6vWOq;(!qcrl{@U4a_fGBI;iL2J4(3wDCU^$F>H?726gk;ujXDZwN*4>V4`%)_fVA9|{4$A|;G5zpD(PzX!8~B$8D3N8Ai#i6KN7=G|ZqM6%~axJLG=Y z3B#~8N*K2!n<4gu9YTXK2~*Q-mkfJ!{y3+#_CM#Wv(A6-yVm!4-}QXH&-ZD~hSg-i z(zZiK6yyK^F4ihP03f45!x19v&XLcOg2N($LoWdkm7AA+kUWA_OCa(+wH-BsdRa!E z54*6D+?{1rod&JOuy16rEdxnwbBw}W?)g3ZO7rNM*r@J~1*vMA?9lNI>S{0=vJCO9 z=cJ|omd)^8AHMW^5h9c_(|2S3Ie8Xp>}kg7_}3oB*u)&zpjBObSiKUR)F0D5-}-%* zOMskytiu`cld(rdxZ1-@BW!X}Jg=ay!YJeQkMHId@mtLehw!_$o%DHTO{yo7qLF1c z%>rTYwJL&sJHEk76Y)C0>Zff!1f2yZ6~&aDBzgIGVsdP+*F*v$fLHG`fX35h2TYI|99#1UKJ1=~Ds*1&y@2+C#27kjN9AXTau?rkp$LynbI_DwDK9zL_E zps2OIkE1`8^vaPQq<_^z_m*f9A@8tvjBI5S~iC zIB$-&8z;rc{%qY{oq=HzSg8R9zu6zW$1g@Y3%zdh;NOSMCnFxXx6&>>~BuI3Wdr-RYn$SD;yW1MMqKQ=(hme+%mh@;?L6s+!Sj3) z-hQgI1kQK(PCo$S?x{&?nmO8yv+FWKabcWaIbMC7l<;@BzK@jKCx;S8uR6NEr+M$O zE+p-a8p)avlk)2sXA@6ffxS#IpfU#Z%YA1d;)Z`iu-QN>^u9;T>;AQC`UgR|4~URg zp_2(EPwTJX6l4I5e(ENtm&W4w>_ZoE?=-4Rv6hZFMV4)GKUgkmGqAi!Jo% z`{p@$N@pRpq*D#fZj-}lbHwwL&fT)bg0iA%lfUQnOYO;9<-3G%PK27SjDEr^J-iI( z@0*jWdMunKr!77ET_15HhWu;;5)wywryr!h9f&l$$mv){ zH(e%_-GPqn?HtrUX^J}kIn1K;;F>bsoy9fi`y;VREG z9jo_k(O$MdEm61j9DKQN8)hoGqtbHe9xoi3SpM`B4Q}N{V`W-z=pNFWGpZZBhnC*! zfj>zM@us1y4lNmU2}7yqYm7^wp`~M&hQyX75bo8hz}l7Q=5f_7UP0$dPWgS49Cr2i zB1EjTGO$9Y1j*h`Uzu*E556A$TsnSay!_oSm}xWoYlRzi^2G=TH;0hx%)rET6EqgTfB>Kf1#NSYr|_|4MGcrnI3pd6@yXgk4$6-3Ok((LajSRA`uRc@mY<@ zgf3iJ*r#5ciEPQlKFH*Zh+~}?!by?pobea)=)H}r=Me8JrYy6_eKv7E)Nx2l28rSe z*o-C9cHISNk*osfnGEf=yE8xD@K=*+7jR>CWs!j&oBo9p0roF^L5kJov`m&5 z2zoF|NvF-44I35~HJY=szCY~UB_0aIiMIOL-#0~No5IX27uZso)jd!1$N&s>??!F9 z_ot>p|7%xY)JoIKACTcP08B8WDRIof=bM)}U*0i6qb_fhD=s$f>l{9HnkE@0a0UvK zbQzX0Pic64A|G}yPsLnSDaFfD*gJr`OSq6pX?;JicmgF%(qhdt$%B?~8Kho~)F87t zA3KAnm3mHT$dg1+Pcs}qxzCOLa-VG>4AJ8*_iRD3XbJ*Lj~47LM0J%HY%U9NK;oli zYRIf)=xt+U)xq+)x+3`~^j^PBq*eds?tdPR%{C!FFFf;;8UTfwf9em=(UTo!v)P|& zxo>cBz`PE;aFybtQ8+ z_C&stM9rvS)_p<}(l+EJcu5!AB+Y!;48Rupe}w$&jBl=wHR(ZW>0hN{N0k*M9D(C; LSGy`(zpH-$8x