Taser Removal

Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml

@@ -32,13 +32,12 @@
     id: SecurityCadetPDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
-   #pocket1: WeaponPistolMk58 - ES Change removes roundstart gun, replaces it with taser
-    pocket1: ESWeaponHybridTaser
+    pocket1: WeaponPistolMk58
     pocket2: BookSecurity
   storage:
     back:
     - Flash
-    #- MagazinePistol - ES Change removes roundstart gun, replaces it with taser
+    - MagazinePistol
 
 - type: chameleonOutfit
   id: SecurityCadetChameleonOutfit

Resources/Prototypes/_ES/Catalog/Crates/crates.yml

@@ -234,7 +234,7 @@
     containers:
       entity_storage:
         all:
-        - id: ESWeaponHybridTaser
+        - id: SmokeGrenade
           amount: 2
         - id: Flash
           amount: 3
@@ -418,4 +418,4 @@
     - id: ESSpeedLoader357
       amount: 2
     - id: ESMagazine9mm
-      amount: 2
+      amount: 2

Resources/Prototypes/_ES/Catalog/Tables/job_lockers.yml

@@ -12,7 +12,7 @@
     - id: NukeDisk
     - id: PinpointerNuclear
     - id: RubberStampCaptain
-    - id: ESWeaponHybridTaser
+    - id: Stunbaton
     - id: ForensicScanner
     - id: ClothingEyesGlassesSecurity
 
@@ -32,15 +32,14 @@
     - id: ClothingHeadsetCommand
     - id: ClothingNeckGoldmedal
     - id: HoPIDCard
-    - id: ESWeaponHybridTaser
+    - id: Stunbaton
     - id: ClothingEyesHudSecurity
 
 # Security
 - type: entityTable
   id: ESLockerFillHeadOfSecurity
   table: !type:AllSelector
     children:
-    - id: ESWeaponHybridTaser
     - id: BoxEncryptionKeySecurity
     - id: CigarGoldCase
       prob: 0.50
@@ -58,7 +57,6 @@
   table: !type:AllSelector
     children:
     - id: FlashlightSeclite
-    - id: ESWeaponHybridTaser
     - id: ClothingBeltSecurityFilled
     - id: Flash
     - id: ClothingEyesGlassesSecurity
@@ -74,7 +72,6 @@
     children:
     - id: FlashlightSeclite
       prob: 0.8
-    - id: ESWeaponHybridTaser
     - id: ESClothingHeadHelmetSecurity
     - id: ESClothingOuterArmorSecurity
     - id: ClothingBeltSecurityFilled
@@ -95,7 +92,7 @@
     - id: ClothingHeadHatDetGadget
       prob: 0.15
     - id: ClothingNeckTieDet
-    - id: ESWeaponHybridTaser
+    - id: Stunbaton
     - id: ESClothingOuterArmorDetective
     - id: ESClothingOuterCoatDetective
     - id: FlippoEngravedLighter

Resources/Prototypes/_ES/Roles/Jobs/Command/head_of_security.yml

@@ -38,7 +38,6 @@
     jumpsuit: ClothingUniformJumpsuitHoS
     outerClothing: ESClothingOuterCoatHoSTrench
     back: ClothingBackpackSecurity
-    pocket1: ESWeaponHybridTaser
   storage:
     back:
     - ESBoxSurvival

Resources/Prototypes/_ES/Roles/Jobs/Security/security_officer.yml

@@ -26,7 +26,6 @@
     jumpsuit: ClothingUniformJumpsuitSec
     outerClothing: ESClothingOuterArmorSecurity
     back: ClothingBackpackSecurity
-    pocket1: ESWeaponHybridTaser
   storage:
     back:
     - ESBoxSurvival

Resources/Prototypes/_ES/Roles/Jobs/Security/warden.yml

@@ -30,7 +30,6 @@
     jumpsuit: ClothingUniformJumpsuitWarden
     outerClothing: ESClothingOuterCoatWarden
     back: ClothingBackpackSecurity
-    pocket1: ESWeaponHybridTaser
   storage:
     back:
     - ESBoxSurvival