From 2c90d5458fca87495e9a5be5302096172bfa212d Mon Sep 17 00:00:00 2001 From: Ripmorld <60119809+UKNOWH@users.noreply.github.com> Date: Thu, 12 May 2022 20:24:01 +0800 Subject: [PATCH] Added the recipes and tech for several non lethal bullet (#8079) --- .../Catalog/Research/technologies.yml | 3 ++ .../Entities/Structures/Machines/lathe.yml | 5 ++- .../Prototypes/Recipes/Lathes/security.yml | 34 +++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 33c5de8b74..9d34f69587 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -172,6 +172,8 @@ - SecurityTechnology unlockedRecipes: - ShellShotgunBeanbag + - ShellTranquilizer + - ShellShotgunFlash - CartridgePistolRubber - CartridgeMagnumRubber - CartridgeClRifleRubber @@ -191,6 +193,7 @@ unlockedRecipes: - CartridgePistol - ShellShotgun + - ShellShotgunFlare - CartridgeLRifle - CartridgeMagnum diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8556e5abcb..a563858c02 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -295,11 +295,13 @@ - CartridgeLRifle - CartridgeMagnum - ShellShotgunBeanbag + - ShellShotgunFlare + - ShellShotgunFlash - CartridgePistolRubber - CartridgeMagnumRubber - CartridgeClRifleRubber - CartridgeLRifleRubber - - CartridgeSRifleRubber #Everything below this is shared with other lathes + - CartridgeSRifleRubber #Everything below this is shared with other lathes - FlashlightLantern - Bucket - MopItem @@ -355,6 +357,7 @@ - ClothingMaskSterile - DiseaseSwab - HandheldCrewMonitor + - ShellTranquilizer - Scalpel - Retractor - Cautery diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index cbfd33dab1..2581e57b07 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -136,3 +136,37 @@ completetime: 2 materials: Steel: 30 + +- type: latheRecipe + id: ShellShotgunFlare + icon: + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flare.rsi + state: base + result: ShellShotgunFlare + completetime: 2 + materials: + Plastic: 20 + Steel: 5 + +- type: latheRecipe + id: ShellTranquilizer + icon: + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi + state: base + result: ShellTranquilizer + completetime: 4 + materials: + Plastic: 15 + Steel: 10 + Glass: 5 + +- type: latheRecipe + id: ShellShotgunFlash + icon: + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi + state: base + result: ShellShotgunFlash + completetime: 2 + materials: + Plastic: 20 + Steel: 5 \ No newline at end of file