From d55a2b830a81edf135015fe6eafacc833ca5111a Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Mon, 14 Jul 2025 02:49:25 +0000 Subject: [PATCH] Vox customization additions (+eyeshadows) (#38906) vox customization stuff --- .../Locale/en-US/accessories/vox-hair.ftl | 6 ++- Resources/Locale/en-US/markings/tattoos.ftl | 23 +++++++- Resources/Locale/en-US/markings/vox.ftl | 11 +++- .../Mobs/Customization/Markings/tattoos.yml | 25 +++++++++ .../Mobs/Customization/Markings/vox_hair.yml | 40 ++++++++++++++ .../Mobs/Customization/Markings/vox_parts.yml | 23 +++++++- .../Customization/Markings/vox_tattoos.yml | 51 +++++++++++++++++- .../tattoos.rsi/eyeshadow_lower.png | Bin 0 -> 134 bytes .../tattoos.rsi/eyeshadow_upper.png | Bin 0 -> 135 bytes .../Mobs/Customization/tattoos.rsi/meta.json | 10 +++- .../Customization/vox_hair.rsi/bushy_s.png | Bin 0 -> 776 bytes .../Customization/vox_hair.rsi/hedgehog_s.png | Bin 0 -> 792 bytes .../vox_hair.rsi/mad_scientist_s.png | Bin 0 -> 504 bytes .../Mobs/Customization/vox_hair.rsi/meta.json | 18 ++++++- .../Customization/vox_hair.rsi/slick_s.png | Bin 0 -> 745 bytes .../vox_hair.rsi/wise_braid_s.png | Bin 1064 -> 1052 bytes .../Customization/vox_parts.rsi/meta.json | 12 ++++- .../Mobs/Customization/vox_parts.rsi/tail.png | Bin 590 -> 457 bytes .../Customization/vox_parts.rsi/tail_big.png | Bin 0 -> 532 bytes .../Customization/vox_parts.rsi/tail_full.png | Bin 0 -> 518 bytes .../vox_parts.rsi/tail_short.png | Bin 0 -> 407 bytes .../vox_parts.rsi/tail_stenciled.png | Bin 297 -> 0 bytes .../vox_tattoos.rsi/eyeshadow_large.png | Bin 0 -> 161 bytes .../vox_tattoos.rsi/eyeshadow_medium.png | Bin 0 -> 143 bytes .../vox_tattoos.rsi/eyeshadow_small.png | Bin 0 -> 141 bytes .../Customization/vox_tattoos.rsi/meta.json | 18 ++++++- .../vox_tattoos.rsi/tail_ring.png | Bin 0 -> 166 bytes .../Mobs/Species/Vox/parts.rsi/torso.png | Bin 955 -> 816 bytes 28 files changed, 226 insertions(+), 11 deletions(-) create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_lower.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_upper.png create mode 100644 Resources/Textures/Mobs/Customization/vox_hair.rsi/bushy_s.png create mode 100644 Resources/Textures/Mobs/Customization/vox_hair.rsi/hedgehog_s.png create mode 100644 Resources/Textures/Mobs/Customization/vox_hair.rsi/mad_scientist_s.png create mode 100644 Resources/Textures/Mobs/Customization/vox_hair.rsi/slick_s.png create mode 100644 Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big.png create mode 100644 Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_full.png create mode 100644 Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_short.png delete mode 100644 Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_large.png create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_medium.png create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_small.png create mode 100644 Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tail_ring.png diff --git a/Resources/Locale/en-US/accessories/vox-hair.ftl b/Resources/Locale/en-US/accessories/vox-hair.ftl index 0e11e1a9b8..e6e32e9c80 100644 --- a/Resources/Locale/en-US/accessories/vox-hair.ftl +++ b/Resources/Locale/en-US/accessories/vox-hair.ftl @@ -21,4 +21,8 @@ marking-VoxHairSurf = Vox Surf marking-VoxHairTielQuills = Vox Tiel Quills marking-VoxHairYasu = Vox Yasuhiro marking-VoxHairWiseBraid = Vox Wise Braids -marking-VoxHairSpotty = Vox Spotty Hair \ No newline at end of file +marking-VoxHairSpotty = Vox Spotty Quills +marking-VoxHairMadScientist = Vox Mad Scientist +marking-VoxHairHedgehog = Vox Hedgehog +marking-VoxHairBushy = Vox Bushy Quills +marking-VoxHairSlick = Vox Slick Quills \ No newline at end of file diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl index 51d3e3c45f..c47f8ae962 100644 --- a/Resources/Locale/en-US/markings/tattoos.ftl +++ b/Resources/Locale/en-US/markings/tattoos.ftl @@ -38,4 +38,25 @@ marking-TattooEyeVoxRight-tattoo_eye_vox_r = Right Eye marking-TattooEyeVoxRight = Right Eye marking-TattooEyeVoxLeft-tattoo_eye_vox_l = Left Eye -marking-TattooEyeVoxLeft = Left Eye \ No newline at end of file +marking-TattooEyeVoxLeft = Left Eye + +marking-TattooEyeshadowUpper-tattoo_eyeshadow_upper = Eyeshadow (Upper) +marking-TattooEyeshadowUpper = Eyeshadow (Upper) + +marking-TattooEyeshadowLower-tattoo_eyeshadow_lower = Eyeshadow (Lower) +marking-TattooEyeshadowLower = Eyeshadow (Lower) + +marking-TattooEyeshadowLowerReptilian-tattoo_eyeshadow_lower_reptilian = Eyeshadow (Lower) +marking-TattooEyeshadowLowerReptilian = Eyeshadow (Lower) + +marking-TattooEyeshadowVoxSmall-tattoo_eyeshadow_small = Eyeshadow (Small) +marking-TattooEyeshadowVoxSmall = Eyeshadow (Small) + +marking-TattooEyeshadowVoxMedium-tattoo_eyeshadow_medium = Eyeshadow (Medium) +marking-TattooEyeshadowVoxMedium = Eyeshadow (Medium) + +marking-TattooEyeshadowVoxLarge-tattoo_eyeshadow_Large = Eyeshadow (Large) +marking-TattooEyeshadowVoxLarge = Eyeshadow (Large) + +marking-TattooVoxTailRing-tattoo_vox_tail_ring = Tail Ring +marking-TattooVoxTailRing = Tail Ring diff --git a/Resources/Locale/en-US/markings/vox.ftl b/Resources/Locale/en-US/markings/vox.ftl index 37502bc7e0..1ae829ebbf 100644 --- a/Resources/Locale/en-US/markings/vox.ftl +++ b/Resources/Locale/en-US/markings/vox.ftl @@ -44,4 +44,13 @@ marking-VoxScarEyeRightSmall-vox_scar_eye_right_small = Right Eye Scar (Small) marking-VoxScarEyeRightSmall = Small Eye Scar (Right) marking-VoxScarEyeLeftSmall-vox_scar_eye_left_small = Left Eye Scar (Small) -marking-VoxScarEyeLeftSmall = Small Eye Scar (Left) \ No newline at end of file +marking-VoxScarEyeLeftSmall = Small Eye Scar (Left) + +marking-VoxTailShort-vox_tail_small = Vox Tail (Short) +marking-VoxTailShort = Vox Tail (Short) + +marking-VoxTail-vox_tail = Vox Tail (Medium) +marking-VoxTail = Vox Tail (Medium) + +marking-VoxTailBig-vox_tail_big = Vox Tail (Big) +marking-VoxTailBig = Vox Tail (Big) \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 8a47856fec..eaca0d719c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -165,3 +165,28 @@ sprites: - sprite: Mobs/Customization/tattoos.rsi state: tattoo_eye_moth_l + +- type: marking + id: TattooEyeshadowUpper + # there are a lot of deliberate limitations with this marking that should be pointed out. some of them may seem overly restrictive on the surface, but most of them are fully intentional. + # this marking is meant to be supplementary so they are transparent. if you give this 255 alpha it will probably be really distracting looking and make the face very difficult to read + # the reason these are also not recolorable is because allowing for the full RGB range makes these look not very good (especially considering they are stackable, and ESPECIALLY considering vox can stack 3 at once.) + # this is not a very big issue on humans, but is much more pronounced on vox & other nonhuman species, where the skin being more colorful can make for some truly dreadful meshing with the sprite thats definitely not desired. + # some of these limitations could possibly be removed with better control over how the marking can be customized - possibly removing stacking, allowing recoloring & clamping higher-end colors for the eyeshadow, etc. + bodyPart: Eyes + markingCategory: Overlay + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf] + forcedColoring: true + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: eyeshadow_upper + +- type: marking + id: TattooEyeshadowLower + bodyPart: Eyes + markingCategory: Overlay + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf] + forcedColoring: true + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: eyeshadow_lower \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml index 7fc3fedaa2..01d88513d8 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml @@ -18,6 +18,16 @@ - sprite: Mobs/Customization/vox_hair.rsi state: braid_s +- type: marking + id: VoxHairBushy + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_hair.rsi + state: bushy_s + - type: marking id: VoxHairCrestedQuills bodyPart: Hair @@ -58,6 +68,16 @@ - sprite: Mobs/Customization/vox_hair.rsi state: hawk_s +- type: marking + id: VoxHairHedgehog + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_hair.rsi + state: hedgehog_s + - type: marking id: VoxHairHorns bodyPart: Hair @@ -108,6 +128,16 @@ - sprite: Mobs/Customization/vox_hair.rsi state: long_braid_s +- type: marking + id: VoxHairMadScientist + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_hair.rsi + state: mad_scientist_s + - type: marking id: VoxHairMange bodyPart: Hair @@ -188,6 +218,16 @@ - sprite: Mobs/Customization/vox_hair.rsi state: shortquills_s +- type: marking + id: VoxHairSlick + bodyPart: Hair + markingCategory: Hair + canBeDisplaced: false + speciesRestriction: [Vox] + sprites: + - sprite: Mobs/Customization/vox_hair.rsi + state: slick_s + - type: marking id: VoxHairSpotty bodyPart: Hair diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml index cd3588bf54..f3c0e5d204 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_parts.yml @@ -141,5 +141,24 @@ forcedColoring: true sprites: - sprite: Mobs/Customization/vox_parts.rsi - # Ideally this should use the normal tail sprite and apply an actual mask over it, not just use a butchered sprite - state: tail_stenciled + state: tail + +- type: marking + id: VoxTailShort + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Vox] + forcedColoring: true + sprites: + - sprite: Mobs/Customization/vox_parts.rsi + state: tail_short + +- type: marking + id: VoxTailBig + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Vox] + forcedColoring: true + sprites: + - sprite: Mobs/Customization/vox_parts.rsi + state: tail_big \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml index 8b25271fca..567c3b2620 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_tattoos.yml @@ -53,7 +53,21 @@ sprites: - sprite: Mobs/Customization/vox_tattoos.rsi state: nightling_s - + +- type: marking + id: TattooVoxTailRing + bodyPart: Tail + markingCategory: Overlay + speciesRestriction: [Vox] + coloring: + default: + type: + !type:TattooColoring + fallbackColor: "#666666" + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: tail_ring + - type: marking id: TattooEyeVoxRight bodyPart: Eyes @@ -81,3 +95,38 @@ sprites: - sprite: Mobs/Customization/vox_tattoos.rsi state: tattoo_eye_vox_l + +- type: marking + id: TattooEyeshadowVoxSmall + # there are a lot of deliberate limitations with this marking that should be pointed out. some of them may seem overly restrictive on the surface, but most of them are fully intentional. + # this marking is meant to be supplementary so they are transparent. if you give this 255 alpha it will probably be really distracting looking and make the face very difficult to read + # the reason these are also not recolorable is because allowing for the full RGB range makes these look not very good (especially considering they are stackable, and ESPECIALLY considering vox can stack 3 at once.) + # this is not a very big issue on humans, but is much more pronounced on vox & other nonhuman species, where the skin being more colorful can make for some truly dreadful meshing with the sprite thats definitely not desired. + # some of these limitations could possibly be removed with better control over how the marking can be customized - possibly removing stacking, allowing recoloring & clamping higher-end colors for the eyeshadow, etc. + bodyPart: Eyes + markingCategory: Overlay + speciesRestriction: [Vox] + forcedColoring: true + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: eyeshadow_small + +- type: marking + id: TattooEyeshadowVoxMedium + bodyPart: Eyes + markingCategory: Overlay + speciesRestriction: [Vox] + forcedColoring: true + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: eyeshadow_medium + +- type: marking + id: TattooEyeshadowVoxLarge + bodyPart: Eyes + markingCategory: Overlay + speciesRestriction: [Vox] + forcedColoring: true + sprites: + - sprite: Mobs/Customization/vox_tattoos.rsi + state: eyeshadow_large \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_lower.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_lower.png new file mode 100644 index 0000000000000000000000000000000000000000..7a10a15fda9375cf9bb174ce8e16cc152be8580e GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%~c)B=-RLpsM zQ<0BBfrt4(ZB700WDYi|9mc+QmqoKO?5?`F|3WYmP$du?c%0|+q;T_}lg*Fjv4cfE Y@%B7sez}?L-aHW3)78&qol`;+0AO<|d;kCd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_upper.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/eyeshadow_upper.png new file mode 100644 index 0000000000000000000000000000000000000000..56615b3dc6da2bad86f28e6e17d5ce6ae375f29d GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|96eneLn`LH zy{Ra~V8Fp_V7G7od1XQAa$lZl*S2vrOuU>oMb2sy3s5Bp2<@G7;`-T-_Ht3-OkjZn ZS>l!K%r9r2nwA0Ld%F6$taD0e0ssg^CK><$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json index bd8400a374..fbaf3ae193 100644 --- a/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297/modular_skyrat/master_files/icons/mob/body_markings/tattoo_markings.dmi. eyeshadow_upper and eyeshadow_lower made by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 @@ -54,6 +54,14 @@ { "name": "tattoo_eye_moth_l", "directions": 4 + }, + { + "name": "eyeshadow_upper", + "directions": 4 + }, + { + "name": "eyeshadow_lower", + "directions": 4 } ] } diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/bushy_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/bushy_s.png new file mode 100644 index 0000000000000000000000000000000000000000..71883f9e7867778404ea0c659cdf44660e1ad82b GIT binary patch literal 776 zcmV+j1NZ!iP)Px%!bwCyRCt{2nn9ARAPk1%tG9P8C(vtf@LU5gV;b2*yt&DZox!BEP~CB|6f_%1{4)IVrnWai?Wqj4N5gg`_@%d$NE zpL3>^5_#{{a^KM}xvKxq8RaP@3L((4EJQ?wgL3d^E{APFq|)gKt!kYt5PM#SRk00%U+7%IidxF zdjS2&G&mYyEa$cQRa*eUUoD=tOkn1+EX$K|J%Bt!8)N6(;k<^X0}xS}_OHNp=vfEg zRH_yRM`KRTBUl>wO$W$yTi5kaDCSWwdI0B>h`4+Phs$~Stc7X|(B{=?nhrBynx;WU zq$e`sds|>HBQ%^Ug0jlj@5rO7cM)9Iwd@tY8d(fm!2+sdu(f#F_P>0u=P_6>zD{|W z3D_Q5{eQKFXd(*d^!^Z%`uC3H`snSd|EjQ_r+`MT_C3Qe48t%C!!QiPFbu=ENUK+W zC!fBTpfY4#*YXJ`FmsU&ns;@o`vO$`GCPhV(bk2jo0fOn4PgdEG~y&EGWehz=7v$jne1XXhsJ$f`9;B`4hXBNHup8GP!Smt>iu&A8#Q`V7K zJnk^a>oZ5Fyd(wH-bb{LTIaoiuKM0Uoe>&))DGCYpL3=McNgdzN}JBy6>7d9o1P@D zqR`e2{$%9$Z1dg^@>Gy@NaKX2;d{jg+)?b#BJHEfMvZ-kMNl>(WubGPx%(n&-?RCt{2noW}9APj}&uGwdePhele2iG;46WD7`z-;DCy)aG?Y22}=^=)D& z1W6!%3Z97bvl*-fV~ly4rXj|d*L9U~9Hsok@6$Ay>ut5aZCn2Q{QSrMJkJtBXtv+v zsH$cWk$Ikloxr<@$g(WmgFn)~sW5sShG0ZhGe5IqJ+pxAr}?T|l+s-pymL9L{ih8OW6aC43~<5% zj4#VF#2B;bPZj$JFr{=C9KPq_f$y#MpEdwyb=hh4N1$Af)qqzW1kQeNFZ0~6uB+L8 zbqJsmYf7P9uSsy4rlFkm0cRx-)p?%H_Nxt`s(Bp8zt6R@A|m5BR?AvZ)y%1m`h~I$ z?>scD_NxuR8x9Mt$$4t7-QZWZeQJhT!x-= zjpI0u<2a7vIF92u&X1w#+zdxeIDf;@GhbR9eHMp%3O@SA$uJI257P&*1AGD{!EvQiSU&Z9y@@KBbiU>jT)pUT?El;%H!NFDtk) zzMP4CysWBu+qTTd(Pub*W?$Gx{{7kiO|8Sq5Acqj-}8$z0a(;5z%&Ge?&81^TA){8 z{XprP7*>RrG5|CGE3&knuyhWqfHY=+Ss%b6q;*~29=wo(B!n=O`vR**p=lLh5mE@@ zRF{uf4$Dlfbx<_}0LxF#7QBc^2;ojjW5wJ6SZ~i5JP08Str9)6K%%Gi??}*5R*{A| z1O8W<8sG}5i&h`a4e;&_PYYM_)p4$Zs(z^I=~sT;ZMLYX*8C%Bd1@*RE818mxG<&NjxO%>lw)4v*k&=xEu!60{ug$ePj32zb$Zp21G~bE+ pVg8C!N%JpUwnKJU%OBP{#(JYoKC2_%7XYJ@!PC{xWt~$(69Bv^+=u`G literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json index 99004ffaf8..446bbd5c95 100644 --- a/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/vox_hair.rsi/meta.json @@ -1,12 +1,16 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled. wise_braid_s modified from braid_s by Flareguy, spotty by Flareguy", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/dcd1f5d88a8c5ba9634fc3fce67a76ada45f71dc/icons/mob/sprite_accessories/vox/vox_hair.dmi and greyscaled. wise_braid_s modified from braid_s by Flareguy. mad_scientist_s modified from keelquills_s by Flareguy. spotty_s, bushy_s, hedgehog_s, and slick_s by Flareguy", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "bushy_s", + "directions": 4 + }, { "name": "crestedquills_s", "directions": 4 @@ -51,10 +55,18 @@ "name": "razor_clipped_s", "directions": 4 }, + { + "name": "mad_scientist_s", + "directions": 4 + }, { "name": "mohawk_s", "directions": 4 }, + { + "name": "hedgehog_s", + "directions": 4 + }, { "name": "horns_s", "directions": 4 @@ -102,6 +114,10 @@ { "name": "flowing_s", "directions": 4 + }, + { + "name": "slick_s", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/vox_hair.rsi/slick_s.png b/Resources/Textures/Mobs/Customization/vox_hair.rsi/slick_s.png new file mode 100644 index 0000000000000000000000000000000000000000..69e9671294a2249ff3c3faab07137e11b1ffe024 GIT binary patch literal 745 zcmVPx%qe({a3ROWduBpN~}<2ZuEMu|rMGzpSN zdHBD>IoI*=E#UL$V8$-r$}y27o}Wn!yoSE zbmfQ=iGm7=L0ce%m~Q1OcAn3>rZnk2^fJwKiw;P(P}JRUAeDShkrPc45K z25k$aPip@N`AR9Rl+tb6n(s^H|HkR8l+s<-K`Ev4JP!aM&wum4ZeOAVS3UrwX?pd! zxqPLRuBz&;fUT4u`E=#U6NX_ho4xb)@FwyiG95^0*E zX&R(yiYSUOj-&bAG!3MbEZI&S$*Sb`YxQ-7#w2%-q6lFa;_>kjm&*mu&(9dg5dhFM z4LI_hVgLztg@4Is z=W~D?QJ&h*=W}4Y;~ISWEYbJ9arbGOt~_9xCbKO1zJJH3&(dMkZ?FPYQ4~7MGVJ&J zSLY4GpzFFehFX)VszdWR2LJqBn(yT1b_}53bN%nZHb9nTtoAjqV+vj6 z|9gP#@_(Ed#5TYmr{7uaYcTgvv)}InDdlWDTJs^yKvBLZirKpWwQuz&!zGfourh~Qh!QNwiYiNk(~YbrPw(Fl1sWQF#`Jp zd-C*&4c-2h9(eISTNkb#@7fWflysV=rY_(kXxmnk2apa+VOh&w_i-Gf?|W02@I5?$ zWRorgM;EpSkmZvk0RT+X#2sQaNH*!Rq%MJNfGCOpz^u2v?;)jpGheU;MNw!ezh#W` zJbw=;4v}sgoDD$kPXUJ@1(GEB5F->tp_3$e74YnU%*hR~Jb+y6&%dr+jf{|G*``LI z^!!}3C!N+V&oPiy4`OG^(&iN0vS4x;20dqBDxIUW*e2O2I}fLn(r@M9Hp|W382cc0 zR~N*ko{^0`=t1meizeSwvg!gAN6zVH8*+zZfJF~NU%IcsT*Q@9Zdxc&*Y#BZCZZ_9 zm+tGL=a9uug7%9DaXcOa`+;O_`o5p70-e)kbq-?p=DPop*i28?V(IVAl7eYxKKhRl nOYj8}9*@W4@pwEQj}!j_35C1bUyRLH00000NkvXXu0mjfLzV&f delta 1029 zcmV+g1p51&2&f2)(>#7{BMo^8@@|0Efe23+G(DcKlDvZ`)Q4 zh0-Ur-$Fj;Tyf4-UDx{iT>0;8I&;od(=_0mt1Qbr0LZe;8-KRXQNmU}03=B=`dnQ; z=UkO#c~!t#N|1cI^5h9^+iFjs-)+YAOgq+ftqzC7)&6x|D*!O*YeQYvswfI1Ndh4R zk|aS81n9a>9}6MC7_*XX)RC-8ZogDtQ)oq>tsw%7YCHVTK(BH|;hcSSTr}|&R+5l;qTD331Fs9H|{@nwH zE^iZqtbYyg@%X{2eF>%>YIeJw#~7Q8M@v40X(-C)c|Lg;p!T)i1@_VA#kf=NCR6z0f-!b6 zUw^O$d7dlAo-@W-mU(nHAl+;*HUPOl<>CoaAdcgk7$MJd702<5fJe7t+ht(w0YV7e z-H%I9$Ovhgu4)8I&re1ByZgi{Cuj{>bsueXS=y9>YZgqlZL6jXOr>*_7F#7dHO#|t z&ef$H+-kYGSH|8)o6!X^sb{oiIOsmwOnw$kzNKW<1S*c4(rsuQ8w1R`4Ss9Bds7jY zF}7-Z?oNgH$mJ#YZg1$)@wC5fY5J6^?3-gmMs88O57M;ZVkA|fIpB6>f~vnMc>h~)ab z@B7WgFq??v5JIk9C*);`$PloIWNU4<*5(kx>nEWOzP@IR$$!?`hbrM?(V70E)9Ez& zyep;PoSQxFW)e^bFCtlM4FE_fK`DiDKGh}?(D!|FF7b;pZ`=0au{V(b{8T_wj$@3# z`4LDdp`1^(>2GNL;(M$A0U{zIA|fIpA|fIpn&qaMFxF+=YSUqIEOp<#w4JxQ38A#q zbIunrUB~iK-+!RBM%Q&s*L98e9?m($7-x50pGj+t7$cl>@ZJw`X{|>q1ICz}i}eNs zW6UNhp=_KeD}OJpa{T$*fMo;1e!mC4pP}Vvy`baq2mo--K`90A{iORxvlT)Z_TyM< zS6v15T*p@bI>tY}-OE62+d?UY-EOzauR;hRr<8_OKPVgy%g)mnb1$o_u=e>85fKrs Z$`_QbDs3N+kN*Gw002ovPDHLkV1g{p&5Qs5 delta 565 zcmX@fe2!&;NU(5NW+}j^#-!}8S zY?3+an9us_*~K<8d=@-*w-vbdiGWb!Vdf9y)qro3>o>3XTxA z)emn@Sj5PXSoTcwN7Y^_j(y5n4C_30|M~v=@Be+WpY$9!Eb3S9KCt%BM`ezF(R0u5 z)c>p5?(?D4{9^fjwr2LF3@#2Vc#x9fhqJyjf33fJyfn7y-}0>&au2QxmpUsH%-JM%gpc=vQ|yfG_wDl< zcdcW;UY~G8hUbLM`Cijr{wEH>Oy|vK`wAorJrd-12@N$p)>iyQIN;9|y>owWDmeb1 z%geQg>&W3*e3oxs-{0kOtl)-k)0_Whcg{#Yz8Ke_rO|b$gO%rd$M?2%4fB(%=lY#& z$*o)dap5Ia7LKE31&Rszt!tQScJ4GZeBJ+r$41n~G2nxqvUmmSoTbOUa=qQvhKRHZ a;U7#&k#4nR*>9dQ0D-5gpUXO@geCy8+567` diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_big.png new file mode 100644 index 0000000000000000000000000000000000000000..a9dfd0f6d61264cd5fcb2f5070517b2c6b3a79da GIT binary patch literal 532 zcmV+v0_**WP)Px$&PhZ;RCt{2+Rcr#Fc1ddm(^E<M9P)ea~TL6I88US!O8~{L`xgA!K0Bfz(bqxS$+jhF| zt+le>?|*geuVtqAdRps?;I-CJO2KX^PFf1LRIYZ!d5nA|fIpA|fIpB3i&jH|5%Y?Q7kH@Ng`t z+mgnbHzA}>Qrc6H#ypm<{0mi8p)AXyEXyK<0Pj79VR*Xp`oCQJfwa~bh5_Dtgb=2< zs;WBs{8@AKcsx$W#+V|6fN>mA*EO7TZ(9j@SzBwxIVW{pV;o0>5Y8H>d5mYS1?QZb zwxc93i((;p*~b{gId?JVA1h$a7*ljzH*G=~hT&E7UQ8-`r4+iZyV*9s*&Q~<6nPe7 zjI!J9-f~rlF-j`?dFkKf);;c=yINB3;-2~4e2#r^`}zKdc$S1uNQ68TJP{Gmc6Px$z)3_wRCt{2+Ch@)AP@%N&eS^u)h==eS$K|kjpR7w8h8#Da0eElxJAE>WJrwj zj5BXEGyk_yunaVGj8zR000000008_x)w3tCmN7=kcGq>Ai{W9$7#W5^O7jKzv5YZe zz{VJH&WUqQhGF>mi%B_s{zrY^FW&D;De~SweBI3~KpDI-Mwpq1 zh*C6l-p}<`WagO@cpX) z0{{R30000000000@Q|xw!cvuWt3`*^v6OZ9Tz1~-A%t8~7m-O!^H|=>FEBG{tt+i{ z6+$5IJ;fLoE3f&q#y7=t)2#y%%uF#x^4?PjVT_BJCz&y(gSA$U$KxbDthG|tHSPC% zI-O3F0%Y5^V|%yTJ>?e38^Fxe_x;$<%+xf^82nOPx$n=v2FV8ynx>ib#~3N4^o8N9 zSB~Gd?c_7>Jt?Iqgz(`t<~t|zK5MNU4u|m|!u*w9AOmjA?R-98?fyK*yC!a}6}lWq zm=C12e(Dp#IVbZurM!=Y`1b8Q?p->bw8|003UvU$r|tl8s{Hu>b%707*qo IM6N<$f*|zn6#xJL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_short.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_short.png new file mode 100644 index 0000000000000000000000000000000000000000..c714a65e890954737b4b1d4da4d7de3e9e1a324b GIT binary patch literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z13g_FLn`LH zy>+&?*+78x!St(QiK^_U7W8isoNiodk*dJAtX-z(&e1ojZereB9O}f>-&-H$>Pcg} z-PyvZ1O~rscK`QF&=kB_le1QLUE5U`7iW%H(&kTcmp;0j{(f)Od()PJaN&J&vz|_# zdp`Yv)!W(24n8e%>=9gk`Q`OXGghx)>$zTi|GUAl1+RBqHQX;h@y6=Tj(6Xy860{9 zk4Y@~7b5!3f`WngTe~DWM4fZr->_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png b/Resources/Textures/Mobs/Customization/vox_parts.rsi/tail_stenciled.png deleted file mode 100644 index 9072c9f4fc3184e3fda883e612f655c2a80f2a9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|9(%ethE&XX zd+ls*ivdsD!~Uxxf=``%FR*DIuU#@}Nw-JI!@UL^XXiBh6+HagW8x(5l;}PgPM}7H z0{gr5>>H-f{P}H8(5@K1_L(!cU#oe&RYCsrnLBs)PIGtQf%MM)nw{MN!(kpkL m@o(6wQoH{MBgl1daO1u72Cnji&_gV9L1Lb+elF{r5}E+8OMt)t diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_large.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_large.png new file mode 100644 index 0000000000000000000000000000000000000000..ff8f5ef3045d795758ae63aff4ce18352fb7813f GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|qCH(4Ln`LH zy=BOCK!Jxfp!$Q)-iqsdq6dXKe%%w{?5h92ma$-6_9MSN&wfANv-QW$`%d~#1RpX2 zwF1F3lgs=PCtq;uTz2d@7xVS5$V_=1c{#8YS2csYCCAgxDS2@qzNf37%Q~loCIH=1 BHaGwP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_medium.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_medium.png new file mode 100644 index 0000000000000000000000000000000000000000..8884d1c5d9a9a83b885972434d43646545043769 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|JUv|;Ln`LH zy=BP9puoXmVE^uZ?2XQ5wxzxiGc2A-Gc%N(nUV8-sZPpk^(`FyKn+0PU~yHnVo`I! i;{(_HHRR>MVqDRWOV}@pSxf8$aXnrAT-G@yGywp!*(rkn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_small.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/eyeshadow_small.png new file mode 100644 index 0000000000000000000000000000000000000000..4027e9a89347cb96e4ebb114b41221777a55710f GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|+&x_!Ln`LH zy{X8@V8FrbV7G7o`7`<*f=2IDx~`cqF&Kq?`ZqQD#6{H}4t}6=AUN=`NHuT2L%5B_ hu9j~P89_n|Hu5?tvffoxn9v5|db;|#taD0e0swQ5DbN4_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json index d0c0edbbba..e1d263c9ac 100644 --- a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy", + "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/ef7a4d962915cb36b138eeb59663f0053d4906fe/icons/mob/sprite_accessories/vox/vox_body_markings.dmi and modified by Flareguy. eyeshadow & tail_ring states by Flareguy", "size": { "x": 32, "y": 32 @@ -30,6 +30,22 @@ { "name": "tattoo_eye_vox_l", "directions": 4 + }, + { + "name": "eyeshadow_small", + "directions": 4 + }, + { + "name": "eyeshadow_medium", + "directions": 4 + }, + { + "name": "eyeshadow_large", + "directions": 4 + }, + { + "name": "tail_ring", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tail_ring.png b/Resources/Textures/Mobs/Customization/vox_tattoos.rsi/tail_ring.png new file mode 100644 index 0000000000000000000000000000000000000000..3e3f2ab413c89299555c7ea7d1241b38febd5787 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|5cMXyE zrTaTJZ3amI0sG9qb@vi0vzI<>&-wiRJM$&2y-i+g85rJtV!C}n;op&ag=!#Wp00i_ I>zopr03(7uJOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png b/Resources/Textures/Mobs/Species/Vox/parts.rsi/torso.png index 3910fb39a676be4de9e10167029a740cc8b12c5f..01259ea03da9b6e767b51424deb45aa4403df789 100644 GIT binary patch delta 781 zcmV+o1M>X42e1Z^Fnbgc%RS1Cy?G*mx-0Ymg{eH*cZ~y=ZApjtL zcg~TVc$KDU{P}#2gRiP8sz7UvrfIU5L6!pMdB%Rf$2`xFQZCxl>)Hg{=~77j$ssEM zsRQX?rIZUfu7Axu&rtzL0Wwk+bG=?YMSfKK-uq}b_(HXxl>_jI_VZeI z&TTdebzLtM5aeIiHL1Vs004keDh^mm38fUtIECZ!2q|Sugkk9&k4I8}SpjI<)+?nj zj^iTnjpGQV6nQg}L)Udc^6U?JAhhR_t$+~mkocZ6@_*Vm=g@Usl)jV_UDuHx!Pz?} zV~p?nezECs&Os?f+KEwU+txqZr|v+>4ySTod;9wn?K2F+Fbu;m48t%C!!W;Rgdk8M=jq`E*TlPjfAmL;sUly2U_T8q?&Endk3kHHVa;EgfyYK-yT z`%TJYX@6-f^a{1b%)#)%1)YB<%DPWo=lw}EQcs3xlRhA{DY1&o+0U-p!c_C}<<_ZWiAAF!f zIv|0^nH;TkRKhe(nCBTEA0Mkd3Lky@G}uB2Tz@VX@&u3+5E32|C1|ZTQGt{aTIw|Jpq6{Pwi9{liNF)-8N9gU%Z5y;^C|YYXj(;Nnpe#!Oz&MU5%W|dD zqx=e)d^j8c0P{RMqX{9H=NZ@Q)&0IFLI_kuc+%906+)< z0C&ACOOz6i(si9Voleg9vMgN`G);r9>w>pIPy|fVgu~&0X_`POU5)$Sdt+t$Tfx^S zgdhj_3i!rSN`F`3xHr=@xd^cGpGMbp=6pUIt+o4{&u0@8ezEe6F;1@4C02e=4gfy9 zz1{1}vOMiBR8_T#02}^QRYk2A>;M2@j5&iTrC^Lj36J4;Jc3f{5~1CC$Kx?-y&wm0 z&JAM><2bGo-#Ct7j71kCAzUsO0JwPy*zr(;BfxsxCV#$dM&6rcS#Y^rTG&N zz0q2`Z-1?|F~&TlJ?6K@d>#6}H!)6#iU8o_4iG{hrF6~G)9Dn|qJ9+H9=F|TDWyA~ z5KFKF+P2Mn4%~EJl6@<_@XGFl=^hu zBetv@&~=@8eSLM;_T&cuv;Ctz9bzNFo4Y%dQhyA?u+m}c2)kVXU>JtgxNplZ{|8Db zUS3`@;Ll@@5OVj<3L(%mjf(`O6sBpq8!g|(ziS&`A3_L(5H~v7ZL&SQ#W^>=6P&V~ zbF890A-`f@V8rt1kaYoc|5{Nr+9;Aj`5{BfuDA zgb=Xj6|MYxx_wfeu58>s25*#a+cuL@LMe4uP@d