Фракционная война-апдейт #713
Merged
Conversation
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
github-actions
bot
added
Changes: Localization
|
RSI Diff Bot; head commit d8c37c2 merging into 2a4abc6 Resources/Textures/Objects/Misc/id_cards.rsi
Resources/Textures/SS220/Objects/Weapons/Melee/combat_hammer.rsi
Resources/Textures/SS220/Objects/Weapons/Melee/combat_sickle.rsi
Resources/Textures/SS220/Clothing/Back/Backpacks/nuclear_backpack.rsi
Resources/Textures/SS220/Clothing/Head/Hardsuits/iron_admiral.rsi
Resources/Textures/SS220/Clothing/Head/Hardsuits/iron_ce.rsi
Resources/Textures/SS220/Clothing/Head/Hardsuits/iron_cmo.rsi
Resources/Textures/SS220/Clothing/Head/Hardsuits/iron_heavy.rsi
Resources/Textures/SS220/Clothing/Head/Hardsuits/iron_heavy_2.rsi
Resources/Textures/SS220/Clothing/Head/Hardsuits/iron_med.rsi
Resources/Textures/SS220/Clothing/Head/Hardsuits/iron_soldier.rsi
Resources/Textures/SS220/Clothing/Mask/nuclear_mask.rsi
Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/iron_admiral.rsi
Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/iron_ce.rsi
Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/iron_cmo.rsi
Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/iron_heavy.rsi
Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/iron_heavy_2.rsi
Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/iron_med.rsi
Resources/Textures/SS220/Clothing/OuterClothing/Hardsuits/iron_soldier.rsi
Resources/Textures/SS220/Clothing/Shoes/Boots/magsyndieebent.rsi
|
Kit0vras
suggested changes
Feb 4, 2024
Resources/Prototypes/SS220/Entities/Clothing/Neck/iron_squad_cloaks.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/SS220/Entities/Clothing/Neck/iron_squad_cloaks.yml
Outdated
Show resolved
Hide resolved
| @@ -1,6 +1,6 @@ | |||
| - type: entity | |||
| id: EventCapturablePostament | |||
| suffix: Ebent | |||
| suffix: Shitspawn, Ebent, FractWar | |||
| name: постамент | |||
| description: Постамент для флага. Для захвата установите сюда флаг вашей фракции. | |||
There was a problem hiding this comment.
Suggested change
| description: Постамент для флага. Для захвата установите сюда флаг вашей фракции. | |
| description: Постамент для флага. Для захвата, установите сюда флаг вашей фракции. |
| parent: ClothingOuterHardsuitBase | ||
| id: ClothingOuterHardsuitIronHeavy2 | ||
| name: тяжёлый сонариумовый скафандр Aid-2 | ||
| description: Тяжёлый боевой костюм обшитый сонариумовым сплавом, используется железным отрядом в самых тяжёлых схватках. |
There was a problem hiding this comment.
Suggested change
| description: Тяжёлый боевой костюм обшитый сонариумовым сплавом, используется железным отрядом в самых тяжёлых схватках. | |
| description: Тяжёлый боевой костюм, обшитый сонариумовым сплавом. Используется железным отрядом в самых тяжёлых схватках. |
Resources/Prototypes/SS220/Shitspawn/Ebent/HardsuitIronSquad.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/SS220/Shitspawn/Ebent/HardsuitIronSquad.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/SS220/Shitspawn/Ebent/hardsuit-helmetsIronSquad.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/SS220/Shitspawn/Ebent/hardsuit-helmetsIronSquad.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/SS220/Shitspawn/Ebent/hardsuit-helmetsIronSquad.yml
Outdated
Show resolved
Hide resolved
…loaks.yml Co-authored-by: Kit0vras <[email protected]>
…loaks.yml Co-authored-by: Kit0vras <[email protected]>
Co-authored-by: Kit0vras <[email protected]>
Co-authored-by: Kit0vras <[email protected]>
Co-authored-by: Kit0vras <[email protected]>
…nSquad.yml Co-authored-by: Kit0vras <[email protected]>
…nSquad.yml Co-authored-by: Kit0vras <[email protected]>
…nSquad.yml Co-authored-by: Kit0vras <[email protected]>
Co-authored-by: Kit0vras <[email protected]>
Co-authored-by: Kit0vras <[email protected]>
Co-authored-by: Kit0vras <[email protected]>
|
😲 |
|
Сюдаааа тесты |
DexlerXD
approved these changes
Feb 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Описание PR
Обновлены все суффиксы, добавлено 7 видов брони синдика , обновлена экипировка ивентовых челов, добавлены ботинки, маска, рюкзак синдиката, починено энерго оружие(ивентовое), починены иконки персонажей ивентовые, починил и обновил в новый дизайн карты сссп, балансные правки брони и кажется всё.
Все изменения связаны ТОЛЬКО с ивентом.
Медиа
Проверки
Изменения
🆑