Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

БольшиеМаленькиеБыстрыеМедленныеПушки #359

Merged
merged 8 commits into from
Jul 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/_NF/research/technologies.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ research-technology-hardsuits-experimental-industrial = Эксперимента
research-technology-hardsuits-armored = Бронированные скафандры
research-technology-hardsuits-armored-advanced = Продвинутый бронированные скафандры
research-technology-hardsuits-experimental-rd = Экспериментальные исследовательские скафандры
research-technology-various-shuttle-weapons = Калиберное вооружение
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-ShuttleShotgunShellsBox = Короб .50 патронов для Trophy-50
ent-ShuttleSmgRifleAmmoBox = Короб .35 патронов для NVT-35
ent-ShuttleRifleAmmoBox = Короб .30 патронов для АК-6.30
ent-ShuttleMagnumRifleAmmoBox = Короб .45 патронов для 2А42-45
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ent-ShuttleShotgun = Trophy-50
.desc = Стационарное корабельное орудие, стреляющее ружейными патроными калибра .50. Предназначено для подавления противника.
ent-ShuttleGunAntiMaterial = BOFROG-60/B
.desc = Корабельное орудие внушительных размеров, стреляющее крупнокалиберными патронами 60-го калибра. Способно пробить даже самую крепкую броню.
ent-ShuttleLightRifleGun = АК-6.30
.desc = Стационарное пулемётное орудие под патроны .30 калибра с ОЧЕНЬ большим запасом боеприпасов.
ent-ShuttleSMGRifle = NVT-35
.desc = Стационарное малокалиберное орудие с более высокой скорострельностью, в отличие от остальных.
ent-ShuttleMagnumRifle = 2А42-45
.desc = Ночной кошмар агентов синдиката, что любят прятаться за закрытыми дверьми. Двуствольное орудие под .45-й магнум калибр.
Original file line number Diff line number Diff line change
@@ -1,2 +1,12 @@
ent-PrinterDocMachineCircuitboard = принтер документов (машинная плата)
.desc = Машинная плата принтера документов.
ent-ShuttleShotgunMachineCircuitboard = Trophy-50 (машинная плата)
.desc = Машинная плата Trophy-50.
ent-ShuttleGunAntiMaterialMachineCircuitboard = BOFROG-60/B (машинная плата)
.desc = Машинная плата BOFROG-60/B.
ent-ShuttleLightRifleGunMachineCircuitboard = АК-6.30 (машинная плата)
.desc = Машинная плата АК-6.30.
ent-ShuttleSMGRifleMachineCircuitboard = NVT-35 (машинная плата)
.desc = Машинная плата NVT-35.
ent-ShuttleMagnumRifleMachineCircuitboard = 2А42-45 (машинная плата)
.desc = Машинная плата 2А42-45.
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,111 @@
requirements:
MatterBin: 3
Manipulator: 1

- type: entity
id: ShuttleShotgunMachineCircuitboard
parent: BaseMachineCircuitboard
name: Trophy-50
description: Machine Board from the shuttle`s gun "Trophy-50"
components:
- type: Sprite
state: security
- type: MachineBoard
prototype: ShuttleShotgun
requirements:
Capacitor: 3
Manipulator: 2
MatterBin: 2
# materialRequirements:
# Cable: 5
# CableHV: 3
# Steel: 12
- type: StaticPrice
price: 150

- type: entity
id: ShuttleGunAntiMaterialMachineCircuitboard
parent: BaseMachineCircuitboard
name: BOFROG-60/B
description: Machine Board from the shuttle`s gun "BOFROG-60/B"
components:
- type: Sprite
state: security
- type: MachineBoard
prototype: ShuttleGunAntiMaterial
requirements:
Capacitor: 5
Manipulator: 3
MatterBin: 1
# materialRequirements:
# Cable: 4
# CableHV: 5
# Steel: 16
- type: StaticPrice
price: 150

- type: entity
id: ShuttleLightRifleGunMachineCircuitboard
parent: BaseMachineCircuitboard
name: АК-6.30
description: Machine Board from the shuttle`s gun "АК-6.30"
components:
- type: Sprite
state: security
- type: MachineBoard
prototype: ShuttleLightRifleGun
requirements:
Capacitor: 4
Manipulator: 4
MatterBin: 5
# materialRequirements:
# Cable: 6
# CableHV: 3
# Steel: 14
- type: StaticPrice
price: 150

- type: entity
id: ShuttleSMGRifleMachineCircuitboard
parent: BaseMachineCircuitboard
name: NVT-35
description: Machine Board from the shuttle`s gun "NVT-35"
components:
- type: Sprite
state: security
- type: MachineBoard
prototype: ShuttleSMGRifle
requirements:
Capacitor: 3
Manipulator: 6
MatterBin: 3
# materialRequirements:
# Cable: 4
# CableHV: 2
# Steel: 11
- type: StaticPrice
price: 150

- type: entity
id: ShuttleMagnumRifleMachineCircuitboard
parent: BaseMachineCircuitboard
name: 2А42-45
description: Machine Board from the shuttle`s gun "2А42-45"
components:
- type: Sprite
state: security
- type: MachineBoard
prototype: ShuttleMagnumRifle
requirements:
Capacitor: 6
Manipulator: 4
MatterBin: 2
# materialRequirements:
# Cable: 5
# CableHV: 3
# Steel: 18
stackRequirements:
Glass: 15
Steel: 15
Steel: 15
- type: StaticPrice
price: 150
77 changes: 77 additions & 0 deletions Resources/Prototypes/Corvax/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,80 @@
materials:
Steel: 300
Uranium: 300

- type: latheRecipe #ShuttleGuns
id: ShuttleShotgunMachineCircuitboard
result: ShuttleShotgunMachineCircuitboard
completetime: 5
materials:
Steel: 1700
Glass: 1100
Gold: 400

- type: latheRecipe #ShuttleGuns
id: ShuttleGunAntiMaterialMachineCircuitboard
result: ShuttleGunAntiMaterialMachineCircuitboard
completetime: 13
materials:
Steel: 3100
Glass: 2500
Gold: 1600

- type: latheRecipe #ShuttleGuns
id: ShuttleLightRifleGunMachineCircuitboard
result: ShuttleLightRifleGunMachineCircuitboard
completetime: 7
materials:
Steel: 2400
Glass: 1800
Gold: 900

- type: latheRecipe #ShuttleGuns
id: ShuttleSMGRifleMachineCircuitboard
result: ShuttleSMGRifleMachineCircuitboard
completetime: 4
materials:
Steel: 1300
Glass: 800
Gold: 400

- type: latheRecipe #ShuttleGuns
id: ShuttleMagnumRifleMachineCircuitboard
result: ShuttleMagnumRifleMachineCircuitboard
completetime: 9
materials:
Steel: 2200
Glass: 1700
Gold: 1000

- type: latheRecipe #ShuttleGuns
id: ShuttleShotgunShellsBox
result: ShuttleShotgunShellsBox
completetime: 6
materials:
Steel: 600
Plastic: 300

- type: latheRecipe #ShuttleGuns
id: ShuttleSmgRifleAmmoBox
result: ShuttleSmgRifleAmmoBox
completetime: 10
materials:
Steel: 1300
Plastic: 300

- type: latheRecipe #ShuttleGuns
id: ShuttleRifleAmmoBox
result: ShuttleRifleAmmoBox
completetime: 15
materials:
Steel: 2700
Plastic: 300

- type: latheRecipe #ShuttleGuns
id: ShuttleMagnumRifleAmmoBox
result: ShuttleMagnumRifleAmmoBox
completetime: 8
materials:
Steel: 900
Plastic: 300
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
- type: entity
id: ShuttleShotgunShellsBox
name: Cartridge for Trophy-50
parent: BaseItem
components:
- type: Tag
tags:
- ShuttleShotgunShellsBox
- type: BallisticAmmoProvider
proto: ShellShotgun
mayTransfer: true
whitelist:
tags:
- ShellShotgun
capacity: 24
soundRack:
path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg
params:
variation: 0.05
soundInsert:
path: /Audio/Weapons/Guns/MagIn/rifle_load.ogg
params:
variation: 0.05
- type: Item
size: Large
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
layers:
- state: 50base
map: ["enum.GunVisualLayers.Base"]
- state: 50mag-6
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: 50mag
steps: 7
zeroVisible: false
- type: Appearance

- type: entity
id: ShuttleSmgRifleAmmoBox
name: Cartridge for NVT-35
parent: BaseItem
components:
- type: Tag
tags:
- ShuttleSmgRifleAmmoBox
- type: BallisticAmmoProvider
proto: CartridgePistol
mayTransfer: true
whitelist:
tags:
- CartridgePistol
capacity: 100
soundRack:
path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg
params:
variation: 0.05
soundInsert:
path: /Audio/Weapons/Guns/MagIn/rifle_load.ogg
params:
variation: 0.05
- type: Item
size: Large
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
layers:
- state: 35base
map: ["enum.GunVisualLayers.Base"]
- state: 35mag-8
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: 35mag
steps: 9
zeroVisible: false
- type: Appearance

- type: entity
id: ShuttleRifleAmmoBox
name: Cartridge for АК-6.30
parent: BaseItem
components:
- type: Tag
tags:
- ShuttleRifleAmmoBox
- type: BallisticAmmoProvider
proto: CartridgeLightRifle
whitelist:
tags:
- CartridgeLightRifle
capacity: 150
mayTransfer: true
soundRack:
path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg
params:
variation: 0.05
soundInsert:
path: /Audio/Weapons/Guns/MagIn/rifle_load.ogg
params:
variation: 0.05
- type: Item
size: Large
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
layers:
- state: 30base
map: ["enum.GunVisualLayers.Base"]
- state: 30mag-8
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: 30mag
steps: 9
zeroVisible: false
- type: Appearance

- type: entity
id: ShuttleMagnumRifleAmmoBox
name: Cartridge for 2А42-45
parent: BaseItem
components:
- type: Tag
tags:
- ShuttleMagnumRifleAmmoBox
- type: BallisticAmmoProvider
proto: CartridgeMagnum
mayTransfer: true
whitelist:
tags:
- CartridgeMagnum
capacity: 40
soundRack:
path: /Audio/Weapons/Guns/Bolt/lmg_bolt_closed.ogg
params:
variation: 0.05
soundInsert:
path: /Audio/Weapons/Guns/MagIn/rifle_load.ogg
params:
variation: 0.05
- type: Item
size: Large
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
- type: Sprite
sprite: Corvax/Objects/Weapons/Guns/Ammunition/Magazine/rifle_cartridges.rsi
layers:
- state: 45base
map: ["enum.GunVisualLayers.Base"]
- state: 45mag-8
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: 45mag
steps: 9
zeroVisible: false
- type: Appearance
Loading
Loading