From 5891c2b64434339c2a4c985f907f6a34d7284b10 Mon Sep 17 00:00:00 2001 From: Marm <85680653+ItsMarmite@users.noreply.github.com> Date: Thu, 7 Jul 2022 22:18:51 +0100 Subject: [PATCH] Reworks Flashbangs (#18189) * Reworks Flashbangs Flashbangs no longer weaken, instead causing those affected to crawl and additionally makes them confused. * Hippie Repellent Reworks Flashbangs. Converts weaken to crawling. Adds confusion. * Riot Control Fixes a typo. * Update code/game/objects/items/weapons/grenades/flashbang.dm Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com> --- code/game/objects/items/weapons/grenades/flashbang.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 251e16cce1d..72ce278bd3d 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -47,20 +47,20 @@ M.show_message("BANG", 2) var/distance = max(1, get_dist(source_turf, get_turf(M))) - var/stun_amount = max(20 SECONDS / distance, 6 SECONDS) + var/status_duration = max(10 SECONDS / distance, 4 SECONDS) // Flash if(flash) if(M.flash_eyes(affect_silicon = TRUE)) - M.Weaken(stun_amount) + M.Confused(status_duration * 2) // Bang var/ear_safety = M.check_ear_prot() if(bang) if(!distance || A.loc == M || A.loc == M.loc) // Holding on person or being exactly where lies is significantly more dangerous and voids protection - M.Weaken(20 SECONDS) + M.KnockDown(10 SECONDS) if(!ear_safety) - M.Weaken(stun_amount) + M.KnockDown(status_duration) M.AdjustEarDamage(5, 15) if(iscarbon(M)) var/mob/living/carbon/C = M