Merge pull request #1455 from Citadel-Station-13/upstream-merge-28125

[MIRROR] I might HAVE accidently made dualwielding hilariously OP again so have a nerf!
This commit is contained in:
LetterJay
2017-06-14 08:53:52 -05:00
committed by GitHub
+5 -2
View File
@@ -1,3 +1,6 @@
#define DUALWIELD_PENALTY_EXTRA_MULTIPLIER 1.4
/obj/item/weapon/gun
name = "gun"
desc = "It's a gun. It's pretty terrible, though."
@@ -229,7 +232,7 @@
break
if(chambered && chambered.BB)
if(randomspread)
sprd = round((rand() - 0.5) * (randomized_gun_spread + randomized_bonus_spread))
sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread))
else //Smart spread
sprd = round((((rand_spr/burst_size) * i) - (0.5 + (rand_spr * 0.25))) * (randomized_gun_spread + randomized_bonus_spread))
@@ -250,7 +253,7 @@
firing_burst = 0
else
if(chambered)
sprd = round((rand() - 0.5) * (randomized_gun_spread + randomized_bonus_spread))
sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread))
if(!chambered.fire_casing(target, user, params, , suppressed, zone_override, sprd))
shoot_with_empty_chamber(user)
return