From 23d217099e71e0464950741bb4974f403be27b41 Mon Sep 17 00:00:00 2001 From: Geeves Date: Tue, 28 Nov 2023 01:20:56 +0200 Subject: [PATCH] Dual Wielding Buff (#17774) --- code/modules/projectiles/gun.dm | 6 +++--- html/changelogs/geeves-dual_wielding_buff.yml | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/geeves-dual_wielding_buff.yml diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index d055a37c545..49f2bd0d215 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -363,9 +363,9 @@ if(!is_offhand && user.a_intent == I_HURT) // no recursion var/obj/item/gun/SG = user.get_inactive_hand() - if(istype(SG)) - var/decreased_accuracy = (SG.w_class * 2) - SG.offhand_accuracy - addtimer(CALLBACK(SG, PROC_REF(Fire), target, user, clickparams, pointblank, reflex, decreased_accuracy, TRUE), 5) + if(istype(SG) && SG.w_class <= w_class) + var/decreased_accuracy = SG.w_class - SG.offhand_accuracy + addtimer(CALLBACK(SG, PROC_REF(Fire), target, user, clickparams, pointblank, reflex, decreased_accuracy, TRUE), 1) //actually attempt to shoot var/turf/targloc = get_turf(target) //cache this in case target gets deleted during shooting, e.g. if it was a securitron that got destroyed. diff --git a/html/changelogs/geeves-dual_wielding_buff.yml b/html/changelogs/geeves-dual_wielding_buff.yml new file mode 100644 index 00000000000..234c94a9ede --- /dev/null +++ b/html/changelogs/geeves-dual_wielding_buff.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - tweak: "Tweaked dual-wielding penalties to not be as harsh and to fire faster. It still works best with smaller weapons such as pistols." + - tweak: "Tweaked dual-wielding to only apply if its smaller or the same size as your main firearm, this makes it easier to pull out a pistol and use only that."