From 5306da79389920e0d0b95be2e8675489da7fc465 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Wed, 19 Aug 2020 12:02:53 +1000 Subject: [PATCH] Update code/modules/projectiles/guns/ballistic.dm Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> --- code/modules/projectiles/guns/ballistic.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 22e53e83f0..1aefa51a51 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -53,10 +53,8 @@ ..() if (istype(A, /obj/item/ammo_box/magazine)) var/obj/item/ammo_box/magazine/AM = A - if(AM.load_delay) - if(do_after(user, AM.load_delay, target = src)) - else - return FALSE + if(AM.load_delay && !do_after(user, AM.load_delay, target = src)) + return FALSE if (!magazine && istype(AM, mag_type)) if(user.transferItemToLoc(AM, src)) magazine = AM