From 3572d6b7c8c966c1d16542710e936e2168f14296 Mon Sep 17 00:00:00 2001
From: keronshb <54602815+keronshb@users.noreply.github.com>
Date: Sat, 27 Sep 2025 23:42:46 -0400
Subject: [PATCH] Removes Taser Bolt Damage & Allows Tasers to be used by
 Pacifists (#40588)

* Removes damage from the taser bolt

* Allows tasers to be used by pacified players

* Sets the taser damage to 0 or else it'll inherit damage
---
 .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml      | 1 +
 .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index 787f263176..30967200d7 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -622,6 +622,7 @@
     steps: 5
     zeroVisible: true
   - type: Appearance
+  - type: PacifismAllowedGun
 
 - type: entity
   name: elite taser
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 3521f57a8b..6c39e112bd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -217,7 +217,7 @@
   - type: Projectile
     damage:
       types:
-        Shock: 1
+        Shock: 0
     soundHit:
       path: "/Audio/Weapons/Guns/Hits/taser_hit.ogg"
     forceSound: true
-- 
2.51.2