From 0739e4b240409a40420ebab45ba757efbe837161 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Fri, 6 Sep 2024 11:16:07 -0500 Subject: [PATCH] prefire check --- code/modules/projectiles/gun.dm | 3 +++ code/modules/projectiles/guns/ballistic.dm | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 564c104d39f1..299a97010cf5 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -210,6 +210,7 @@ var/recoil_backtime_multiplier = 2 ///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 @@ -552,6 +553,8 @@ return /obj/item/gun/proc/pre_fire(atom/target, mob/living/user, message = TRUE, flag, params = null, zone_override = "", bonus_spread = 0, dual_wielded_gun = FALSE) + prefire_empty_checks() + add_fingerprint(user) // If we have a cooldown, don't do anything, obviously diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 50242e19b320..f7f7d0ccc15a 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -113,10 +113,6 @@ if (last_shot_succeeded && bolt_type == BOLT_TYPE_CLIP) update_appearance() -/obj/item/gun/ballistic/pre_fire(atom/target, mob/living/user, message = TRUE, flag, params = null, zone_override = "", bonus_spread = 0, dual_wielded_gun = FALSE) - prefire_empty_checks() - return ..() - /obj/item/gun/ballistic/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, burst_firing = FALSE, spread_override = 0, iteration = 0) . = ..() //The gun actually firing postfire_empty_checks(.)