From 071e830c109c06442c145b04d7ac997daacd9a78 Mon Sep 17 00:00:00 2001
From: kerisargit <108146620+kerisargit@users.noreply.github.com>
Date: Sun, 8 Oct 2023 20:08:20 +0300
Subject: [PATCH] fix: Incendiary bullets no longer deal cold, acid, or shock
 damage that ignores all armor. (#20836)

---
 .../Weapons/Guns/Ammunition/Projectiles/light_rifle.yml    | 5 +++--
 .../Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml | 7 ++++---
 .../Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml | 5 +++--
 .../Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml  | 6 ++++--
 .../Weapons/Guns/Ammunition/Projectiles/shotgun.yml        | 5 +++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
index 315f1af7e19..6350b77094f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml
@@ -39,5 +39,6 @@
   components:
   - type: Projectile
     damage:
-      groups:
-        Burn: 17
+      types:
+        Blunt: 3
+        Heat: 16
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
index 2da1e190d9d..8b30bfe1820 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml
@@ -41,9 +41,10 @@
   components:
   - type: Projectile
     damage:
-      groups:
-        Burn: 32
-
+      types:
+        Blunt: 3
+        Heat: 32
+        
 - type: entity
   id: BulletMagnumAP
   name: bullet (.45 magnum armor-piercing)
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
index f3e7d1e6bac..0e6c08c3dfd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml
@@ -39,5 +39,6 @@
   components:
   - type: Projectile
     damage:
-      groups:
-        Burn: 14
+      types:
+        Blunt: 2
+        Heat: 14
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
index 009ab6bbb4f..768fec3c428 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
@@ -39,5 +39,7 @@
   components:
   - type: Projectile
     damage:
-      groups:
-        Burn: 15
+      types:
+        Blunt: 2
+        Heat: 15
+        
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 ec23d3063a0..887295b4b1c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
@@ -53,8 +53,9 @@
     state: buckshot-flare
   - type: Projectile
     damage:
-      groups:
-        Burn: 7
+      types:
+        Blunt: 1
+        Heat: 7
 
 - type: entity
   id: PelletShotgunPractice