From 66379b65d198894a4dcc71cb565bc7ce046cb82e Mon Sep 17 00:00:00 2001 From: nukkuminen <90336027+oldschoolotaku@users.noreply.github.com> Date: Thu, 25 Sep 2025 14:25:10 +0300 Subject: [PATCH] added funny facial hair (#1797) * added funny facial hair * fixed atributions * new mustages --- .../_CP14/markings/human-facial-hair.ftl | 3 +- .../_CP14/markings/human-facial-hair.ftl | 3 +- .../Markings/human_facial_hair.yml | 9 +- .../human_facial_hair.rsi/hussar.png | Bin 0 -> 248 bytes .../human_facial_hair.rsi/meta.json | 284 +++++++++--------- 5 files changed, 156 insertions(+), 143 deletions(-) create mode 100644 Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/hussar.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 ae9f043f7d..c115a824b4 100644 --- a/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl +++ b/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl @@ -31,4 +31,5 @@ marking-CP14HumanFacialHairVandyke = evening branch marking-CP14HumanFacialHairVolaju = steppe fringe marking-CP14HumanFacialHairWalrus = walrus storm marking-CP14HumanFacialHairWatson = scholarly classic -marking-CP14HumanFacialHairWise = runebound \ No newline at end of file +marking-CP14HumanFacialHairWise = runebound +marking-CP14HumanFacialHairHussar = hussar 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 e11d231182..4f5f912786 100644 --- a/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl +++ b/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl @@ -11,4 +11,5 @@ marking-CP14HumanFacialHairMutton = Баранья marking-CP14HumanFacialHairPigtail = Косичка marking-CP14HumanFacialHairSage = Ман Чу marking-CP14HumanFacialHairWatson = Ватсон -marking-CP14HumanFacialHairWhiskers = Бакенбарды \ No newline at end of file +marking-CP14HumanFacialHairWhiskers = Бакенбарды +marking-CP14HumanFacialHairHussar = Гусарские 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 213cba81c0..70e7127615 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 @@ -126,6 +126,14 @@ - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi state: hogan +- type: marking + id: CP14HumanFacialHairHussar + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: hussar + - type: marking id: CP14HumanFacialHairJensen bodyPart: FacialHair @@ -269,4 +277,3 @@ sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi state: wise - diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/hussar.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/hussar.png new file mode 100644 index 0000000000000000000000000000000000000000..d46bf511a1ae382599446df9b010dadf9ae7609d GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijUdAc};RK&f#b&$73L4d(wubsvzuiTW~H=I5!eONI=!t~jmnJw(xiOe?T z?TifnuH9h&mXfBsv}b1I@2#eBUX~@#F5A^6_`C4DeX5)kefrF;bM;3b-k=;hAS ot`hRQ{(1fj{t6{^u)h2a3{T~f+tO+lJ_hkUUHx3vIVCg!07^b#U;qFB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json index b7ab9980c8..6cf8fd50b3 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/meta.json @@ -4,144 +4,148 @@ "x": 32, "y": 32 }, - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi, adapted by Dinazewwr. goateemush by TheShuEd", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi, adapted by Dinazewwr. goateemush by TheShuEd, hussar taken from skyrat-tg and edited by Lugzag", "license": "All right reserved", - "states": [ - { - "name": "3oclock", - "directions": 4 - }, - { - "name": "5oclockmoustache", - "directions": 4 - }, - { - "name": "7oclock", - "directions": 4 - }, - { - "name": "7oclockmoustache", - "directions": 4 - }, - { - "name": "abe", - "directions": 4 - }, - { - "name": "chinlessbeard", - "directions": 4 - }, - { - "name": "dwarf", - "directions": 4 - }, - { - "name": "dwarf2", - "directions": 4 - }, - { - "name": "elvis", - "directions": 4 - }, - { - "name": "fiveoclock", - "directions": 4 - }, - { - "name": "fullbeard", - "directions": 4 - }, - { - "name": "fumanchu", - "directions": 4 - }, - { - "name": "goateemush", - "directions": 4 - }, - { - "name": "gt", - "directions": 4 - }, - { - "name": "hip", - "directions": 4 - }, - { - "name": "hogan", - "directions": 4 - }, - { - "name": "jensen", - "directions": 4 - }, - { - "name": "longbeard", - "directions": 4 - }, - { - "name": "martialartist", - "directions": 4 - }, - { - "name": "martialartist2", - "directions": 4 - }, - { - "name": "moonshiner", - "directions": 4 - }, - { - "name": "moustache", - "directions": 4 - }, - { - "name": "mutton", - "directions": 4 - }, - { - "name": "muttonmus", - "directions": 4 - }, - { - "name": "neckbeard", - "directions": 4 - }, - { - "name": "pencilstache", - "directions": 4 - }, - { - "name": "selleck", - "directions": 4 - }, - { - "name": "sideburn", - "directions": 4 - }, - { - "name": "smallstache", - "directions": 4 - }, - { - "name": "vandyke", - "directions": 4 - }, - { - "name": "volaju", - "directions": 4 - }, - { - "name": "walrus", - "directions": 4 - }, - { - "name": "watson", - "directions": 4 - }, - { - "name": "wise", - "directions": 4 - } - ] -} \ No newline at end of file + "states": [ + { + "name": "3oclock", + "directions": 4 + }, + { + "name": "5oclockmoustache", + "directions": 4 + }, + { + "name": "7oclock", + "directions": 4 + }, + { + "name": "7oclockmoustache", + "directions": 4 + }, + { + "name": "abe", + "directions": 4 + }, + { + "name": "chinlessbeard", + "directions": 4 + }, + { + "name": "dwarf", + "directions": 4 + }, + { + "name": "dwarf2", + "directions": 4 + }, + { + "name": "elvis", + "directions": 4 + }, + { + "name": "fiveoclock", + "directions": 4 + }, + { + "name": "fullbeard", + "directions": 4 + }, + { + "name": "fumanchu", + "directions": 4 + }, + { + "name": "goateemush", + "directions": 4 + }, + { + "name": "gt", + "directions": 4 + }, + { + "name": "hip", + "directions": 4 + }, + { + "name": "hussar", + "directions": 4 + }, + { + "name": "hogan", + "directions": 4 + }, + { + "name": "jensen", + "directions": 4 + }, + { + "name": "longbeard", + "directions": 4 + }, + { + "name": "martialartist", + "directions": 4 + }, + { + "name": "martialartist2", + "directions": 4 + }, + { + "name": "moonshiner", + "directions": 4 + }, + { + "name": "moustache", + "directions": 4 + }, + { + "name": "mutton", + "directions": 4 + }, + { + "name": "muttonmus", + "directions": 4 + }, + { + "name": "neckbeard", + "directions": 4 + }, + { + "name": "pencilstache", + "directions": 4 + }, + { + "name": "selleck", + "directions": 4 + }, + { + "name": "sideburn", + "directions": 4 + }, + { + "name": "smallstache", + "directions": 4 + }, + { + "name": "vandyke", + "directions": 4 + }, + { + "name": "volaju", + "directions": 4 + }, + { + "name": "walrus", + "directions": 4 + }, + { + "name": "watson", + "directions": 4 + }, + { + "name": "wise", + "directions": 4 + } + ] +}