diff --git a/Resources/Locale/ru-RU/markings/cat.ftl b/Resources/Locale/ru-RU/markings/cat.ftl index 197457c67c..b8c2fc0acf 100644 --- a/Resources/Locale/ru-RU/markings/cat.ftl +++ b/Resources/Locale/ru-RU/markings/cat.ftl @@ -27,3 +27,15 @@ marking-CatTailDouble-double_tail_cat_back = Первый хвост marking-CatTailDouble-double_tail_cat_front = Второй хвост marking-DemonTailWarete = Демонический хвост marking-DemonTailWarete-tail = Хвост +marking-DemonTailWarete-tail_tip = Кончик +marking-DemonHairWarete = Демоническая прическа +marking-DemonHairWarete-hair = Цвет +marking-SomeTailHZ = Лисий хвост 2 +marking-SomeTailHZ-m_waggingtail_oni_BEHIND = Цвет +marking-SomeEarsHZ = Ебать, лисьи ушки! +marking-SomeEarsHZ-m_ears_fox_FRONT = Цвет +marking-SomeEarsHZZ = Ебать, лисьи ушки 2! +marking-SomeEarsHZZ-m_earsinner_fox_FRONT = Цвет +marking-SomeTailHZZ = Лисий хвост 3 +marking-SomeTailHZZ-tail = Хвост +marking-SomeTailHZZ-tail_tip = Кончик diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index 8af1983198..a5e2d9f1bb 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -181,3 +181,22 @@ - type: Paper content: Ego voco electi pet - type: PetSummon + +# 2sh0nka +- type: entity + parent: ClothingUnderwearSocksBase + id: ClothingUnderwearSocksBlack2sh0nka + name: чёрные чулки + description: Вау. Они.. чёрные? + components: + - type: Sprite + sprite: White/Fluff/deadman1740/black.rsi + +- type: entity + parent: ClothingUnderwearSocksBase + id: ClothingUnderwearSocksGray2sh0nka + name: серые чулки + description: Вау. Они.. серые? + components: + - type: Sprite + sprite: White/Fluff/deadman1740/gray.rsi diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml index 8917dc5d76..7bc258968e 100644 --- a/Resources/Prototypes/White/Fluff/sponsor.yml +++ b/Resources/Prototypes/White/Fluff/sponsor.yml @@ -63,3 +63,15 @@ id: PetsSummonBookLoadout entity: PetSummonBook sponsorOnly: true + +# 2sh0nka + +- type: loadout + id: 2sh0nkaBlackLoadout + entity: ClothingUnderwearSocksBlack2sh0nka + sponsorOnly: true + +- type: loadout + id: 2sh0nkaGrayLoadout + entity: ClothingUnderwearSocksGray2sh0nka + sponsorOnly: true diff --git a/Resources/Prototypes/White/Mobs/Customization/Markings/2shonka-parts.yml b/Resources/Prototypes/White/Mobs/Customization/Markings/2shonka-parts.yml new file mode 100644 index 0000000000..8d91c14616 --- /dev/null +++ b/Resources/Prototypes/White/Mobs/Customization/Markings/2shonka-parts.yml @@ -0,0 +1,41 @@ +- type: marking + id: SomeEarsHZ + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Human, Felinid ] + sponsorOnly: true + sprites: + - sprite: White/Mobs/Customization/mam_ears.rsi + state: m_ears_fox_FRONT + +- type: marking + id: SomeEarsHZZ + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [ Human, Felinid ] + sponsorOnly: true + sprites: + - sprite: White/Mobs/Customization/mam_ears.rsi + state: m_earsinner_fox_FRONT + +- type: marking + id: SomeTailHZ + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Human, Felinid ] + sponsorOnly: true + sprites: + - sprite: White/Mobs/Customization/oni.rsi + state: m_waggingtail_oni_BEHIND + +- type: marking + id: SomeTailHZZ + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [ Human, Felinid ] + sponsorOnly: false + sprites: + - sprite: White/Mobs/Customization/vtergot_fox_parts.rsi + state: tail + - sprite: White/Mobs/Customization/vtergot_fox_parts.rsi + state: tail_tip diff --git a/Resources/Textures/Shaders/White/anime.swsl b/Resources/Textures/Shaders/White/anime.swsl index 916c9d61a2..b2eaf01227 100644 --- a/Resources/Textures/Shaders/White/anime.swsl +++ b/Resources/Textures/Shaders/White/anime.swsl @@ -1,4 +1,4 @@ -const highp float shake_power = 0.03; +const highp float shake_power = 0.04; const highp float shake_block_size = 30.5; const highp float fade = 0.01; const highp vec2 direction_r = vec2( 1.0, 0.0 ); diff --git a/Resources/Textures/White/Fluff/deadman1740/black.rsi/equipped-SOCKS-body-slim.png b/Resources/Textures/White/Fluff/deadman1740/black.rsi/equipped-SOCKS-body-slim.png new file mode 100644 index 0000000000..46f88596a5 Binary files /dev/null and b/Resources/Textures/White/Fluff/deadman1740/black.rsi/equipped-SOCKS-body-slim.png differ diff --git a/Resources/Textures/White/Fluff/deadman1740/black.rsi/equipped-SOCKS.png b/Resources/Textures/White/Fluff/deadman1740/black.rsi/equipped-SOCKS.png new file mode 100644 index 0000000000..237ad91a85 Binary files /dev/null and b/Resources/Textures/White/Fluff/deadman1740/black.rsi/equipped-SOCKS.png differ diff --git a/Resources/Textures/White/Fluff/deadman1740/black.rsi/icon.png b/Resources/Textures/White/Fluff/deadman1740/black.rsi/icon.png new file mode 100644 index 0000000000..a1fb5ffb74 Binary files /dev/null and b/Resources/Textures/White/Fluff/deadman1740/black.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/deadman1740/black.rsi/meta.json b/Resources/Textures/White/Fluff/deadman1740/black.rsi/meta.json new file mode 100644 index 0000000000..c70cf458c4 --- /dev/null +++ b/Resources/Textures/White/Fluff/deadman1740/black.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13", + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-SOCKS", + "directions": 4 + }, + { + "name": "equipped-SOCKS-body-slim", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/White/Fluff/deadman1740/gray.rsi/equipped-SOCKS-body-slim.png b/Resources/Textures/White/Fluff/deadman1740/gray.rsi/equipped-SOCKS-body-slim.png new file mode 100644 index 0000000000..a68d7d1b28 Binary files /dev/null and b/Resources/Textures/White/Fluff/deadman1740/gray.rsi/equipped-SOCKS-body-slim.png differ diff --git a/Resources/Textures/White/Fluff/deadman1740/gray.rsi/equipped-SOCKS.png b/Resources/Textures/White/Fluff/deadman1740/gray.rsi/equipped-SOCKS.png new file mode 100644 index 0000000000..c5f9f6e199 Binary files /dev/null and b/Resources/Textures/White/Fluff/deadman1740/gray.rsi/equipped-SOCKS.png differ diff --git a/Resources/Textures/White/Fluff/deadman1740/gray.rsi/icon.png b/Resources/Textures/White/Fluff/deadman1740/gray.rsi/icon.png new file mode 100644 index 0000000000..8f482966c2 Binary files /dev/null and b/Resources/Textures/White/Fluff/deadman1740/gray.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/deadman1740/gray.rsi/meta.json b/Resources/Textures/White/Fluff/deadman1740/gray.rsi/meta.json new file mode 100644 index 0000000000..c70cf458c4 --- /dev/null +++ b/Resources/Textures/White/Fluff/deadman1740/gray.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13", + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-SOCKS", + "directions": 4 + }, + { + "name": "equipped-SOCKS-body-slim", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/m_ears_fox_ADJ.png b/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/m_ears_fox_ADJ.png new file mode 100644 index 0000000000..b5be59d484 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/m_ears_fox_ADJ.png differ diff --git a/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/m_ears_fox_FRONT.png b/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/m_ears_fox_FRONT.png new file mode 100644 index 0000000000..5845b05ec1 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/m_ears_fox_FRONT.png differ diff --git a/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/m_earsinner_fox_FRONT.png b/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/m_earsinner_fox_FRONT.png new file mode 100644 index 0000000000..b6fbc1241f Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/m_earsinner_fox_FRONT.png differ diff --git a/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/meta.json new file mode 100644 index 0000000000..5e9a1d6849 --- /dev/null +++ b/Resources/Textures/White/Mobs/Customization/mam_ears.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "m_ears_fox_ADJ", + "directions": 4 + }, + { + "name": "m_earsinner_fox_FRONT", + "directions": 4 + }, + { + "name": "m_ears_fox_FRONT", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/Mobs/Customization/oni.rsi/m_tail_oni_BEHIND.png b/Resources/Textures/White/Mobs/Customization/oni.rsi/m_tail_oni_BEHIND.png new file mode 100644 index 0000000000..145e6909a2 Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/oni.rsi/m_tail_oni_BEHIND.png differ diff --git a/Resources/Textures/White/Mobs/Customization/oni.rsi/m_tail_oni_FRONT.png b/Resources/Textures/White/Mobs/Customization/oni.rsi/m_tail_oni_FRONT.png new file mode 100644 index 0000000000..2878424c0b Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/oni.rsi/m_tail_oni_FRONT.png differ diff --git a/Resources/Textures/White/Mobs/Customization/oni.rsi/m_waggingtail_oni_BEHIND.png b/Resources/Textures/White/Mobs/Customization/oni.rsi/m_waggingtail_oni_BEHIND.png new file mode 100644 index 0000000000..eaa0b5075f Binary files /dev/null and b/Resources/Textures/White/Mobs/Customization/oni.rsi/m_waggingtail_oni_BEHIND.png differ diff --git a/Resources/Textures/White/Mobs/Customization/oni.rsi/meta.json b/Resources/Textures/White/Mobs/Customization/oni.rsi/meta.json new file mode 100644 index 0000000000..8320faa77e --- /dev/null +++ b/Resources/Textures/White/Mobs/Customization/oni.rsi/meta.json @@ -0,0 +1,111 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "m_tail_oni_BEHIND", + "directions": 4 + }, + { + "name": "m_tail_oni_FRONT", + "directions": 4 + }, + { + "name": "m_waggingtail_oni_BEHIND", + "directions": 4, + "delays": [ + [ + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996 + ], + [ + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996 + ], + [ + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996 + ], + [ + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996, + 0.089999996 + ] + ] + } + ] +} \ No newline at end of file