From 8a3170b7b4d171d433860e42c4d1a3d13f275396 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Thu, 19 Jan 2023 17:28:23 -0500 Subject: [PATCH] fixes flashbang cheese (#20254) --- code/game/objects/items/weapons/grenades/flashbang.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 72ce278bd3d..ee90ccce47b 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -45,8 +45,9 @@ if(M.stat == DEAD) continue M.show_message("BANG", 2) + var/mobturf = get_turf(M) - var/distance = max(1, get_dist(source_turf, get_turf(M))) + var/distance = max(1, get_dist(source_turf, mobturf)) var/status_duration = max(10 SECONDS / distance, 4 SECONDS) // Flash @@ -57,7 +58,7 @@ // 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 + if(source_turf == mobturf) // Holding on person or being exactly where lies is significantly more dangerous and voids protection M.KnockDown(10 SECONDS) if(!ear_safety) M.KnockDown(status_duration)