]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix some invalid damage types (#26295)
authorTayrtahn <tayrtahn@gmail.com>
Thu, 21 Mar 2024 01:58:21 +0000 (21:58 -0400)
committerGitHub <noreply@github.com>
Thu, 21 Mar 2024 01:58:21 +0000 (12:58 +1100)
Fixed some invalid damage types

Resources/Prototypes/Entities/Mobs/NPCs/space.yml
Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
Resources/Prototypes/NPCs/Combat/melee.yml
Resources/Prototypes/NPCs/utility_queries.yml
Resources/Prototypes/Reagents/botany.yml
Resources/Prototypes/Reagents/fun.yml

index a08b46fb5122721b77ffb3f3d198f5f2de8e08a3..eeee64022599a00fff590231d0fc79355f703298 100644 (file)
@@ -52,7 +52,7 @@
     animation: WeaponArcClaw
     damage:
       types:
-        Brute: 5
+        Blunt: 5
         Slash: 10
   - type: Tag
     tags:
index ddd3592d49f5b794937efd896db846ed2017af21..977a8a931b5144097aa9e7b8fa24ade0ceb7ae7a 100644 (file)
@@ -14,7 +14,7 @@
     wideAnimationRotation: -90
     damage:
       types:
-        Pierce: 0
+        Piercing: 0
     attackRate: 2
   - type: Tool
     qualities:
index 05cac3ae7b7ce319e42b2cc5e2afc6ada3075bf5..75b1b25916bf861d0ff3fa41bd90d45dc63fabb0 100644 (file)
       attackRate: 10
       damage:
         types:
-          Structure: 150
+          Structural: 150
           Slash: 20 #Horror
           Blunt: 20
           Heat: 20
index 282e794ee7765c3d9d2d89c5065994795f7358da..2facfaa5427a64f482d88ff4f6f2760a9fe0b5fd 100644 (file)
@@ -11,7 +11,7 @@
           - type: MeleeWeapon
             damage:
               types:
-                Brute: 0
+                Blunt: 0
           invert: true
       tasks:
         - !type:HTNCompoundTask
@@ -34,7 +34,7 @@
             - type: MeleeWeapon
               damage:
                 types:
-                  Brute: 0
+                  Blunt: 0
           invert: true
       tasks:
         - !type:HTNCompoundTask
index d62e1a7e8cf5f82582116717aea31154707500ac..3d5385ecbcd651f3635c4fa3131cc0d5a927e06f 100644 (file)
         - type: MeleeWeapon
           damage:
             types:
-              Brute: 0
+              Blunt: 0
         - type: Item
   considerations:
     - !type:TargetMeleeCon
index f6c55cf39464411105249efbea1213003d234435..a03c3826a4d05aefe74aac5325ad8781277bf620 100644 (file)
         damage:
           types:
             Asphyxiation: 1
-            Burn: 2
+            Heat: 2
             Poison: 1
     Medicine:
       effects:
index 9597627e876104f04d5ba15ea86c81f2c6b6a7a1..befa8d829688ed6612d83ec6cd6ddb627736628f 100644 (file)
         damage:
           types:
              Cold: 0.01 # slightly nips directly, other cold damage comes from the temp change
-             Burn: -3 # ghetto burn chem. i don't think anyone would use this intentionally but it's funny
+             Heat: -3 # ghetto burn chem. i don't think anyone would use this intentionally but it's funny
       - !type:PopupMessage
         conditions:
         - !type:ReagentThreshold