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

Фикс KS23 #101

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+58 −14
Open

Фикс KS23 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions Resources/Locale/ru-RU/_NF/store/uplink-catalog.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,14 @@ uplink-security-key-name = Ключи шифрования ДСБФ
uplink-security-key-desc = Коробка с 4 ключами шифрования, дающими доступ к радиоканалу ДСБФ.
uplink-security-emprocket-name = ЭМИ-ракета
uplink-security-emprocket-desc = ЭМИ-ракета для РПГ-7. Гарантированно испортит день любому пирату.
uplink-security-magazineks23flashbang-name = Светошумовые патроны для KS23
uplink-security-magazineks23flashbang-desc = Коробка со светошумовыми патронами для дробовика KS23.
uplink-security-magazineks23smoke-name = Газовые патроны для KS23
uplink-security-magazineks23smoke-desc = Коробка с газовыми патронами для дробовика KS23.
uplink-security-boxks23beanbag-name = Раздатчик патронов для KS23 (травматические)
uplink-security-boxks23beanbag-desc = Полная коробка травматических патронов для дробовика KS23.
uplink-security-boxks23smoke-name = Раздатчик патронов для KS23 (газовые)
uplink-security-boxks23smoke-desc = Полная коробка газовых патронов для дробовика KS23.
uplink-security-boxks23flashbang-name = Раздатчик патронов для KS23 (светошумовые)
uplink-security-boxks23flashbang-desc = Полная коробка светошумовых патронов для дробовика KS23.
uplink-security-boxks23lethal-name = Раздатчик патронов для KS23 (летальные)
uplink-security-boxks23lethal-desc = Полная коробка летальных патронов для дробовика KS23.
uplink-security-thrusterkit-name = Набор для Апгрейда Двигателей
uplink-security-thrusterkit-desc = Содержит 12 суперконденсаторов. Идеально подходит для улучшения корабельных двигателей.
uplink-security-magazinepistol-name = Магазины для пистолета калибра .35 авто
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,6 +931,8 @@
- WeaponLaserCannon
- WeaponLaserCarbine
- WeaponXrayCannon
- BoxSmokeKS23 # Corvax-Frontier
- BoxFlashbangKS23 # Corvax-Frontier
- type: MaterialStorage
whitelist:
tags:
Expand Down Expand Up @@ -983,6 +985,8 @@
- SpeedLoaderMagnumEmpty
- SpeedLoaderRifleHeavy # Frontier
- SpeedLoaderRifleHeavyEmpty # Frontier
- BoxBeanbagKS23 # Corvax-Frontier
- BoxLethalshotKS23 # Corvax-Frontier
- type: MaterialStorage
whitelist:
tags:
Expand Down
52 changes: 42 additions & 10 deletions Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,11 +585,11 @@
- SecurityUplink

- type: listing # Corvax-Frontier
id: UplinkSecurityKS23Flashbang
name: uplink-security-magazineks23flashbang-name
description: uplink-security-magazineks23flashbang-desc
productEntity: BoxMagazineKS23Flashbang
icon: { sprite: Objects/Storage/boxes.rsi, state: box }
id: UplinkSecurityBoxBeanbagKS23
name: uplink-security-boxks23beanbag-name
description: uplink-security-boxks23beanbag-desc
productEntity: BoxBeanbagKS23
icon: { sprite: Corvax/Objects/Storage/boxes.rsi, state: KS23BeanbagDispenser }
cost:
FrontierUplinkCoin: 2
categories:
Expand All @@ -601,11 +601,43 @@
- SecurityUplink

- type: listing # Corvax-Frontier
id: UplinkSecurityKS23Smoke
name: uplink-security-magazineks23smoke-name
description: uplink-security-magazineks23smoke-desc
productEntity: BoxMagazineKS23Smoke
icon: { sprite: Objects/Storage/boxes.rsi, state: box }
id: UplinkSecurityBoxSmokeKS23
name: uplink-security-boxks23smoke-name
description: uplink-security-boxks23smoke-desc
productEntity: BoxSmokeKS23
icon: { sprite: Corvax/Objects/Storage/boxes.rsi, state: KS23SmokeDispenser }
cost:
FrontierUplinkCoin: 3
categories:
- UplinkSecurityAmmo
conditions:
- !type:StoreWhitelistCondition
whitelist:
tags:
- SecurityUplink

- type: listing # Corvax-Frontier
id: UplinkSecurityBoxFlashbangKS23
name: uplink-security-boxks23flashbang-name
description: uplink-security-boxks23flashbang-desc
productEntity: BoxFlashbangKS23
icon: { sprite: Corvax/Objects/Storage/boxes.rsi, state: KS23FlashbangDispenser }
cost:
FrontierUplinkCoin: 3
categories:
- UplinkSecurityAmmo
conditions:
- !type:StoreWhitelistCondition
whitelist:
tags:
- SecurityUplink

- type: listing # Corvax-Frontier
id: UplinkSecurityBoxLethalshotKS23
name: uplink-security-boxks23lethal-name
description: uplink-security-boxks23lethal-desc
productEntity: BoxLethalshotKS23
icon: { sprite: Corvax/Objects/Storage/boxes.rsi, state: KS23BaseDispenser }
cost:
FrontierUplinkCoin: 2
categories:
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,8 @@
- MagazineBoxRifle
- CrossbowBolt
- CrossbowBoltBroadhead
- BoxBeanbagKS23 # Corvax-Frontier
- BoxLethalshotKS23 # Corvax-Frontier
## Mags / Speedloaders / Clips
- MagazineNovaliteC1Empty
- MagazineNovaliteC1
Expand Down Expand Up @@ -886,6 +888,8 @@
- MagazineBoxPistolRubber
- MagazineBoxRifleRubber
- MagazineShotgunBeanbag
- BoxSmokeKS23 # Corvax-Frontier
- BoxFlashbangKS23 # Corvax-Frontier

- type: entity
id: MercenaryTechFabHacked
Expand Down
Loading