From c7e21a541203bea39c19e4d0eb1766ab2c2481ae Mon Sep 17 00:00:00 2001 From: Anewbe Date: Wed, 30 Oct 2019 20:59:27 -0400 Subject: [PATCH] Merge pull request #6505 from Heroman3003/tension Fixes runtime in tension.dm --- code/modules/tension/tension.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/tension/tension.dm b/code/modules/tension/tension.dm index 841d691037..aa95662849 100644 --- a/code/modules/tension/tension.dm +++ b/code/modules/tension/tension.dm @@ -24,7 +24,7 @@ will_point_blank = ai_holder.pointblank var/potential_damage = 0 - if(!projectiletype || ( get_dist(src, threatened >= 1) && !will_point_blank ) ) // Melee damage. + if(!projectiletype || ( ( get_dist(src, threatened) >= 1) && !will_point_blank ) ) // Melee damage. potential_damage = (melee_damage_lower + melee_damage_upper) / 2 // Treat potential_damage as estimated DPS. If the enemy attacks twice as fast as usual, it will double the number.