From 036c4aab2723435f45ad84b044aa31861bb7907c Mon Sep 17 00:00:00 2001 From: Martinpachu Date: Fri, 21 Jun 2024 13:29:48 -0300 Subject: [PATCH] first one :3 --- code/modules/projectiles/guns/ballistic/revolver.dm | 7 ------- code/modules/projectiles/guns/ballistic/shotgun.dm | 12 ++++++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index c19c03f31e3e..812a33630523 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -718,10 +718,3 @@ EMPTY_GUN_HELPER(revolver/detective) /obj/item/gun/ballistic/revolver/shadow/ComponentInitialize() . = ..() 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 diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 896ae8095cd6..d34bd25e254e 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -616,6 +616,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, "You quickly rack the [bolt_wording] of \the [src]!") + balloon_alert_to_viewers("quickly racks!") + fire_delay = 0 SECONDS /obj/item/gun/ballistic/shotgun/flamingarrow/sawoff(mob/user) . = ..()