diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index bdedb92e0a..223f31e945 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -176,6 +176,7 @@ contents: - id: WeaponRevolverInspector - id: SpeedLoaderMagnum + - id: SpeedLoaderMagnumRubber - type: entity id: ClothingBeltChefFilled diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 1c491ef80e..83bec42f95 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -689,7 +689,6 @@ - ForensicPad - RiotShield - ShellShotgun - - ShellShotgunBeanbag - ShellShotgunSlug - ShellShotgunFlare - ShellTranquilizer diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 5e16440cd1..ae23bf070b 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -314,6 +314,15 @@ Steel: 300 Plastic: 300 +- type: latheRecipe + id: MagazineBoxPistolRubber + result: MagazineBoxPistolRubber + category: Ammo + completetime: 5 + materials: + Steel: 350 + Plastic: 300 + - type: latheRecipe id: MagazineBoxMagnum result: MagazineBoxMagnum @@ -331,6 +340,15 @@ Steel: 500 Plastic: 700 +- type: latheRecipe + id: MagazineBoxMagnumRubber + result: MagazineBoxMagnumRubber + category: Ammo + completetime: 5 + materials: + Steel: 350 + Plastic: 300 + - type: latheRecipe id: MagazineRifle result: MagazineRifle @@ -364,6 +382,15 @@ Steel: 350 Plastic: 550 +- type: latheRecipe + id: MagazineBoxRifleRubber + result: MagazineBoxRifleRubber + category: Ammo + completetime: 5 + materials: + Steel: 350 + Plastic: 600 + - type: latheRecipe id: MagazineBoxLightRifle result: MagazineBoxLightRifle @@ -381,6 +408,15 @@ Steel: 350 Plastic: 550 +- type: latheRecipe + id: MagazineBoxLightRifleRubber + result: MagazineBoxLightRifleRubber + category: Ammo + completetime: 5 + materials: + Steel: 350 + Plastic: 600 + - type: latheRecipe id: SpeedLoaderMagnum result: SpeedLoaderMagnum diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index fe22c48b27..1166b65417 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -46,6 +46,26 @@ recipeUnlocks: - WeaponLaserCarbine +- type: technology + id: NonlethalAmmunition + name: research-technology-nonlethal-ammunition + icon: + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: beanbag + discipline: Arsenal + tier: 1 + cost: 5000 + recipeUnlocks: + - ShellShotgunBeanbag + - CartridgePistolRubber + - CartridgeMagnumRubber + - CartridgeLightRifleRubber + - CartridgeRifleRubber + - MagazineBoxPistolRubber + - MagazineBoxMagnumRubber + - MagazineBoxLightRifleRubber + - MagazineBoxRifleRubber + - type: technology id: UraniumMunitions name: research-technology-uranium-munitions