From 627bf30580e9f4f5bf1eefbaa93ecf0b6dce4aa0 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Mon, 11 Dec 2023 17:33:29 -0500
Subject: [PATCH] Remove tasers from arsenal tech (#22361)

---
 Resources/Locale/en-US/research/technologies.ftl     |  1 -
 .../Entities/Structures/Machines/lathe.yml           |  2 --
 Resources/Prototypes/Recipes/Lathes/security.yml     | 12 +-----------
 Resources/Prototypes/Research/arsenal.yml            | 12 ------------
 4 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 7f90f134ea..5c8aaa82b3 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -41,7 +41,6 @@ research-technology-practice-ammunition = Practice Ammunition
 research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry
 research-technology-wave-particle-harnessing = Wave Particle Harnessing
 research-technology-advanced-riot-control = Advanced Riot Control
-research-technology-handheld-electrical-propulsion = Handheld Electrical Propulsion
 research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry
 
 research-technology-basic-robotics = Basic Robotics
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 73c094bcb7..ec83d4005f 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -282,7 +282,6 @@
       - WeaponAdvancedLaser
       - WeaponLaserCannon
       - WeaponXrayCannon
-      - WeaponTaser
 
 - type: entity
   id: CircuitImprinter
@@ -589,7 +588,6 @@
       - WeaponLaserCannon
       - WeaponLaserCarbine
       - WeaponLaserCarbinePractice
-      - WeaponTaser
       - WeaponXrayCannon
   - type: MaterialStorage
     whitelist:
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index ee29b4261a..6c4ca98938 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -65,16 +65,6 @@
     Plastic: 250
     Gold: 100
 
-- type: latheRecipe
-  id: WeaponTaser
-  result: WeaponTaser
-  completetime: 5
-  materials:
-    Steel: 700
-    Plastic: 300
-    Gold: 250
-    Silver: 500
-
 - type: latheRecipe
   id: ForensicPad
   result: ForensicPad
@@ -89,7 +79,7 @@
   materials:
     Steel: 300
     Glass: 200
-    
+
 - type: latheRecipe
   id: ClothingEyesHudSecurity
   result: ClothingEyesHudSecurity
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 75107a1b5e..bf8d67bc30 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -145,18 +145,6 @@
 
 # Tier 3
 
-- type: technology
-  id: HandheldElectricalPropulsion
-  name: research-technology-handheld-electrical-propulsion
-  icon:
-    sprite: Objects/Weapons/Guns/Battery/taser.rsi
-    state: icon
-  discipline: Arsenal
-  tier: 3
-  cost: 15000
-  recipeUnlocks:
-  - WeaponTaser
-
 - type: technology
   id: PortableMicrofusionWeaponry
   name: research-technology-portable-microfusion-weaponry
-- 
2.51.2