-
Notifications
You must be signed in to change notification settings - Fork 110
Ивентовый контент #574
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Phantom4502
wants to merge
6
commits into
imperial-space:develop
Choose a base branch
from
Phantom4502:develop
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Ивентовый контент #574
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e5be541
Adding new content
Phantom4502 e5fd939
Merge branch 'develop' of https://github.com/Phantom4502/Phantom4502-…
Phantom4502 bc11ab2
Modification in the prototype
Phantom4502 c233add
fixed
Phantom4502 e921457
fixed
Phantom4502 a8a7758
Merge branch 'imperial-space:develop' into develop
Phantom4502 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
Binary file added
BIN
+445 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Alive/Ambient-Tuman.ogg
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
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 added
BIN
+39.4 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Alive/labenginestop.ogg
Binary file not shown.
Binary file added
BIN
+29.2 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Alive/labfootsteps.ogg
Binary file not shown.
Binary file added
BIN
+19.6 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Alive/labgratefall.ogg
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+34 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Alive/labpsyambient.ogg
Binary file not shown.
Binary file added
BIN
+18.2 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Alive/labstone2fall.ogg
Binary file not shown.
Binary file added
BIN
+18.2 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Alive/labstonefall.ogg
Binary file not shown.
Binary file added
BIN
+34.1 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Alive/waterdrops1.ogg
Binary file not shown.
Binary file added
BIN
+2.92 MB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Blowout/Blowout-Defalut.ogg
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
Binary file added
BIN
+2.94 MB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Blowout/Blowout-NotShoots.ogg
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
Binary file added
BIN
+3.83 MB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Conversation/Break-Default.ogg
Binary file not shown.
Binary file added
BIN
+924 KB
...urces/Audio/Imperial/DeadSector/Sound/Ambient/Conversation/Break-MilitaryConversation.ogg
Binary file not shown.
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
Binary file added
BIN
+18.9 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/Other/Strobosiren.ogg
Binary file not shown.
Binary file added
BIN
+224 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/WarAmbient/Flying.ogg
Binary file not shown.
Binary file added
BIN
+104 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/WarAmbient/Shooting-1.ogg
Binary file not shown.
Binary file added
BIN
+101 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/WarAmbient/Shooting-2.ogg
Binary file not shown.
Binary file added
BIN
+103 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/WarAmbient/Shooting-3.ogg
Binary file not shown.
Binary file added
BIN
+128 KB
Resources/Audio/Imperial/DeadSector/Sound/Ambient/WarAmbient/helicopter.ogg
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed
BIN
-4.8 MB
Resources/Audio/Imperial/ElysiumPrime/Music/Destiny_of_Colonists.ogg
Binary file not shown.
Binary file not shown.
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
Poeeno marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
Binary file removed
BIN
-3.22 MB
Resources/Audio/Imperial/ElysiumPrime/Music/Super_Nova_In_The_Catacombs.ogg
Binary file not shown.
Binary file removed
BIN
-2.64 MB
Resources/Audio/Imperial/ElysiumPrime/Music/X4ToTheDeathForTheGlory.ogg
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| ent-CopperWire = Медная проволка | ||
| .desc = Ресурс, используемый для создания чего-либо | ||
coderabbitai[bot] marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| ent-DeadSectorAdminIDCard1 = Карта доступа | ||
| .desc = Карта с доступов в закрытую секцию. | ||
|
|
||
| ent-DeadSectorStarCorpsIDCard2 = Карта доступа | ||
| .desc = Карта с доступов в закрытую секцию. | ||
coderabbitai[bot] marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| ent-Journals = Журнал "Выживание" | ||
| .desc = Первая часть журнала. | ||
|
|
||
| ent-MoneyCard = Банковская карта | ||
| .desc = Кажется на ней ещё есть деньги... | ||
|
|
||
| ent-PotTrass = Банка | ||
| .desc = Что в ней...? | ||
|
|
||
| ent-PotEmpty = Банка | ||
| .desc = Кажется, она сломана | ||
|
|
||
| ent-Rope = Верёвка | ||
| .desc = Самая обычная верёвка | ||
|
|
||
| ent-Sim = Симкарта | ||
| .desc = Маленький модуль для мобильного телефона. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| ent-Artifacts1 = Артефакт | ||
| .desc = Какой-то странный предмет | ||
|
|
||
| ent-Artifacts2 = Артефакт | ||
| .desc = Какой-то странный предмет | ||
|
|
||
| ent-Artifacts3 = Артефакт | ||
| .desc = Какой-то странный предмет | ||
|
|
||
| ent-Artifacts4 = Артефакт | ||
| .desc = Какой-то странный предмет | ||
|
|
||
| ent-Artifacts5 = Артефакт | ||
| .desc = Какой-то странный предмет | ||
|
|
||
| ent-BoxBlueMRE = Американский ИРП | ||
| .desc = Набор Индивидуального Рациона Питания, используемого солдатами КМП США | ||
|
|
||
| ent-BoxiconGreenMRE = Советский ИРП | ||
| .desc = Набор Индивидуального Рациона Питания, используемого солдатами СССП | ||
|
|
||
| ent-PlateDeadSector = Металическая тарелка | ||
| .desc = Большая тарелка | ||
|
|
||
| ent-SeismicChargeDeadSector = Взрывчатка | ||
| .desc = 150.000 тон тратилла | ||
|
|
||
| ent-ChainsawYellow = Бензопила | ||
| .desc = Время пришло для того, чтобы стать маньяком. | ||
|
|
||
| ent-GeigerCounterNu7 = Дозиметр "Nu-7" | ||
| .desc = Дешёвый советский дозиметр |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| ent-Helicopter = Силуэт вертолёта. | ||
| .desc = Похоже на Ми-24, он где-то высоко.. | ||
|
|
||
| ent-GraveDeadSector1 = Могильный крест | ||
| .desc = Тут кто-то отдыхает. | ||
|
|
||
| ent-GraveDeadSector2 = Могильный крест | ||
| .desc = Тут кто-то отдыхает. | ||
|
|
||
| ent-DeadSectorAntenns = Антенна | ||
| .desc = Передаёт и принимает какой-то радиосигнал. | ||
|
|
||
| ent-DeadSectorAntennsAnimation = Антенна | ||
| .desc = Передаёт и принимает какой-то радиосигнал. | ||
|
|
||
| ent-Sandbags1 = Мешки с песком | ||
| .desc = Самодельная оборонительная конструкция. | ||
|
|
||
| ent-Sandbags2 = Мешки с песком | ||
| .desc = Самодельная оборонительная конструкция. | ||
|
|
||
| ent-Sandbags3 = Мешки с песком | ||
| .desc = Самодельная оборонительная конструкция. | ||
|
|
||
| ent-Sandbags4 = Мешки с песком | ||
| .desc = Самодельная оборонительная конструкция. | ||
|
|
||
| ent-DeadSectorSignDanger = Знак "Мины" | ||
| .desc = Знак, указывающий что дальше расположено минное поле. | ||
|
|
||
| ent-PoweredStrobeLightSirenDeadSectorEmpty = стробоскоп | ||
| .desc = ЧТО?! Извини, всё, что я слышу, это УИИ-УУУ-УИИ-УУУ! | ||
|
|
||
| ent-PoweredStrobeLightSirenDeadSectorRed = стробоскоп | ||
| .desc = ЧТО?! Извини, всё, что я слышу, это УИИ-УУУ-УИИ-УУУ! |
37 changes: 37 additions & 0 deletions
37
Resources/Locale/ru-RU/Imperial/DeadSector/cash_and_etc/spacecash.ftl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| ent-spacecash1 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| ent-spacecash10 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| ent-spacecash100 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| ent-spacecash500 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| ent-spacecash1000 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| ent-spacecash2500 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| ent-spacecash5000 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| ent-spacecash10000 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| ent-spacecash20000 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| ent-spacecash30000 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| ent-spacecash100000 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| ent-spacecash1000000 = Земные Кредиты | ||
| .desc = Валюта, которую используют в ОПЗ. | ||
|
|
||
| spacecash = Земные Кредиты |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.