From a7a964154e324169003f639233617acf9d4d6713 Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Wed, 19 Aug 2020 12:02:34 +1000 Subject: [PATCH 1/3] Update code/modules/projectiles/boxes_magazines/_box_magazine.dm Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> --- code/modules/projectiles/boxes_magazines/_box_magazine.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index c99508cda5..2406b09c45 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -89,8 +89,7 @@ var/loadtime = load_delay if(AM.load_delay > load_delay) loadtime = AM.load_delay - if(do_after(user, loadtime, target = src)) - else + if(!do_after(user, loadtime, target = src)) return FALSE var/did_load = give_round(AC, replace_spent) if(did_load) From 09bba250508cc219796032fba5b50afa38e4eade Mon Sep 17 00:00:00 2001 From: lolman360 <22850904+lolman360@users.noreply.github.com> Date: Wed, 19 Aug 2020 12:02:45 +1000 Subject: [PATCH 2/3] Update code/modules/projectiles/boxes_magazines/_box_magazine.dm Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> --- code/modules/projectiles/boxes_magazines/_box_magazine.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 2406b09c45..78ca6e9280 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -86,9 +86,7 @@ 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 + 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) 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 3/3] 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