From 478867d8d68042ef457a2404463ba3905e8d8d0b Mon Sep 17 00:00:00 2001
From: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Date: Tue, 1 Feb 2022 06:15:29 +0000
Subject: [PATCH] adds rubber bullets + beanbags to nonlethal technology
 (#6413)

---
 .../Catalog/Research/technologies.yml         | 18 +++++
 .../Entities/Structures/Machines/lathe.yml    |  6 ++
 .../Prototypes/Recipes/Lathes/security.yml    | 66 +++++++++++++++++++
 3 files changed, 90 insertions(+)

diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml
index 670f747716..8347b6a76c 100644
--- a/Resources/Prototypes/Catalog/Research/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -134,6 +134,24 @@
     - Handcuffs
     - Stunbaton
 
+- type: technology
+  name: "non-lethal technology"
+  id: NonLethalTechnology
+  description: For the softer approach to detaining.
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi
+    state: base
+  requiredPoints: 8000
+  requiredTechnologies:
+     - SecurityTechnology
+  unlockedRecipes:
+    - ShellShotgunBeanbag
+    - CartridgePistolRubber
+    - CartridgeMagnumRubber
+    - CartridgeClRifleRubber
+    - CartridgeLRifleRubber
+    - CartridgeSRifleRubber
+
 - type: technology
   name: "ballistic technology"
   id: BallisticTechnology
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 26aaf460a2..85fb4b3c34 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -166,6 +166,12 @@
       - ShellShotgun
       - CartridgeLRifle
       - CartridgeMagnum
+      - ShellShotgunBeanbag
+      - CartridgePistolRubber
+      - CartridgeMagnumRubber
+      - CartridgeClRifleRubber
+      - CartridgeLRifleRubber
+      - CartridgeSRifleRubber
       - MicroManipulatorStockPart
       - ScanningModuleStockPart
       - MicroLaserStockPart
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 2e73b37d0c..00f93dc309 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -31,6 +31,72 @@
     Plastic: 200
     Steel: 100
 
+- type: latheRecipe
+  id: ShellShotgunBeanbag
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi
+    state: base
+  result: ShellShotgunBeanbag
+  completetime: 500
+  materials:
+    Plastic: 15
+    Steel: 10
+    
+- type: latheRecipe
+  id: CartridgePistolRubber
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    state: base
+  result: CartridgePistolRubber
+  completetime: 500
+  materials:
+    Plastic: 5
+    Steel: 5
+    
+- type: latheRecipe
+  id: CartridgeMagnumRubber
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    state: base
+  result: CartridgeMagnumRubber
+  completetime: 500
+  materials:
+    Plastic: 5
+    Steel: 5
+    
+- type: latheRecipe
+  id: CartridgeClRifleRubber
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    state: base
+  result: CartridgeClRifleRubber
+  completetime: 500
+  materials:
+    Plastic: 10
+    Steel: 5
+    
+- type: latheRecipe
+  id: CartridgeLRifleRubber
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    state: base
+  result: CartridgeLRifleRubber
+  completetime: 500
+  materials:
+    Plastic: 10
+    Steel: 5
+    
+- type: latheRecipe
+  id: CartridgeSRifleRubber
+  icon:
+    sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    state: base
+  result: CartridgeSRifleRubber
+  completetime: 500
+  materials:
+    Plastic: 10
+    Steel: 5
+
 - type: latheRecipe
   id: CartridgePistol
   icon: