Skip to content

Commit

Permalink
give it up for MERGE CONFLICT NO. 4, MERGE CONFLICT NUMBER 4
Browse files Browse the repository at this point in the history
  • Loading branch information
CapCamIII committed Aug 9, 2023
1 parent 8ebffc1 commit 91c18e7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/pistols.dm
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@

/obj/item/weapon/gun/pistol/np92/set_gun_config_values()
..()
fire_delay = FIRE_DELAY_TIER_10
fire_delay = FIRE_DELAY_TIER_12
accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_5
accuracy_mult_unwielded = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_5
scatter = SCATTER_AMOUNT_TIER_6
Expand All @@ -299,7 +299,7 @@
icon_state = "npz92"
item_state = "npz92"
inherent_traits = list(TRAIT_GUN_SILENCED)
fire_sound = 'sound/weapons/gun_c99.ogg'
fire_sound = "gun_silenced"
current_mag = /obj/item/ammo_magazine/pistol/np92/suppressed
flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER
attachable_allowed = list(
Expand Down

0 comments on commit 91c18e7

Please sign in to comment.