fix: Incendiary bullets no longer deal cold, acid, or shock damage that ignores all...

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 315f1af7e192cb86b73b3be376a17534842388c5..6350b77094f80de2b609b3c7bb4ec313da6650fd 100644 (file)
--- 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 2da1e190d9da904d2159441aedb11d6ed6add6d2..8b30bfe182027661a5de7bd4f105587163ce595a 100644 (file)
--- 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 f3e7d1e6bac916344446a194bf59cf7291642e97..0e6c08c3dfd1a3aadbd7b22df3a0ca7d09175aa6 100644 (file)
--- 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 009ab6bbb4f26ff1adaa192e1c726f54c5191994..768fec3c428c2fa9df2136f1e6beb2d34bbb0561 100644 (file)
--- 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 ec23d3063a0b87c0439bdd5cb14e74df7e4a94ac..887295b4b1cd500e028ca42aacf8b63e1b7a9b25 100644 (file)
--- 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