From 33a9173920c2a44659403006e043cc88f1b26fb4 Mon Sep 17 00:00:00 2001 From: MegaDaimond <158335048+MegaDaimond@users.noreply.github.com> Date: Sun, 29 Sep 2024 23:18:08 +0700 Subject: [PATCH 1/2] =?UTF-8?q?Vector+=D0=9C=D0=B8=D0=BA=D1=80=D0=BE=D0=A1?= =?UTF-8?q?=D0=91=20=D0=B0=D0=BF=D0=B4=D0=B5=D0=B9=D1=82=20(#213)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Vector+МикроСБ апдейт * Update security.yml * Pleh * Перенос Попросили потому что * Update heavy_rifle.yml * Пробел * :skull: * British humor * Update Resources/Prototypes/Recipes/Lathes/security.yml Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: Evgencheg <73418250+Evgencheg@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .../guns/ammunition/magazines/magnum.ftl | 14 ++-- .../objects/weapons/guns/smgs/smgs.ftl | 8 +-- .../Catalog/Fills/Lockers/heads.yml | 3 +- .../Catalog/Fills/Lockers/security.yml | 4 +- .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 1 - .../Ammunition/Cartridges/heavy_rifle.yml | 2 +- .../Guns/Ammunition/Magazines/magnum.yml | 16 ++--- .../Ammunition/Projectiles/heavy_rifle.yml | 2 +- .../Objects/Weapons/Guns/SMGs/smgs.yml | 9 ++- .../Entities/Structures/Machines/lathe.yml | 6 ++ Resources/Prototypes/Research/arsenal.yml | 2 + .../Prototypes/Roles/Jobs/Security/warden.yml | 1 - .../_LostParadise/Catalog/Hos_catalog.yml | 13 +++- .../Weapons/Guns/Ammunition/Box/Rifle.yml | 72 ++++++++++++++++++- .../Ammunition/Cartridges/LPPCartridge.yml | 58 +++++++++++++++ .../Guns/Ammunition/Projectile/LPPBullets.yml | 46 ++++++++++++ .../Entities/Objects/Weapons/Guns/tags.yml | 5 +- .../_LostParadise/Recipes/Lathes/security.yml | 33 +++++++++ 18 files changed, 261 insertions(+), 34 deletions(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl index 95f5bea195..b56464c692 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl @@ -1,6 +1,6 @@ ent-BaseMagazineMagnum = пистолетный магазин (.45 магнум) .desc = { ent-BaseMagazinePistol.desc } -ent-BaseMagazineMagnumSubMachineGun = магазин Вектора (.45 магнум) +ent-BaseMagazineMagnumSubMachineGun = магазин Вектора (.10 винтовочные) .desc = { ent-BaseItem.desc } ent-MagazineMagnumEmpty = пистолетный магазин (.45 магнум любые) .suffix = Пустой @@ -15,16 +15,16 @@ ent-MagazineMagnumUranium = пистолетный магазин (.45 магн .desc = { ent-BaseMagazineMagnum.desc } ent-MagazineMagnumAP = пистолетный магазин (.45 магнум бронебойные) .desc = { ent-BaseMagazineMagnum.desc } -ent-MagazineMagnumSubMachineGunEmpty = магазин Вектора (.45 магнум любые) +ent-MagazineMagnumSubMachineGunEmpty = магазин Вектора (.10 винтовочные любые) .suffix = Пустой .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } -ent-MagazineMagnumSubMachineGun = магазин Вектора (.45 магнум) +ent-MagazineMagnumSubMachineGun = магазин Вектора (.10 винтовочные) .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } -ent-MagazineMagnumSubMachineGunRubber = магазин Вектора (.45 магнум резиновые) +ent-MagazineMagnumSubMachineGunRubber = магазин Вектора (.10 винтовочные резиновые) .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } -ent-MagazineMagnumSubMachineGunPractice = магазин Вектора (.45 магнум учебные) +ent-MagazineMagnumSubMachineGunPractice = магазин Вектора (.10 винтовочные учебные) .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } -ent-MagazineMagnumSubMachineGunUranium = магазин Вектора (.45 магнум урановые) +ent-MagazineMagnumSubMachineGunUranium = магазин Вектора (.10 винтовочные урановые) .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } -ent-MagazineMagnumSubMachineGunPiercing = магазин Вектора (.45 магнум бронебойные) +ent-MagazineMagnumSubMachineGunPiercing = магазин Вектора (.10 винтовочные бронебойные) .desc = { ent-BaseMagazineMagnumSubMachineGun.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl index de3ddd5cbe..91f50425d8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/smgs/smgs.ftl @@ -9,11 +9,11 @@ ent-WeaponSubMachineGunC20r = C-20r ent-WeaponSubMachineGunDrozd = Дрозд .desc = Превосходный, полностью автоматический, тяжёлый пистолет-пулемёт. Использует патроны калибра .35 авто. ent-WeaponSubMachineGunVector = Вектор - .desc = Превосходный тяжёлый пистолет-пулемёт. Использует патроны калибра .45 магнум. - .suffix = Неактуален, используйте Дрозд + .desc = Превосходный тяжёлый пистолет-пулемёт. Использует патроны калибра .10 винтовочные. + .suffix = Актуален, используйте ent-WeaponSubMachineGunVectorRubber = Вектор - .desc = Превосходный тяжёлый пистолет-пулемёт. Использует патроны калибра .45 магнум. - .suffix = Неактуален, используйте Дрозд, Резиновые + .desc = Превосходный тяжёлый пистолет-пулемёт. Использует патроны калибра .10 винтовочные. + .suffix = Актуален, используйте, Резиновые ent-WeaponSubMachineGunWt550 = WT550 .desc = Отличный пистолет-пулемёт, производства NanoTrasen's Small Arms Division. Использует патроны калибра .35 авто. .suffix = Пистолет-пулемёт diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index a532320748..26f50ec246 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -22,6 +22,7 @@ - id: QuartermasterIDCard # Delta-V - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 + - id: WeaponEnergyGunMini #LPP - type: entity id: LockerCaptainFilledHardsuit @@ -122,7 +123,7 @@ - id: BoxID - id: BoxHeadset - id: IDComputerCircuitboard - - id: WeaponDisabler + - id: WeaponEnergyGunMini #LPP - id: ClothingOuterCoatHoPArmored # DeltaV - id: ClothingOuterArmorDuraVest # DeltaV - replaced HoP's armoured coat with a standard stabproof, pending HoPcoat resprite - id: CigarGoldCase diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 473723aaeb..55c6273a52 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -31,7 +31,7 @@ - id: LPPWeaponPistolPF20 - id: LPPMagazinePistolPF20lethal - id: LPPMagazinePistolPF20Rubber - prob: 0.5 #Кибербуллинг метаюзеров :D + - id: LPPHOSUplinkShop #На будущее, будет хайриском - type: entity id: LockerWardenFilled @@ -119,6 +119,8 @@ prob: 0.01 - id: ClothingMaskClown prob: 0.1 + - id: WeaponDisabler + prob: 0.33 - type: entity id: LockerBrigmedicFilled diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index 8e6c79dfe5..7c89b4e51d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -138,4 +138,3 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - state: uranium - diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml index a63351b6f9..65e961d76f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml @@ -23,7 +23,7 @@ - type: entity id: CartridgeMinigun name: cartridge (.10 rifle) - parent: BaseCartridgeHeavyRifle + parent: LPPBaseCartridgeMinigun components: - type: CartridgeAmmo proto: BulletMinigun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index 6a1cc041de..aa30062518 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -16,7 +16,7 @@ - type: entity id: BaseMagazineMagnumSubMachineGun - name: "Vector magazine (.45 magnum)" + name: "Vector magazine (.10 rifle)" parent: BaseItem abstract: true components: @@ -27,8 +27,8 @@ mayTransfer: true whitelist: tags: - - CartridgeMagnum - capacity: 25 + - CartridgeMinigun + capacity: 40 - type: Item size: Small - type: ContainerContainer @@ -123,7 +123,7 @@ parent: BaseMagazineMagnumSubMachineGun components: - type: BallisticAmmoProvider - proto: CartridgeMagnum + proto: CartridgeMinigun - type: Sprite layers: - state: red @@ -137,7 +137,7 @@ parent: BaseMagazineMagnumSubMachineGun components: - type: BallisticAmmoProvider - proto: CartridgeMagnumPractice + proto: LPPCartridgeMinigunPractice - type: Sprite layers: - state: practice @@ -151,7 +151,7 @@ parent: BaseMagazineMagnumSubMachineGun components: - type: BallisticAmmoProvider - proto: CartridgeMagnumRubber + proto: LPPCartridgeMinigunrubber - type: Sprite layers: - state: rubber @@ -165,7 +165,7 @@ parent: BaseMagazineMagnumSubMachineGun components: - type: BallisticAmmoProvider - proto: CartridgeMagnumUranium + proto: LPPCartridgeMinigunUranium - type: Sprite layers: - state: uranium @@ -179,7 +179,7 @@ parent: BaseMagazineMagnumSubMachineGun components: - type: BallisticAmmoProvider - proto: CartridgeMagnumAP + proto: LPPCartridgeMinigunAP - type: Sprite layers: - state: piercing diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml index be6a07e486..3e24fb8135 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml @@ -18,4 +18,4 @@ - type: Projectile damage: types: - Piercing: 5 + Piercing: 8 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 3962f6e1f5..c8f7f68053 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -20,7 +20,7 @@ maxAngle: 16 fireRate: 8 angleIncrease: 3 - angleDecay: 16 + angleDecay: 16 selectedMode: FullAuto availableModes: - SemiAuto @@ -162,7 +162,6 @@ name: Vector parent: BaseWeaponSubMachineGun id: WeaponSubMachineGunVector - suffix: Deprecated use Drozd description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo. components: - type: Sprite @@ -195,11 +194,11 @@ - MagazineMagnumSubMachineGun gun_chamber: name: Chamber - startingItem: CartridgeMagnum + startingItem: CartridgeMinigun priority: 1 whitelist: tags: - - CartridgeMagnum + - CartridgeMinigun - type: MagazineVisuals magState: mag steps: 1 @@ -234,7 +233,7 @@ minAngle: 1 maxAngle: 6 angleIncrease: 1.5 - angleDecay: 6 + angleDecay: 6 selectedMode: FullAuto shotsPerBurst: 5 availableModes: diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2c8c4f3b36..e7e5694148 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -772,6 +772,9 @@ - MagazineBoxSpecialPractice - SpeedLoaderSpecial - MagazinePistolSpecial + #LPP + - LPPMagazineMagnumSubMachineGun + - LPPMagazineBoxMinigun # End of modified code dynamicRecipes: - LPPSpaceForgeCircuitBoardCMDAndSec @@ -850,6 +853,9 @@ - MagazineBoxSpecialIncendiary - MagazineBoxSpecialUranium - MagazineBoxSpecialMindbreaker + #LPP + - LPPMagazineBoxMinigunPractice + - LPPMagazineBoxMinigunRubber # End of modified code - type: MaterialStorage whitelist: diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 7432d4225f..3397f1ac13 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -72,6 +72,8 @@ # DeltaV - .38 special rubber ammo - Adds .38 special rubber ammo to the research tree - CartridgeSpecialRubber - MagazineBoxSpecialRubber + - LPPMagazineBoxMinigunPractice + - LPPMagazineBoxMinigunRubber # End of modified code - type: technology diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index f4fbee3e3d..66bba0046e 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -41,7 +41,6 @@ ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal - pocket2: LPPHOSUplinkShop socks: LPPClothingUnderSocksNorm underwear: LPPBoxer underwear: LPPBriefs diff --git a/Resources/Prototypes/_LostParadise/Catalog/Hos_catalog.yml b/Resources/Prototypes/_LostParadise/Catalog/Hos_catalog.yml index 42a5e74880..76b756f471 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/Hos_catalog.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/Hos_catalog.yml @@ -342,10 +342,10 @@ - type: listing id: LPPHosCatalogWeaponSubMachineGunVector name: Вектор - description: Превосходный тяжёлый пистолет-пулемёт. Использует патроны калибра .45 магнум. Чувствуется вкус ностальгии... + description: Превосходный тяжёлый пистолет-пулемёт. Использует патроны калибра .10 винтовочные. Чувствуется вкус ностальгии... productEntity: WeaponSubMachineGunVector cost: - LPPCentcoin: 11 + LPPCentcoin: 5 categories: - LPPhosweapon @@ -853,6 +853,15 @@ categories: - LPPhosammo +- type: listing + id: LPPHosCatalogMagazineBoxMinigun + name: коробка патронов (.10 винтовочные) + description: Коробка патронов, что не понятно? Зачем тебе вообще описание коробки патронов? + productEntity: LPPMagazineBoxRifleMinigun + cost: + LPPCentcoin: 1 + categories: + - LPPhosammo #brigmeme - type: listing diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Box/Rifle.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Box/Rifle.yml index b58873a69e..83a8abbe71 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Box/Rifle.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Box/Rifle.yml @@ -154,4 +154,74 @@ - state: base map: ["enum.GunVisualLayers.Base"] - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] \ No newline at end of file + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: BaseMagazineBoxRifle + id: LPPMagazineBoxRifleMinigun + name: ammunition box (.10 rifle) + components: + - type: BallisticAmmoProvider + proto: CartridgeMinigun + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: BaseMagazineBoxRifle + id: LPPMagazineBoxRifleMinigunRubber + name: ammunition box (.10 rifle rubber) + components: + - type: BallisticAmmoProvider + proto: LPPCartridgeMinigunrubber + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: BaseMagazineBoxRifle + id: LPPMagazineBoxRifleMinigunPractice + name: ammunition box (.10 rifle practice) + components: + - type: BallisticAmmoProvider + proto: LPPCartridgeMinigunPractice + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: BaseMagazineBoxRifle + id: LPPMagazineBoxRifleMinigunUranium + name: ammunition box (.10 rifle uranium) + components: + - type: BallisticAmmoProvider + proto: LPPCartridgeMinigunUranium + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + parent: BaseMagazineBoxRifle + id: LPPMagazineBoxRifleMinigunAP + name: ammunition box (.10 rifle AP) + components: + - type: BallisticAmmoProvider + proto: LPPCartridgeMinigunAP + - type: Sprite + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/LPPCartridge.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/LPPCartridge.yml index 800aff0400..422250a829 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/LPPCartridge.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/LPPCartridge.yml @@ -18,6 +18,28 @@ - type: Appearance - type: SpentAmmoVisuals +- type: entity + id: LPPBaseCartridgeMinigun + name: cartridge (.10 rifle) + parent: BaseCartridge + abstract: true + components: + - type: Tag + tags: + - Cartridge + - CartridgeMinigun + - type: CartridgeAmmo + proto: BulletHeavyRifle + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + layers: + - state: base + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + - type: StaticPrice + price: 10 + - type: entity id: LPPCartridgeM4A1Lethal name: патрон (калибр 5,56х45) @@ -85,3 +107,39 @@ components: - type: CartridgeAmmo proto: LPPBulletLightRifleHunting + +- type: entity + id: LPPCartridgeMinigunrubber + name: bullet (.10 rifle rubber) + parent: LPPBaseCartridgeMinigun + components: + - type: CartridgeAmmo + proto: LPPBulletMinigunRubber + deleteOnSpawn: true + +- type: entity + id: LPPCartridgeMinigunPractice + name: bullet (.10 rifle practice) + parent: LPPBaseCartridgeMinigun + components: + - type: CartridgeAmmo + proto: BaseBulletPractice + deleteOnSpawn: true + +- type: entity + id: LPPCartridgeMinigunAP + name: bullet (.10 rifle AP) + parent: LPPBaseCartridgeMinigun + components: + - type: CartridgeAmmo + proto: LPPBulletMinigunAP + deleteOnSpawn: true + +- type: entity + id: LPPCartridgeMinigunUranium + name: bullet (.10 rifle uranium) + parent: LPPBaseCartridgeMinigun + components: + - type: CartridgeAmmo + proto: LPPBulletMinigunUranium + deleteOnSpawn: true diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml index 4a3326f2fd..5247c947b5 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Projectile/LPPBullets.yml @@ -121,3 +121,49 @@ types: Piercing: 16 Blunt: 7 + +- type: entity + id: LPPBulletMinigunRubber + name: minigun bullet (.10 rifle rubber) + parent: BaseBulletRubber + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 1 + +- type: entity + id: LPPBulletMinigunPractice + name: minigun bullet (.10 rifle practice) + parent: BaseBulletPractice + noSpawn: true + components: + - type: Projectile + damage: + types: + Blunt: 2 + +- type: entity + id: LPPBulletMinigunAP + name: minigun bullet (.10 rifle AP) + parent: BulletHeavyRifle + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 5 + ignoreResistances: true + +- type: entity + id: LPPBulletMinigunUranium + name: minigun bullet (.10 rifle uranium) + parent: BaseBulletPractice + noSpawn: true + components: + - type: Projectile + damage: + types: + Piercing: 2 + Radiation: 8 diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/tags.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/tags.yml index a65d26a43b..f0548a559f 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/tags.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/tags.yml @@ -11,4 +11,7 @@ id: LPPMagazineMars - type: Tag - id: LPPMagazineGarand \ No newline at end of file + id: LPPMagazineGarand + +- type: Tag + id: CartridgeMinigun diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml index 37af37a2a2..6dba2165ef 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml @@ -110,3 +110,36 @@ materials: Plastic: 375 Plasma: 375 + +- type: latheRecipe + id: LPPMagazineBoxMinigunPractice + result: LPPMagazineBoxRifleMinigunPractice + category: Ammo + completetime: 5 + materials: + Plastic: 500 + +- type: latheRecipe + id: LPPMagazineBoxMinigunRubber + result: LPPMagazineBoxRifleMinigunRubber + category: Ammo + completetime: 5 + materials: + Steel: 350 + Plastic: 600 + +- type: latheRecipe + id: LPPMagazineBoxMinigun + result: LPPMagazineBoxRifleMinigun + category: Ammo + completetime: 5 + materials: + Steel: 750 + +- type: latheRecipe + id: LPPMagazineMagnumSubMachineGun + result: MagazineMagnumSubMachineGun + category: Ammo + completetime: 5 + materials: + Steel: 375 From 5d6a2f2be704429be00e0a41cfc8e7f6c27848d7 Mon Sep 17 00:00:00 2001 From: Lost-Paradise-Bot <172407741+Lost-Paradise-Bot@users.noreply.github.com> Date: Sun, 29 Sep 2024 16:18:39 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20(#213)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Changelog/ChangelogLPP.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index dd677adf3b..5fd7a223c0 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -864,3 +864,26 @@ Entries: id: 77 time: '2024-09-29T05:58:18.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/225 +- author: MegaDaimond + changes: + - type: Add + message: >- + Добавлены новые виды .10 патронов (Резиновые, тренировочные, урановые, + бронебойные) + - type: Add + message: Добавлены коробки под .10 патроны + - type: Tweak + message: Вектор теперь использует .10 патроны, а не .45 магнум + - type: Tweak + message: Магазин под вектора теперь вмещает 40 патронов .10 + - type: Tweak + message: Цена на вектор в планшете уменьшилась 11>5 ЦентКоинов + - type: Tweak + message: Планшет закупа СБ перемещён из кармана смотрителя в его шкафчик + - type: Tweak + message: С небольшим шансом станнеры могут появится в шкафчиках СБ + - type: Tweak + message: ГП и КМ получили миниатюрные лазерные пистолеты в их шкафчики + id: 78 + time: '2024-09-29T16:18:08.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/213