diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index c99508cda5..78ca6e9280 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -86,11 +86,8 @@ var/obj/item/ammo_box/AM = A for(var/obj/item/ammo_casing/AC in AM.stored_ammo) if(load_delay || AM.load_delay) - var/loadtime = load_delay - if(AM.load_delay > load_delay) - loadtime = AM.load_delay - if(do_after(user, loadtime, target = src)) - else + var/loadtime = max(AM.load_delay, load_delay) + if(!do_after(user, loadtime, target = src)) return FALSE var/did_load = give_round(AC, replace_spent) if(did_load) 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