Skip to content

Commit

Permalink
the people decide
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Sep 6, 2024
1 parent bdee8e1 commit a93cab2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,12 @@
///this is how much deviation the gun recoil can have, recoil pushes the screen towards the reverse angle you shot + some deviation which this is the max.
var/recoil_deviation = 22.5

///Used if the guns recoil is lower then the min, it clamps the highest recoil
var/min_recoil = 0

var/gunslinger_recoil_bonus = 0
var/gunslinger_spread_bonus = 0

/// how many shots per burst, Ex: most machine pistols, M90, some ARs are 3rnd burst, while others like the GAR and laser minigun are 2 round burst.
var/burst_size = 3
///The rate of fire when firing in a burst. Not the delay between bursts
Expand Down Expand Up @@ -316,11 +322,6 @@
///This prevents gun from firing until the coodown is done, affected by lag
var/current_cooldown = 0

var/min_recoil = 0

var/gunslinger_recoil_bonus = 0
var/gunslinger_spread_bonus = 0

/obj/item/gun/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/ballistic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
has_safety = TRUE
safety = TRUE

min_recoil = 0.1

valid_attachments = list(
/obj/item/attachment/silencer,
/obj/item/attachment/laser_sight,
Expand All @@ -34,8 +36,6 @@
)
)

min_recoil = 0.25

/obj/item/gun/ballistic/Initialize()
. = ..()
if (!spawnwithmagazine && !ispath(mag_type, /obj/item/ammo_box/magazine/internal))
Expand Down

0 comments on commit a93cab2

Please sign in to comment.