From: Arendian <137322659+Arendian@users.noreply.github.com>
Date: Tue, 16 Jan 2024 09:17:05 +0000 (+0100)
Subject: Fix flare shell not applying firestacks and makes it embed (#23648)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=495956a7fa3f5b78dd7a902ea340e06f5698ba38;p=space-station-14.git

Fix flare shell not applying firestacks and makes it embed (#23648)

* Fix flare gun not igniting and small firestack increase.

* Flare shells now embed
---

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
index 7c47e5d93e..0971391105 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -120,26 +120,22 @@
   name: pellet (.50 flare)
   noSpawn: true
   components:
-  - type: CollisionWake
-  - type: TileFrictionModifier
-    modifier: 0.5
   - type: Physics
     bodyType: Dynamic
     fixedRotation: false
+  - type: EmbeddableProjectile
+    deleteOnRemove: true
   - type: Fixtures
     fixtures:
-      fix1:
+      projectile:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-        density: 20
+          bounds: "-0.1,-0.1,0.1,0.1"
         mask:
-          - ItemMask
-        restitution: 0.3
-        friction: 0.2
+        - BulletImpassable
   - type: Tag
     tags:
-      - PelletShotgunFlare
+    - PelletShotgunFlare
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
     state: buckshot-flare
@@ -163,6 +159,11 @@
     color: "#FF8080"
     radius: 15.0
     energy: 9.0
+  - type: Projectile
+    deleteOnCollide: false
+    damage:
+      types:
+        Heat: 5
 
 - type: entity
   id: PelletShotgunUranium