From 5df9a526f07e92ce5b6f612aaba2a6336ec29a1f Mon Sep 17 00:00:00 2001 From: Ed Date: Sun, 13 Apr 2025 23:27:24 +0300 Subject: [PATCH] new horns --- .../en-US/_CP14/markings/tiefling-horns.ftl | 3 ++- .../ru-RU/_CP14/markings/tiefling-horns.ftl | 3 ++- .../Customization/Markings/tiefling_horns.yml | 12 +++++++++++- Resources/Prototypes/_CP14/Species/carcat.yml | 2 +- .../Customization/tiefling_horns.rsi/horn8.png | Bin 0 -> 355 bytes .../Customization/tiefling_horns.rsi/meta.json | 4 ++++ 6 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/horn8.png diff --git a/Resources/Locale/en-US/_CP14/markings/tiefling-horns.ftl b/Resources/Locale/en-US/_CP14/markings/tiefling-horns.ftl index e21d5bbb9b..f9aca6944b 100644 --- a/Resources/Locale/en-US/_CP14/markings/tiefling-horns.ftl +++ b/Resources/Locale/en-US/_CP14/markings/tiefling-horns.ftl @@ -6,4 +6,5 @@ marking-CP14TieflingHorns4 = Change marking-CP14TieflingHorns5 = The Devil marking-CP14TieflingHorns5Broken = Broken Devil marking-CP14TieflingHorns6 = Lamb -marking-CP14TieflingHorns7 = Horny horns \ No newline at end of file +marking-CP14TieflingHorns7 = Horny horns +marking-CP14TieflingHorns8 = Crown \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl b/Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl index 76b9a1fd3b..6c8f51a0af 100644 --- a/Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl +++ b/Resources/Locale/ru-RU/_CP14/markings/tiefling-horns.ftl @@ -6,4 +6,5 @@ marking-CP14TieflingHorns4 = Мелочь marking-CP14TieflingHorns5 = Дьявол marking-CP14TieflingHorns5Broken = Сломленный дьявол marking-CP14TieflingHorns6 = Барашек -marking-CP14TieflingHorns7 = Облегающие \ No newline at end of file +marking-CP14TieflingHorns7 = Облегающие +marking-CP14TieflingHorns8 = Корона \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml index fdce8373e5..c2e3b17ec3 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Customization/Markings/tiefling_horns.yml @@ -86,4 +86,14 @@ followSkinColor: true sprites: - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi - state: horn7 \ No newline at end of file + state: horn7 + +- type: marking + id: CP14TieflingHorns8 + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ CP14Tiefling ] + followSkinColor: true + sprites: + - sprite: _CP14/Mobs/Customization/tiefling_horns.rsi + state: horn8 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Species/carcat.yml b/Resources/Prototypes/_CP14/Species/carcat.yml index 6bf9e3c1ed..4c1201a103 100644 --- a/Resources/Prototypes/_CP14/Species/carcat.yml +++ b/Resources/Prototypes/_CP14/Species/carcat.yml @@ -6,7 +6,7 @@ sprites: CP14MobCarcatSprites markingLimits: CP14MobCarcatMarkingLimits dollPrototype: CP14MobCarcatDummy - skinColoration: VoxFeathers + skinColoration: Hues defaultSkinTone: "#4a382f" maleFirstNames: CP14_Names_Carcat_First femaleFirstNames: CP14_Names_Carcat_First diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/horn8.png b/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/horn8.png new file mode 100644 index 0000000000000000000000000000000000000000..5e9f84fdfe14b4f11e42d96a85735274c14ac603 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zWj$RSLn`LH zyUf425o)rXp=w_1MRd8zGOef>+O+h?tAZSxfr{QBKL$NY6i zM@4=0+$S?@lIP8fPx|&lKu}PAe*E-(yE^{<`FyjaC}Z2I*&$Z{4^E%EsQN%GP-Ihm z@V{RU&ZmF=PO(ZY3$T3Q`&XY4=zL`G<7tHX5s4~gx4HZM+t2CdFY@1Z$=1DGRs8f_ z>)hMRR^?qv+Ua%I_wJ{M>Ax$*Plv90rS`P;>8`m!UFG+_yyUYA>oQrAx6km4%vZBz i?-m%QvLYM)Z?7!d++8!5)qVI0683cUb6Mw<&;$T))|w{( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/meta.json index a95f239ef6..6b447265d8 100644 --- a/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Customization/tiefling_horns.rsi/meta.json @@ -42,6 +42,10 @@ { "name": "horn7", "directions": 4 + }, + { + "name": "horn8", + "directions": 4 } ] }