From 451d04d759d7c9c39622f3132ea1a64f28e93b0d Mon Sep 17 00:00:00 2001 From: ravage <142820619+ravage123321@users.noreply.github.com> Date: Mon, 8 Jul 2024 14:21:56 +0300 Subject: [PATCH] Add beards (#312) * :neckbeard: borodi * :neckbeard: v2 a --- .../_CP14/markings/human-facial-hair.ftl | 10 +++ .../_CP14/markings/human-facial-hair.ftl | 12 ++- .../Markings/human_facial_hair.yml | 82 +++++++++++++++++- .../human_facial_hair.rsi/briefs.png | Bin 0 -> 232 bytes .../human_facial_hair.rsi/circle.png | Bin 0 -> 235 bytes .../human_facial_hair.rsi/espanol.png | Bin 0 -> 222 bytes .../human_facial_hair.rsi/imperial.png | Bin 0 -> 186 bytes .../human_facial_hair.rsi/machete.png | Bin 0 -> 197 bytes .../human_facial_hair.rsi/meta.json | 40 +++++++++ .../human_facial_hair.rsi/mutton.png | Bin 0 -> 272 bytes .../human_facial_hair.rsi/pigtail.png | Bin 0 -> 207 bytes .../human_facial_hair.rsi/sage.png | Bin 0 -> 206 bytes .../human_facial_hair.rsi/watson.png | Bin 0 -> 176 bytes .../human_facial_hair.rsi/whiskers.png | Bin 0 -> 200 bytes 14 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/briefs.png create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/circle.png create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/espanol.png create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/imperial.png create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/machete.png create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/mutton.png create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pigtail.png create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/sage.png create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/watson.png create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/whiskers.png diff --git a/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl b/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl index d3ed1d42cc..babc82bdbe 100644 --- a/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl +++ b/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl @@ -2,3 +2,13 @@ marking-CP14HumanFacialHair3Clock = 3 O'clock marking-CP14HumanFacialHairAbe = Abe marking-CP14HumanFacialHairDwarf = Dwarf marking-CP14HumanFacialHairGoateeMush = Goatee +marking-CP14HumanFacialHairBriefs = Briefs +marking-CP14HumanFacialHairCircle = Circle +marking-CP14HumanFacialHairEspanol = Espanol +marking-CP14HumanFacialHairImperial = Imperial +marking-CP14HumanFacialHairMachete = Machete +marking-CP14HumanFacialHairMutton = Mutton +marking-CP14HumanFacialHairPigtail = Pigtail +marking-CP14HumanFacialHairSage = Sage +marking-CP14HumanFacialHairWatson = Watson +marking-CP14HumanFacialHairWhiskers = Whiskers \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl b/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl index 9c52e10fc7..e11d231182 100644 --- a/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl +++ b/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl @@ -1,4 +1,14 @@ marking-CP14HumanFacialHair3Clock = Легкая щетина marking-CP14HumanFacialHairAbe = Серьезная щетина marking-CP14HumanFacialHairDwarf = Дворф -marking-CP14HumanFacialHairGoateeMush = Козлиная бородка с усиками \ No newline at end of file +marking-CP14HumanFacialHairGoateeMush = Козлиная бородка с усиками +marking-CP14HumanFacialHairBriefs = Шорты +marking-CP14HumanFacialHairCircle = Круглая +marking-CP14HumanFacialHairEspanol = Эспаньолка +marking-CP14HumanFacialHairImperial = Имперская +marking-CP14HumanFacialHairMachete = Мачете +marking-CP14HumanFacialHairMutton = Баранья +marking-CP14HumanFacialHairPigtail = Косичка +marking-CP14HumanFacialHairSage = Ман Чу +marking-CP14HumanFacialHairWatson = Ватсон +marking-CP14HumanFacialHairWhiskers = Бакенбарды \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml index d4af8a430e..2a3bf873cc 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_facial_hair.yml @@ -28,4 +28,84 @@ markingCategory: FacialHair sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi - state: goateemush \ No newline at end of file + state: goateemush + +- type: marking + id: CP14HumanFacialHairBriefs + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: briefs + +- type: marking + id: CP14HumanFacialHairCircle + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: circle + +- type: marking + id: CP14HumanFacialHairEspanol + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: espanol + +- type: marking + id: CP14HumanFacialHairImperial + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: imperial + +- type: marking + id: CP14HumanFacialHairMachete + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: machete + +- type: marking + id: CP14HumanFacialHairMutton + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: mutton + +- type: marking + id: CP14HumanFacialHairPigtail + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: pigtail + +- type: marking + id: CP14HumanFacialHairSage + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: sage + +- type: marking + id: CP14HumanFacialHairWatson + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: watson + +- type: marking + id: CP14HumanFacialHairWhiskers + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: whiskers \ No newline at end of file diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/briefs.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/briefs.png new file mode 100644 index 0000000000000000000000000000000000000000..5dc24f5aaec9b61dc239170f068970370682e641 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|7J0fjhE&XX zduJo>VFdx!0GW-9)f?)c%WB+c;+-%@OS2=$<&&o0mw7JE2iq6_*JK20VL0&q=J&rp zQsy(P-I{#vXUtmD!}X8F3SUSlf4vucuJZNX<%Vu9JRpV0;DG19g~}Sgcoj=c`Ike~)M(OrR?^Oi}db;|# JtaD0e0ssJlR3ZQX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/circle.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/circle.png new file mode 100644 index 0000000000000000000000000000000000000000..0a1f54216436e8eb0f1579b5961647b1814dd09c GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|mU_B4hE&XX zd&iLPuz~=~0q-N#fBu&Te3&)aL$q^;C#%^tA7;@t4!eq!fr=Rz8kSd|wX!h&T^{c> zv+Vr4d&Ycc&)kdZ?&!F7>wNkKhqYVN)8wzOHokjx%S8jbUxhMm0$^=O#O>&yMH_?5 zFT7e4{Hw|B`MU+Xt7Fbz+-d#dmCgS(?<}K?_{v`K-O|)XX!-t$QEO@1F$Q}kevqK2 LtDnm{r-UW|MI2Qa literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/espanol.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/espanol.png new file mode 100644 index 0000000000000000000000000000000000000000..7da85438e3b818d170138e20eeac532d091763d2 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|W_Y?dhE&XX zd&iOMuz~>Vh0KrtzJE}Qt(H@~8KTj+Y|0U~x782a9RKsIQ)dDyXK2uWI!E69-2aPz zUop&CGi8&D%ay3<+v2|eY|Pzk`hRcq`tIB3`#U@|ORL#I%8@`r@fid873I9oSkLBJ y+rM~aGvCMZamEoRw=;XPTkhZQnIei%ToJ{%e5;?U&-3;NAVE)8KbLh*2~7Y+uuuB{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/imperial.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/imperial.png new file mode 100644 index 0000000000000000000000000000000000000000..f3b5ee1c12a702c6e2b61839bdfa4f6a15e40c86 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|N<3X0Ln`LH zy|aOEZ?Ln`LH zy|a>iJw7K$>RY?C z<@0N|EpwIorUmV?hR7qx1KGhzkfTwQZy5sK>4+2t>( Ud|%GADjy{1>FVdQ&MBb@07^Fkw!>i$X8$S^eV6zvfSu`SiieYjN77rhkJaKgc}^J5`~BVusE>g` z&gA^(PhPeCb=&sj$Q(bc{nhqX3FBddKkLp526}6nD!tlj)w{;NCUV;5&n1E;VO}e@ z-(v)8L=YAF_owh)DVpZ{ILog#*eu|5ab*{F|9U-VaT>RWrtfP3%jfIf|8_pN z^XhZ6;+xqnSEgM0az5Ag{p8I}c00=vM%|dJ{CrwmpZyytbC95?tDnm{r-UW|0jX%M literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pigtail.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pigtail.png new file mode 100644 index 0000000000000000000000000000000000000000..3857a6e04532d4929b4bf95ff876013f835cc4d6 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|Iz3$+Ln`LH zy<^D7WXQvE;P?N}f96efa%E&aW!fTY9J_04^7egtK!rf?OJ$~i{=S5?ut}!IuS=%w z|B_QDBwx_PYjK9{55rk@h$1+dm$gsy%ACKhm!D2qw&wOMz2zpUcdwa*`bKUy^$iWa j7CnnA>lDbHU~phIdtk=`r#>hy85}Sb4q9e02p&aDF6Tf literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/watson.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/watson.png new file mode 100644 index 0000000000000000000000000000000000000000..b90fc1a840fb022efb89475439de0d59887cddfe GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|vOHZJLn`LH zy|ah8~q&lRCxW!?5qP6-M9zl$BA;=up8AM7nMomzi$g9JTY{an^LB{Ts5?X5H> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/whiskers.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/whiskers.png new file mode 100644 index 0000000000000000000000000000000000000000..16a63c68bd0fa905279c1dd859df51851b93774a GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|nmk<`Ln`LH zy<^DLV8FwA;n83JXE#nBW+^EbT-n=j<99WKorvJ? z6aTwn983iZ_f@7h{obT24^n~zDgstYXQYYcYKDfsVw*MdC~HXA!ewf;ZD$yb&hsJE ao!-e%9%6m5_Pfkvkf5ilpUXO@geCxU0zdo! literal 0 HcmV?d00001