Skip to content

Commit

Permalink
TGS Test Merge (#8034)
Browse files Browse the repository at this point in the history
  • Loading branch information
cm13-github committed Jan 7, 2025
2 parents ca8d3a9 + 482797c commit bc2e681
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/datums/ammo/bullet/lever_action.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
/datum/ammo/bullet/lever_action/xm88
name = ".458 SOCOM round"

damage = 104
damage = 80
penetration = ARMOR_PENETRATION_TIER_2
accuracy = HIT_ACCURACY_TIER_1
shell_speed = AMMO_SPEED_TIER_6
Expand Down
5 changes: 3 additions & 2 deletions code/modules/projectiles/guns/lever_action.dm
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ their unique feature is that a direct hit will buff your damage and firerate
/obj/item/attachable/bayonet/upp, // Barrel
/obj/item/attachable/bayonet,
/obj/item/attachable/extended_barrel,
/obj/item/attachable/heavy_barrel,
/obj/item/attachable/suppressor,
/obj/item/attachable/compensator,
/obj/item/attachable/reddot, // Rail
Expand All @@ -372,9 +373,9 @@ their unique feature is that a direct hit will buff your damage and firerate

/obj/item/weapon/gun/lever_action/xm88/set_gun_config_values()
..()
set_fire_delay(FIRE_DELAY_TIER_2 + FIRE_DELAY_TIER_11)
set_fire_delay(FIRE_DELAY_TIER_2)
lever_delay = FIRE_DELAY_TIER_3
accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_2
accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_5
accuracy_mult_unwielded = BASE_ACCURACY_MULT - HIT_ACCURACY_MULT_TIER_10
scatter = SCATTER_AMOUNT_TIER_8
burst_scatter_mult = 0
Expand Down

0 comments on commit bc2e681

Please sign in to comment.