diff --git a/Resources/Audio/_RMC14/Voice/Avali/attributions.yml b/Resources/Audio/_RMC14/Voice/Avali/attributions.yml index 2dd3857826f..6a4e94d6f73 100644 --- a/Resources/Audio/_RMC14/Voice/Avali/attributions.yml +++ b/Resources/Audio/_RMC14/Voice/Avali/attributions.yml @@ -13,8 +13,3 @@ license: "CC-BY-NC-SA-3.0" copyright: "Made by @randomposter. with sounds taken from Steam 'Avali sounds' mod / Starbound. Made by Steam user: https://steamcommunity.com/id/Nefuki with permission." source: "https://discord.com/channels/1168210010233376858/1168217282988757116/1316157844281884752" - -- files: ["avali_whistle, avali_scream2, avali_laugh2, avali_laugh3, avali_cry1, avali_cry2, avali_cough"] - license: "CC-BY-NC-SA-3.0" - copyright: "Знайдено й додано Сенсеєм." - source: "https://www.reddit.com/r/avali/s/UauWrFSU8r" \ No newline at end of file diff --git a/Resources/Audio/_Sich/Jukebox/attributions.yml b/Resources/Audio/_Sich/Jukebox/attributions.yml new file mode 100644 index 00000000000..0613f95269e --- /dev/null +++ b/Resources/Audio/_Sich/Jukebox/attributions.yml @@ -0,0 +1,61 @@ +# Думаю не варто питати про ліцензії на ці файли. . . Але хоча б трохи структуризації та посиланна на авторів. + +- files: ["paranoid.ogg"] + license: "CC0-1.0" + copyright: "Black Sabbath – Paranoid." + source: "https://www.youtube.com/watch?v=0qanF-91aJo" + +- files: ["fortunate_son.ogg"] + license: "CC0-1.0" + copyright: "Creedence Clearwater Revival – Fortunate Son." + source: "https://www.youtube.com/watch?v=ZWijx_AgPiA" + +- files: ["california_dreamin'.ogg"] + license: "CC0-1.0" + copyright: "The Mamas & The Papas – California Dreamin'." + source: "https://www.youtube.com/watch?v=N-aK6JnyFmk" + +- files: ["paint_it_black.ogg"] + license: "CC0-1.0" + copyright: "The Rolling Stones – Paint It, Black." + source: "https://www.youtube.com/watch?v=O4irXQhgMqg" + +- files: ["seven_nation_army.ogg"] + license: "CC0-1.0" + copyright: "The White Stripes – Seven Nation Army." + source: "https://www.youtube.com/watch?v=0J2QdDbelmY" + +- files: ["this_fire.ogg"] + license: "CC0-1.0" + copyright: "Franz Ferdinand – This Fire." + source: "https://www.youtube.com/watch?v=DkWML41wUCo" + +- files: ["welcome_to_the_jungle.ogg"] + license: "CC0-1.0" + copyright: "Guns N' Roses – Welcome To The Jungle." + source: "https://www.youtube.com/watch?v=CP3sn7T0rxY" + +- files: ["the_man_who_sold_the_world.ogg"] + license: "CC0-1.0" + copyright: "The Man Who Sold the World (2010 Remaster) made by Midge Ure. Original by David Bowie." + source: "https://www.youtube.com/watch?v=mXHKjFKBC0g" + +- files: ["invinsible.ogg"] + license: "CC0-1.0" + copyright: "Duran Duran – INVISIBLE." + source: "https://www.youtube.com/watch?v=NRtnUVaRwXM" + +- files: ["snake_eater.ogg"] + license: "CC0-1.0" + copyright: "Snake Eater written by Norihiko Hibino and performed by Cynthia Harrell." + source: "https://www.youtube.com/watch?v=m2OR_JaXDaM" + +- files: ["vulytsia_skhid.ogg"] + license: "CC0-1.0" + copyright: "ДК Енергетик – Вулиця Схід." + source: "https://www.youtube.com/watch?v=lSmaS3p9w7Y" + +- files: ["shybenyk.ogg"] + license: "CC0-1.0" + copyright: "Харцизи – Шибеник." + source: "https://www.youtube.com/watch?v=NwuV3W4oFVU" diff --git a/Resources/Audio/_Sich/Jukebox/californiaDream.ogg b/Resources/Audio/_Sich/Jukebox/californiaDream.ogg deleted file mode 100644 index 2548e1e4fd3..00000000000 Binary files a/Resources/Audio/_Sich/Jukebox/californiaDream.ogg and /dev/null differ diff --git a/Resources/Audio/_Sich/Jukebox/california_dreamin'.ogg b/Resources/Audio/_Sich/Jukebox/california_dreamin'.ogg new file mode 100644 index 00000000000..a2a0791c02d Binary files /dev/null and b/Resources/Audio/_Sich/Jukebox/california_dreamin'.ogg differ diff --git a/Resources/Audio/_Sich/Jukebox/dkEnergetikStreetEast.ogg b/Resources/Audio/_Sich/Jukebox/dkEnergetikStreetEast.ogg deleted file mode 100644 index 9159ad62eeb..00000000000 Binary files a/Resources/Audio/_Sich/Jukebox/dkEnergetikStreetEast.ogg and /dev/null differ diff --git a/Resources/Audio/_Sich/Jukebox/fortunaSon.ogg b/Resources/Audio/_Sich/Jukebox/fortunaSon.ogg deleted file mode 100644 index cac0a9430b3..00000000000 Binary files a/Resources/Audio/_Sich/Jukebox/fortunaSon.ogg and /dev/null differ diff --git a/Resources/Audio/_Sich/Jukebox/fortunate_son.ogg b/Resources/Audio/_Sich/Jukebox/fortunate_son.ogg new file mode 100644 index 00000000000..a02a528c4d9 Binary files /dev/null and b/Resources/Audio/_Sich/Jukebox/fortunate_son.ogg differ diff --git a/Resources/Audio/_Sich/Jukebox/invinsible.ogg b/Resources/Audio/_Sich/Jukebox/invinsible.ogg new file mode 100644 index 00000000000..d01a52c4e38 Binary files /dev/null and b/Resources/Audio/_Sich/Jukebox/invinsible.ogg differ diff --git a/Resources/Audio/_Sich/Jukebox/paintInBlack.ogg b/Resources/Audio/_Sich/Jukebox/paintInBlack.ogg deleted file mode 100644 index 4dc13621364..00000000000 Binary files a/Resources/Audio/_Sich/Jukebox/paintInBlack.ogg and /dev/null differ diff --git a/Resources/Audio/_Sich/Jukebox/paint_it_black.ogg b/Resources/Audio/_Sich/Jukebox/paint_it_black.ogg new file mode 100644 index 00000000000..49fc8a1c5b5 Binary files /dev/null and b/Resources/Audio/_Sich/Jukebox/paint_it_black.ogg differ diff --git a/Resources/Audio/_Sich/Jukebox/paranoid.ogg b/Resources/Audio/_Sich/Jukebox/paranoid.ogg index 9675f1fd978..5666f582a9a 100644 Binary files a/Resources/Audio/_Sich/Jukebox/paranoid.ogg and b/Resources/Audio/_Sich/Jukebox/paranoid.ogg differ diff --git a/Resources/Audio/_Sich/Jukebox/sevenNationArmy.ogg b/Resources/Audio/_Sich/Jukebox/sevenNationArmy.ogg deleted file mode 100644 index 9426375e7d1..00000000000 Binary files a/Resources/Audio/_Sich/Jukebox/sevenNationArmy.ogg and /dev/null differ diff --git a/Resources/Audio/_Sich/Jukebox/seven_nation_army.ogg b/Resources/Audio/_Sich/Jukebox/seven_nation_army.ogg new file mode 100644 index 00000000000..1d4389ad61a Binary files /dev/null and b/Resources/Audio/_Sich/Jukebox/seven_nation_army.ogg differ diff --git a/Resources/Audio/_Sich/Jukebox/shubenuk.ogg b/Resources/Audio/_Sich/Jukebox/shubenuk.ogg deleted file mode 100644 index f38b6e21283..00000000000 Binary files a/Resources/Audio/_Sich/Jukebox/shubenuk.ogg and /dev/null differ diff --git a/Resources/Audio/_Sich/Jukebox/shybenyk.ogg b/Resources/Audio/_Sich/Jukebox/shybenyk.ogg new file mode 100644 index 00000000000..a72a9e54e91 Binary files /dev/null and b/Resources/Audio/_Sich/Jukebox/shybenyk.ogg differ diff --git a/Resources/Audio/_Sich/Jukebox/snake_eater.ogg b/Resources/Audio/_Sich/Jukebox/snake_eater.ogg new file mode 100644 index 00000000000..5a20073951b Binary files /dev/null and b/Resources/Audio/_Sich/Jukebox/snake_eater.ogg differ diff --git a/Resources/Audio/_Sich/Jukebox/theManWhoSoldTheWorld.ogg b/Resources/Audio/_Sich/Jukebox/theManWhoSoldTheWorld.ogg deleted file mode 100644 index 605bf8d0efd..00000000000 Binary files a/Resources/Audio/_Sich/Jukebox/theManWhoSoldTheWorld.ogg and /dev/null differ diff --git a/Resources/Audio/_Sich/Jukebox/the_man_who_sold_the_world.ogg b/Resources/Audio/_Sich/Jukebox/the_man_who_sold_the_world.ogg new file mode 100644 index 00000000000..f6033693e3a Binary files /dev/null and b/Resources/Audio/_Sich/Jukebox/the_man_who_sold_the_world.ogg differ diff --git a/Resources/Audio/_Sich/Jukebox/this_fire.ogg b/Resources/Audio/_Sich/Jukebox/this_fire.ogg new file mode 100644 index 00000000000..1e6e14a26e1 Binary files /dev/null and b/Resources/Audio/_Sich/Jukebox/this_fire.ogg differ diff --git a/Resources/Audio/_Sich/Jukebox/thisfire.ogg b/Resources/Audio/_Sich/Jukebox/thisfire.ogg deleted file mode 100644 index 7f650abfae0..00000000000 Binary files a/Resources/Audio/_Sich/Jukebox/thisfire.ogg and /dev/null differ diff --git a/Resources/Audio/_Sich/Jukebox/vulytsia_skhid.ogg b/Resources/Audio/_Sich/Jukebox/vulytsia_skhid.ogg new file mode 100644 index 00000000000..4cc8c96e7db Binary files /dev/null and b/Resources/Audio/_Sich/Jukebox/vulytsia_skhid.ogg differ diff --git a/Resources/Audio/_Sich/Jukebox/welcomeToTheJungle.ogg b/Resources/Audio/_Sich/Jukebox/welcomeToTheJungle.ogg deleted file mode 100644 index c5161fccb71..00000000000 Binary files a/Resources/Audio/_Sich/Jukebox/welcomeToTheJungle.ogg and /dev/null differ diff --git a/Resources/Audio/_Sich/Jukebox/welcome_to_the_jungle.ogg b/Resources/Audio/_Sich/Jukebox/welcome_to_the_jungle.ogg new file mode 100644 index 00000000000..2eedf268f03 Binary files /dev/null and b/Resources/Audio/_Sich/Jukebox/welcome_to_the_jungle.ogg differ diff --git a/Resources/Audio/_Sich/Voice/Avali/attributions.yml b/Resources/Audio/_Sich/Voice/Avali/attributions.yml new file mode 100644 index 00000000000..b788c43cc24 --- /dev/null +++ b/Resources/Audio/_Sich/Voice/Avali/attributions.yml @@ -0,0 +1,4 @@ +- files: ["avali_whistle, avali_scream2, avali_laugh2, avali_laugh3, avali_cry1, avali_cry2, avali_cough"] + license: "CC-BY-NC-SA-3.0" + copyright: "Знайдено й додано sunsetsensei." + source: "https://www.reddit.com/r/avali/s/UauWrFSU8r" diff --git a/Resources/Audio/_RMC14/Voice/Avali/avali_cough.ogg b/Resources/Audio/_Sich/Voice/Avali/avali_cough.ogg similarity index 100% rename from Resources/Audio/_RMC14/Voice/Avali/avali_cough.ogg rename to Resources/Audio/_Sich/Voice/Avali/avali_cough.ogg diff --git a/Resources/Audio/_RMC14/Voice/Avali/avali_cry1.ogg b/Resources/Audio/_Sich/Voice/Avali/avali_cry1.ogg similarity index 100% rename from Resources/Audio/_RMC14/Voice/Avali/avali_cry1.ogg rename to Resources/Audio/_Sich/Voice/Avali/avali_cry1.ogg diff --git a/Resources/Audio/_RMC14/Voice/Avali/avali_cry2.ogg b/Resources/Audio/_Sich/Voice/Avali/avali_cry2.ogg similarity index 100% rename from Resources/Audio/_RMC14/Voice/Avali/avali_cry2.ogg rename to Resources/Audio/_Sich/Voice/Avali/avali_cry2.ogg diff --git a/Resources/Audio/_RMC14/Voice/Avali/avali_laugh1.ogg b/Resources/Audio/_Sich/Voice/Avali/avali_laugh1.ogg similarity index 100% rename from Resources/Audio/_RMC14/Voice/Avali/avali_laugh1.ogg rename to Resources/Audio/_Sich/Voice/Avali/avali_laugh1.ogg diff --git a/Resources/Audio/_RMC14/Voice/Avali/avali_laugh2.ogg b/Resources/Audio/_Sich/Voice/Avali/avali_laugh2.ogg similarity index 100% rename from Resources/Audio/_RMC14/Voice/Avali/avali_laugh2.ogg rename to Resources/Audio/_Sich/Voice/Avali/avali_laugh2.ogg diff --git a/Resources/Audio/_RMC14/Voice/Avali/avali_scream2.ogg b/Resources/Audio/_Sich/Voice/Avali/avali_scream2.ogg similarity index 100% rename from Resources/Audio/_RMC14/Voice/Avali/avali_scream2.ogg rename to Resources/Audio/_Sich/Voice/Avali/avali_scream2.ogg diff --git a/Resources/Audio/_RMC14/Voice/Avali/avali_whistle.ogg b/Resources/Audio/_Sich/Voice/Avali/avali_whistle.ogg similarity index 100% rename from Resources/Audio/_RMC14/Voice/Avali/avali_whistle.ogg rename to Resources/Audio/_Sich/Voice/Avali/avali_whistle.ogg diff --git a/Resources/Audio/_Sich/Voice/Moth/attributions.yml b/Resources/Audio/_Sich/Voice/Moth/attributions.yml new file mode 100644 index 00000000000..4198ab9b45a --- /dev/null +++ b/Resources/Audio/_Sich/Voice/Moth/attributions.yml @@ -0,0 +1,4 @@ +- files: ["moth_flap.ogg"] + license: "CC0-1.0" + copyright: "Перенесено з Губа (https://github.com/Goob-Station/Goob-Station/pull/1117). Taken from https://freesound.org/people/Godowan/sounds/240476/" + source: "https://freesound.org/people/Godowan/sounds/240476/" diff --git a/Resources/Audio/_Sich/Voice/Moth/moth_flap.ogg b/Resources/Audio/_Sich/Voice/Moth/moth_flap.ogg new file mode 100644 index 00000000000..38a75843f89 Binary files /dev/null and b/Resources/Audio/_Sich/Voice/Moth/moth_flap.ogg differ diff --git a/Resources/Audio/_Sich/Voice/Talk/attributions.yml b/Resources/Audio/_Sich/Voice/Talk/attributions.yml new file mode 100644 index 00000000000..683b72de9f6 --- /dev/null +++ b/Resources/Audio/_Sich/Voice/Talk/attributions.yml @@ -0,0 +1,4 @@ +- files: ["moth.ogg, moth_ask.ogg, moth_exclaim.ogg"] + license: "CC-BY-4.0" + copyright: "Перенесено з білду КД (https://github.com/cosmatic-drift-14/cosmatic-drift/pull/549). sfx_humanoid_saturn_hawkchat1.ogg (Renamed to moth.ogg), sfx_humanoid_saturn_hawkchat3b (Renamed to moth_ask.ogg), sfx_humanoid_saturn_hawkchat3 (Renamed to moth_exclaim.ogg) all taken from https://github.com/CyanSkyKnight/Cyans-Free-Stuff/tree/main/Bug%20Sounds " + source: "https://github.com/CyanSkyKnight/Cyans-Free-Stuff/tree/main/Bug%20Sounds" diff --git a/Resources/Audio/_Sich/Voice/Talk/moth.ogg b/Resources/Audio/_Sich/Voice/Talk/moth.ogg new file mode 100644 index 00000000000..ac36d0c5bd2 Binary files /dev/null and b/Resources/Audio/_Sich/Voice/Talk/moth.ogg differ diff --git a/Resources/Audio/_Sich/Voice/Talk/moth_ask.ogg b/Resources/Audio/_Sich/Voice/Talk/moth_ask.ogg new file mode 100644 index 00000000000..58af7621129 Binary files /dev/null and b/Resources/Audio/_Sich/Voice/Talk/moth_ask.ogg differ diff --git a/Resources/Audio/_Sich/Voice/Talk/moth_exclaim.ogg b/Resources/Audio/_Sich/Voice/Talk/moth_exclaim.ogg new file mode 100644 index 00000000000..982dc373551 Binary files /dev/null and b/Resources/Audio/_Sich/Voice/Talk/moth_exclaim.ogg differ diff --git a/Resources/Locale/en-US/_RMC14/chat/species-emotes.ftl b/Resources/Locale/en-US/_RMC14/chat/species-emotes.ftl index 2dfac9c3e65..3146cd1860e 100644 --- a/Resources/Locale/en-US/_RMC14/chat/species-emotes.ftl +++ b/Resources/Locale/en-US/_RMC14/chat/species-emotes.ftl @@ -23,16 +23,16 @@ rmc-emote-howl = виє. rmc-emote-name-gnash = Скрежетіти rmc-emote-gnash = скрежетить зубами. -rmc-emote-name-r-rattle = Rattle Tail +rmc-emote-name-r-rattle = Гриміти хвостом -rmc-emote-r-rattle = rattles {POSS-ADJ($entity)} tail. +rmc-emote-r-rattle = гримить хвостом. rmc-emote-name-xeno-roar = Заревіти rmc-emote-name-xeno-tail-swipe = Махнути хвостом rmc-emote-name-xeno-help = Покликати на Допомогу rmc-emote-xeno-roar = реве! -rmc-emote-xeno-tail-swipe = махає {POSS-ADJ($entity)} хвостом. +rmc-emote-xeno-tail-swipe = взмахує хвостом. rmc-emote-xeno-help = потребує допомоги! rmc-emote-name-peep = Піп diff --git a/Resources/Locale/en-US/_RMC14/rmc-cassette.ftl b/Resources/Locale/en-US/_RMC14/rmc-cassette.ftl index 7ac48b936e9..9cdb3b3bf22 100644 --- a/Resources/Locale/en-US/_RMC14/rmc-cassette.ftl +++ b/Resources/Locale/en-US/_RMC14/rmc-cassette.ftl @@ -1,12 +1,12 @@ -rmc-cassette-play = You press {THE($player)} 'play' button, {$current} of {$total} -rmc-cassette-playing = Now playing {$current} of {$total} -rmc-cassette-pause = You pause {THE($player)} -rmc-cassette-resume = Resuming {$current} of {$total} -rmc-cassette-change = You change the song, {$current} of {$total} -rmc-cassette-restart = You restart the song, {$current} of {$total} -rmc-cassette-tape-examine = It has [color=lightblue]{$total}[/color] tracks. -rmc-cassette-tape-custom = [color=cyan]Use it while in your hand to choose a custom track to play.[/color] -rmc-cassette-tape-custom-choose = Choose a track -rmc-cassette-player-examine-tape = It has a {$tape} inside. -rmc-cassette-player-examine-none = It doesn't have a cassette inside. -rmc-cassette-player-eject = Eject tape +rmc-cassette-play = Ви натиснули кнопку 'грати' на {$player}, {$current} з {$total} +rmc-cassette-playing = Тепер грає {$current} з {$total} +rmc-cassette-pause = Ви поставили на паузу {$player} +rmc-cassette-resume = Відновлення {$current} з {$total} +rmc-cassette-change = Ви змінили пісню, {$current} з {$total} +rmc-cassette-restart = Ви перезапустили пісню, {$current} з {$total} +rmc-cassette-tape-examine = Вона має [color=lightblue]{$total}[/color] треків. +rmc-cassette-tape-custom = [color=cyan]Використайте її, тримаючи в руці, щоб обрати власний трек для запису.[/color] +rmc-cassette-tape-custom-choose = Обрати трек +rmc-cassette-player-examine-tape = Всередині нього {$tape}. +rmc-cassette-player-examine-none = Касета всередині відсутня. +rmc-cassette-player-eject = Вийняти касету diff --git a/Resources/Locale/en-US/_Sich/chat/emotes.ftl b/Resources/Locale/en-US/_Sich/chat/emotes.ftl new file mode 100644 index 00000000000..d0477c35cce --- /dev/null +++ b/Resources/Locale/en-US/_Sich/chat/emotes.ftl @@ -0,0 +1,5 @@ +# Назва +chat-emote-name-flap = Махати крилами + +# Повідомлення +chat-emote-msg-flap = тріпотить крилами. \ No newline at end of file diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl index 38c227aae2f..cb4b38467e3 100644 --- a/Resources/Locale/en-US/chat/emotes.ftl +++ b/Resources/Locale/en-US/chat/emotes.ftl @@ -8,10 +8,10 @@ chat-emote-name-crying = Поплакати chat-emote-name-squish = Хлюпнути chat-emote-name-chitter = Скрекотати chat-emote-name-squeak = Пищати -chat-emote-name-thump = Стукнути Хвостом +chat-emote-name-thump = Стукнути хвостом chat-emote-name-click = Клацнути chat-emote-name-clap = Плескати -chat-emote-name-clap-single = Один Раз Плеснути +chat-emote-name-clap-single = Один раз плеснути chat-emote-name-snap = Ляскнути пальцями chat-emote-name-salute = Військове вітання chat-emote-name-gasp = Задихатися @@ -20,16 +20,16 @@ chat-emote-name-buzz = Дзижчати chat-emote-name-weh = Вех chat-emote-name-hew = Хев chat-emote-name-chirp = Цвірінькати -chat-emote-name-beep = Біп -chat-emote-name-chime = Дзвонити -chat-emote-name-buzztwo = Дзижчати Два +chat-emote-name-beep = Пищати +chat-emote-name-chime = Дзвеніти +chat-emote-name-buzztwo = Дзижчати двічі chat-emote-name-ping = Пінг chat-emote-name-sneeze = Чхнути chat-emote-name-cough = Прокашлятися -chat-emote-name-catmeow = Котячий Няв -chat-emote-name-cathisses = Котяче Шипіння -chat-emote-name-monkeyscreeches = Мавпячий Вереск -chat-emote-name-robotbeep = Робот +chat-emote-name-catmeow = Котячий няв +chat-emote-name-cathisses = Котяче шипіння +chat-emote-name-monkeyscreeches = Мавпячий вереск +chat-emote-name-robotbeep = Роботичний писк chat-emote-name-yawn = Позіхнути chat-emote-name-snore = Хропіти @@ -43,15 +43,15 @@ chat-emote-msg-crying = плаче. chat-emote-msg-squish = хлюпає. chat-emote-msg-chitter = скрекотить. chat-emote-msg-squeak = пищить. -chat-emote-msg-thump = стукає {POSS-ADJ($entity)} хвостом. +chat-emote-msg-thump = стукає хвостом. chat-emote-msg-click = клацає. chat-emote-msg-clap = аплодує! chat-emote-msg-clap-single = хлопає в долоні. chat-emote-msg-snap = ляскає пальцями. chat-emote-msg-salute = салютує. chat-emote-msg-gasp = задихається. -chat-emote-msg-deathgasp = безсило падає на підлогу, {POSS-ADJ($entity)} очі порожні і залишені життям... -chat-emote-msg-deathgasp-monkey = швидко видихає, коли {SUBJECT($entity)} тіло припиняє рухатися... +chat-emote-msg-deathgasp = захоплює подих, безсило падаючи на підлогу, {POSS-ADJ($entity)} очі порожні і залишені життям... +chat-emote-msg-deathgasp-monkey = верещачи в останнє, {SUBJECT($entity)} осідає на підлогу та бездиханно завмирає chat-emote-msg-deathgasp-scurret = видає останнє «ва» і завмирає... chat-emote-msg-buzz = дзижчіть! chat-emote-msg-weh = вехає! diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl index a6a378d79fa..35e4a608a91 100644 --- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl +++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl @@ -1,18 +1,18 @@ ### Інтерфейс -chat-manager-max-message-length = Ваше повідомлення перевищує {$maxMessageLength} ліміт по символах +chat-manager-max-message-length = Ваше повідомлення перевищує ліміт у {$maxMessageLength} символів chat-manager-ooc-chat-enabled-message = Чат ООС було увімкнено. chat-manager-ooc-chat-disabled-message = Чат ООС було вимкнено. chat-manager-looc-chat-enabled-message = Чат ЛООС було увімкнено. chat-manager-looc-chat-disabled-message = Чат ЛООС було вимкнено. chat-manager-dead-looc-chat-enabled-message = Мертві гравці тепер можуть використовувати ЛООС. chat-manager-dead-looc-chat-disabled-message = Мертві гравці більше не можуть використовувати ЛООС. -chat-manager-crit-looc-chat-enabled-message = Персонажи у крит. стані тепер можуть використовувати ЛООС. -chat-manager-crit-looc-chat-disabled-message = Персонажи у крит. стані більше не можуть використовувати ЛООС. +chat-manager-crit-looc-chat-enabled-message = Персонажі у крит. стані тепер можуть використовувати ЛООС. +chat-manager-crit-looc-chat-disabled-message = Персонажі у крит. стані більше не можуть використовувати ЛООС. chat-manager-admin-ooc-chat-enabled-message = Чат Адмін ООС було увімкнено. chat-manager-admin-ooc-chat-disabled-message = Чат Адмін ООС було вимкнено. -chat-manager-max-message-length-exceeded-message = Ваше повідомлення перевищує {$limit} ліміт по символах +chat-manager-max-message-length-exceeded-message = Ваше повідомлення перевищує ліміт у {$limit} символів chat-manager-no-headset-on-message = Ви не маєте гарнітуру на собі! chat-manager-no-radio-key = Не вказано радіоключ! chat-manager-no-such-channel = Не існує каналу з ключем '{$key}'! @@ -25,8 +25,8 @@ chat-manager-sender-announcement-wrap-message = [font size=14][bold]{$sender} О chat-manager-entity-say-wrap-message = [BubbleHeader][bold][Name]{$entityName}[/Name][/bold][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent]{$message}[/BubbleContent]"[/font] chat-manager-entity-say-bold-wrap-message = [BubbleHeader][bold][Name]{$entityName}[/Name][/bold][/BubbleHeader] {$verb}, [font={$fontType} size={$fontSize}]"[BubbleContent][bold]{$message}[/bold][/BubbleContent]"[/font] -chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] whispers,"[BubbleContent]{$message}[/BubbleContent]"[/italic][/font] -chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Someone[/BubbleHeader] whispers, "[BubbleContent]{$message}[/BubbleContent]"[/italic][/font] +chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{$entityName}[/Name][/BubbleHeader] шепче,"[BubbleContent]{$message}[/BubbleContent]"[/italic][/font] +chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Хтось[/BubbleHeader] шепче, "[BubbleContent]{$message}[/BubbleContent]"[/italic][/font] # THE() is not used here because the entity and its name can technically be disconnected if a nameOverride is passed... chat-manager-entity-me-wrap-message = [italic]{ PROPER($entity) -> diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 2b837b768e4..5b37376b083 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -497,8 +497,8 @@ - type: GhostTakeoverAvailable - type: Speech speechVerb: Moth - speechSounds: Squeak - allowedEmotes: ['Chitter', 'Squeak'] + speechSounds: Moth # Sich. Перенесено з КД + allowedEmotes: ['Chitter', 'Squeak', 'Flap'] # Sich додала Flap. Перенесено з Губа - type: FaxableObject insertingState: inserting_mothroach - type: MothAccent diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index adbb797e013..30dc774f423 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -170,8 +170,6 @@ - ридають - схлипує - схлипають - - реве - - ревуть - ллє сльози - ллють сльози - заливається слізьми @@ -415,7 +413,8 @@ chatMessages: ["chat-emote-msg-deathgasp"] chatTriggers: - deathgasp - - передсмертний подих # Це та все нижче (до кінця прототипу) - з білду Січі + - видає передсмертний подих # Це та все нижче (до кінця прототипу) - з білду Січі + - видають передсмертний подих - type: emote id: MonkeyDeathgasp diff --git a/Resources/Prototypes/_RMC14/Actions/Marines/marine_cassette_actions.yml b/Resources/Prototypes/_RMC14/Actions/Marines/marine_cassette_actions.yml index b33a2a64aa5..f1e02e4a70a 100644 --- a/Resources/Prototypes/_RMC14/Actions/Marines/marine_cassette_actions.yml +++ b/Resources/Prototypes/_RMC14/Actions/Marines/marine_cassette_actions.yml @@ -9,8 +9,8 @@ - type: entity parent: RMCActionCassetteBase id: RMCActionCassettePlayPause - name: Play/Pause - description: Starts or stops playing music. + name: Грати/Пауза + description: Запускає або зупиняє програвання музики. components: - type: Action icon: @@ -22,8 +22,8 @@ - type: entity parent: RMCActionCassetteBase id: RMCActionCassetteNext - name: Next song - description: Moves to the next track. + name: Наступний трек + description: Запускає відтворення наступного треку. components: - type: Action icon: @@ -35,8 +35,8 @@ - type: entity parent: RMCActionCassetteBase id: RMCActionCassetteRestart - name: Restart song - description: Restarts the current track. + name: Перезапустити трек + description: Перезапускає відтворення поточного треку. components: - type: Action icon: diff --git a/Resources/Prototypes/_RMC14/Entities/Clothing/Pouches/storage.yml b/Resources/Prototypes/_RMC14/Entities/Clothing/Pouches/storage.yml index 711ecf217eb..4a6a536d9cc 100644 --- a/Resources/Prototypes/_RMC14/Entities/Clothing/Pouches/storage.yml +++ b/Resources/Prototypes/_RMC14/Entities/Clothing/Pouches/storage.yml @@ -586,8 +586,8 @@ - type: entity parent: [RMCPouchOpenClosed, RMCPouchStorage] id: RMCPouchCassette - name: cassette pouch - description: A finely crafted pouch, made specifically to keep cassettes safe during wartime. + name: підсумок для касет + description: Високоякісний чохол, спеціально розроблений для безпечного зберігання касет навіть під обстрілами. components: - type: Sprite sprite: _RMC14/Objects/Clothing/Pouches/cassette.rsi diff --git a/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml b/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml index fb76c3611e3..4f8a9c1f8cb 100644 --- a/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml +++ b/Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml @@ -13,13 +13,13 @@ - type: Sprite drawdepth: Mobs scale: 0.8, 0.8 # Sich. Чому? Бо вони малі пташки. - - type: TypingIndicator + - type: TypingIndicator # Sich proto: avali - - type: Vocal + - type: Vocal # Sich sounds: - Male: RMCMaleAvali - Unsexed: RMCMaleAvali - Female: RMCFemaleAvali + Male: SichMaleAvali + Unsexed: SichMaleAvali + Female: SichFemaleAvali - type: Wagging action: ActionToggleAvaliWagging - type: Speech diff --git a/Resources/Prototypes/_RMC14/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/_RMC14/Entities/Mobs/Species/moth.yml index 7b17f8d5192..c10f634e42d 100644 --- a/Resources/Prototypes/_RMC14/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/_RMC14/Entities/Mobs/Species/moth.yml @@ -14,14 +14,15 @@ accent: zombieMoth - type: Speech speechVerb: Moth - allowedEmotes: ['Chitter', 'Squeak'] + speechSounds: Moth # Sich. Перенесено з КД + allowedEmotes: ['Chitter', 'Squeak', 'Flap'] # Sich додала Flap. Перенесено з Губа - type: TypingIndicator proto: moth - - type: Vocal + - type: Vocal # Sich sounds: - Male: RMCMaleMoth - Female: RMCFemaleMoth - Unsexed: UnisexMoth + Male: SichMaleMoth + Female: SichFemaleMoth + Unsexed: SichMaleMoth - type: DamageVisuals damageOverlayGroups: Brute: diff --git a/Resources/Prototypes/_RMC14/Entities/Objects/Devices/cassettes.yml b/Resources/Prototypes/_RMC14/Entities/Objects/Devices/cassettes.yml index 269662bc295..20162631785 100644 --- a/Resources/Prototypes/_RMC14/Entities/Objects/Devices/cassettes.yml +++ b/Resources/Prototypes/_RMC14/Entities/Objects/Devices/cassettes.yml @@ -1,8 +1,8 @@ - type: entity parent: BaseItem id: RMCCassettePlayer - name: cassette player - description: A cassette player that first hit the market over 100 years ago. Crazy how these never went out of style. + name: касетофон + description: Касетний програвач, який вперше з'явився на ринку понад 100 років тому. Дивно, як він ніколи не виходив з моди. components: - type: Sprite sprite: _RMC14/Objects/Devices/cassette_player.rsi @@ -21,8 +21,8 @@ abstract: true parent: BaseItem id: RMCCassetteTapeBase - name: cassette - description: A plastic cassette tape. + name: касета + description: Пластикова касета. components: - type: Sprite sprite: _RMC14/Objects/Devices/cassette_player.rsi @@ -35,7 +35,8 @@ - type: entity parent: RMCCassetteTapeBase id: RMCCassetteTapeCustom - name: custom cassette + name: саморобна касета + description: Касета, на яку ви самі записали музику! Підтримує максимум одну композицію. На жаль, інші не зможуть оцінити ваш смак у музиці завдяки ній. # Sich components: - type: Sprite state: cassette_rising_sun @@ -48,7 +49,7 @@ - type: entity parent: RMCCassetteTapeBase id: RMCCassetteTapeWigWoo1 - name: WigWoo1 cassette + name: касета WigWoo1 components: - type: Sprite state: cassette_blue @@ -59,7 +60,7 @@ - type: entity parent: RMCCassetteTapeBase id: RMCCassetteTapeMendax - name: Mendax cassette + name: касета Mendax components: - type: Sprite state: cassette_orange_blue @@ -72,7 +73,7 @@ - type: entity parent: RMCCassetteTapeBase id: RMCCassetteTapeNighty - name: Nighty cassette + name: касета Nighty components: - type: Sprite state: cassette_green @@ -88,7 +89,7 @@ - type: entity parent: RMCCassetteTapeBase id: RMCCassetteTapeGoodShowOldChap - name: GoodShowOldChap cassette + name: касета GoodShowOldChap components: - type: Sprite state: cassette_ocean @@ -101,7 +102,7 @@ - type: entity parent: RMCCassetteTapeBase id: RMCCassetteTapeRedQwesta - name: Qwesta cassette + name: касета Qwesta components: - type: Sprite state: cassette_pink_stripe @@ -115,7 +116,7 @@ - type: entity parent: RMCCassetteTapeBase id: RMCCassetteTapeBolgarich - name: Bolgarich cassette + name: касета русні components: - type: Sprite state: cassette_gray @@ -133,8 +134,8 @@ - type: entity parent: RMCCassetteTapeBase id: RMCCassetteTapeQwertyquerty - name: Qwertyquerty cassette - description: A plastic cassette tape. + name: касета Qwertyquerty + description: Пластикова касета. components: - type: Sprite state: cassette_orange @@ -147,7 +148,7 @@ - type: entity parent: RMCCassetteTapeBase id: RMCCassetteTapePigeonBeans - name: PigeonBeans cassette + name: касета PigeonBeans components: - type: Sprite state: cassette_red_stripe diff --git a/Resources/Prototypes/_RMC14/SoundCollections/avali.yml b/Resources/Prototypes/_RMC14/SoundCollections/avali.yml deleted file mode 100644 index 65b253f5b84..00000000000 --- a/Resources/Prototypes/_RMC14/SoundCollections/avali.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Всі прототипи нижче додавання білду Січі -- type: soundCollection - id: AvaliLaugh - files: - - /Audio/_RMC14/Voice/Avali/avali_laugh.ogg - - /Audio/_RMC14/Voice/Avali/avali_laugh1.ogg - - /Audio/_RMC14/Voice/Avali/avali_laugh2.ogg - -- type: soundCollection - id: AvaliCry - files: - - /Audio/_RMC14/Voice/Avali/avali_cry1.ogg - - /Audio/_RMC14/Voice/Avali/avali_cry2.ogg diff --git a/Resources/Prototypes/_RMC14/SoundCollections/screams.yml b/Resources/Prototypes/_RMC14/SoundCollections/screams.yml index 5e6544460da..7900133f4ee 100644 --- a/Resources/Prototypes/_RMC14/SoundCollections/screams.yml +++ b/Resources/Prototypes/_RMC14/SoundCollections/screams.yml @@ -41,9 +41,3 @@ # - /Audio/_RMC14/Voice/Human/female_preburst5.ogg # - /Audio/_RMC14/Voice/Human/female_preburst6.ogg # - /Audio/_RMC14/Voice/Human/female_preburst7.ogg - -- type: soundCollection # Додавання білду Січі - id: AvaliScreams - files: - - /Audio/_RMC14/Voice/Avali/avali_scream.ogg - - /Audio/_RMC14/Voice/Avali/avali_scream2.ogg diff --git a/Resources/Prototypes/_RMC14/Voice/Avali/avali_emote_sounds.yml b/Resources/Prototypes/_RMC14/Voice/Avali/avali_emote_sounds.yml index ed6ee6f24c7..ad8682a5eac 100644 --- a/Resources/Prototypes/_RMC14/Voice/Avali/avali_emote_sounds.yml +++ b/Resources/Prototypes/_RMC14/Voice/Avali/avali_emote_sounds.yml @@ -1,18 +1,10 @@ - type: emoteSounds - id: RMCUnisexAvali # З білдом Січі - params: - variation: 0.125 + id: RMCUnisexAvali sounds: Scream: - collection: AvaliScreams + path: /Audio/_RMC14/Voice/Avali/avali_scream.ogg Laugh: - collection: AvaliLaugh - Cough: - path: /Audio/_RMC14/Voice/Avali/avali_cough.ogg - Crying: - collection: AvaliCry - Whistle: - path: /Audio/_RMC14/Voice/Avali/avali_whistle.ogg + path: /Audio/_RMC14/Voice/Avali/avali_laugh.ogg - type: emoteSounds parent: [RMCUnisexAvali, RMCMaleHuman] diff --git a/Resources/Prototypes/_RMC14/Voice/Xenonid/xeno_emotes.yml b/Resources/Prototypes/_RMC14/Voice/Xenonid/xeno_emotes.yml index 2aafe1f3b02..9cbadbdd098 100644 --- a/Resources/Prototypes/_RMC14/Voice/Xenonid/xeno_emotes.yml +++ b/Resources/Prototypes/_RMC14/Voice/Xenonid/xeno_emotes.yml @@ -16,6 +16,10 @@ - roars - roaring - roared + - реве # Це та все нижче (до кінця прототипу) - з білду Січі + - ревуть + - ричить + - ричать - type: emote id: XenoTailSwipe @@ -41,6 +45,12 @@ - swipes their tail - swipes her tail - swipes his tail + - взмахує хвостом # Це та все нижче (до кінця прототипу) - з білду Січі + - взмахують хвостом + - маше хвостом + - машуть хвостом + - махає хвостом + - махають хвостом - type: emote id: XenoHelp @@ -60,4 +70,8 @@ - needhelp - needshelp - need help - - needs help \ No newline at end of file + - needs help + - потребує допомоги # Це та все нижче (до кінця прототипу) - з білду Січі + - потребують допомоги + - кличе на допомогу + - кличуть на допомогу diff --git a/Resources/Prototypes/_RMC14/Voice/speech_emotes.yml b/Resources/Prototypes/_RMC14/Voice/speech_emotes.yml index e77792a5ff3..8b8e48cad88 100644 --- a/Resources/Prototypes/_RMC14/Voice/speech_emotes.yml +++ b/Resources/Prototypes/_RMC14/Voice/speech_emotes.yml @@ -99,8 +99,6 @@ - growled - гарчить # Це та все нижче (до кінця прототипу) - з білду Січі - гарчать - - ричить - - ричать - type: emote id: Purr @@ -345,8 +343,8 @@ - warbles - warbles. - warbles! - - співає # білд Січі - - співають # білд Січі + - співає # Це та все нижче (до кінця прототипу) - з білду Січі + - співають # Reptilian @@ -374,3 +372,7 @@ - rattles her tail - rattles his tail - rattles its tail + - брязкає хвостом # Це та все нижче (до кінця прототипу) - з білду Січ + - брязкають хвостом + - гримить хвостом + - гримлять хвостом diff --git a/Resources/Prototypes/_RMC14/typing_indicator.yml b/Resources/Prototypes/_RMC14/typing_indicator.yml deleted file mode 100644 index cbb3b393ed8..00000000000 --- a/Resources/Prototypes/_RMC14/typing_indicator.yml +++ /dev/null @@ -1,7 +0,0 @@ -# Додано білдом Січі -- type: typingIndicator - id: avali - spritePath: /Textures/_RMC14/Effects/avali_speech.rsi - typingState: avali0 - idleState: idle - offset: -0.12, 0.1 \ No newline at end of file diff --git a/Resources/Prototypes/_Sich/Entities/Objects/Devices/cassettes.yml b/Resources/Prototypes/_Sich/Entities/Objects/Devices/cassettes.yml index ccb622c91bd..21ed8b729f3 100644 --- a/Resources/Prototypes/_Sich/Entities/Objects/Devices/cassettes.yml +++ b/Resources/Prototypes/_Sich/Entities/Objects/Devices/cassettes.yml @@ -7,47 +7,47 @@ sprite: _Sich/Objects/Devices/cassette_player.rsi # Січ - - type: entity parent: RMCSichCassetteTapeBase id: RMCSichCassetteTape name: запальна касета - description: Касета з композиціями, під які ваша смерть буде виглядати красиво. Спеціально для українського полку КМПОН! + description: Касета з композиціями, під які ваша смерть буде виглядати красиво. Спеціально для роти "Січові Стрільці" КМПОН! components: - type: Sprite state: cassette_hellfire - type: CassetteTape songs: - - /Audio/_Sich/Jukebox/californiaDream.ogg - - /Audio/_Sich/Jukebox/fortunaSon.ogg - - /Audio/_Sich/Jukebox/welcomeToTheJungle.ogg - - /Audio/_Sich/Jukebox/thisfire.ogg - - /Audio/_Sich/Jukebox/sevenNationArmy.ogg + - /Audio/_Sich/Jukebox/california_dreamin'.ogg + - /Audio/_Sich/Jukebox/fortunate_son.ogg + - /Audio/_Sich/Jukebox/welcome_to_the_jungle.ogg + - /Audio/_Sich/Jukebox/this_fire.ogg + - /Audio/_Sich/Jukebox/seven_nation_army.ogg - /Audio/_Sich/Jukebox/paranoid.ogg - - /Audio/_Sich/Jukebox/paintInBlack.ogg + - /Audio/_Sich/Jukebox/paint_it_black.ogg - type: entity parent: RMCSichCassetteTapeBase id: RMCSichCassetteTapeManSoldWorld name: касета продавшого світ - description: Касета від того, хто продав світ. Спеціально для українського полку КМПОН! + description: Касета від того, хто продав світ. Спеціально для роти "Січові Стрільці" КМПОН! components: - type: Sprite state: cassette_who_sold_world - type: CassetteTape songs: - - /Audio/_Sich/Jukebox/theManWhoSoldTheWorld.ogg - + - /Audio/_Sich/Jukebox/the_man_who_sold_the_world.ogg + - /Audio/_Sich/Jukebox/invinsible.ogg + - /Audio/_Sich/Jukebox/snake_eater.ogg - type: entity parent: RMCSichCassetteTapeBase id: RMCSichCassetteTapeUa name: українська касета - description: Касета з збірником українських композицій. Спеціально для українського полку КМПОН! + description: Касета з збірником українських композицій. Спеціально для роти "Січові Стрільці" КМПОН! components: - type: Sprite state: cassette_ua - type: CassetteTape songs: - - /Audio/_Sich/Jukebox/dkEnergetikStreetEast.ogg - - /Audio/_Sich/Jukebox/shubenuk.ogg \ No newline at end of file + - /Audio/_Sich/Jukebox/vulytsia_skhid.ogg + - /Audio/_Sich/Jukebox/shybenyk.ogg diff --git a/Resources/Prototypes/_Sich/SoundCollections/avali.yml b/Resources/Prototypes/_Sich/SoundCollections/avali.yml new file mode 100644 index 00000000000..d011f1a9838 --- /dev/null +++ b/Resources/Prototypes/_Sich/SoundCollections/avali.yml @@ -0,0 +1,12 @@ +- type: soundCollection + id: AvaliLaugh + files: + - /Audio/_RMC14/Voice/Avali/avali_laugh.ogg + - /Audio/_Sich/Voice/Avali/avali_laugh1.ogg + - /Audio/_Sich/Voice/Avali/avali_laugh2.ogg + +- type: soundCollection + id: AvaliCry + files: + - /Audio/_Sich/Voice/Avali/avali_cry1.ogg + - /Audio/_Sich/Voice/Avali/avali_cry2.ogg diff --git a/Resources/Prototypes/_Sich/SoundCollections/scream.yml b/Resources/Prototypes/_Sich/SoundCollections/scream.yml new file mode 100644 index 00000000000..e3f16576e26 --- /dev/null +++ b/Resources/Prototypes/_Sich/SoundCollections/scream.yml @@ -0,0 +1,5 @@ +- type: soundCollection + id: AvaliScreams + files: + - /Audio/_RMC14/Voice/Avali/avali_scream.ogg + - /Audio/_Sich/Voice/Avali/avali_scream2.ogg diff --git a/Resources/Prototypes/_Sich/Voice/Avali/avali_emote_sounds.yml b/Resources/Prototypes/_Sich/Voice/Avali/avali_emote_sounds.yml new file mode 100644 index 00000000000..5d873f55581 --- /dev/null +++ b/Resources/Prototypes/_Sich/Voice/Avali/avali_emote_sounds.yml @@ -0,0 +1,23 @@ +- type: emoteSounds + id: SichUnisexAvali + params: + variation: 0.125 + sounds: + Scream: + collection: AvaliScreams + Laugh: + collection: AvaliLaugh + Cough: + path: /Audio/_Sich/Voice/Avali/avali_cough.ogg + Crying: + collection: AvaliCry + Whistle: + path: /Audio/_Sich/Voice/Avali/avali_whistle.ogg + +- type: emoteSounds + parent: [SichUnisexAvali, RMCMaleHuman] + id: SichMaleAvali + +- type: emoteSounds + parent: [SichUnisexAvali, RMCFemaleHuman] + id: SichFemaleAvali \ No newline at end of file diff --git a/Resources/Prototypes/_Sich/Voice/Moth/moth_emote_sounds.yml b/Resources/Prototypes/_Sich/Voice/Moth/moth_emote_sounds.yml new file mode 100644 index 00000000000..c59b0b0b150 --- /dev/null +++ b/Resources/Prototypes/_Sich/Voice/Moth/moth_emote_sounds.yml @@ -0,0 +1,35 @@ +- type: emoteSounds + id: SichUnisexMoth + params: + variation: 0.125 + sounds: + Buzz: + path: /Audio/Voice/Moth/moth_scream.ogg + Scream: + path: /Audio/Voice/Moth/moth_scream.ogg + Laugh: + path: /Audio/Voice/Moth/moth_laugh.ogg + Chitter: + path: /Audio/Voice/Moth/moth_chitter.ogg + Squeak: + path: /Audio/Voice/Moth/moth_squeak.ogg + Weh: + collection: Weh + Hew: + collection: Hew + Honk: + collection: BikeHorn + Flap: # Все зроблено заради цієї емоції + path: /Audio/_Sich/Voice/Moth/moth_flap.ogg + Gasp: + collection: MaleGasp + DefaultDeathgasp: + collection: MothDeathGasp + +- type: emoteSounds + parent: [RMCBaseMaleSounds, SichUnisexMoth] + id: SichMaleMoth + +- type: emoteSounds + parent: [RMCBaseFemaleSounds, SichUnisexMoth] + id: SichFemaleMoth diff --git a/Resources/Prototypes/_Sich/Voice/speech_emotes.yml b/Resources/Prototypes/_Sich/Voice/speech_emotes.yml new file mode 100644 index 00000000000..4b400f01fca --- /dev/null +++ b/Resources/Prototypes/_Sich/Voice/speech_emotes.yml @@ -0,0 +1,20 @@ +- type: emote + id: Flap + name: chat-emote-name-flap + category: Vocal + available: false + icon: _Sich/Interface/Emotes/flap.png + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: ["chat-emote-msg-flap"] + chatTriggers: + - маше крилами + - машуть крилами + - трепушить крилами + - трепушать крилами + - тріпотить крилами + - тріпотять крилами diff --git a/Resources/Prototypes/_Sich/Voice/speech_sounds.yml b/Resources/Prototypes/_Sich/Voice/speech_sounds.yml new file mode 100644 index 00000000000..db39fee3eda --- /dev/null +++ b/Resources/Prototypes/_Sich/Voice/speech_sounds.yml @@ -0,0 +1,8 @@ +- type: speechSounds + id: Moth # squeaksqueaksqueaksqueak. Перенесено з білду КД + saySound: + path: /Audio/_Sich/Voice/Talk/moth.ogg + askSound: + path: /Audio/_Sich/Voice/Talk/moth_ask.ogg + exclaimSound: + path: /Audio/_Sich/Voice/Talk/moth_exclaim.ogg diff --git a/Resources/Prototypes/_Sich/typing_indicator.yml b/Resources/Prototypes/_Sich/typing_indicator.yml new file mode 100644 index 00000000000..5dd7bcc1454 --- /dev/null +++ b/Resources/Prototypes/_Sich/typing_indicator.yml @@ -0,0 +1,6 @@ +- type: typingIndicator + id: avali + spritePath: /Textures/_Sich/Effects/avali_speech.rsi + typingState: avali0 + idleState: avali3 + offset: -0.12, 0.1 diff --git a/Resources/Textures/_RMC14/Effects/avali_speech.rsi/avali0.png b/Resources/Textures/_RMC14/Effects/avali_speech.rsi/avali0.png deleted file mode 100644 index 0ebc7a12ae4..00000000000 Binary files a/Resources/Textures/_RMC14/Effects/avali_speech.rsi/avali0.png and /dev/null differ diff --git a/Resources/Textures/_RMC14/Effects/avali_speech.rsi/avali1.png b/Resources/Textures/_RMC14/Effects/avali_speech.rsi/avali1.png deleted file mode 100644 index 0b1f578a8ba..00000000000 Binary files a/Resources/Textures/_RMC14/Effects/avali_speech.rsi/avali1.png and /dev/null differ diff --git a/Resources/Textures/_RMC14/Effects/avali_speech.rsi/avali2.png b/Resources/Textures/_RMC14/Effects/avali_speech.rsi/avali2.png deleted file mode 100644 index ae67f9ff53d..00000000000 Binary files a/Resources/Textures/_RMC14/Effects/avali_speech.rsi/avali2.png and /dev/null differ diff --git a/Resources/Textures/_RMC14/Effects/avali_speech.rsi/idle.png b/Resources/Textures/_RMC14/Effects/avali_speech.rsi/idle.png deleted file mode 100644 index 5746900891f..00000000000 Binary files a/Resources/Textures/_RMC14/Effects/avali_speech.rsi/idle.png and /dev/null differ diff --git a/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali0.png b/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali0.png new file mode 100644 index 00000000000..adb98da0b76 Binary files /dev/null and b/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali0.png differ diff --git a/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali1.png b/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali1.png new file mode 100644 index 00000000000..43f36763cd4 Binary files /dev/null and b/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali1.png differ diff --git a/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali2.png b/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali2.png new file mode 100644 index 00000000000..86b5f026d34 Binary files /dev/null and b/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali2.png differ diff --git a/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali3.png b/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali3.png new file mode 100644 index 00000000000..447d4cea95a Binary files /dev/null and b/Resources/Textures/_Sich/Effects/avali_speech.rsi/avali3.png differ diff --git a/Resources/Textures/_RMC14/Effects/avali_speech.rsi/meta.json b/Resources/Textures/_Sich/Effects/avali_speech.rsi/meta.json similarity index 83% rename from Resources/Textures/_RMC14/Effects/avali_speech.rsi/meta.json rename to Resources/Textures/_Sich/Effects/avali_speech.rsi/meta.json index 89a1cb8237c..c7e08606574 100644 --- a/Resources/Textures/_RMC14/Effects/avali_speech.rsi/meta.json +++ b/Resources/Textures/_Sich/Effects/avali_speech.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Sprites by HITAroko, adapted and installed by 2Sensei2", + "copyright": "Sprites by HITAroko, adapted and installed by 2Sensei2. Updated by Pgriha", "states": [ { "name": "avali0", @@ -19,22 +19,23 @@ ] }, { - "name": "idle", + "name": "avali1" + }, + { + "name": "avali2" + }, + { + "name": "avali3", "delays": [ [ + 0.2, + 0.2, 0.2, 0.3, 0.3, - 0.5, - 0.5 + 0.3 ] ] - }, - { - "name": "avali1" - }, - { - "name": "avali2" } ] diff --git a/Resources/Textures/_Sich/Interface/Emotes/attributtions.yml b/Resources/Textures/_Sich/Interface/Emotes/attributtions.yml new file mode 100644 index 00000000000..6f9f1cab5bc --- /dev/null +++ b/Resources/Textures/_Sich/Interface/Emotes/attributtions.yml @@ -0,0 +1,4 @@ +- files: ["flap.png"] + license: "CC-BY-SA-4.0" + copyright: "Створено з mothroach.png, Pgriha'ою" + source: "https://github.com/Pgriha" diff --git a/Resources/Textures/_Sich/Interface/Emotes/flap.png b/Resources/Textures/_Sich/Interface/Emotes/flap.png new file mode 100644 index 00000000000..fac07d9610c Binary files /dev/null and b/Resources/Textures/_Sich/Interface/Emotes/flap.png differ diff --git a/Resources/Textures/_Sich/Objects/Devices/cassette_player.rsi/meta.json b/Resources/Textures/_Sich/Objects/Devices/cassette_player.rsi/meta.json index 8b574845b80..52073b92985 100644 --- a/Resources/Textures/_Sich/Objects/Devices/cassette_player.rsi/meta.json +++ b/Resources/Textures/_Sich/Objects/Devices/cassette_player.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/2314793744d0b4ae00e330a9c9fdb7662e67b2de/icons/obj/items/walkman.dmi, https://github.com/cmss13-devs/cmss13/blob/925b704ac6622abaa972fd2a1c8d6348340bbb51/icons/mob/humans/onmob/clothing/ears.dmi", + "license": "CC-BY-SA-4.0", + "copyright": "Зроблено strol20 (ДС) для Морпіхоти Січі.", "size": { "x": 32, "y": 32