-
Notifications
You must be signed in to change notification settings - Fork 94
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
Дарвиний #1210
Merged
Merged
Дарвиний #1210
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
0456d23
Был добавлен дарвиний
banumbas 995663d
мелкие фиксы
banumbas 5dded93
ааа наконец та
banumbas 627be43
Исправил ошибки, добавил вульп и фелинидов.
banumbas 900c161
багфикс ошибки в консоли
banumbas 5004a3b
фикс перевода и линтера
banumbas f26b014
заебало чё то
banumbas e06bf22
фелиниды ликвидированы.
banumbas 9eedb19
Update cargo_medical.yml
VigersRay 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 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 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,6 @@ | ||
using Robust.Shared.GameStates; | ||
|
||
namespace Content.Shared._Sunrise.Reagents; | ||
|
||
[RegisterComponent, NetworkedComponent] | ||
public sealed partial class CognizinFixComponent : Component { } |
21 changes: 21 additions & 0 deletions
21
Resources/Locale/ru-RU/_prototypes/_sunrise/body/organs/animal.ftl
This file contains 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,23 @@ | ||
ent-OrganManeaterAnimalStomach = maneater stomach | ||
.desc = { ent-OrganAnimalStomach.desc } | ||
|
||
ent-OrganPrimateHeart = { ent-OrganAnimalHeart } | ||
.desc = { ent-OrganAnimalHeart.desc } | ||
|
||
ent-OrganKoboldHeart = { ent-OrganAnimalHeart } | ||
.desc = { ent-OrganAnimalHeart.desc } | ||
|
||
ent-OrganFelinidHeart = { ent-OrganAnimalHeart } | ||
.desc = { ent-OrganAnimalHeart.desc } | ||
|
||
ent-SentientWildSlimeCore = { ent-SentientSlimeCore } | ||
.desc = { ent-SentientSlimeCore.desc } | ||
|
||
ent-OrganMothroachHeart = { ent-OrganAnimalHeart } | ||
.desc = { ent-OrganAnimalHeart.desc } | ||
|
||
ent-OrganPigHeart = { ent-OrganAnimalHeart } | ||
.desc = { ent-OrganAnimalHeart.desc } | ||
|
||
ent-OrganChikenHeart = { ent-OrganAnimalHeart } | ||
.desc = { ent-OrganAnimalHeart.desc } |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/medical.ftl
This file contains 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-CrateNPCVariantCubeBoxSunrise = ящик с кубиками генетических предков | ||
.desc = Ящик, содержит кубики генетических предков. 2 кубика обезьян, слаймов, куриц, свиней и таракамолей. |
14 changes: 14 additions & 0 deletions
14
Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/misc/cube.ftl
This file contains 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,14 @@ | ||
ent-VariantCubeBoxSunrise = коробка кубиков генетических предков | ||
.desc = Кубики генетических предков. | ||
ent-SlimeCubeWrapped = кубик слайма | ||
.desc = Разверните его, чтобы получить кубик слайма. | ||
.suffix = Завёрнутый | ||
ent-ChikenCubeWrapped = кубик курицы | ||
.desc = Разверните его, чтобы получить кубик курицы. | ||
.suffix = Завёрнутый | ||
ent-PigCubeWrapped = кубик свиньи | ||
.desc = Разверните его, чтобы получить кубик свиньи. | ||
.suffix = Завёрнутый | ||
ent-MothroachCubeWrapped = кубик таракамоли | ||
.desc = Разверните его, чтобы получить кубик таракамоли. | ||
.suffix = Завёрнутый |
6 changes: 6 additions & 0 deletions
6
Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/rehydrateable.ftl
This file contains 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,6 @@ | ||
ent-PigCube = свиной кубик | ||
.desc = Просто добавь воды! | ||
ent-WildSlimeCube = слаймовый кубик | ||
.desc = Просто добавь воды! | ||
ent-ChikenCube = куриный кубик | ||
.desc = Просто добавь воды! |
2 changes: 2 additions & 0 deletions
2
Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/medicine.ftl
This file contains 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 @@ | ||
reagent-name-darvinium = дарвиниум | ||
reagent-desc-darvinium = Лекарство способное ускорить развитие генома почти любого низшего существа, и превратить его в гуманоида. |
9 changes: 9 additions & 0 deletions
9
Resources/Locale/ru-RU/_strings/_sunrise/metabolism/metabolizer-types.ftl
This file contains 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,9 @@ | ||
metabolizer-type-primate = Примат | ||
metabolizer-type-chiken = Курица | ||
metabolizer-type-pig = Свинья | ||
metabolizer-type-mothroach = Таракамоль | ||
metabolizer-type-wild-slime = Дикий слайм | ||
metabolizer-type-felinid = Фелинид | ||
metabolizer-type-kobold = Кобольд | ||
metabolizer-type-cat = Кот | ||
metabolizer-type-dog = Собака |
This file contains 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 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 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 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 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 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 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 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 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 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
9 changes: 9 additions & 0 deletions
9
Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_medical.yml
This file contains 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,9 @@ | ||
- type: cargoProduct | ||
id: CrateNPCVariantCubeBoxSunrise | ||
icon: | ||
sprite: Objects/Misc/monkeycube.rsi | ||
state: box_variant | ||
product: CrateNPCVariantCubeBoxSunrise | ||
cost: 3000 | ||
category: cargoproduct-category-name-medical | ||
group: market |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
с ценой проблемы, внутри лежат 2 свиньи и 2 курицы. Покупка данных животных отдельно будет стоить дороже.