diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/accessories/human-hair.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/accessories/human-hair.ftl index a7dd01e8e9..e8c6796921 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/accessories/human-hair.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/accessories/human-hair.ftl @@ -69,3 +69,23 @@ marking-HumanHairVictory = Победа marking-HumanHairViper = Гадюка marking-HumanHairWife = Жена marking-HumanHairZiegler = Циглер +marking-HairAyanami = Аянами (NEW) +marking-HairBasarab = Басараб (NEW) +marking-HairBubbleGum = Бабл Гам (NEW) +marking-HairCloud = Облачная (NEW) +marking-HairCrayfish = Клешни (NEW) +marking-HairHank = Хэнк (NEW) +marking-HairHonor = Ваша честь (NEW) +marking-HairMadScientist = Безумный учёный (NEW) +marking-HairMavis = Мейвиc (NEW) +marking-HairMonday = Стиль "понедельник" (NEW) +marking-HairMorningHairstyle = Стиль "доброе утро" (NEW) +marking-HairMorningHairstyle2 = Стиль "доброе утро" 2 (NEW) +marking-HairNemesida = Кривая чёлка (NEW) +marking-HairPonytail = Пышная с хвостом (NEW) +marking-HairPrinceCharming = Принц (NEW) +marking-HairPunk = Мамин панк (NEW) +marking-HairShavedFemale = Женская с выбритым боком (NEW) +marking-HairShavedFemaleUnisex = Унисекс с пучком (NEW) +marking-HairTuranga = Джунгли (NEW) +marking-HairMoon = Адская гончая (NEW) diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Customization/Markings/human_hair.yml index 1c4254b63b..a0dec631a6 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Customization/Markings/human_hair.yml @@ -567,3 +567,165 @@ sprites: - sprite: _Sunrise/Mobs/Customization/human_hair.rsi state: ziegler + +### NEW SUNRISE SPRITES LICENSED UNDER CLA: + +- type: marking + id: HairBasarab + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: basarab + +- type: marking + id: HairCrayfish + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: crayfish + +- type: marking + id: HairHank + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: hank + +- type: marking + id: HairHonor + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: honor + +- type: marking + id: HairMadScientist + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: madscientist + +- type: marking + id: HairMonday + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: monday + +- type: marking + id: HairNemesida + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: nemesida + +- type: marking + id: HairPunk + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: punk + +- type: marking + id: HairTuranga + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: turanga + +- type: marking + id: HairAyanami + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: ayanami + +- type: marking + id: HairBubbleGum + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: bubble_gum + +- type: marking + id: HairMavis + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: mavis + +- type: marking + id: HairCloud + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: cloud + +- type: marking + id: HairMorningHairstyle + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: morning_hairstyle + +- type: marking + id: HairMorningHairstyle2 + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: morning_hairstyle_2 + +- type: marking + id: HairPonytail8 + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: ponytail8 + +- type: marking + id: HairPrinceCharming + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: prince_charming + +- type: marking + id: HairShavedFemale + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: shaved_female + +- type: marking + id: HairShavedFemaleUnisex + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: shaved_unisex + +- type: marking + id: HairMoon + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Sunrise/Mobs/Customization/sunrise_human_hair.rsi + state: moon diff --git a/Resources/Textures/Mobs/Customization/human_hair.rsi/unshaven_mohawk.png b/Resources/Textures/Mobs/Customization/human_hair.rsi/unshaven_mohawk.png index 63004c2c28..09b8d814e4 100644 Binary files a/Resources/Textures/Mobs/Customization/human_hair.rsi/unshaven_mohawk.png and b/Resources/Textures/Mobs/Customization/human_hair.rsi/unshaven_mohawk.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/ayanami.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/ayanami.png new file mode 100644 index 0000000000..8d31a5f973 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/ayanami.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/basarab.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/basarab.png new file mode 100644 index 0000000000..e317987a51 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/basarab.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/bubble_gum.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/bubble_gum.png new file mode 100644 index 0000000000..7ab406d629 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/bubble_gum.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/cloud.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/cloud.png new file mode 100644 index 0000000000..60b1fff2ac Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/cloud.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/crayfish.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/crayfish.png new file mode 100644 index 0000000000..b7b4b9e266 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/crayfish.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/hank.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/hank.png new file mode 100644 index 0000000000..50451d58a2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/hank.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/honor.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/honor.png new file mode 100644 index 0000000000..67220e1593 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/honor.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/madscientist.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/madscientist.png new file mode 100644 index 0000000000..8e4b81357a Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/madscientist.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/mavis.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/mavis.png new file mode 100644 index 0000000000..3e1bdf695e Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/mavis.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/meta.json b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/meta.json new file mode 100644 index 0000000000..c066b46fdc --- /dev/null +++ b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/meta.json @@ -0,0 +1,91 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ayanami", + "directions": 4 + }, + { + "name": "bubble_gum", + "directions": 4 + }, + { + "name": "cloud", + "directions": 4 + }, + { + "name": "mavis", + "directions": 4 + }, + { + "name": "basarab", + "directions": 4 + }, + { + "name": "crayfish", + "directions": 4 + }, + { + "name": "hank", + "directions": 4 + }, + { + "name": "honor", + "directions": 4 + }, + { + "name": "madscientist", + "directions": 4 + }, + { + "name": "monday", + "directions": 4 + }, + { + "name": "nemesida", + "directions": 4 + }, + { + "name": "punk", + "directions": 4 + }, + { + "name": "turanga", + "directions": 4 + }, + { + "name": "morning_hairstyle", + "directions": 4 + }, + { + "name": "morning_hairstyle_2", + "directions": 4 + }, + { + "name": "ponytail8", + "directions": 4 + }, + { + "name": "prince_charming", + "directions": 4 + }, + { + "name": "shaved_female", + "directions": 4 + }, + { + "name": "moon", + "directions": 4 + }, + { + "name": "shaved_unisex", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/monday.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/monday.png new file mode 100644 index 0000000000..72f304f311 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/monday.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/moon.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/moon.png new file mode 100644 index 0000000000..b3749088cb Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/moon.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/morning_hairstyle.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/morning_hairstyle.png new file mode 100644 index 0000000000..4d895c33c1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/morning_hairstyle.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/morning_hairstyle_2.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/morning_hairstyle_2.png new file mode 100644 index 0000000000..dd93c11037 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/morning_hairstyle_2.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/nemesida.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/nemesida.png new file mode 100644 index 0000000000..304770de76 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/nemesida.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/ponytail8.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/ponytail8.png new file mode 100644 index 0000000000..6170f94461 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/ponytail8.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/prince_charming.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/prince_charming.png new file mode 100644 index 0000000000..187ec7412d Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/prince_charming.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/punk.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/punk.png new file mode 100644 index 0000000000..0573e427f3 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/punk.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/shaved_female.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/shaved_female.png new file mode 100644 index 0000000000..81d76bb889 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/shaved_female.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/shaved_unisex.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/shaved_unisex.png new file mode 100644 index 0000000000..dbb926fdcf Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/shaved_unisex.png differ diff --git a/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/turanga.png b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/turanga.png new file mode 100644 index 0000000000..ecada4a229 Binary files /dev/null and b/Resources/Textures/_Sunrise/Mobs/Customization/sunrise_human_hair.rsi/turanga.png differ