Skip to content

Commit

Permalink
Merge pull request #3414 from X0-11/suppressor-tweak
Browse files Browse the repository at this point in the history
suppressor tweak
  • Loading branch information
BDpuffy420 committed Jul 26, 2023
2 parents 4539a5f + 16caf56 commit 0cc1fdd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions code/modules/halo/weapons/forerunner/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,6 @@
icon = 'code/modules/halo/weapons/icons/forerunner_sprites.dmi'
icon_state = "suppressor_ammo"
damage = 25
armor_penetration = 20
armor_penetration = 10
penetrating = 1
shield_damage = 15
shield_damage = 10
6 changes: 3 additions & 3 deletions code/modules/halo/weapons/forerunner/rifles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

fire_delay = 8
burst = 6
burst_delay = 1.4
burst_delay = 1.6
one_hand_penalty = -1
dispersion = list(0.0,0.2,0.3,0.5,0.73,0.8)
w_class = ITEM_SIZE_LARGE
Expand All @@ -29,8 +29,8 @@
)

firemodes = list(\
list(mode_name="short bursts", burst=5, dispersion=list(0.0,0.2,0.3,0.5,0.73,0.8)),
list(mode_name="extended bursts", burst=10, dispersion=list(0.1,0.2,0.3,0.3, 0.5, 0.5, 0.6, 0.7, 0.8, 1.0))
list(mode_name="short bursts", burst=6, dispersion=list(0.0,0.2,0.3,0.5,0.73,0.8)),
list(mode_name="extended bursts", burst=12, dispersion=list(0.1,0.2,0.3,0.6, 0.8, 0.9, 0.9, 0.9, 0.9, 1.0))
)

/obj/item/weapon/gun/projectile/suppressor/can_use_when_prone()
Expand Down

0 comments on commit 0cc1fdd

Please sign in to comment.