diff --git a/Resources/Locale/ru-RU/_white/fluff/doxxxom.ftl b/Resources/Locale/ru-RU/_white/fluff/doxxxom.ftl new file mode 100644 index 0000000000..ebf9dc578f --- /dev/null +++ b/Resources/Locale/ru-RU/_white/fluff/doxxxom.ftl @@ -0,0 +1,7 @@ +marking-DoxxxomHair = Запутанные волосы + +marking-DoxxxomHorns = Змеиные рожки +marking-DoxxxomHorns-m_frills_hornsdouble_ADJ = Основной + +marking-DoxxxomTail = Змеиный хвост +marking-DoxxxomTail-m_tail_lizard_wagging_smooth_BEHIND = Основной diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index d5f5cce506..0a6bb56dc8 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -1206,3 +1206,31 @@ - type: EmitSoundOnUse sound: path: /Audio/White/Fluff/Joulerk/activate.ogg + +# DoxXxoM +- type: marking + id: DoxxxomHorns + bodyPart: HeadTop + markingCategory: HeadTop + sponsorOnly: false + sprites: + - sprite: White/Fluff/DoxXxoM/horns.rsi + state: m_frills_hornsdouble_ADJ + +- type: marking + id: DoxxxomTail + bodyPart: Tail + markingCategory: Tail + sponsorOnly: false + sprites: + - sprite: White/Fluff/DoxXxoM/tail.rsi + state: m_tail_lizard_wagging_smooth_BEHIND + +- type: marking + id: DoxxxomHair + bodyPart: Hair + markingCategory: Hair + sponsorOnly: false + sprites: + - sprite: White/Fluff/DoxXxoM/hair.rsi + state: hair_allthefuzz diff --git a/Resources/Textures/White/Fluff/DoxXxoM/hair.rsi/hair_allthefuzz.png b/Resources/Textures/White/Fluff/DoxXxoM/hair.rsi/hair_allthefuzz.png new file mode 100644 index 0000000000..997b069d7e Binary files /dev/null and b/Resources/Textures/White/Fluff/DoxXxoM/hair.rsi/hair_allthefuzz.png differ diff --git a/Resources/Textures/White/Fluff/DoxXxoM/hair.rsi/meta.json b/Resources/Textures/White/Fluff/DoxXxoM/hair.rsi/meta.json new file mode 100644 index 0000000000..f1d49dabcb --- /dev/null +++ b/Resources/Textures/White/Fluff/DoxXxoM/hair.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "FrostyDev", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hair_allthefuzz", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Fluff/DoxXxoM/horns.rsi/m_frills_hornsdouble_ADJ.png b/Resources/Textures/White/Fluff/DoxXxoM/horns.rsi/m_frills_hornsdouble_ADJ.png new file mode 100644 index 0000000000..b55a79e8f6 Binary files /dev/null and b/Resources/Textures/White/Fluff/DoxXxoM/horns.rsi/m_frills_hornsdouble_ADJ.png differ diff --git a/Resources/Textures/White/Fluff/DoxXxoM/horns.rsi/meta.json b/Resources/Textures/White/Fluff/DoxXxoM/horns.rsi/meta.json new file mode 100644 index 0000000000..91e8f347d4 --- /dev/null +++ b/Resources/Textures/White/Fluff/DoxXxoM/horns.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "FrostyDev", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "m_frills_hornsdouble_ADJ", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Fluff/DoxXxoM/tail.rsi/m_tail_lizard_wagging_smooth_BEHIND.png b/Resources/Textures/White/Fluff/DoxXxoM/tail.rsi/m_tail_lizard_wagging_smooth_BEHIND.png new file mode 100644 index 0000000000..749812789f Binary files /dev/null and b/Resources/Textures/White/Fluff/DoxXxoM/tail.rsi/m_tail_lizard_wagging_smooth_BEHIND.png differ diff --git a/Resources/Textures/White/Fluff/DoxXxoM/tail.rsi/meta.json b/Resources/Textures/White/Fluff/DoxXxoM/tail.rsi/meta.json new file mode 100644 index 0000000000..ace83cc869 --- /dev/null +++ b/Resources/Textures/White/Fluff/DoxXxoM/tail.rsi/meta.json @@ -0,0 +1,61 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "FrostyDev", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "m_tail_lizard_wagging_smooth_BEHIND", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file