From 784e7e454e62d287f2125337cf72386744e9ba58 Mon Sep 17 00:00:00 2001
From: Kara <lunarautomaton6@gmail.com>
Date: Thu, 14 Jul 2022 06:44:44 -0700
Subject: [PATCH] Remove some tasers (#9727)

---
 Resources/Maps/centcomm.yml                               | 4 ++--
 .../Catalog/Fills/Backpacks/StarterGear/backpack.yml      | 8 ++++----
 Resources/Prototypes/Catalog/Fills/Crates/security.yml    | 2 +-
 Resources/Prototypes/Catalog/Fills/Lockers/heads.yml      | 6 +++---
 Resources/Prototypes/Catalog/Fills/Lockers/security.yml   | 2 +-
 Resources/Prototypes/LootTables/suspicion_loot_table.yml  | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml
index c159539c5c..32c02bf5ac 100644
--- a/Resources/Maps/centcomm.yml
+++ b/Resources/Maps/centcomm.yml
@@ -25234,7 +25234,7 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 2984
-  type: WeaponTaser
+  type: WeaponDisabler
   components:
   - pos: 27.485548,43.777584
     parent: 55
@@ -25251,7 +25251,7 @@ entities:
       charger-slot: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 2986
-  type: WeaponTaser
+  type: WeaponDisabler
   components:
   - pos: 27.485548,43.183834
     parent: 55
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index d2edb5ea11..5196ff6557 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -156,7 +156,7 @@
         - id: MagazinePistolHighCapacityRubber
         - id: MagazinePistol
         - id: Handcuffs
-        
+
 
 - type: entity
   noSpawn: true
@@ -166,12 +166,12 @@
     - type: StorageFill
       contents:
         - id: BoxSurvival
-        - id: WeaponTaser
+        - id: WeaponDisabler
         - id: WeaponPulsePistol
         - id: WeaponPulseCarbine
         - id: BoxHandcuff
         - id: Handcuffs
-        
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackERTMedical
@@ -199,7 +199,7 @@
         - id: RCDAmmo
         - id: RCDAmmo
         - id: RCDAmmo
-        
+
 - type: entity
   noSpawn: true
   parent: ClothingBackpackERTJanitor
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
index c4c59db884..893762ddab 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -27,7 +27,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponTaser
+      - id: WeaponDisabler
         amount: 3
       - id: Stunbaton
         amount: 3
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 73b2d1bef0..f7e8f4c654 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -39,7 +39,7 @@
       - id: ClothingHandsGlovesCaptain
       - id: ClothingOuterHardsuitCap
       - id: ClothingMaskGasCaptain
-      - id: WeaponTaser
+      - id: WeaponDisabler
       - id: CommsComputerCircuitboard
       - id: ClothingHeadsetAltCommand
       - id: SpaceCash1000
@@ -73,7 +73,7 @@
       - id: BoxPDA
       - id: BoxID
       - id: IDComputerCircuitboard
-      - id: WeaponTaser
+      - id: WeaponDisabler
       - id: ClothingShoesColorBlack
         prob: 0.7
       - id: PlushieLizard
@@ -158,7 +158,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponTaser
+      - id: WeaponDisabler
       - id: ClothingHeadHatBeretHoS
       - id: ClothingHeadHatHoshat
       - id: ClothingNeckCloakHos
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 40ee7ee22c..2f394b2b11 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -6,7 +6,7 @@
   - type: StorageFill
     contents:
       - id: FlashlightSeclite
-      - id: WeaponTaser
+      - id: WeaponDisabler
         prob: 0.3
       - id: ClothingHeadHatWarden
       - id: ClothingHeadHatBeretWarden
diff --git a/Resources/Prototypes/LootTables/suspicion_loot_table.yml b/Resources/Prototypes/LootTables/suspicion_loot_table.yml
index a7b9682e2b..05487827a5 100644
--- a/Resources/Prototypes/LootTables/suspicion_loot_table.yml
+++ b/Resources/Prototypes/LootTables/suspicion_loot_table.yml
@@ -90,7 +90,7 @@
   - id: WeaponXrayCannon
     amount: 0
     maxAmount: 2
-  - id: WeaponTaser
+  - id: WeaponDisabler
     amount: 0
     maxAmount: 4