From: RenQ <164364533+ImRenQ@users.noreply.github.com> Date: Fri, 22 Mar 2024 17:35:40 +0000 (+0300) Subject: The return of the 'long bedhead' haircut as an alternative (#26336) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6bffa31eba2c0b108ec9d5bebb3d161fc7e83ebb;p=space-station-14.git The return of the 'long bedhead' haircut as an alternative (#26336) --- diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl index a39e09d5d5..3a507ec6cf 100644 --- a/Resources/Locale/en-US/accessories/human-hair.ftl +++ b/Resources/Locale/en-US/accessories/human-hair.ftl @@ -7,6 +7,7 @@ marking-HumanHairBedhead = Bedhead marking-HumanHairBedheadv2 = Bedhead 2 marking-HumanHairBedheadv3 = Bedhead 3 marking-HumanHairLongBedhead = Long Bedhead +marking-HumanHairLongBedhead2 = Long Bedhead 2 marking-HumanHairFloorlengthBedhead = Floorlength Bedhead marking-HumanHairBeehive = Beehive marking-HumanHairBeehivev2 = Beehive 2 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml index c3f3bd13a3..449f8aa2cd 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml @@ -61,6 +61,13 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: long_bedhead +- type: marking + id: HumanHairLongBedhead2 + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: long_bedhead2 - type: marking id: HumanHairFloorlengthBedhead bodyPart: Hair diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/long_bedhead2.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/long_bedhead2.png new file mode 100644 index 0000000000..12520f077d Binary files /dev/null and b/Resources/Textures/Mobs/Customization/human_hair.rsi/long_bedhead2.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 7fce060492..5cb41c258b 100644 --- a/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json @@ -423,6 +423,10 @@ "name": "long_bedhead", "directions": 4 }, + { + "name": "long_bedhead2", + "directions": 4 + }, { "name": "longemo", "directions": 4