diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/guns.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/guns.ftl index afda7e0c075..4d67082f0ca 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/guns.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/guns.ftl @@ -30,3 +30,17 @@ ent-Cartridge556 = патрон (5.56 мм) ent-Cartridge762x39 = патрон (.30 мм) ent-Cartridge762x54 = патрон (7.62x54 мм) ent-Cartridge050 = патрон (.50 мм) +ent-BaseMagazinePistolCaselessRifleExtended = расширенный пистолетный магазин (.20 безгильзовый) +ent-MagazinePPSH41Extended = расширенный магазин PPSH41 +ent-MagazineMP5Extended = расширенный магазин MP5 +ent-MagazineMP7Extended = расширенный магазин MP7 +ent-MagazineP90Extended = расширенный магазин P90 +ent-MagazineM16A4Extended = расширенный магазин M16A4 +ent-MagazineAR18Extended = расширенный магазин AR18 +ent-MagazineM28Extended = расширенный магазин M28 +ent-MagazineG36Extended = расширенный магазин G36 +ent-MagazineFamasExtended = расширенный магазин Famas +ent-MagazineV31Extended = расширенный магазин V31 +ent-MagazineBauer127Extended = расширенный магазин Bauer127 +ent-MagazineBR64Extended = расширенный магазин BR64 +ent-MagazineDragunovExtended = расширенный магазин Dragunov diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl index 15686dfa519..dbc3db04099 100644 --- a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl +++ b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl @@ -1,2 +1,3 @@ research-technology-handcraft-nvd = Кустарные ПНВ research-technology-basic-nvd = Продвинутое ПНВ +research-technology-extended-amunitions = Расширенные магазины \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 431fba71e6b..8ced5e8da83 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -925,6 +925,20 @@ - SpeedLoaderMagnumUranium - TelescopicShield - TimerTrigger + - BaseMagazinePistolCaselessRifleExtended + - MagazinePPSH41Extended + - MagazineMP5Extended + - MagazineMP7Extended + - MagazineP90Extended + - MagazineM16A4Extended + - MagazineAR18Extended + - MagazineM28Extended + - MagazineG36Extended + - MagazineFamasExtended + - MagazineV31Extended + - MagazineBauer127Extended + - MagazineBR64Extended + - MagazineDragunovExtended - Truncheon - VoiceTrigger - WeaponAdvancedLaser diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 66c1e5a9f5a..2c225fb9e98 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -170,7 +170,7 @@ - type: technology id: EnergyBarriers name: research-technology-energy_barriers - icon: + icon: sprite: Objects/Tools/EnergyDome/reinhardt.rsi state: icon discipline: Arsenal @@ -178,7 +178,7 @@ cost: 6000 recipeUnlocks: - EnergyDomeDirectionalTurtle - + - type: technology id: BasicShuttleArmament name: research-technology-basic-shuttle-armament @@ -306,4 +306,4 @@ - WeaponMechCombatShotgun - WeaponMechCombatShotgunIncendiary technologyPrerequisites: - - Gygax \ No newline at end of file + - Gygax diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index 4f05f07a970..03c8d3e3c85 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -17,3 +17,10 @@ steps: 6 zeroVisible: false - type: Appearance + +- type: entity + parent: BaseMagazinePistolCaselessRifle + id: BaseMagazinePistolCaselessRifleExtended + components: + - type: BallisticAmmoProvider + capacity: 20 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 8bbaa99eb33..1c1fae599aa 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -58,3 +58,11 @@ steps: 6 zeroVisible: false - type: Appearance + +- type: entity + parent: MagazineDeagle + id: MagazineDeagleExtended + components: + - type: BallisticAmmoProvider + capacity: 10 + diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index a51b7aca4b5..c2627d59f91 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -157,3 +157,31 @@ steps: 2 zeroVisible: false - type: Appearance + +- type: entity + parent: MagazinePPSH41 + id: MagazinePPSH41Extended + components: + - type: BallisticAmmoProvider + capacity: 85 + +- type: entity + parent: MagazineMP5 + id: MagazineMP5Extended + components: + - type: BallisticAmmoProvider + capacity: 54 + +- type: entity + parent: MagazineMP7 + id: MagazineMP7Extended + components: + - type: BallisticAmmoProvider + capacity: 51 + +- type: entity + parent: MagazineP90 + id: MagazineP90Extended + components: + - type: BallisticAmmoProvider + capacity: 63 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index 35d18a01b7b..042f188f25d 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -210,3 +210,45 @@ steps: 2 zeroVisible: false - type: Appearance + +- type: entity + parent: MagazineV31 + id: MagazineV31Extended + components: + - type: BallisticAmmoProvider + capacity: 50 + +- type: entity + parent: MagazineFamas + id: MagazineFamasExtended + components: + - type: BallisticAmmoProvider + capacity: 34 + +- type: entity + parent: MagazineG36 + id: MagazineG36Extended + components: + - type: BallisticAmmoProvider + capacity: 34 + +- type: entity + parent: MagazineM28 + id: MagazineM28Extended + components: + - type: BallisticAmmoProvider + capacity: 34 + +- type: entity + parent: MagazineAR18 + id: MagazineAR18Extended + components: + - type: BallisticAmmoProvider + capacity: 34 + +- type: entity + parent: MagazineM16A4 + id: MagazineM16A4Extended + components: + - type: BallisticAmmoProvider + capacity: 34 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml index 313b5039c7b..6731ef18af8 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml @@ -107,3 +107,23 @@ zeroVisible: false - type: Appearance +- type: entity + parent: MagazineDragunov + id: MagazineDragunovExtended + components: + - type: BallisticAmmoProvider + capacity: 25 + +- type: entity + parent: MagazineBR64 + id: MagazineBR64Extended + components: + - type: BallisticAmmoProvider + capacity: 25 + +- type: entity + parent: MagazineBauer127 + id: MagazineBauer127Extended + components: + - type: BallisticAmmoProvider + capacity: 15 diff --git a/Resources/Prototypes/_Sunrise/Research/arsenal.yml b/Resources/Prototypes/_Sunrise/Research/arsenal.yml index 75924015120..d9f6c32cfdf 100644 --- a/Resources/Prototypes/_Sunrise/Research/arsenal.yml +++ b/Resources/Prototypes/_Sunrise/Research/arsenal.yml @@ -13,6 +13,31 @@ - WeaponEnergyGun - WeaponEnergyGunMini +- type: technology + id: ExtendedAmunitions + name: research-technology-extended-amunitions + icon: + sprite: _Sunrise\Objects\Weapons\Guns\Ammunition\Magazines\famas.rsi + state: base + discipline: Arsenal + tier: 2 + cost: 12500 + recipeUnlocks: + - BaseMagazinePistolCaselessRifleExtended + - MagazinePPSH41Extended + - MagazineMP5Extended + - MagazineMP7Extended + - MagazineP90Extended + - MagazineM16A4Extended + - MagazineAR18Extended + - MagazineM28Extended + - MagazineG36Extended + - MagazineFamasExtended + - MagazineV31Extended + - MagazineBauer127Extended + - MagazineBR64Extended + - MagazineDragunovExtended + - type: technology id: EnergyGunsAdvanced name: research-technology-energy-gun-advance #