Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Derringer buffs #13966

Merged
merged 4 commits into from
Sep 20, 2023
Merged

Derringer buffs #13966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc27cd3
derringer buffs
Pariah919 Sep 16, 2023
72c6d8a
0.1 fire delay to 0.2
Pariah919 Sep 16, 2023
707a91d
unwielded recoil fix
Pariah919 Sep 16, 2023
818e28a
removed stagger/knockback added a bit of slow on hit
Pariah919 Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammo_datums.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, slowdown = 0.5)

/datum/ammo/bullet/pistol/mech
name = "super-heavy pistol bullet"
Expand Down
11 changes: 6 additions & 5 deletions code/modules/projectiles/guns/shotguns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,12 +510,13 @@
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.2 SECONDS
scatter = 0
scatter_unwielded = 0
recoil = 0
recoil_unwielded = 0
aim_slowdown = 0
wield_delay = 0.5 SECONDS
wield_delay = 0.1 SECONDS

/obj/item/weapon/gun/shotgun/double/derringer/Initialize(mapload)
. = ..()
Expand Down