Skip to content

Commit

Permalink
various fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Kitsunemitsu committed May 9, 2024
1 parent 42fbfd2 commit d8179e7
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions code/modules/projectiles/guns/ego_gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,19 @@
return ..()

/obj/item/gun/ego_gun/attack_self(mob/user)
if(reloadtime)
is_reloading = TRUE
to_chat(user,span_notice("You start loading a new magazine."))
playsound(src, 'sound/weapons/gun/general/slide_lock_1.ogg', 50, TRUE)
if(do_after(user, reloadtime, src)) //gotta reload
playsound(src, 'sound/weapons/gun/general/bolt_rack.ogg', 50, TRUE)
shotsleft = initial(shotsleft)
is_reloading = FALSE
if(reloadtime && !is_reloading)
INVOKE_ASYNC(src, PROC_REF(reload_ego), user)
..()

/obj/item/gun/ego_gun/proc/reload_ego(mob/user)
is_reloading = TRUE
to_chat(user,span_notice("You start loading a new magazine."))
playsound(src, 'sound/weapons/gun/general/slide_lock_1.ogg', 50, TRUE)
if(do_after(user, reloadtime, src)) //gotta reload
playsound(src, 'sound/weapons/gun/general/bolt_rack.ogg', 50, TRUE)
shotsleft = initial(shotsleft)
is_reloading = FALSE

//Examine text for pistols.
/obj/item/gun/ego_gun/pistol/examine(mob/user)
. = ..()
Expand Down

0 comments on commit d8179e7

Please sign in to comment.