Metal foam grenade rework, small tweaks to grenade timers (#34579)

diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index d31a900236e236829aca0bf547da9469102a73e8..2f4646e001ea4dca846fdce4554a8e1e237a6c1e 100644 (file)
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -183,7 +183,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 50
+        damage: 12
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index ebfdf184f7ee572fc828968fecc468157b2f3943..b76a1c2554bb546d43a11634683d8f22175fc11c 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -15,7 +15,7 @@
     slots:
     - Belt
   - type: OnUseTimerTrigger
-    delay: 3.5
+    delay: 3
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible
@@ -448,13 +448,15 @@
   parent: [ BaseEngineeringContraband, SmokeGrenade ]
   id: MetalFoamGrenade
   name: metal foam grenade
-  description: An emergency tool used for patching up holes. Almost as good as real walls.
+  description: An emergency tool used for patching breaches with special quick-set metal foam. Almost as good as real walls.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/metalfoam.rsi
+  - type: OnUseTimerTrigger
+    delay: 1.5
   - type: SmokeOnTrigger
-    duration: 10
-    spreadAmount: 13
+    duration: 2
+    spreadAmount: 5
     smokePrototype: AluminiumMetalFoam
   - type: StaticPrice
     price: 350
@@ -488,6 +490,8 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/syndgrenade.rsi
+  - type: OnUseTimerTrigger
+    delay: 5
   - type: SoundOnTrigger
     sound:
       path: /Audio/Effects/Emotes/parp1.ogg

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
index a3087f1f9e8a52eed9e964a329b532b900f494b9..0b5f69496420a557c8929315b84241508d21d445 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml
@@ -18,6 +18,8 @@
       behaviors:
       - !type:TriggerBehavior
   - type: ScatteringGrenade
+  - type: OnUseTimerTrigger
+    delay: 3
   - type: Tag
     tags:
     - HandGrenade
@@ -39,8 +41,6 @@
   - type: Sprite
     sprite: Objects/Weapons/Grenades/clusterbang.rsi
     state: base-0
-  - type: OnUseTimerTrigger
-    delay: 3.5
 
 - type: entity
   parent: ClusterBang
@@ -95,7 +95,6 @@
         volume: 5
     initialBeepDelay: 0
     beepInterval: 0.5
-    delay: 3.5
   - type: EmitSoundOnTrigger
     sound:
       path: "/Audio/Machines/door_lock_off.ogg"
@@ -171,7 +170,6 @@
         volume: 5
     initialBeepDelay: 0
     beepInterval: 2
-    delay: 3.5
   - type: EmitSoundOnTrigger
     sound:
       path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg"