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 d3ed1d42cc..babc82bdbe 100644 --- a/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl +++ b/Resources/Locale/en-US/_CP14/markings/human-facial-hair.ftl @@ -2,3 +2,13 @@ marking-CP14HumanFacialHair3Clock = 3 O'clock marking-CP14HumanFacialHairAbe = Abe marking-CP14HumanFacialHairDwarf = Dwarf marking-CP14HumanFacialHairGoateeMush = Goatee +marking-CP14HumanFacialHairBriefs = Briefs +marking-CP14HumanFacialHairCircle = Circle +marking-CP14HumanFacialHairEspanol = Espanol +marking-CP14HumanFacialHairImperial = Imperial +marking-CP14HumanFacialHairMachete = Machete +marking-CP14HumanFacialHairMutton = Mutton +marking-CP14HumanFacialHairPigtail = Pigtail +marking-CP14HumanFacialHairSage = Sage +marking-CP14HumanFacialHairWatson = Watson +marking-CP14HumanFacialHairWhiskers = Whiskers \ No newline at end of file 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 9c52e10fc7..e11d231182 100644 --- a/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl +++ b/Resources/Locale/ru-RU/_CP14/markings/human-facial-hair.ftl @@ -1,4 +1,14 @@ marking-CP14HumanFacialHair3Clock = Легкая щетина marking-CP14HumanFacialHairAbe = Серьезная щетина marking-CP14HumanFacialHairDwarf = Дворф -marking-CP14HumanFacialHairGoateeMush = Козлиная бородка с усиками \ No newline at end of file +marking-CP14HumanFacialHairGoateeMush = Козлиная бородка с усиками +marking-CP14HumanFacialHairBriefs = Шорты +marking-CP14HumanFacialHairCircle = Круглая +marking-CP14HumanFacialHairEspanol = Эспаньолка +marking-CP14HumanFacialHairImperial = Имперская +marking-CP14HumanFacialHairMachete = Мачете +marking-CP14HumanFacialHairMutton = Баранья +marking-CP14HumanFacialHairPigtail = Косичка +marking-CP14HumanFacialHairSage = Ман Чу +marking-CP14HumanFacialHairWatson = Ватсон +marking-CP14HumanFacialHairWhiskers = Бакенбарды \ No newline at end of file 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 d4af8a430e..2a3bf873cc 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 @@ -28,4 +28,84 @@ markingCategory: FacialHair sprites: - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi - state: goateemush \ No newline at end of file + state: goateemush + +- type: marking + id: CP14HumanFacialHairBriefs + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: briefs + +- type: marking + id: CP14HumanFacialHairCircle + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: circle + +- type: marking + id: CP14HumanFacialHairEspanol + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: espanol + +- type: marking + id: CP14HumanFacialHairImperial + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: imperial + +- type: marking + id: CP14HumanFacialHairMachete + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: machete + +- type: marking + id: CP14HumanFacialHairMutton + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: mutton + +- type: marking + id: CP14HumanFacialHairPigtail + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: pigtail + +- type: marking + id: CP14HumanFacialHairSage + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: sage + +- type: marking + id: CP14HumanFacialHairWatson + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: watson + +- type: marking + id: CP14HumanFacialHairWhiskers + bodyPart: FacialHair + markingCategory: FacialHair + sprites: + - sprite: _CP14/Mobs/Customization/human_facial_hair.rsi + state: whiskers \ No newline at end of file diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/briefs.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/briefs.png new file mode 100644 index 0000000000..5dc24f5aae Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/briefs.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/circle.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/circle.png new file mode 100644 index 0000000000..0a1f542164 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/circle.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/espanol.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/espanol.png new file mode 100644 index 0000000000..7da85438e3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/espanol.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/imperial.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/imperial.png new file mode 100644 index 0000000000..f3b5ee1c12 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/imperial.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/machete.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/machete.png new file mode 100644 index 0000000000..a0a4586294 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/machete.png differ 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 1d39b1c095..5c2688781a 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 @@ -22,6 +22,46 @@ { "name": "goateemush", "directions": 4 + }, + { + "name": "whiskers", + "directions": 4 + }, + { + "name": "circle", + "directions": 4 + }, + { + "name": "espanol", + "directions": 4 + }, + { + "name": "imperial", + "directions": 4 + }, + { + "name": "machete", + "directions": 4 + }, + { + "name": "mutton", + "directions": 4 + }, + { + "name": "pigtail", + "directions": 4 + }, + { + "name": "sage", + "directions": 4 + }, + { + "name": "watson", + "directions": 4 + }, + { + "name": "briefs", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/mutton.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/mutton.png new file mode 100644 index 0000000000..51c61c2719 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/mutton.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pigtail.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pigtail.png new file mode 100644 index 0000000000..3857a6e045 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/pigtail.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/sage.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/sage.png new file mode 100644 index 0000000000..7bbac883e3 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/sage.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/watson.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/watson.png new file mode 100644 index 0000000000..b90fc1a840 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/watson.png differ diff --git a/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/whiskers.png b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/whiskers.png new file mode 100644 index 0000000000..16a63c68bd Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Customization/human_facial_hair.rsi/whiskers.png differ