From: Арт <123451459+JustArt1m@users.noreply.github.com> Date: Tue, 3 Sep 2024 08:29:24 +0000 (+0300) Subject: Return Long2 and Long3 hairstyles (#30963) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0c018769a685158f26b4870cd8f1a17a55cae5a4;p=space-station-14.git Return Long2 and Long3 hairstyles (#30963) * Sprites * Prototype_&_Locale * sorted_in_alphabetical_order --- diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl index 7d3467a610..9575cd5c2f 100644 --- a/Resources/Locale/en-US/accessories/human-hair.ftl +++ b/Resources/Locale/en-US/accessories/human-hair.ftl @@ -45,6 +45,8 @@ marking-HumanHairClassicBusiness = Classic Business Hair marking-HumanHairClassicCia = Classic CIA marking-HumanHairClassicCornrows2 = Classic Cornrows 2 marking-HumanHairClassicFloorlengthBedhead = Classic Floorlength Bedhead +marking-HumanHairClassicLong2 = Classic Long Hair 2 +marking-HumanHairClassicLong3 = Classic Long Hair 3 marking-HumanHairClassicModern = Classic Modern marking-HumanHairClassicMulder = Classic Mulder marking-HumanHairClassicWisp = Classic Wisp diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml index aa983583c5..bd7bed25f6 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml @@ -1349,3 +1349,17 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: tailed +- type: marking + id: HumanHairClassicLong2 + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: classiclong2 +- type: marking + id: HumanHairClassicLong3 + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: classiclong3 diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong2.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong2.png new file mode 100644 index 0000000000..4bf29c6c3c Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong2.png differ diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong3.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong3.png new file mode 100644 index 0000000000..6597c3a3d0 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/classiclong3.png differ diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json index 8fd4f5e1b9..d6cd1e11da 100644 --- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json @@ -782,6 +782,14 @@ { "name": "tailed", "directions": 4 + }, + { + "name": "classiclong2", + "directions": 4 + }, + { + "name": "classiclong3", + "directions": 4 } ] }