diff --git a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl index 6f213fd47f..4725cf65fb 100644 --- a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl +++ b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl @@ -11,6 +11,7 @@ marking-CP14HumanHairBigBraid = Full Braid marking-CP14HumanHairCrazyBald = CrazyBald marking-CP14HumanHairBigDoubleBun = Double Bun marking-CP14HumanHairPonyTail7 = Ponytail +marking-CP14HumanHairPulato = Pulato marking-CP14HumanHairSideTail4 = Side tail marking-CP14HumanHairSwept2 = Swept marking-CP14HumanHairUpdo = Updo diff --git a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl index 107d93b486..a70d4f78e6 100644 --- a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl +++ b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl @@ -11,6 +11,7 @@ marking-CP14HumanHairBigBraid = Хвост во весь рост marking-CP14HumanHairCrazyBald = Безумная проплешина marking-CP14HumanHairBigDoubleBun = Два пунпона marking-CP14HumanHairPonyTail7 = Конский хвост +marking-CP14HumanHairPulato = Пулато marking-CP14HumanHairSideTail4 = Хвост сбоку marking-CP14HumanHairSwept2 = Суровый взгляд marking-CP14HumanHairUpdo = Пучок diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml index ebfb0ef7ee..479fd0f9ed 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml @@ -102,6 +102,14 @@ - sprite: _CP14/Mobs/Customization/human_hair.rsi state: ponytail7 +- type: marking + id: CP14HumanHairPulato + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _CP14/Mobs/Customization/human_hair.rsi + state: pulato + - type: marking id: CP14HumanHairSideTail4 bodyPart: Hair diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json index 93e8616f34..b9d427b328 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json @@ -4,7 +4,7 @@ "x": 48, "y": 48 }, - "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, adapted to CrystallEdge by TheShuEd. Crazybald by TheShuEd, maxy_shagy by Max Gab", + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi ,resprited by Alekshhh, a modified by potato1234x, uneven and tailed is drawn by Ubaser, adapted to CrystallEdge by TheShuEd. Crazybald by TheShuEd, maxy_shagy by Max Gab, pulato.png made by DreamlyJack", "license": "CC-BY-SA-3.0", "states": [ { @@ -63,6 +63,10 @@ "name": "ponytail7", "directions": 4 }, + { + "name": "pulato", + "directions": 4 + }, { "name": "sidetail4", "directions": 4 diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/pulato.png b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/pulato.png new file mode 100644 index 0000000000..08edb7fb47 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/pulato.png differ