diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 5eed03b394..8ce9ec4960 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -428,8 +428,11 @@ - WeaponAdvancedLaser - WeaponLaserCannon - WeaponLaserCarbine + - EnergyCellCarbine - WeaponXrayCannon - WeaponDisablerSMG + - EnergyCellDisablerSmg + - EnergyCellDisabler - ClothingHandsGlovesMagnetic - ClothingHandsGlovesMagneticAdvanced - ExplosivePayload @@ -822,6 +825,7 @@ - MagazinePistolHighCapacity - MagazinePistolHighCapacityPractice - MagazinePistolHighCapacityRubber + - EnergyCellDisabler dynamicRecipes: - CartridgeLightRifleIncendiary - CartridgeMagnumIncendiary @@ -859,8 +863,10 @@ - WeaponDisablerPractice - WeaponAdvancedLaser - WeaponDisablerSMG + - EnergyCellDisablerSmg - WeaponLaserCannon - WeaponLaserCarbine + - EnergyCellCarbine - WeaponXrayCannon - WeaponTempGun # WD EDIT - PowerCageSmall diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index b9e5a8a8fe..5cac2ee56e 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -797,3 +797,33 @@ Plastic: 400 Glass: 600 Silver: 100 + +- type: latheRecipe + id: EnergyCellCarbine + result: EnergyCellCarbine + category: Ammo + completetime: 6 + materials: + Steel: 400 + Glass: 200 + Plastic: 300 + +- type: latheRecipe + id: EnergyCellDisabler + result: EnergyCellDisabler + category: Ammo + completetime: 6 + materials: + Steel: 200 + Glass: 100 + Plastic: 100 + +- type: latheRecipe + id: EnergyCellDisablerSmg + result: EnergyCellDisablerSmg + category: Ammo + completetime: 6 + materials: + Steel: 200 + Glass: 150 + Plastic: 300 diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 2267804906..e22be07067 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -45,6 +45,7 @@ cost: 7500 recipeUnlocks: - WeaponLaserCarbine + - EnergyCellCarbine - type: technology id: NonlethalAmmunition @@ -104,6 +105,7 @@ - TelescopicShield - HoloprojectorSecurity - WeaponDisablerSMG + - EnergyCellDisablerSmg # Tier 2 diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/_Honk/Entities/Objects/Power/powercells.yml index def6d4c35d..e45fae8f57 100644 --- a/Resources/Prototypes/_Honk/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/_Honk/Entities/Objects/Power/powercells.yml @@ -43,9 +43,9 @@ - type: entity parent: BasePowerCellHonk - id: EnergyCellСarbine + id: EnergyCellCarbine suffix: Full - name: Энергитическая батарея карабина + name: энергитическая батарея карабина description: Перезаряжаемый элемент питания. Модифицирован для работы с лазерной винтовкой. components: - type: ProjectileBatteryAmmoProvider @@ -64,13 +64,13 @@ startingCharge: 1000 - type: Tag tags: - - EnergyCellСarbine + - EnergyCellCarbine - type: entity parent: BasePowerCellHonk id: EnergyCellDisabler suffix: Full - name: Энергитическая батарея дизейблера + name: энергитическая батарея дизейблера description: Перезаряжаемый элемент питания. Модифицирован для работы с дизейблером. components: - type: Sprite @@ -95,7 +95,7 @@ parent: BasePowerCellHonk id: EnergyCellDisablerSmg suffix: Full - name: Энергитическая батарея дизейблера пулемёта + name: энергитическая батарея дизейблера пулемёта description: Перезаряжаемый элемент питания. Модифицирован для работы с дизейблером-пулемётом. components: - type: Sprite diff --git a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index c77ed0aba7..59c1bd34fc 100644 --- a/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Honk/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -109,13 +109,13 @@ slots: gun_magazine: name: Magazine - startingItem: EnergyCellСarbine + startingItem: EnergyCellCarbine priority: 4 insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg whitelist: tags: - - EnergyCellСarbine + - EnergyCellCarbine aim_module: name: Aim Module insertSound: /Audio/White/Gun/Modules/insertmodule.ogg diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml index ad0cb87aaa..de4f84d435 100644 --- a/Resources/Prototypes/_White/tags.yml +++ b/Resources/Prototypes/_White/tags.yml @@ -131,7 +131,7 @@ id: MirrorShieldGhetto - type: Tag - id: EnergyCellСarbine + id: EnergyCellCarbine - type: Tag id: EnergyCellDisabler