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

Clicking a magazine to tac reload instead of drag #26

Merged
merged 1 commit into from
Jul 20, 2024
Merged

Clicking a magazine to tac reload instead of drag #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions code/modules/projectiles/gun_helpers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@

active_attachable.reload(I, user)

//tactical reloads
/obj/item/weapon/gun/afterattack(atom/target, mob/user, has_proximity, click_parameters)
if(istype(target, /obj/item/ammo_magazine) || istype(target, /obj/item/cell))
tactical_reload(target, user)
return ..()

/obj/item/weapon/gun/mob_can_equip(mob/user, slot, warning = TRUE, override_nodrop = FALSE, bitslot = FALSE)
//Cannot equip wielded items or items burst firing.
if(HAS_TRAIT(src, TRAIT_GUN_BURST_FIRING))
Expand Down Expand Up @@ -88,12 +94,6 @@ As sniper rifles have both and weapon mods can change them as well. ..() deals w
return
wield(user)//Trying to wield it

//tactical reloads
/obj/item/weapon/gun/MouseDrop_T(atom/dropping, mob/living/carbon/human/user)
if(istype(dropping, /obj/item/ammo_magazine) || istype(dropping, /obj/item/cell))
tactical_reload(dropping, user)
return ..()

///This performs a tactical reload with src using new_magazine to load the gun.
/obj/item/weapon/gun/proc/tactical_reload(obj/item/new_magazine, mob/living/carbon/human/user)
if(!istype(user) || user.incapacitated(TRUE) || user.do_actions)
Expand Down
Loading