From 3355239a9a76e1f4ad4dde10fcc93d3e632f3ce0 Mon Sep 17 00:00:00 2001
From: DarkSide-droids <MY_NAME@example.com>
Date: Mon, 11 Nov 2024 21:33:12 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=8D=D0=BD=D0=B5=D1=80=D0=B3=D0=B5=D1=82=D0=B8?=
 =?UTF-8?q?=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B3=D0=BE=20=D0=B2=D0=BE=D0=BE?=
 =?UTF-8?q?=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Weapons/Guns/Projectiles/projectiles.yml  | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 03b97671b2..6d544ec4d6 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -218,7 +218,7 @@
 - type: entity
   name : disabler bolt
   id: BulletDisabler
-  parent: BaseBullet
+  parent: [ BaseBullet, BaseBulletTrigger ]
   noSpawn: true
   components:
   - type: Reflective
@@ -232,8 +232,9 @@
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
     layers:
-    - state: omnilaser
+    - state: omnilaser_greyscale
       shader: unshaded
+      color: '#00DCF0'
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -249,6 +250,14 @@
   - type: Ammo
   - type: StaminaDamageOnCollide
     damage: 30
+  - type: EmpOnTrigger
+    range: 0.5
+    energyConsumption: 10
+    disableDuration: 0.1
+  - type: PointLight
+    radius: 2.3
+    color: '#00DCF0'
+    energy: 0.7
   - type: Projectile
     impactEffect: BulletImpactEffectDisabler
     damage:
@@ -272,8 +281,9 @@
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
     layers:
-    - state: omnilaser
+    - state: omnilaser_greyscale
       shader: unshaded
+      color: '#00DCF0'
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -289,6 +299,10 @@
   - type: Ammo
   - type: StaminaDamageOnCollide
     damage: 1
+  - type: PointLight
+    radius: 2.3
+    color: '#00DCF0'
+    energy: 0.7
   - type: Projectile
     impactEffect: BulletImpactEffectDisabler
     damage:
@@ -925,7 +939,7 @@
 - type: entity
   name : disabler bolt smg
   id: BulletDisablerSmg
-  parent: BaseBullet
+  parent: [ BaseBullet, BaseBulletTrigger ]
   noSpawn: true
   components:
   - type: Reflective
@@ -939,8 +953,9 @@
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi
     layers:
-    - state: omnilaser
+    - state: omnilaser_greyscale
       shader: unshaded
+      color: '#00DCF0'
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -956,6 +971,14 @@
   - type: Ammo
   - type: StaminaDamageOnCollide
     damage: 15
+  - type: EmpOnTrigger
+    range: 0.5
+    energyConsumption: 5
+    disableDuration: 0.1
+  - type: PointLight
+    radius: 2.3
+    color: '#00DCF0'
+    energy: 0.7
   - type: Projectile
     impactEffect: BulletImpactEffectDisabler
     damage:
@@ -1041,3 +1064,7 @@
         Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun
     soundHit:
       collection: MeatLaserImpact
+  - type: PointLight
+    radius: 2.3
+    color: red
+    energy: 0.7
\ No newline at end of file