From 03a02e48c02efe1f23d1bc30aa33a97d901776d7 Mon Sep 17 00:00:00 2001 From: LordFowl Date: Thu, 8 Feb 2018 04:58:57 -0500 Subject: [PATCH] Fixes bayonet oversight (#4256) Much like modular guns cap projectile damage to 60, modular guns will now cap melee damage to 40, no matter how many bayonets you tape on. --- code/modules/projectiles/guns/energy/modular.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/modular.dm b/code/modules/projectiles/guns/energy/modular.dm index 91baefa02b1..2b11c518447 100644 --- a/code/modules/projectiles/guns/energy/modular.dm +++ b/code/modules/projectiles/guns/energy/modular.dm @@ -127,7 +127,7 @@ burst += modifier.burst burst_delay += modifier.burst_delay max_shots *= modifier.shots - force += modifier.gun_force + force = min(force + modifier.gun_force, 40) chargetime += modifier.chargetime*10 accuracy += modifier.accuracy criticality *= modifier.criticality