Skip to content
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

fix-blueshield-belts #2438

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix-blueshield-belts #2438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cebf64f
fix-blueshield-belts
EstKemran Dec 31, 2024
696bd46
radio
EstKemran Dec 31, 2024
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
11 changes: 9 additions & 2 deletions Resources/Locale/ru-RU/ss220/clothing/Back/backpacks.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
ent-ClothingBackpackArmy = армейский ранец
.desc = Твердый ранец с спальным мешком. Помогает пережить длительные марши.

ent-ClothingBackpackBlueShield = рюкзак "Синий Щит"
.desc = Рюкзак, специально разработанный для "Синий Щит", с уникальной технологией карманного скафандра.
ent-ClothingBackpackBlueShieldHight = рюкзак "Синий Щит"
.desc = Рюкзак, специально разработанный для "Синий Щит", с уникальной технологией карманного скафандра.
.suffix = Лёгкий скафандр

ent-ClothingBackpackBlueShieldHight = { ent-ClothingBackpackBlueShield }
.desc = { ent-ClothingBackpackBlueShield.desc }
.suffix = Тяжелый скафандр
ent-ClothingBackpackBlueShieldHightFilled = { ent-ClothingBackpackBlueShield }
.suffix = Тяжелый скафандр, заполненный
.desc = { ent-ClothingBackpackBlueShield.desc }
4 changes: 2 additions & 2 deletions Resources/Locale/ru-RU/ss220/clothing/Belt/belts.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ent-ClothingBeltBlueShieldFilled = { ent-ClothingBeltBlueShield }

ent-ClothingBeltWebbingBlueShield = РПС "Синий Щит"
.desc = Универсальный разгрузочный жилет с ремнями и поясом. Может вмещать всё что угодно... всё что угодно небольшого размера.
ent-ClothingBeltWebbingBlueShieldFilled = { ent-ClothingBeltBlueShield }
.desc = { ent-ClothingBeltBlueShield.desc }
ent-ClothingBeltWebbingBlueShieldFilled = { ent-ClothingBeltWebbingBlueShield }
.desc = { ent-ClothingBeltWebbingBlueShield.desc }
.suffix = Заполненный

ent-ClothingBeltMedicalInterdyne = РПС образца НМП-023
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Clothing/Belt/belts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@
- CombatKnife
- Truncheon
- HolofanProjectorSecurity # SS220 Fix #2009
- BlasterPowerCell # SS220 fix-blueshield-belts
Copy link
Collaborator

Choose a reason for hiding this comment

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

В прошлый раз не заметил этого, но этот прототип создан для щитспавна на ивенте, лучше создай отдельный базовый для своих.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Можешь с этим id создать в целом то, только тогда для щитспавн-ячейки поменяй id

components:
- Stunbaton
- FlashOnTrigger
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/Catalog/Fills/Backpacks/backpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
- type: StorageFill
contents:
- id: BoxSurvivalSecurity
- id: WeaponBlasterKRS
- id: WeaponBlasterKRV
- id: BlasterPowerCellPulse
amount: 3
- id: BlasterPowerCellDisabler
Expand Down
35 changes: 21 additions & 14 deletions Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
maxItemSize: Normal
defaultStorageOrientation: Vertical
grid:
- 0,0,4,2
- 0,0,6,2

- type: entity
parent: ClothingBeltBlueShield
Expand All @@ -23,10 +23,11 @@
components:
- type: StorageFill
contents:
- id: Stunbaton
- id: Handcuffs
- id: Handcuffs
- id: GrenadeFlashBang
- id: GrenadeFlashBang
- id: RadioHandheldSecurity
- id: FlashlightSeclite

- type: entity
Expand All @@ -40,18 +41,20 @@
- type: Clothing
sprite: SS220/Clothing/Belt/blueshieldwebbing.rsi
- type: Storage
maxItemSize: Small
defaultStorageOrientation: Vertical
grid:
- 0,1,0,2
- 1,1,1,1
- 2,2,2,3
- 3,0,3,1
- 4,2,4,3
- 5,0,5,1
- 6,2,6,3
- 7,0,7,1
- 8,2,8,3
- 9,1,9,1
- 10,1,10,2
- 0,0,6,1
- type: ItemSlots
slots:
item:
name: clothing-boots-sidearm
whitelist:
tags:
- Sidearm
- Medkit
components:
- Stunbaton

- type: entity
parent: ClothingBeltWebbingBlueShield
Expand All @@ -64,7 +67,11 @@
- id: FlashlightSeclite
- id: Handcuffs
- id: GrenadeFlashBang
- id: GrenadeFlashBang
- id: RadioHandheldSecurity
- type: ContainerFill
containers:
item:
- Stunbaton

- type: entity
parent: ClothingBeltSheath
Expand Down
Loading