From 53e09e834a7f67ccd80d1edbfbdb9026245f67c4 Mon Sep 17 00:00:00 2001 From: Alex C Date: Sat, 21 Dec 2024 16:17:49 -0500 Subject: [PATCH 1/2] bodyhair and fixed male body texture --- .../en-US/_Impstation/markings/bodyhair.ftl | 8 +++++ .../Mobs/Customization/Markings/bodyhair.yml | 28 ++++++++++++++++++ .../Mobs/Species/Human/parts.rsi/torso_m.png | Bin 682 -> 470 bytes .../bodyhair.rsi/human_bodyhair_female.png | Bin 0 -> 239 bytes .../bodyhair.rsi/human_bodyhair_male.png | Bin 0 -> 310 bytes .../Mobs/Customization/bodyhair.rsi/meta.json | 23 ++++++++++++++ .../bodyhair.rsi/spelf_bodyhair.png | Bin 0 -> 304 bytes 7 files changed, 59 insertions(+) create mode 100644 Resources/Locale/en-US/_Impstation/markings/bodyhair.ftl create mode 100644 Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/bodyhair.yml create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/human_bodyhair_female.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/human_bodyhair_male.png create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/meta.json create mode 100644 Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/spelf_bodyhair.png diff --git a/Resources/Locale/en-US/_Impstation/markings/bodyhair.ftl b/Resources/Locale/en-US/_Impstation/markings/bodyhair.ftl new file mode 100644 index 00000000000000..8123b9cc6213d2 --- /dev/null +++ b/Resources/Locale/en-US/_Impstation/markings/bodyhair.ftl @@ -0,0 +1,8 @@ +marking-BodyhairHumanMale-human_bodyhair_male = Bodyhair +marking-BodyhairHumanMale = Bodyhair + +marking-BodyhairHumanFemale-human_bodyhair_female = Bodyhair +marking-BodyhairHumanFemale = Bodyhair + +marking-BodyhairSpelf-spelf_bodyhair = Bodyhair +marking-BodyhairSpelf = Bodyhair diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/bodyhair.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/bodyhair.yml new file mode 100644 index 00000000000000..71220638612d2d --- /dev/null +++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Customization/Markings/bodyhair.yml @@ -0,0 +1,28 @@ +- type: marking + id: BodyhairHumanMale + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Dwarf, Human ] + sexRestriction: [ Male ] + sprites: + - sprite: _Impstation/Mobs/Customization/bodyhair.rsi + state: human_bodyhair_male + +- type: marking + id: BodyhairHumanFemale + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Dwarf, Human ] + sexRestriction: [ Female ] + sprites: + - sprite: _Impstation/Mobs/Customization/bodyhair.rsi + state: human_bodyhair_female + +- type: marking + id: BodyhairSpelf + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ SpElf ] + sprites: + - sprite: _Impstation/Mobs/Customization/bodyhair.rsi + state: spelf_bodyhair diff --git a/Resources/Textures/Mobs/Species/Human/parts.rsi/torso_m.png b/Resources/Textures/Mobs/Species/Human/parts.rsi/torso_m.png index 3097763a95efd0b32ce02b6b696790597a3bc3c8..be5a3a80179c7283a8f585a8a6df4a53f4dce65e 100644 GIT binary patch delta 455 zcmV;&0XY7u1=a(Q8Gi!+005o0f$RVP00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z0016POjJeMw6gi`^6J^#@!H$}|Nr~@`~Lp^_TJ~zrlJ4<01ma`-2eap3UpFVQ~&?} z|NsC0|Nj88%q-6U000SaNLh0L01m?d01m?e$8V@)0003iNqjUPh!S4W7836k0{Ud;bQ*4%wV&a;0Dm5z02D8A4B(LhkUz8z0niYDkO6=;&J=K!VFwULR0_bSBK%lddsA#w zwbofzejfdzCSU@n377!ty8sscyeLB`n4@*!$)#~n*7v%v&(@{_p!#W5-ggl8V}Oda z_DQzwF>W)659z4d|A$l9AM$Mmp;Nn34RHG!b3h&7c0dXt#c;m`i9d&*73!oa{VYm~^?JRfx!G(=KUno&@;apVd%TAVQPq9? z_5;q|y#`Iwxczy-vU47%Lfb{D+wZ=)6xL@70PXkwWW3c**Q?`#3aEX0qMP(_YhATI z5YH_Zv-wWH&wrw%Sj^_i`hQh_Mf_5?Iu@*m&!x|F2Tw0X}N4zHkUo-7l%W0t;!dn zW6?(t1VIo4K@bE%5ClPx=LYfIGB-&7+sF&neOS!qTRvn_qTYvxyW5?_D5b3+R8PK6 z7A3{Q-7S+3%%8>grJ&nPlI+vsNsmj(4d!tQAql`7+{iF@5OZ(?Aqk`vV@L^r-tU27 z*|7AdGJnh+Wa&@Auxx25d1=|kLPlKN&Z6gC^gef~iu}8ICmKxkX+4 ze^ia?{a#}bST6$C6>ECrZ96xA3_c(Tf*=TT+7|o)p8Lt?Wb}V300000NkvXXu0mjf D2zffC diff --git a/Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/human_bodyhair_female.png b/Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/human_bodyhair_female.png new file mode 100644 index 0000000000000000000000000000000000000000..c4730912befd675d0ad95f1cb67538bfc2f731f4 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|R(iTPhE&XX zdvhZ%lOa!QV)GO;=M){aU4apry|+Cg4+I6xXk*i|xbTzj-+KQ~UzB!kZ7lbK%$ cmO8NSE<;?Qm*Aezz%G!0r>mdKI;Vst0KZ{a`2YX_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/human_bodyhair_male.png b/Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/human_bodyhair_male.png new file mode 100644 index 0000000000000000000000000000000000000000..2253f2140fbde834858e821d64d9913903df6968 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|K6tt~hE&XX zd&@BIumMkN;su_~GKv zogoO+&hSIE-2UktXP1zxLVfp;^1DdPd}q>K(r$L-$|5Y+_rl?4>C#IB^x{ z#&yx@w|i&Ky=xm{8e;0DxxV^q_`P!`_n|0FfzRu5L1Znz^vyWlE%EV5WnYrshd{0+Dmvv4FO#rKW Bf*=3@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/meta.json b/Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/meta.json new file mode 100644 index 00000000000000..f2634e13a80f56 --- /dev/null +++ b/Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "copyright": "Made for Impstation by Honeyed_Lemons_", + "license": "CC-BY-SA-4.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "human_bodyhair_male", + "directions": 4 + }, + { + "name": "human_bodyhair_female", + "directions": 4 + }, + { + "name": "spelf_bodyhair", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/spelf_bodyhair.png b/Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi/spelf_bodyhair.png new file mode 100644 index 0000000000000000000000000000000000000000..cf670a97a4415de556f463c7b039883d3ab9b6c9 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|UU|AWhE&XX zd($xQumMkN;x_gVFPMKs*t(pXxcG_L%$*sc4i4SoQgJslTeC|tM4g*v|G#Y#u|z{! zZXO3vd&B*r@2h9FcAVI??%})Z_iRlk7Vq0py=2OvyNB=Qullt$ZraoT{EMa(i3{H3 zQIvaqZ?Ea(pj|twS7fconi3TE{6qArs$b3fzvnI3zMRc~=kW2uwQ~Z_{oHEbSUIo% z^^(ckZ?SLRzc+K%s_%?I%fR6IWg|KJO<|!6HuAfk(K%L_Bh_bn)_^>bP0l+XkK1(Jj% literal 0 HcmV?d00001 From c11b69ff8d8904604730d9e8bc5670e3dfeeffae Mon Sep 17 00:00:00 2001 From: Alex C <53302665+honeyed-lemons@users.noreply.github.com> Date: Sat, 21 Dec 2024 17:24:41 -0500 Subject: [PATCH 2/2] Update bodyhair.ftl --- .../Locale/en-US/_Impstation/markings/bodyhair.ftl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/en-US/_Impstation/markings/bodyhair.ftl b/Resources/Locale/en-US/_Impstation/markings/bodyhair.ftl index 8123b9cc6213d2..410cd1aa8f47d7 100644 --- a/Resources/Locale/en-US/_Impstation/markings/bodyhair.ftl +++ b/Resources/Locale/en-US/_Impstation/markings/bodyhair.ftl @@ -1,8 +1,8 @@ -marking-BodyhairHumanMale-human_bodyhair_male = Bodyhair -marking-BodyhairHumanMale = Bodyhair +marking-BodyhairHumanMale-human_bodyhair_male = Body Hair +marking-BodyhairHumanMale = Body Hair -marking-BodyhairHumanFemale-human_bodyhair_female = Bodyhair -marking-BodyhairHumanFemale = Bodyhair +marking-BodyhairHumanFemale-human_bodyhair_female = Body Hair +marking-BodyhairHumanFemale = Body Hair -marking-BodyhairSpelf-spelf_bodyhair = Bodyhair -marking-BodyhairSpelf = Bodyhair +marking-BodyhairSpelf-spelf_bodyhair = Body Hair +marking-BodyhairSpelf = Body Hair