Oni melee weapons#288
Open
artur-001 wants to merge 11 commits into
Open
Conversation
…влен шанс срабатывания, если кому-то понадобится
github-actions
Bot
added
S: Untriaged
size/M
Sprites
C#
YML
and removed
size/M
S: Untriaged
labels
artur-001
force-pushed
the
oni-mili-weapons
branch
from
e702d33 to
1e2e2d6
Compare
artur-001
force-pushed
the
oni-mili-weapons
branch
from
1e2e2d6 to
3209b4d
Compare
Terrka
pushed a commit
to Terrka/Monolith
that referenced
this pull request
Jun 29, 2026
* Небольшое обновление СБ (Forge-Station#288) * Fix Wega security port merge conflicts and prototype load errors. Resolve leftover conflict markers, remove duplicate loadouts and job prototypes, strip unimplemented clothing components, and fix SecApartment station lookup. Co-authored-by: Cursor <cursoragent@cursor.com> * Remove non-SecApartment content from Wega security port. Drop vouchers, Wega uniforms, android survival boxes, and Corvax security loadout duplicates. Revert merged base prototypes and keep only SecApartment with HoS tablet spawn. Co-authored-by: Cursor <cursoragent@cursor.com> * Enhance faction personnel tablets Co-authored-by: Cursor <cursoragent@cursor.com> * Fix SecApartment window analyzer error Co-authored-by: Cursor <cursoragent@cursor.com> * Fix personnel tablet polish and loadout groups Co-authored-by: Cursor <cursoragent@cursor.com> * remove hardcode fix colors Co-authored-by: Cursor <cursoragent@cursor.com> * Add faction SecApartment tablets with company-based crew filtering. Wire faction tablet access and starting gear, refine UI themes (including USSP), stop sensor refresh from resetting open dropdowns, and run YAML linter on Debug and Release. Co-authored-by: Cursor <cursoragent@cursor.com> * Fix CRLF line endings in SecApartment theme files. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Zekins <136648667+Zekins3366@users.noreply.github.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Suvorov Pavel <128121177+mersen-tyn@users.noreply.github.com>
mersen-tyn
approved these changes
Jul 2, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
Добавлено японское милишное вооружение, а именно:
Ножны для:
Ящик для:
Добавлены новые компоненты и системы, а именно:
KnockdownOnHitComponent
KnockdownOnHitSystem
SpeciesMeleeDamageComponent
SpeciesMeleeDamageSystem
SpeciesWieldComponent
SpeciesWieldSystem
Добавлены ножны с Тип 3 в лодаут.
Зачем / Баланс
По запросу из данного предложения:
https://discord.com/channels/1222332535628103750/1519816567939006464
Медиа
Требования
Как тестировать
Заспавнить выше описанные предметы по их именам или по их Id:
id: Odati
id: Kanabo
id: Sasymata
id: Type3
id: Nahinati
id: kanaboBox
id: OdatiSheath
id: Type3Sheath
id: Type3SheathFilled
id: OdatiSheathFilled
Ломающие изменения
Changelog
🆑