Skip to content

Ребаланс и некоторые изменения#1

Merged
Pcolik505 merged 43 commits into
Lua-Frontier:masterfrom
Raldjatech:мяу
Jun 19, 2026

Hidden character warning

The head ref may contain hidden characters: "\u043c\u044f\u0443"
Merged

Ребаланс и некоторые изменения#1
Pcolik505 merged 43 commits into
Lua-Frontier:masterfrom
Raldjatech:мяу

Conversation

@Raldjatech

Copy link
Copy Markdown
Contributor

About the PR

ребаланс в основном скафандров ТСФ и чутка ДФ включающий в себя добавление ЭМИ-резиста на скафандры с щитом. Бафф бёрнера. Перенос ПНВ таяры с тушки на глаза, выдача вульпам термал и добавление отдельных глаз для них. исправление мизерной части проеба локализации и еще по мелочи

Why / Balance

по хотелке коврового покрытия с мордой тюленя

Requirements

  • I have read relevant guidelines/documentation to this PR found on our devwiki.
  • I have added media to this PR or it does not require an ingame showcase.
  • I can confirm this PR contains either no AI-generated content, or AI-generated content that meets our guidelines.

How to test

залить эти изменения к себе и посмотреть на них

@github-actions

github-actions Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

RSI Diff Bot; head commit a36bf28 merging into 7474592
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Mono/Objects/Weapons/Melee/phaseblade.rsi

State Old New Status
e_sword_blade Modified

Resources/Textures/_LuaM/Body/Organs/tajaran-eyes.rsi

State Old New Status
eyeball-l Added
eyeball-r Added

Edit: diff updated after a36bf28

@Pcolik505 Pcolik505 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Реши на что ругается гитхаб-акшен бот, убери из названия PRки невидимые символы, а также шаттлы в папке _Mono измененные в папку _LuaM, тобишь в _Mono никаких измененных карт быть не должно. всё остальное я указал ниже.

Comment thread Resources/Locale/ru-RU/_LuaM/Actions.ftl
Comment thread Resources/Locale/ru-RU/_LuaM/Organs.ftl
Comment thread Resources/Prototypes/_DV/Body/Prototypes/vulpkanin.yml Outdated
Comment thread Resources/Prototypes/_Goobstation/Body/Prototypes/tajaran.yml Outdated
Comment on lines -41 to -43
- type: NightVision
activateSound: null
deactivateSound: null

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не удалить, а закомментить.

Comment thread Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml Outdated
Comment thread Resources/Prototypes/_Mono/Shipyard/Nfsd/sentinel.yml Outdated
Comment thread Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Comment thread Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml Outdated

@Pcolik505 Pcolik505 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Реши на что ругается гитхаб-акшен бот, убери из названия PRки невидимые символы, а также шаттлы в папке _Mono измененные в папку _LuaM, тобишь в _Mono никаких измененных карт быть не должно. Также добавь en-US локаль для того, что сделал в ru-RU. Всё остальное я указал ниже.

Raldjatech and others added 7 commits June 19, 2026 13:15
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Raldjatech and others added 16 commits June 19, 2026 13:24
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
Co-authored-by: Pcol <mandarincik3000@gmail.com>
@Pcolik505 Pcolik505 changed the title ребалансы и чутка по мелочи Some Tweaks Jun 19, 2026
@Pcolik505 Pcolik505 changed the title Some Tweaks Ребаланс и некоторые изменения Jun 19, 2026

@Pcolik505 Pcolik505 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Жду ещё мету обновленную, комментирование заместо удаления в Resources/Prototypes/_Mono/Entities/Clothing/OuterClothing/Hardsuits/tsfmc.yml‎ и пометки о комментировании. Также два шаттла в папке _Mono новых, заместо нашей как-то оказались.

Comment thread Resources/Prototypes/_Goobstation/Entities/Mobs/Species/tajaran.yml Outdated
Comment thread Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml Outdated
@Pcolik505
Pcolik505 merged commit eccf3d1 into Lua-Frontier:master Jun 19, 2026
9 checks passed
@Raldjatech
Raldjatech deleted the мяу branch June 19, 2026 17:14
Pcolik505 added a commit that referenced this pull request Jul 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants