Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Resources/Audio/_RMC14/Voice/Avali/attributions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
61 changes: 61 additions & 0 deletions Resources/Audio/_Sich/Jukebox/attributions.yml
Original file line number Diff line number Diff line change
@@ -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"
Binary file removed Resources/Audio/_Sich/Jukebox/californiaDream.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/_Sich/Jukebox/fortunaSon.ogg
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/_Sich/Jukebox/invinsible.ogg
Binary file not shown.
Binary file removed Resources/Audio/_Sich/Jukebox/paintInBlack.ogg
Binary file not shown.
Binary file not shown.
Binary file modified Resources/Audio/_Sich/Jukebox/paranoid.ogg
Binary file not shown.
Binary file removed Resources/Audio/_Sich/Jukebox/sevenNationArmy.ogg
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/_Sich/Jukebox/shubenuk.ogg
Binary file not shown.
Binary file added Resources/Audio/_Sich/Jukebox/shybenyk.ogg
Binary file not shown.
Binary file added Resources/Audio/_Sich/Jukebox/snake_eater.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Resources/Audio/_Sich/Jukebox/this_fire.ogg
Binary file not shown.
Binary file removed Resources/Audio/_Sich/Jukebox/thisfire.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions Resources/Audio/_Sich/Voice/Avali/attributions.yml
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 4 additions & 0 deletions Resources/Audio/_Sich/Voice/Moth/attributions.yml
Original file line number Diff line number Diff line change
@@ -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/"
Binary file added Resources/Audio/_Sich/Voice/Moth/moth_flap.ogg
Binary file not shown.
4 changes: 4 additions & 0 deletions Resources/Audio/_Sich/Voice/Talk/attributions.yml
Original file line number Diff line number Diff line change
@@ -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"
Binary file added Resources/Audio/_Sich/Voice/Talk/moth.ogg
Binary file not shown.
Binary file added Resources/Audio/_Sich/Voice/Talk/moth_ask.ogg
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions Resources/Locale/en-US/_RMC14/chat/species-emotes.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Піп
Expand Down
24 changes: 12 additions & 12 deletions Resources/Locale/en-US/_RMC14/rmc-cassette.ftl
Original file line number Diff line number Diff line change
@@ -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 = Вийняти касету
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/_Sich/chat/emotes.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Назва
chat-emote-name-flap = Махати крилами

# Повідомлення
chat-emote-msg-flap = тріпотить крилами.
24 changes: 12 additions & 12 deletions Resources/Locale/en-US/chat/emotes.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Задихатися
Expand All @@ -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 = Хропіти

Expand All @@ -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 = вехає!
Expand Down
12 changes: 6 additions & 6 deletions Resources/Locale/en-US/chat/managers/chat-manager.ftl
Original file line number Diff line number Diff line change
@@ -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}'!
Expand All @@ -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) ->
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions Resources/Prototypes/Voice/speech_emotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@
- ридають
- схлипує
- схлипають
- реве
- ревуть
- ллє сльози
- ллють сльози
- заливається слізьми
Expand Down Expand Up @@ -415,7 +413,8 @@
chatMessages: ["chat-emote-msg-deathgasp"]
chatTriggers:
- deathgasp
- передсмертний подих # Це та все нижче (до кінця прототипу) - з білду Січі
- видає передсмертний подих # Це та все нижче (до кінця прототипу) - з білду Січі
- видають передсмертний подих

- type: emote
id: MonkeyDeathgasp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -35,8 +35,8 @@
- type: entity
parent: RMCActionCassetteBase
id: RMCActionCassetteRestart
name: Restart song
description: Restarts the current track.
name: Перезапустити трек
description: Перезапускає відтворення поточного треку.
components:
- type: Action
icon:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/_RMC14/Entities/Mobs/Species/avali.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions Resources/Prototypes/_RMC14/Entities/Mobs/Species/moth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading
Loading