Skip to content

Чайна теперь стреляет всеми 40мм гранатами и исправлен их перевод #236

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.

Sign up for GitHub

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

Open
gordod3 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Чайна теперь стреляет всеми 40мм гранатами и исправлен их перевод #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4b8dca
Fix translation and ChinaLake whitelist
gordod3 Jun 8, 2026
0354e8a
Comment # Forge-Change
gordod3 Jun 8, 2026
18918d7
Merge branch 'main' into 40mmGrenadeTranslateFix
gordod3 Jun 8, 2026
a606827
Merge branch 'Forge-Station:main' into 40mmGrenadeTranslateFix
gordod3 Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...le/ru-RU/ss14-ru/prototypes/_Mono/entities/objects/weapons/guns/ammunition/explosives.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ ent-CartridgeRocket = граната ПГ-7ВЛ
ent-CartridgeRocketSlow = граната ПГ-7ВЛ «Улитка-Ракета»
.desc = Боевая часть 1.5 для гранатомёта РПГ-7. Необычно медленная.
ent-BaseGrenade = базовая граната
ent-40mmGrenadeBaton = false
ent-40mmGrenadeThermobaric = false
ent-40mmGrenadeFlash = false
ent-40mmGrenadeFragmentation = false
ent-40mmGrenadeEMP = false
ent-40mmGrenadeBaton = 40мм резиновая-граната
ent-40mmGrenadeThermobaric = 40мм зажигательная-граната
ent-40mmGrenadeFlash = 40мм световая-граната
ent-40mmGrenadeFragmentation = 40мм фраг-граната
ent-40mmGrenadeEMP = 40мм ЭМИ граната
ent-BaseCannonBall = базовое пушечное ядро
ent-CannonBall = Враждебный
ent-CannonBallGrapeshot = Враждебный
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
whitelist:
tags:
- Grenade
- LessLethalGrenade # Forge-Change
capacity: 3
proto: 40mmGrenadeFragmentation
soundInsert:
Expand Down
Loading