From: SoulFN <164462467+SoulFN@users.noreply.github.com>
Date: Sat, 20 Apr 2024 06:21:12 +0000 (+0800)
Subject: Glass shards damage (#26783)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=95c66b4f96cc869f1004242e5c27b909cbf66f1f;p=space-station-14.git

Glass shards damage (#26783)

* Update shards.yml

Changed glass shards damage depends on their type, each tier of glass gains 1 more damage, also changed attack rate to 1, because you cant fast swing with weapon that can hurt you

* Oops

Forgot about base shard

* Update shards.yml

Cleanup

* Update shards.yml

Changed damage on step (Attack damage + 1)
---

diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 621a3b1c38..834a2e7ff0 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -17,7 +17,7 @@
           shard2: ""
           shard3: ""
   - type: MeleeWeapon
-    attackRate: 1.5
+    attackRate: 1
     damage:
       types:
         Slash: 3.5
@@ -91,7 +91,7 @@
   - type: DamageUserOnTrigger
     damage:
       types:
-        Piercing: 5
+        Piercing: 4.5
   - type: Tag
     tags:
       - GlassShard
@@ -116,6 +116,10 @@
   components:
   - type: Sprite
     color: "#96cdef"
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 4.5
   - type: WelderRefinable
     refineResult:
     - SheetGlass1
@@ -123,7 +127,7 @@
   - type: DamageUserOnTrigger
     damage:
       types:
-        Piercing: 5
+        Piercing: 5.5
   - type: Tag
     tags:
       - ReinforcedGlassShard
@@ -148,6 +152,10 @@
   components:
   - type: Sprite
     color: "#FF72E7"
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 5.5
   - type: WelderRefinable
     refineResult:
     - SheetGlass1
@@ -155,7 +163,7 @@
   - type: DamageUserOnTrigger
     damage:
       types:
-        Piercing: 5
+        Piercing: 6.5
   - type: Tag
     tags:
       - PlasmaGlassShard
@@ -182,6 +190,11 @@
   components:
   - type: Sprite
     color: "#8eff7a"
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 4.5
+        Radiation: 2
   - type: WelderRefinable
     refineResult:
     - SheetGlass1
@@ -189,8 +202,8 @@
   - type: DamageUserOnTrigger
     damage:
       types:
-        Piercing: 3
-        Radiation: 2
+        Piercing: 5
+        Radiation: 2.5
   - type: Tag
     tags:
       - UraniumGlassShard