Skip to content

Commit

Permalink
Merge branch 'master' into заебался
Browse files Browse the repository at this point in the history
  • Loading branch information
Evgencheg authored Aug 28, 2024
2 parents 581010a + bcd7bc7 commit 76e0efb
Show file tree
Hide file tree
Showing 2,958 changed files with 11,974 additions and 7,579 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/Corvax/Announcements/announce.ogg
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/Corvax/Announcements/centcomm.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/Corvax/Announcements/flux.ogg
Binary file not shown.
Binary file removed Resources/Audio/Corvax/Announcements/ionstorm.ogg
Binary file not shown.
1 change: 0 additions & 1 deletion Resources/Audio/Corvax/Announcements/licenses.txt

This file was deleted.

Binary file removed Resources/Audio/_LostParadise/Announcement/cmo.ogg
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Announcement/hop.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Announcement/hos.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Announcement/kep.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Announcement/rd.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Announcement/se.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/CPR/CPR.ogg
Binary file not shown.
4 changes: 0 additions & 4 deletions Resources/Audio/_LostParadise/IPC/attributions.yml

This file was deleted.

Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/IPC/buzz-sigh.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/IPC/buzz-two.ogg
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/IPC/ping.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/IPC/signal.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/IPC/synth_no.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/IPC/synth_scream.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/IPC/synth_yes.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Jukebox/PivoDance.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/aliens.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/animes.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/intercept.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/ionstorm.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/meteors.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/newAI.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/outbreak5.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/outbreak7.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/poweroff.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/poweron.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/radiation.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Medibot/welcome.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Supermatter/alarm.ogg
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Supermatter/calm.ogg
Binary file not shown.
Binary file not shown.
Binary file removed Resources/Audio/_LostParadise/Supermatter/dust.ogg
Binary file not shown.
1 change: 0 additions & 1 deletion Resources/Audio/_LostParadise/Voice/Ipc/license.txt

This file was deleted.

Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion Resources/Audio/_LostParadise/Voice/Vulpkanin/license.txt

This file was deleted.

2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/Content/Power/batteryDrinker.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
battery-drinker-verb-drink = Слить
battery-drinker-verb-drink = Высосать энергию
battery-drinker-empty = { CAPATALIZE(THE($target)) } уже пуст!

This file was deleted.

2 changes: 0 additions & 2 deletions Resources/Locale/ru-RU/_LostParadise/TomCranePlushie.ftl

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/_LostParadise/kyburka_drop_lol.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ ent-LPPAirlockEVA = Шлюз хранилища EVA
.desc = За ним находится спасение!
ent-LPPAirlockGate = Шлюз врат
.desc = За ним находится таинственная машина...
ent-ExpeditorIDCard = ID карта исследователя
.desc = { ent-IDCardStandard.desc }
4 changes: 2 additions & 2 deletions Resources/Locale/ru-RU/_LostParadise/masks-clowns.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ ent-LPPClothingCoreMaskMime = маска мима-ядро
.desc = Маска мима - ядра.
ent-LPPClothingDoubleMaskMime = двойная маска мима
.desc = Маска мима - двойная.
ent-LPPClothingHeartMaskMime = маска мима-сердце
.desc = Маска мима - сердце.
ent-LPPClothingHeartMaskMime = Маска мима с сердцем
.desc = Маска мима в виде сердечка <3
ent-LPPClothingHorizontalMaskMime = маска мима-горизонтальная
.desc = Маска мима - горизонтальная.
ent-LPPClothingMarkMaskMime = маска мима-марка
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ ent-LPPKilt = килт
ent-LPPClothingOuterCoatHoSTrenchCAS = Тренч CAS
.desc = Чёрно-белый тренч.
.suffix = { "Спонсор" }
ent-LPPReallyBlackSuit = Черный костюм
.desc = Ну реально черный.
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ ent-WeaponCutterAdv = улучшенный ионный резак
ent-OreBagBluespace = блюспейс сумка для руды
.desc = Прочная сумка для утилизаторов и шахтеров для переноски ОЧЕНЬ больших объемов руды.
.suffix = { "" }
ent-BluespaceChemBag = Блюспейс сумка для химикатов
.desc = Сумка, использующая технологию блюспейс для хранения химических продуктов, таких как таблетки, канистры для таблеток, склянки и шприцы.
7 changes: 7 additions & 0 deletions Resources/Locale/ru-RU/_LostParadise/tts-voices.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,10 @@ tts-voice-name-dmitrii = Дмитрий
tts-voice-name-julia = Юлия
tts-voice-name-roman = Роман
tts-voice-name-veniamin = Вениамин
tts-voice-name-oleg = Олег
tts-voice-name-zina = Зина
tts-voice-name-aidar = Аидар
tts-voice-name-baya = Байя
tts-voice-name-kseniya = Ксения
tts-voice-name-xenia = Кзениа
tts-voice-name-eugene = Юджин
7 changes: 0 additions & 7 deletions Resources/Locale/ru-RU/_LostParadise/tts.ftl

This file was deleted.

Loading

0 comments on commit 76e0efb

Please sign in to comment.