From cc27cd342217ac4844c7ff8380c01082597bd7d6 Mon Sep 17 00:00:00 2001 From: Pariah919 <46353991+Pariah919@users.noreply.github.com> Date: Sat, 16 Sep 2023 15:22:19 -0500 Subject: [PATCH 1/4] derringer buffs --- code/modules/projectiles/ammo_datums.dm | 2 +- code/modules/projectiles/guns/shotguns.dm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index 2673cd166d891..de1e5dcc1a3a6 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -432,7 +432,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh handful_icon_state = "derringer" /datum/ammo/bullet/pistol/superheavy/derringer/on_hit_mob(mob/M,obj/projectile/P) - staggerstun(M, P, knockback = 1) + staggerstun(M, P, stagger = 2 SECONDS, knockback = 1) /datum/ammo/bullet/pistol/mech name = "super-heavy pistol bullet" diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index ce9fa2d31920f..77e369e82af1d 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -510,12 +510,12 @@ attachable_allowed = list() flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER - fire_delay = 0.5 SECONDS - scatter = 2 - recoil = 1 - recoil_unwielded = 1 + fire_delay = 0.1 SECONDS + scatter = 0 + scatter_unwielded = 0 + recoil = 0 aim_slowdown = 0 - wield_delay = 0.5 SECONDS + wield_delay = 0.1 SECONDS /obj/item/weapon/gun/shotgun/double/derringer/Initialize(mapload) . = ..() From 72c6d8ac953fac41394bccb347b980fc375e950d Mon Sep 17 00:00:00 2001 From: Pariah919 <46353991+Pariah919@users.noreply.github.com> Date: Sat, 16 Sep 2023 15:25:59 -0500 Subject: [PATCH 2/4] 0.1 fire delay to 0.2 --- code/modules/projectiles/guns/shotguns.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index 77e369e82af1d..b4c55243ac484 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -510,7 +510,7 @@ attachable_allowed = list() flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER - fire_delay = 0.1 SECONDS + fire_delay = 0.2 SECONDS scatter = 0 scatter_unwielded = 0 recoil = 0 From 707a91d90846aadfc6131e4ce656b1ee777474b2 Mon Sep 17 00:00:00 2001 From: Pariah919 <46353991+Pariah919@users.noreply.github.com> Date: Sat, 16 Sep 2023 15:27:04 -0500 Subject: [PATCH 3/4] unwielded recoil fix --- code/modules/projectiles/guns/shotguns.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index b4c55243ac484..6fce61a7c80d9 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -514,6 +514,7 @@ scatter = 0 scatter_unwielded = 0 recoil = 0 + recoil_unwielded = 0 aim_slowdown = 0 wield_delay = 0.1 SECONDS From 818e28abbae690309ecbdef2d7c26e452ff672a6 Mon Sep 17 00:00:00 2001 From: Pariah919 <46353991+Pariah919@users.noreply.github.com> Date: Sat, 16 Sep 2023 15:36:15 -0500 Subject: [PATCH 4/4] removed stagger/knockback added a bit of slow on hit --- code/modules/projectiles/ammo_datums.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index de1e5dcc1a3a6..173acb9f2d015 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -432,7 +432,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh handful_icon_state = "derringer" /datum/ammo/bullet/pistol/superheavy/derringer/on_hit_mob(mob/M,obj/projectile/P) - staggerstun(M, P, stagger = 2 SECONDS, knockback = 1) + staggerstun(M, P, slowdown = 0.5) /datum/ammo/bullet/pistol/mech name = "super-heavy pistol bullet"