Skip to content

Commit

Permalink
Superheavy pistol changes (#13957)
Browse files Browse the repository at this point in the history
* superheavy pistol changes

* Update ammo_datums.dm

* slightly higher fire delay
  • Loading branch information
Pariah919 authored Sep 19, 2023
1 parent bb84a4e commit c8bfe87
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
5 changes: 3 additions & 2 deletions code/modules/projectiles/ammo_datums.dm
Original file line number Diff line number Diff line change
Expand Up @@ -422,10 +422,11 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh
hud_state = "pistol_superheavy"
damage = 45
penetration = 15
sundering = 3.5
sundering = 3
damage_falloff = 0.75

/datum/ammo/bullet/pistol/superheavy/on_hit_mob(mob/M,obj/projectile/P)
staggerstun(M, P, stagger = 2 SECONDS, slowdown = 1)
staggerstun(M, P, stagger = 2 SECONDS, slowdown = 0.5, knockback = 1)

/datum/ammo/bullet/pistol/superheavy/derringer
handful_amount = 2
Expand Down
14 changes: 7 additions & 7 deletions code/modules/projectiles/guns/pistols.dm
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,11 @@
flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER
attachable_offset = list("muzzle_x" = 31, "muzzle_y" = 19,"rail_x" = 9, "rail_y" = 23, "under_x" = 22, "under_y" = 14, "stock_x" = 20, "stock_y" = 17)

fire_delay = 0.7 SECONDS
fire_delay = 0.3 SECONDS
scatter_unwielded = 25
recoil = 1
recoil_unwielded = 2
scatter = 4
scatter = 2
scatter_unwielded = 7
accuracy_mult = 1
accuracy_mult_unwielded = 0.7
Expand Down Expand Up @@ -453,7 +453,7 @@


//-------------------------------------------------------
//.45 MARSHALS PISTOL //Inspired by the Browning Hipower
// Browning Hipower

/obj/item/weapon/gun/pistol/highpower
name = "\improper Highpower automag"
Expand All @@ -473,13 +473,13 @@
flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER
attachable_offset = list("muzzle_x" = 27, "muzzle_y" = 20,"rail_x" = 8, "rail_y" = 22, "under_x" = 18, "under_y" = 15, "stock_x" = 16, "stock_y" = 15)

fire_delay = 1 SECONDS
fire_delay = 0.35 SECONDS
burst_delay = 0.5 SECONDS
damage_mult = 1.2
recoil = 1
recoil = 0
recoil_unwielded = 2
accuracy_mult_unwielded = 0.7
scatter = 3
accuracy_mult_unwielded = 0.6
scatter = 2
scatter_unwielded = 6

//-------------------------------------------------------
Expand Down

0 comments on commit c8bfe87

Please sign in to comment.