From 85fd80abfabdaeda6b1b880de756358f63d7b685 Mon Sep 17 00:00:00 2001 From: retlaw34 <58402542+retlaw34@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:50:45 -0700 Subject: [PATCH] removes min recoil to get this merged asap --- code/modules/projectiles/gun.dm | 4 +--- code/modules/projectiles/guns/ballistic.dm | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index b0151144cce3..023f6212e06f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -316,8 +316,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 @@ -810,7 +808,7 @@ /obj/item/gun/proc/calculate_recoil(mob/user, recoil_bonus = 0) if(HAS_TRAIT(user, TRAIT_GUNSLINGER)) recoil_bonus += gunslinger_recoil_bonus - return clamp(recoil_bonus, min_recoil , INFINITY) + return clamp(recoil_bonus, 0 , INFINITY) /obj/item/gun/proc/calculate_spread(mob/user, bonus_spread) var/final_spread = 0 diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 6af7de9a7878..1790ba25a858 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -13,8 +13,6 @@ has_safety = TRUE safety = TRUE - min_recoil = 0.25 - valid_attachments = list( /obj/item/attachment/silencer, /obj/item/attachment/laser_sight,