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

Модуль энергетического оружия киборгам #42

Closed
wants to merge 8 commits into from
Closed

Модуль энергетического оружия киборгам #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0316273
Модуль
FireFoxPhoenix Sep 16, 2024
af99d3a
Merge branch 'Corvax-Frontier:master' into Модуль-оружия
FireFoxPhoenix Sep 28, 2024
20dc447
Merge branch 'Corvax-Frontier:master' into Модуль-оружия
FireFoxPhoenix Oct 2, 2024
6a625eb
Merge branch 'Corvax-Frontier:master' into Модуль-оружия
FireFoxPhoenix Oct 3, 2024
48b0524
Merge branch 'Corvax-Frontier:master' into Модуль-оружия
FireFoxPhoenix Oct 5, 2024
f625da3
Merge branch 'Corvax-Frontier:master' into Модуль-оружия
FireFoxPhoenix Oct 5, 2024
2bc2c2a
Merge branch 'Corvax-Frontier:master' into Модуль-оружия
FireFoxPhoenix Oct 13, 2024
fb2b0ec
Merge branch 'Corvax-Frontier:master' into Модуль-оружия
FireFoxPhoenix Oct 20, 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
2 changes: 2 additions & 0 deletions ...urces/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,5 @@ ent-BorgModuleL6C = модуль киборга с L6C ROW
.desc = Модуль, в который входит пулемёт L6C.
ent-BorgModuleMartyr = модуль киборга Мученик
.desc = Модуль, поставляемый со взрывчаткой, с которой вы, скорее всего, не захотите связываться сами.
ent-BorgModuleWeapon = модуль энергетического оружия киборга
.desc = Модуль, с энергокижалом и продвинутым лазерным пистолетом для киборга.
16 changes: 16 additions & 0 deletions Resources/Prototypes/Corvax/Entities/Objects/Specific/Robotics/borg_modules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- type: entity
id: BorgModuleWeapon
parent: [ BaseBorgModule, BaseProviderBorgModule ]
name: cyborg energy weapon module
description: Module with an energy dagger and an advanced laser pistol for a cyborg.
components:
- type: Sprite
layers:
- state: syndicate
- state: icon-syndicate
- type: ItemBorgModule
items:
- WeaponAdvancedLaser
- EnergyDagger
- type: StaticPrice
vendPrice: 25000
1 change: 1 addition & 0 deletions Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@
VestineChemistryVial: 2
HoverbikeSyndicateFlatpack: 3
SpaceBladeContra: 1
BorgModuleWeapon: 3 # Corvax-Frontier
Loading