removes min recoil to get this merged asap

shiptest-ss13 · Aug 26, 2024 · 85fd80a · 85fd80a
1 parent d05770a
commit 85fd80a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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,