-
Notifications
You must be signed in to change notification settings - Fork 21
Ребаланс и некоторые изменения #1
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
Merged
The head ref may contain hidden characters: "\u043C\u044F\u0443"
Merged
Changes from all commits
Commits
Show all changes
43 commits
Select commit
Hold shift + click to select a range
f811fc4
эт нам нужно
Raldjatech 1bb9bc7
мяв
Raldjatech 7902099
фикс
Raldjatech 2581a09
Apply suggestion from @Pcolik505
Raldjatech 998c50f
Apply suggestion from @Pcolik505
Raldjatech 906bfc9
Update Resources/Prototypes/_Mono/Atmospherics/crystallizer.yml
Raldjatech 701355c
Update Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml
Raldjatech 67b3a54
Apply suggestion from @Pcolik505
Raldjatech da55fb6
Apply suggestion from @Pcolik505
Raldjatech a78095a
Apply suggestion from @Pcolik505
Raldjatech 879c232
Apply suggestion from @Pcolik505
Raldjatech d6427f9
Apply suggestion from @Pcolik505
Raldjatech 66004ee
Apply suggestion from @Pcolik505
Raldjatech de6d929
Apply suggestion from @Pcolik505
Raldjatech d59f0cb
Apply suggestion from @Pcolik505
Raldjatech e5f9f7e
Apply suggestion from @Pcolik505
Raldjatech 10fb969
Apply suggestion from @Pcolik505
Raldjatech 8899a5b
Apply suggestion from @Pcolik505
Raldjatech ca3707c
Apply suggestion from @Pcolik505
Raldjatech ddff071
Apply suggestion from @Pcolik505
Raldjatech 6db51d1
Apply suggestion from @Pcolik505
Raldjatech b9a33bc
Apply suggestion from @Pcolik505
Raldjatech efb016b
Apply suggestion from @Pcolik505
Raldjatech 776e569
Apply suggestion from @Pcolik505
Raldjatech 680920a
Apply suggestion from @Pcolik505
Raldjatech def3c1b
Apply suggestion from @Pcolik505
Raldjatech 43e41f6
Apply suggestion from @Pcolik505
Raldjatech 2cc850e
Apply suggestion from @Pcolik505
Raldjatech 519d5c3
Apply suggestion from @Pcolik505
Raldjatech e865e62
Apply suggestion from @Pcolik505
Raldjatech 80299a3
Apply suggestion from @Pcolik505
Raldjatech b3bd0b5
Apply suggestion from @Pcolik505
Raldjatech be46cab
Apply suggestion from @Pcolik505
Raldjatech e2e5d70
Apply suggestion from @Pcolik505
Raldjatech c0f25db
Apply suggestion from @Pcolik505
Raldjatech 2715246
Apply suggestion from @Pcolik505
Raldjatech dd81e1c
Rename Sentinel.yml to sentinel.yml
Raldjatech dbf67e5
Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits…
Raldjatech c69d315
Update Resources/Prototypes/_Goobstation/Entities/Mobs/Species/tajara…
Raldjatech 8e30fd4
Delete Resources/Maps/_Mono/Shuttles/Nfsd/santinel.yml
Raldjatech 017bd0c
Delete Resources/Maps/_Mono/Shuttles/Nfsd/flyssa.yml
Raldjatech b1b5ae0
Update tsfmc.yml
Raldjatech a36bf28
Update meta.json
Raldjatech 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
There are no files selected for viewing
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,2 @@ | ||
| ent-PulseVulpkaninThermalVision = Focus eyes | ||
| .desc = Focus your gaze to momentarily see the heat signatures of people around you. |
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,5 @@ | ||
| ent-OrganVulpkaninEyes = Eyes Vulpkanin | ||
| .desc = They reflect the red tones | ||
|
|
||
| ent-JunkCannon = Глаза таяры | ||
| .desc = They reflect even the weakest rays of light. |
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,2 @@ | ||
| ent-PulseVulpkaninThermalVision = Сфокусировать глаза | ||
| .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,5 @@ | ||
| ent-OrganVulpkaninEyes = Глаза вульпканина | ||
| .desc = Они отражают красные тона | ||
|
|
||
| ent-JunkCannon = Глаза таяры | ||
| .desc = Они отражают даже самые слабые лучи света | ||
|
Pcolik505 marked this conversation as resolved.
|
||
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 |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| guide-entry-asakim = Асаким | ||
| guide-entry-asakim = Азаким | ||
| guide-entry-letoferol = Летоферол и Химеры |
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 |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| ## Species Names | ||
|
|
||
| species-name-protogen = Протоген | ||
| species-name-asakim = Асаким | ||
| species-name-asakim = Азаким |
6 changes: 3 additions & 3 deletions
6
...14-ru/prototypes/_Mono/entities/SpaceArtillery/SpaceArtillery/kinetic/charon_launcher.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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| ent-WeaponTurretCharonBase = масс-драйвер M381 «Чарон» | ||
| ent-WeaponTurretCharon = масс-драйвер M381 «Чарон» (станционный, автозарядка) | ||
| ent-WeaponTurretCharonBase = масс-драйвер M381 «Харон» | ||
| ent-WeaponTurretCharon = масс-драйвер M381 «Харон» (станционный, автозарядка) | ||
| .desc = Рельсовое орудие капитального класса, выпускающее массивный снаряд на экстремальной скорости и способное наносить катастрофический урон вражеским кораблям. Тяжёлый линейный ускоритель: может активироваться дистанционно или подключаться к GCS. Эта установка питается от автозарядника и не требует ручной перезарядки. | ||
| ent-WeaponTurretCharonReload = масс-драйвер M381 «Чарон» (корабельный, ручная перезарядка) | ||
| ent-WeaponTurretCharonReload = масс-драйвер M381 «Харон» (корабельный, ручная перезарядка) | ||
| .desc = Рельсовое орудие капитального класса, выпускающее массивный снаряд на экстремальной скорости и способное наносить катастрофический урон вражеским кораблям. Тяжёлый линейный ускоритель: может активироваться дистанционно или подключаться к GCS. |
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.