diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 7dd7e370f8b8..1807f2c4ab03 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -730,12 +730,5 @@ EMPTY_GUN_HELPER(revolver/detective)
 	. = ..()
 	AddComponent(/datum/component/ammo_hud/revolver)
 
-/obj/item/gun/ballistic/revolver/shadow/before_firing(atom/target, mob/user)
-	. = ..()
-	// if you go through the pain of not only using this shitty gun, but also with the fucking gunslinger quirk, you deserve this bonus. not a BIG bonus, but enough as an incentive to make people actually take the quirk.
-	if(chambered.BB && (HAS_TRAIT(user, TRAIT_GUNSLINGER)))
-		chambered.BB.damage += 5
-		chambered.BB.armour_penetration += 5
-
 /obj/item/gun/ballistic/revolver/shadow/no_mag
 	spawnwithmagazine = FALSE
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 81642a13262f..f9e4fca2a641 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -626,6 +626,18 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
 	if(!wielded)
 		SpinAnimation(7,1)
 
+/obj/item/gun/ballistic/shotgun/flamingarrow/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+	var/fan = FALSE
+	if(HAS_TRAIT(user, TRAIT_GUNSLINGER) && !semi_auto && wielded_fully && loc == user && !safety)
+		fan = TRUE
+		fire_delay = 0.35 SECONDS
+	. = ..()
+	fire_delay = src::fire_delay
+	if(fan)
+		rack()
+		to_chat(user, "<span class='notice'>You quickly rack the [bolt_wording] of \the [src]!</span>")
+		balloon_alert_to_viewers("quickly racks!")
+		fire_delay = 0 SECONDS
 
 /obj/item/gun/ballistic/shotgun/flamingarrow/sawoff(mob/user)
 	. = ..()