diff --git a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl index 4725cf65fb..e829bdfcad 100644 --- a/Resources/Locale/en-US/_CP14/markings/human-hair.ftl +++ b/Resources/Locale/en-US/_CP14/markings/human-hair.ftl @@ -18,4 +18,5 @@ marking-CP14HumanHairUpdo = Updo marking-CP14HumanHairVLongFringe = Straight bangs marking-CP14HumanHairVolaju = Volaju marking-CP14HumanHairWisp = Wisp -marking-CP14HumanHairMaxyShagy = Maximum Shagginess \ No newline at end of file +marking-CP14HumanHairMaxyShagy = Maximum Shagginess +marking-CP14HumanHairDismas = From the high road \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl index a70d4f78e6..826b9f5cca 100644 --- a/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl +++ b/Resources/Locale/ru-RU/_CP14/markings/human-hair.ftl @@ -18,4 +18,5 @@ marking-CP14HumanHairUpdo = Пучок marking-CP14HumanHairVLongFringe = Прямая челка marking-CP14HumanHairVolaju = Вояж marking-CP14HumanHairWisp = Огонек -marking-CP14HumanHairMaxyShagy = Максимальная лохматость \ No newline at end of file +marking-CP14HumanHairMaxyShagy = Максимальная лохматость +marking-CP14HumanHairDismas = С большой дороги \ No newline at end of file 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 479fd0f9ed..9f0f830e79 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/human_hair.yml @@ -164,4 +164,12 @@ markingCategory: Hair sprites: - sprite: _CP14/Mobs/Customization/human_hair.rsi - state: maxy_shagy \ No newline at end of file + state: maxy_shagy + +- type: marking + id: CP14HumanHairDismas + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _CP14/Mobs/Customization/CP14_human_hair.rsi + state: dismas \ No newline at end of file diff --git a/Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/dismas.png b/Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/dismas.png new file mode 100644 index 0000000000..68b19faa4e Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/dismas.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/meta.json new file mode 100644 index 0000000000..59899044ae --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Customization/CP14_human_hair.rsi/meta.json @@ -0,0 +1,16 @@ +{ + "version": 1, + "size": { + "x": 48, + "y": 48 + }, + "copyright": "dismas by creamy", + "license": "All right reserved", + "states": [ + { + "name": "dismas", + "directions": 4 + } + + ] + } 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 b9d427b328..6ad5eb1897 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/human_hair.rsi/meta.json @@ -91,5 +91,6 @@ "name": "wisp", "directions": 4 } + ] }