From 2f3db89ca264bc2d0a20717c5f7d372398350e05 Mon Sep 17 00:00:00 2001 From: Admiral-Obvious-001 <89495925+Admiral-Obvious-001@users.noreply.github.com> Date: Sun, 17 Aug 2025 12:42:19 -0700 Subject: [PATCH 1/3] Test First commit --- Content.Shared/Ninja/Components/StunProviderComponent.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Ninja/Components/StunProviderComponent.cs b/Content.Shared/Ninja/Components/StunProviderComponent.cs index 2da094291d..9614383653 100644 --- a/Content.Shared/Ninja/Components/StunProviderComponent.cs +++ b/Content.Shared/Ninja/Components/StunProviderComponent.cs @@ -49,13 +49,13 @@ public sealed partial class StunProviderComponent : Component /// Time that someone is stunned for, stacks if done multiple times. /// [DataField] - public TimeSpan StunTime = TimeSpan.FromSeconds(5); + public TimeSpan StunTime = TimeSpan.FromSeconds(2); /// /// How long stunning is disabled after stunning something. /// [DataField] - public TimeSpan Cooldown = TimeSpan.FromSeconds(2); + public TimeSpan Cooldown = TimeSpan.FromSeconds(5); /// /// ID of the cooldown use delay. From 5e84fae7727604a1702902a1ad375868d248661a Mon Sep 17 00:00:00 2001 From: Admiral-Obvious-001 <89495925+Admiral-Obvious-001@users.noreply.github.com> Date: Sun, 17 Aug 2025 12:47:57 -0700 Subject: [PATCH 2/3] Commit 2 --- Content.Shared/Ninja/Components/StunProviderComponent.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Ninja/Components/StunProviderComponent.cs b/Content.Shared/Ninja/Components/StunProviderComponent.cs index 9614383653..3e6bd2cbb1 100644 --- a/Content.Shared/Ninja/Components/StunProviderComponent.cs +++ b/Content.Shared/Ninja/Components/StunProviderComponent.cs @@ -49,13 +49,13 @@ public sealed partial class StunProviderComponent : Component /// Time that someone is stunned for, stacks if done multiple times. /// [DataField] - public TimeSpan StunTime = TimeSpan.FromSeconds(2); + public TimeSpan StunTime = TimeSpan.FromSeconds(5); /// /// How long stunning is disabled after stunning something. /// [DataField] - public TimeSpan Cooldown = TimeSpan.FromSeconds(5); + public TimeSpan Cooldown = TimeSpan.FromSeconds(10); /// /// ID of the cooldown use delay. From c6fc95e32bb17ee64c28bcb1beeb189523e76cb0 Mon Sep 17 00:00:00 2001 From: Admiral-Obvious-001 <89495925+Admiral-Obvious-001@users.noreply.github.com> Date: Sun, 17 Aug 2025 13:41:39 -0700 Subject: [PATCH 3/3] Addressed Requested Changes --- Content.Shared/Ninja/Components/StunProviderComponent.cs | 2 +- Resources/Prototypes/Entities/Clothing/Hands/gloves.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Ninja/Components/StunProviderComponent.cs b/Content.Shared/Ninja/Components/StunProviderComponent.cs index 3e6bd2cbb1..2da094291d 100644 --- a/Content.Shared/Ninja/Components/StunProviderComponent.cs +++ b/Content.Shared/Ninja/Components/StunProviderComponent.cs @@ -55,7 +55,7 @@ public sealed partial class StunProviderComponent : Component /// How long stunning is disabled after stunning something. /// [DataField] - public TimeSpan Cooldown = TimeSpan.FromSeconds(10); + public TimeSpan Cooldown = TimeSpan.FromSeconds(2); /// /// ID of the cooldown use delay. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index e17e2ba59d..273384a28a 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -241,6 +241,7 @@ - components: - type: BatteryDrainer - type: StunProvider + cooldown: 10 noPowerPopup: ninja-no-power whitelist: components: